diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bb1523940d1..20ca24ba1bb 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,8 +7,3 @@ Please include a description of your change & check your PR against this list, t
 - [ ] The build will pass (run `yarn test:all` and `yarn lint`)
 
 We appreciate your contribution!
-
----
-
-<!-- Leave the line below if you'd like GitHub Copilot to generate a summary from your commit -->
-copilot:summary
diff --git a/.github/actions/restore-cache/action.yml b/.github/actions/restore-cache/action.yml
index fcd4fddbebc..fb6a08de204 100644
--- a/.github/actions/restore-cache/action.yml
+++ b/.github/actions/restore-cache/action.yml
@@ -6,13 +6,13 @@ runs:
   steps:
     - name: Check dependency cache
       id: dep-cache
-      uses: actions/cache/restore@v3
+      uses: actions/cache/restore@v4
       with:
         path: ${{ env.CACHED_DEPENDENCY_PATHS }}
         key: ${{ env.DEPENDENCY_CACHE_KEY }}
 
     - name: Check build cache
-      uses: actions/cache/restore@v3
+      uses: actions/cache/restore@v4
       id: build-cache
       with:
         path: ${{ env.CACHED_BUILD_PATHS }}
diff --git a/.github/scripts/dev.js b/.github/scripts/dev.js
index e022c50b55c..83c9f30c955 100644
--- a/.github/scripts/dev.js
+++ b/.github/scripts/dev.js
@@ -1,7 +1,9 @@
+const fs = require('fs');
 const path = require('path');
 const util = require('util');
 const exec = util.promisify(require('child_process').exec);
 
+const chalk = require('chalk');
 const concurrently = require('concurrently');
 
 // check we're running on Node 18 and above
@@ -15,6 +17,20 @@ const config = require('../../ghost/core/core/shared/config/loader').loadNconf({
     customConfigPath: path.join(__dirname, '../../ghost/core')
 });
 
+const tsPackages = fs.readdirSync(path.resolve(__dirname, '../../ghost'), {withFileTypes: true})
+    .filter(dirent => dirent.isDirectory())
+    .map(dirent => dirent.name)
+    .filter(packageFolder => {
+        try {
+            const packageJson = require(path.resolve(__dirname, `../../ghost/${packageFolder}/package.json`));
+            return packageJson.scripts?.['build:ts'];
+        } catch (err) {
+            return false;
+        }
+    })
+    .map(packageFolder => `ghost/${packageFolder}`)
+    .join(',');
+
 const liveReloadBaseUrl = config.getSubdir() || '/ghost/';
 const siteUrl = config.getSiteUrl();
 
@@ -44,32 +60,40 @@ const COMMAND_ADMIN = {
 
 const COMMAND_TYPESCRIPT = {
     name: 'ts',
-    command: 'nx watch --projects=ghost/collections,ghost/in-memory-repository,ghost/bookshelf-repository,ghost/mail-events,ghost/model-to-domain-event-interceptor,ghost/post-revisions,ghost/nql-filter-expansions,ghost/post-events,ghost/donations,ghost/recommendations -- nx run \\$NX_PROJECT_NAME:build:ts',
+    command: `while [ 1 ]; do nx watch --projects=${tsPackages} -- nx run \\$NX_PROJECT_NAME:build:ts; done`,
     cwd: path.resolve(__dirname, '../../'),
     prefixColor: 'cyan',
     env: {}
 };
 
-const COMMAND_ADMINX = {
+const adminXApps = '@tryghost/admin-x-demo,@tryghost/admin-x-settings,@tryghost/admin-x-activitypub';
+
+const COMMANDS_ADMINX = [{
+    name: 'adminXDeps',
+    command: 'while [ 1 ]; do nx watch --projects=apps/admin-x-design-system,apps/admin-x-framework -- nx run \\$NX_PROJECT_NAME:build; done',
+    cwd: path.resolve(__dirname, '../..'),
+    prefixColor: '#C72AF7',
+    env: {}
+}, {
     name: 'adminX',
-    command: 'yarn dev',
-    cwd: path.resolve(__dirname, '../../apps/admin-x-settings'),
-    prefixColor: '#C35831',
+    command: `nx run-many --projects=${adminXApps} --parallel=${adminXApps.length} --targets=dev`,
+    cwd: path.resolve(__dirname, '../../apps/admin-x-settings', '../../apps/admin-x-activitypub'),
+    prefixColor: '#C72AF7',
     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')) {
     commands.push({
         name: 'portal',
-        command: 'yarn dev',
+        command: 'nx run @tryghost/portal:dev',
         cwd: path.resolve(__dirname, '../../apps/portal'),
         prefixColor: 'magenta',
         env: {}
@@ -92,7 +116,7 @@ if (DASH_DASH_ARGS.includes('portal') || DASH_DASH_ARGS.includes('all')) {
 if (DASH_DASH_ARGS.includes('signup') || DASH_DASH_ARGS.includes('all')) {
     commands.push({
         name: 'signup-form',
-        command: DASH_DASH_ARGS.includes('signup') ? 'yarn dev' : 'yarn preview',
+        command: DASH_DASH_ARGS.includes('signup') ? 'nx run @tryghost/signup-form:dev' : 'nx run @tryghost/signup-form:preview',
         cwd: path.resolve(__dirname, '../../apps/signup-form'),
         prefixColor: 'magenta',
         env: {}
@@ -103,7 +127,7 @@ if (DASH_DASH_ARGS.includes('signup') || DASH_DASH_ARGS.includes('all')) {
 if (DASH_DASH_ARGS.includes('announcement-bar') || DASH_DASH_ARGS.includes('announcementBar') || DASH_DASH_ARGS.includes('announcementbar') || DASH_DASH_ARGS.includes('all')) {
     commands.push({
         name: 'announcement-bar',
-        command: 'yarn dev',
+        command: 'nx run @tryghost/announcement-bar:dev',
         cwd: path.resolve(__dirname, '../../apps/announcement-bar'),
         prefixColor: '#DC9D00',
         env: {}
@@ -114,7 +138,7 @@ if (DASH_DASH_ARGS.includes('announcement-bar') || DASH_DASH_ARGS.includes('anno
 if (DASH_DASH_ARGS.includes('search') || DASH_DASH_ARGS.includes('all')) {
     commands.push({
         name: 'search',
-        command: 'yarn dev',
+        command: 'nx run @tryghost/sodo-search:dev',
         cwd: path.resolve(__dirname, '../../apps/sodo-search'),
         prefixColor: '#23de43',
         env: {}
@@ -153,7 +177,7 @@ if (DASH_DASH_ARGS.includes('comments') || DASH_DASH_ARGS.includes('all')) {
 
     commands.push({
         name: 'comments',
-        command: 'yarn dev',
+        command: 'nx run @tryghost/comments-ui:dev',
         cwd: path.resolve(__dirname, '../../apps/comments-ui'),
         prefixColor: '#E55137',
         env: {}
@@ -165,7 +189,6 @@ async function handleStripe() {
         if (DASH_DASH_ARGS.includes('offline')) {
             return;
         }
-        console.log('Fetching Stripe secret token..');
 
         let stripeSecret;
         try {
@@ -198,6 +221,8 @@ async function handleStripe() {
         process.exit(0);
     }
 
+    console.log(`Running projects: ${commands.map(c => chalk.green(c.name)).join(', ')}`);
+
     const {result} = concurrently(commands, {
         prefix: 'name',
         killOthers: ['failure', 'success']
@@ -206,6 +231,10 @@ async function handleStripe() {
     try {
         await result;
     } catch (err) {
-        console.error('\nExecuting dev command failed, ensure dependencies are up-to-date by running `yarn fix`\n');
+        console.error();
+        console.error(chalk.red(`Executing dev command failed:`) + `\n`);
+        console.error(chalk.red(`If you've recently done a \`yarn main\`, dependencies might be out of sync. Try running \`${chalk.green('yarn fix')}\` to fix this.`));
+        console.error(chalk.red(`If not, something else went wrong. Please report this to the Ghost team.`));
+        console.error();
     }
 })();
diff --git a/.github/scripts/docker-compose.yml b/.github/scripts/docker-compose.yml
new file mode 100644
index 00000000000..a8d89941f7d
--- /dev/null
+++ b/.github/scripts/docker-compose.yml
@@ -0,0 +1,39 @@
+version: '3.8'
+
+name: ghost
+
+services:
+  mysql:
+    image: mysql:8.0.35
+    container_name: ghost-mysql
+    # We'll need to look into how we can further fine tune the memory usage/performance here
+    command: --innodb-buffer-pool-size=1G --innodb-log-buffer-size=500M --innodb-change-buffer-max-size=50 --innodb-flush-log-at-trx_commit=0 --innodb-flush-method=O_DIRECT
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: ghost
+    restart: always
+    volumes:
+      # Turns out you can drop .sql or .sql.gz files in here, cool!
+      - ./mysql-preload:/docker-entrypoint-initdb.d
+    healthcheck:
+      test: "mysql -uroot -proot ghost -e 'select 1'"
+      interval: 1s
+      retries: 120
+  redis:
+    image: redis:7.0
+    container_name: ghost-redis
+    ports:
+      - "6379:6379"
+    restart: always
+  jaeger:
+      image: jaegertracing/all-in-one:1.58
+      container_name: ghost-jaeger
+      ports:
+        - "4318:4318"
+        - "16686:16686"
+        - "9411:9411"
+      restart: always
+      environment:
+        COLLECTOR_ZIPKIN_HOST_PORT: :9411
\ No newline at end of file
diff --git a/.github/scripts/mysql-preload/.keep b/.github/scripts/mysql-preload/.keep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/.github/scripts/setup.js b/.github/scripts/setup.js
new file mode 100644
index 00000000000..f0558b298d7
--- /dev/null
+++ b/.github/scripts/setup.js
@@ -0,0 +1,138 @@
+const {spawn} = require('child_process');
+const fs = require('fs').promises;
+const path = require('path');
+
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+
+/**
+ * Run a command and stream output to the console
+ *
+ * @param {string} command
+ * @param {string[]} args
+ * @param {object} options
+ */
+async function runAndStream(command, args, options) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(command, args, {
+            stdio: 'inherit',
+            ...options
+        });
+
+        child.on('close', (code) => {
+            if (code === 0) {
+                resolve(code);
+            } else {
+                reject(new Error(`'${command} ${args.join(' ')}' exited with code ${code}`));
+            }
+        });
+
+    });
+}
+
+(async () => {
+    if (process.env.NODE_ENV !== 'development') {
+        console.log(chalk.yellow(`NODE_ENV is not development, skipping setup`));
+        return;
+    }
+
+    const coreFolder = path.join(__dirname, '../../ghost/core');
+    const rootFolder = path.join(__dirname, '../..');
+    const config = require('../../ghost/core/core/shared/config/loader').loadNconf({
+        customConfigPath: coreFolder
+    });
+
+    const dbClient = config.get('database:client');
+    const isUsingDocker = config.get('database:docker');
+
+    // Only reset data if we are using Docker
+    let resetData = false;
+
+    if (!dbClient.includes('mysql')) {
+        let mysqlSetup = false;
+        console.log(chalk.blue(`Attempting to setup MySQL via Docker`));
+        try {
+            await runAndStream('yarn', ['docker:reset'], {cwd: path.join(__dirname, '../../')});
+            mysqlSetup = true;
+        } catch (err) {
+            console.error(chalk.red('Failed to run MySQL Docker container'), err);
+            console.error(chalk.red('Hint: is Docker installed and running?'));
+        }
+
+        if (mysqlSetup) {
+            resetData = true;
+            console.log(chalk.blue(`Adding MySQL credentials to config.local.json`));
+            const currentConfigPath = path.join(coreFolder, 'config.local.json');
+
+            let currentConfig;
+            try {
+                currentConfig = require(currentConfigPath);
+            } catch (err) {
+                currentConfig = {};
+            }
+
+            currentConfig.database = {
+                client: 'mysql',
+                docker: true,
+                connection: {
+                    host: '127.0.0.1',
+                    user: 'root',
+                    password: 'root',
+                    database: 'ghost'
+                }
+            };
+
+            try {
+                await fs.writeFile(currentConfigPath, JSON.stringify(currentConfig, null, 4));
+            } catch (err) {
+                console.error(chalk.red('Failed to write config.local.json'), err);
+                console.log(chalk.yellow(`Please add the following to config.local.json:\n`), JSON.stringify(currentConfig, null, 4));
+                process.exit(1);
+            }
+        }
+    } else {
+        if (isUsingDocker) {
+            const yesAll = process.argv.includes('-y');
+            const noAll = process.argv.includes('-n');
+            const {confirmed} =
+                yesAll ? {confirmed: true}
+                : (
+                    noAll ? {confirmed: false}
+                    : await inquirer.prompt({name: 'confirmed', type:'confirm', message: 'MySQL is running via Docker, do you want to reset the Docker container? This will delete all existing data.', default: false})
+                );
+
+            if (confirmed) {
+                console.log(chalk.yellow(`Resetting Docker container`));
+
+                try {
+                    await runAndStream('yarn', ['docker:reset'], {cwd: path.join(__dirname, '../../')});
+                    resetData = true;
+                } catch (err) {
+                    console.error(chalk.red('Failed to run MySQL Docker container'), err);
+                    console.error(chalk.red('Hint: is Docker installed and running?'));
+                }
+            }
+        } else {
+            console.log(chalk.green(`MySQL already configured locally. Stop your local database and delete your "database" configuration in config.local.json to switch to Docker.`));
+        }
+    }
+
+    console.log(chalk.blue(`Running knex-migrator init`));
+    await runAndStream('yarn', ['knex-migrator', 'init'], {cwd: coreFolder});
+    if (process.argv.includes('--no-seed')) {
+        console.log(chalk.yellow(`Skipping seed data`));
+        console.log(chalk.yellow(`Done`));
+        return;
+    }
+    if (resetData) {
+        const xxl = process.argv.includes('--xxl');
+
+        if (xxl) {
+            console.log(chalk.blue(`Resetting all data (with xxl)`));
+            await runAndStream('yarn', ['reset:data:xxl'], {cwd: rootFolder});
+        } else {
+            console.log(chalk.blue(`Resetting all data`));
+            await runAndStream('yarn', ['reset:data'], {cwd: rootFolder});
+        }
+    }
+})();
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f42641eaafa..e09d3b804cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: CI
 on:
   pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
   push:
     branches:
       - main
@@ -12,7 +13,6 @@ on:
 env:
   FORCE_COLOR: 1
   HEAD_COMMIT: ${{ github.sha }}
-  GITHUB_CONTEXT: ${{ toJson(github) }}
   CACHED_DEPENDENCY_PATHS: |
     ${{ github.workspace }}/node_modules
     ${{ github.workspace }}/apps/*/node_modules
@@ -43,6 +43,11 @@ jobs:
           ref: ${{ env.HEAD_COMMIT }}
           fetch-depth: 2
 
+      - name: Output GitHub context
+        run: echo "$GITHUB_CONTEXT"
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+
       - name: Get metadata (push)
         if: github.event_name == 'push'
         run: |
@@ -58,7 +63,7 @@ jobs:
           echo "BASE_COMMIT=$BASE_COMMIT" >> $GITHUB_ENV
 
       - name: Determine added packages
-        uses: dorny/paths-filter@v2.11.1
+        uses: dorny/paths-filter@v2.12.0
         id: added
         with:
           filters: |
@@ -144,7 +149,7 @@ jobs:
           echo "$EOF" >> "$GITHUB_ENV"
 
       - name: Nx cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache_nx
         with:
           path: .nxcache
@@ -152,7 +157,7 @@ jobs:
           restore-keys: ${{needs.job_get_metadata.outputs.is_main == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
 
       - name: Check dependency cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache_dependencies
         with:
           path: ${{ env.CACHED_DEPENDENCY_PATHS }}
@@ -160,14 +165,14 @@ jobs:
           restore-keys: ${{needs.job_get_metadata.outputs.is_main == 'false' && env.DEPENDENCY_CACHE_RESTORE_KEYS || 'dep-never-restore'}}
 
       - name: Check build cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache_built_packages
         with:
           path: ${{ env.CACHED_BUILD_PATHS }}
           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 +197,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:
@@ -203,7 +208,7 @@ jobs:
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_install_deps.outputs.dependency_cache_key }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ghost/**/.eslintcache
           key: eslint-cache
@@ -228,7 +233,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 +257,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"
 
@@ -269,7 +274,7 @@ jobs:
       - name: Merge Admin test coverage
         run: yarn ember coverage-merge
         working-directory: ghost/admin
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: admin-coverage
           path: ghost/*/coverage/cobertura-coverage.xml
@@ -285,7 +290,7 @@ jobs:
     name: Browser tests
     timeout-minutes: 60
     runs-on:
-      labels: ubuntu-latest-4-cores
+      labels: ubuntu-latest
     needs: [job_get_metadata, job_install_deps]
     if: needs.job_get_metadata.outputs.changed_any_code == 'true' && (needs.job_get_metadata.outputs.is_main == 'true' || needs.job_get_metadata.outputs.has_browser_tests_label == 'true')
     concurrency:
@@ -294,7 +299,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       env:
         FORCE_COLOR: 0
       with:
@@ -321,7 +326,7 @@ jobs:
     - name: Get Playwright version
       id: playwright-version
       run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       name: Check if Playwright browser is cached
       id: playwright-cache
       with:
@@ -352,26 +357,74 @@ jobs:
       env:
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: browser-tests-playwright-report
         path: ghost/core/playwright-report
         retention-days: 30
 
+  job_perf-tests:
+    runs-on:
+      labels: ubuntu-latest-4-cores
+    needs: [job_get_metadata, job_install_deps]
+    if: needs.job_get_metadata.outputs.changed_core == 'true' && needs.job_get_metadata.outputs.is_main == 'true'
+    name: Performance tests
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/setup-node@v4
+        env:
+          FORCE_COLOR: 0
+        with:
+          node-version: '18.12.1'
+
+      - name: Restore caches
+        uses: ./.github/actions/restore-cache
+        env:
+          DEPENDENCY_CACHE_KEY: ${{ needs.job_install_deps.outputs.dependency_cache_key }}
+
+      - name: Install hyperfine
+        run: |
+          export HYPERFINE_VERSION=1.18.0
+          wget https://github.com/sharkdp/hyperfine/releases/download/v$HYPERFINE_VERSION/hyperfine-v$HYPERFINE_VERSION-x86_64-unknown-linux-gnu.tar.gz
+          tar -zxvf hyperfine-v$HYPERFINE_VERSION-x86_64-unknown-linux-gnu.tar.gz
+          mv hyperfine-v$HYPERFINE_VERSION-x86_64-unknown-linux-gnu/hyperfine /usr/local/bin
+          chmod +x /usr/local/bin/hyperfine
+
+      - name: Run hyperfine on boot
+        working-directory: ghost/core
+        run: hyperfine --show-output --warmup 3 'GHOST_CI_SHUTDOWN_AFTER_BOOT=1 node index.js' --export-json boot-perf.json
+
+      - name: Convert data
+        working-directory: ghost/core
+        run: |
+          jq '[{ name: "Boot time", unit: "s", value: .results[0].median, range: ((.results[0].max - .results[0].min) | tostring) }]' < boot-perf.json > boot-perf-formatted.json
+
+      - name: Run analysis
+        uses: benchmark-action/github-action-benchmark@v1.20.3
+        with:
+          tool: 'customSmallerIsBetter'
+          output-file-path: ghost/core/boot-perf-formatted.json
+          benchmark-data-dir-path: ""
+          gh-repository: github.com/TryGhost/Ghost-Benchmarks
+          github-token: ${{ secrets.CANARY_DOCKER_BUILD }}
+          auto-push: true
+
   job_unit-tests:
     runs-on: ubuntu-latest
     needs: [job_get_metadata, job_install_deps]
     if: needs.job_get_metadata.outputs.changed_any_code == 'true'
     strategy:
       matrix:
-        node: [ '18.12.1' ]
+        node: [ '18.12.1', '20.11.1' ]
     name: Unit tests (Node ${{ matrix.node }})
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 100
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -384,7 +437,7 @@ jobs:
 
       - run: yarn nx affected -t test:unit --base=${{ needs.job_get_metadata.outputs.BASE_COMMIT }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: startsWith(matrix.node, '18')
         with:
           name: unit-coverage
@@ -403,7 +456,7 @@ jobs:
     if: needs.job_get_metadata.outputs.changed_core == 'true'
     strategy:
       matrix:
-        node: [ '18.12.1' ]
+        node: [ '18.12.1', '20.11.1' ]
         env:
           - DB: mysql8
             NODE_ENV: testing-mysql
@@ -418,7 +471,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:
@@ -467,7 +520,7 @@ jobs:
           endTime="$(date +%s)"
           echo "test_time=$(($endTime-$startTime))" >> $GITHUB_ENV
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: startsWith(matrix.node, '18') && contains(matrix.env.DB, 'mysql')
         with:
           name: e2e-coverage
@@ -539,7 +592,9 @@ jobs:
     name: Regression tests (Node ${{ matrix.node }}, ${{ matrix.env.DB }})
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+        with:
+          submodules: true
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -590,7 +645,7 @@ jobs:
       CI: true
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -604,7 +659,7 @@ jobs:
       - name: Get Playwright version
         id: playwright-version
         run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Check if Playwright browser is cached
         id: playwright-cache
         with:
@@ -621,7 +676,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: admin-x-settings-playwright-report
           path: apps/admin-x-settings/playwright-report
@@ -643,7 +698,7 @@ jobs:
       CI: true
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -657,7 +712,7 @@ jobs:
       - name: Get Playwright version
         id: playwright-version
         run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Check if Playwright browser is cached
         id: playwright-cache
         with:
@@ -674,7 +729,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: comments-ui-playwright-report
           path: apps/comments-ui/playwright-report
@@ -696,7 +751,7 @@ jobs:
       CI: true
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         env:
           FORCE_COLOR: 0
         with:
@@ -710,7 +765,7 @@ jobs:
       - name: Get Playwright version
         id: playwright-version
         run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Check if Playwright browser is cached
         id: playwright-cache
         with:
@@ -727,7 +782,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: signup-form-playwright-report
           path: apps/signup-form/playwright-report
@@ -750,7 +805,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 +834,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:
@@ -789,6 +844,13 @@ jobs:
         run: |
           ghost update -f -d $V4_DIR --archive $(pwd)/ghost/core/ghost.tgz
 
+      - name: Save Ghost CLI Debug Logs
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: ghost-cli-debug-logs
+          path: /home/runner/.ghost/logs/
+
       - name: Clean Install
         run: |
           DIR=$(mktemp -d)
@@ -825,7 +887,7 @@ jobs:
 
       - name: Restore Admin coverage
         if: contains(needs.job_admin-tests.result, 'success')
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: admin-coverage
 
@@ -842,7 +904,7 @@ jobs:
 
       - name: Restore E2E coverage
         if: contains(needs.job_database-tests.result, 'success')
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: e2e-coverage
 
diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
deleted file mode 100644
index 9e8e243cf9a..00000000000
--- a/.github/workflows/i18n.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: i18n check
-on:
-  pull_request_target:
-    types: [opened]
-    paths:
-      - 'ghost/i18n/locales/**'
-jobs:
-  create-label:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'TryGhost'
-    name: Add i18n label
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ["i18n"]
-            })
diff --git a/.github/workflows/migration-review.yml b/.github/workflows/migration-review.yml
index 18d0adbcf1b..885fa98f7e5 100644
--- a/.github/workflows/migration-review.yml
+++ b/.github/workflows/migration-review.yml
@@ -38,6 +38,7 @@ jobs:
             - [ ]  Uses the correct utils
             - [ ]  Contains a minimal changeset
             - [ ]  Does not mix DDL/DML operations
+            - [ ]  Tested in MySQL and SQLite
 
             ### Schema changes
 
diff --git a/.gitignore b/.gitignore
index 3162730395a..b3e179754d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,6 +83,7 @@ typings/
 *.db
 *.db-journal
 
+/ghost/core/test-results/
 /ghost/core/core/server/data/export/exported*
 /ghost/core/content/tmp/*
 /ghost/core/content/data/*
@@ -133,7 +134,7 @@ Caddyfile
 /apps/comments-ui/umd
 /apps/comments-ui/playwright-report
 /ghost/comments-ui/playwright/.cache/
-/ghost/comments-ui/test-results/
+/apps/comments-ui/test-results/
 
 # Portal
 !/apps/portal/.env
@@ -166,3 +167,8 @@ tsconfig.tsbuildinfo
 /apps/admin-x-settings/test-results/
 /apps/admin-x-settings/playwright-report/
 /apps/admin-x-settings/playwright/.cache/
+
+# Tinybird
+.tinyb
+.venv
+.diff_tmp
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3e00ee2b0b8..698afa15d2b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,6 +4,21 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Backend",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/.github/scripts/dev.js",
+            "args": [
+                "--ghost"
+            ],
+            "autoAttachChildProcesses": true,
+            "outputCapture": "std",
+            "console": "integratedTerminal",
+        },
         {
             "type": "node",
             "request": "launch",
diff --git a/LICENSE b/LICENSE
index b52cfae1945..ce0968e726b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2023 Ghost Foundation
+Copyright (c) 2013-2024 Ghost Foundation
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
diff --git a/PRIVACY.md b/PRIVACY.md
index 5d6bd677029..667393649c3 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -44,8 +44,4 @@ Ghost outputs basic meta tags to allow rich snippets of your content to be recog
 
 - Schema.org - http://schema.org/docs/documents.html
 - Open Graph - http://ogp.me/
-- Twitter cards - https://dev.twitter.com/cards/overview
-
-### Default Theme
-
-The default theme which comes with Ghost loads a copy of jQuery from the jQuery Foundation's [public CDN](https://code.jquery.com/jquery-3.4.1.min.js).
+- Twitter cards - https://dev.twitter.com/cards/overview
\ No newline at end of file
diff --git a/README.md b/README.md
index dff64aaeda9..7fa794ca2ce 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
     <a href="https://twitter.com/ghost">Twitter</a>
     <br /><br />
     <a href="https://ghost.org/">
-        <img src="https://img.shields.io/badge/downloads-3M-brightgreen.svg" alt="Downloads" />
+        <img src="https://img.shields.io/badge/downloads-100M+-brightgreen.svg" alt="Downloads" />
     </a>
     <a href="https://github.com/TryGhost/Ghost/releases/">
         <img src="https://img.shields.io/github/release/TryGhost/Ghost.svg" alt="Latest release" />
@@ -29,9 +29,7 @@
         <img src="https://img.shields.io/github/contributors/TryGhost/Ghost.svg" alt="Contributors" />
     </a>
 </p>
-<p align="center">
-  Love open source? <a href="https://careers.ghost.org/devops-engineer">We're hiring</a> DevOps engineers to work on Ghost full-time.
-</p>
+
 
 &nbsp;
 
@@ -84,7 +82,7 @@ For anyone wishing to contribute to Ghost or to hack/customize core files we rec
 
 # Ghost sponsors
 
-We'd like to extend big thanks to our sponsors and partners who make Ghost possible. If you're interested in sponsoring Ghost and supporting the project, please check out our profile on [GitHub sponsors](https://github.com/sponsors/TryGhost) :heart:
+A big thanks to our sponsors and partners who make Ghost possible. If you're interested in sponsoring Ghost and supporting the project, please check out our profile on [GitHub sponsors](https://github.com/sponsors/TryGhost) :heart:
 
 **[DigitalOcean](https://m.do.co/c/9ff29836d717)** • **[Fastly](https://www.fastly.com/)**
 
@@ -92,12 +90,13 @@ We'd like to extend big thanks to our sponsors and partners who make Ghost possi
 
 # Getting help
 
-You can find answers to a huge variety of questions, along with a large community of helpful developers over on the [Ghost forum](https://forum.ghost.org/) - replies are generally very quick. **Ghost(Pro)** customers also have access to 24/7 email support.
+Everyone can get help and support from a large community of developers over on the [Ghost forum](https://forum.ghost.org/). **Ghost(Pro)** customers have access to 24/7 email support.
 
-To stay up to date with all the latest news and product updates, make sure you [subscribe to our blog](https://ghost.org/blog/) — or you can always follow us [on Twitter](https://twitter.com/Ghost), if you prefer your updates bite-sized and facetious. :saxophone::turtle:
+To stay up to date with all the latest news and product updates, make sure you [subscribe to our changelog newsletter](https://ghost.org/changelog/) — or follow us [on Twitter](https://twitter.com/Ghost), if you prefer your updates bite-sized and facetious. :saxophone::turtle:
 
 &nbsp;
 
 # Copyright & license
 
-Copyright (c) 2013-2023 Ghost Foundation - Released under the [MIT license](LICENSE). Ghost and the Ghost Logo are trademarks of Ghost Foundation Ltd. Please see our [trademark policy](https://ghost.org/trademark/) for info on acceptable usage.
+Copyright (c) 2013-2024 Ghost Foundation - Released under the [MIT license](LICENSE). 
+Ghost and the Ghost Logo are trademarks of Ghost Foundation Ltd. Please see our [trademark policy](https://ghost.org/trademark/) for info on acceptable usage.
diff --git a/apps/admin-x-activitypub/.eslintignore b/apps/admin-x-activitypub/.eslintignore
new file mode 100644
index 00000000000..9944eccea22
--- /dev/null
+++ b/apps/admin-x-activitypub/.eslintignore
@@ -0,0 +1 @@
+tailwind.config.cjs
diff --git a/apps/admin-x-activitypub/.eslintrc.cjs b/apps/admin-x-activitypub/.eslintrc.cjs
new file mode 100644
index 00000000000..919b0f2cdf6
--- /dev/null
+++ b/apps/admin-x-activitypub/.eslintrc.cjs
@@ -0,0 +1,56 @@
+/* eslint-env node */
+module.exports = {
+    root: true,
+    extends: [
+        'plugin:ghost/ts',
+        'plugin:react/recommended',
+        'plugin:react-hooks/recommended'
+    ],
+    plugins: [
+        'ghost',
+        'react-refresh',
+        'tailwindcss'
+    ],
+    settings: {
+        react: {
+            version: 'detect'
+        }
+    },
+    rules: {
+        // sort multiple import lines into alphabetical groups
+        'ghost/sort-imports-es6-autofix/sort-imports-es6': ['error', {
+            memberSyntaxSortOrder: ['none', 'all', 'single', 'multiple']
+        }],
+
+        // TODO: re-enable this (maybe fixed fast refresh?)
+        'react-refresh/only-export-components': 'off',
+
+        // 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',
+
+        // TODO: re-enable these if deemed useful
+        '@typescript-eslint/no-non-null-assertion': 'off',
+        '@typescript-eslint/no-empty-function': 'off',
+
+        // custom react rules
+        '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-activitypub/.gitignore b/apps/admin-x-activitypub/.gitignore
new file mode 100644
index 00000000000..68565785a7f
--- /dev/null
+++ b/apps/admin-x-activitypub/.gitignore
@@ -0,0 +1,3 @@
+dist
+playwright-report
+test-results
diff --git a/apps/admin-x-activitypub/index.html b/apps/admin-x-activitypub/index.html
new file mode 100644
index 00000000000..60bd860b4a7
--- /dev/null
+++ b/apps/admin-x-activitypub/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>AdminX Standalone</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/standalone.tsx"></script>
+</body>
+</html>
diff --git a/apps/admin-x-activitypub/package.json b/apps/admin-x-activitypub/package.json
new file mode 100644
index 00000000000..d73be09910f
--- /dev/null
+++ b/apps/admin-x-activitypub/package.json
@@ -0,0 +1,73 @@
+{
+  "name": "@tryghost/admin-x-activitypub",
+  "version": "0.0.1",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/TryGhost/Ghost/tree/main/apps/admin-x-activitypub"
+  },
+  "author": "Ghost Foundation",
+  "files": [
+    "LICENSE",
+    "README.md",
+    "dist/"
+  ],
+  "main": "./dist/admin-x-activitypub.umd.cjs",
+  "module": "./dist/admin-x-activitypub.js",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "dev": "vite build --watch",
+    "dev:start": "vite",
+    "build": "tsc && vite build",
+    "lint": "yarn run lint:code && yarn run lint:test",
+    "lint:code": "eslint --ext .js,.ts,.cjs,.tsx --cache src",
+    "lint:test": "eslint -c test/.eslintrc.cjs --ext .js,.ts,.cjs,.tsx --cache test",
+    "test:unit": "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"
+  },
+  "devDependencies": {
+    "@playwright/test": "1.38.1",
+    "@testing-library/react": "14.3.1",
+    "@tryghost/admin-x-design-system": "0.0.0",
+    "@tryghost/admin-x-framework": "0.0.0",
+    "@types/jest": "29.5.12",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "jest": "29.7.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "ts-jest": "29.1.5"
+  },
+  "nx": {
+    "targets": {
+      "build": {
+        "dependsOn": [
+          "^build"
+        ]
+      },
+      "dev": {
+        "dependsOn": [
+          "^build"
+        ]
+      },
+      "test:unit": {
+        "dependsOn": [
+          "^build",
+          "test:unit"
+        ]
+      },
+      "test:acceptance": {
+        "dependsOn": [
+          "^build",
+          "test:acceptance"
+        ]
+      }
+    }
+  }
+}
diff --git a/apps/admin-x-activitypub/playwright.config.mjs b/apps/admin-x-activitypub/playwright.config.mjs
new file mode 100644
index 00000000000..8fa59553e54
--- /dev/null
+++ b/apps/admin-x-activitypub/playwright.config.mjs
@@ -0,0 +1,3 @@
+import {adminXPlaywrightConfig} from '@tryghost/admin-x-framework/playwright';
+
+export default adminXPlaywrightConfig();
diff --git a/apps/admin-x-activitypub/postcss.config.cjs b/apps/admin-x-activitypub/postcss.config.cjs
new file mode 100644
index 00000000000..8799f4acf82
--- /dev/null
+++ b/apps/admin-x-activitypub/postcss.config.cjs
@@ -0,0 +1 @@
+module.exports = require('@tryghost/admin-x-design-system/postcss.config.cjs');
diff --git a/apps/admin-x-activitypub/public/styles/reader.css b/apps/admin-x-activitypub/public/styles/reader.css
new file mode 100644
index 00000000000..4cdaee420e1
--- /dev/null
+++ b/apps/admin-x-activitypub/public/styles/reader.css
@@ -0,0 +1,1928 @@
+
+.gh-whats-new-canvas .gh-canvas-header-content {
+    margin-bottom: -1px;
+    padding: 8px 0 16px;
+    align-items: center;
+}
+
+.gh-whats-new {
+    flex-grow: 2;
+    color: var(--darkgrey);
+    font-size: 1.5rem;
+    letter-spacing: 0;
+    margin-top: -24px;
+}
+
+.gh-whats-new-heading {
+    display: flex;
+    align-items: center;
+    font-size: 1.5rem;
+    letter-spacing: 0;
+    line-height: 1.3em;
+    font-weight: 700;
+    margin: 0;
+}
+
+.gh-whats-new-heading svg {
+    width: 20px;
+    height: 20px;
+    margin-top: -2px;
+    margin-right: 12px;
+}
+
+.gh-whats-new-heading svg path {
+    fill: var(--pink);
+}
+
+.gh-wn-header {
+    position: relative;
+    display: flex;
+    align-items: center;
+    margin: -32px -32px 0;
+    padding: 18px 18px 12px;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    overflow: hidden;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background: var(--pink);
+    background: linear-gradient(135deg, color-mod(var(--pink) h(-10) s(+5%) l(-10%)) 0%, rgba(173,38,180,1) 100%);
+}
+
+.gh-wn-header .background-img {
+    position: absolute;
+    top: -30px;
+    left: 0;
+}
+
+.gh-wn-header h2 {
+    font-size: 1.3rem;
+    font-weight: 600;
+    text-transform: uppercase;
+    color: #FFF;
+    margin: 0 8px 4px;
+}
+
+.gh-wn-header svg path {
+    fill: #fff;
+}
+
+.gh-wn-close {
+    stroke: #FFF;
+    opacity: 0.6;
+    transition: all 0.2s ease-in-out;
+}
+
+.gh-wn-close:hover {
+    opacity: 1.0;
+}
+
+.gh-wn-entry {
+    margin: 0 0 5vmin;
+    padding-bottom: 5vmin;
+    width: 100%;
+    border-bottom: 1px solid var(--lightgrey-l2);
+    color: inherit;
+    text-decoration: none;
+}
+
+.gh-wn-content {
+    max-width: 620px;
+}
+
+.gh-whats-new-canvas .gh-wn-content {
+    margin: 0 auto;
+}
+
+.gh-wn-entry h4 {
+    font-size: 1.2rem;
+    font-weight: 500;
+    letter-spacing: 0;
+    text-transform: uppercase;
+    margin: 24px 0 4px;
+    color: var(--midlightgrey);
+}
+
+.gh-wn-entry h1 {
+    font-size: 3.7rem;
+    line-height: 1.3em;
+    font-weight: 700;
+    letter-spacing: -0.021em;
+    color: var(--black);
+    margin-bottom: 16px;
+}
+
+.gh-whats-new-canvas .gh-wn-entry h1,
+.gh-whats-new-canvas .gh-wn-entry h4 {
+    max-width: 620px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.gh-wn-entry h2 {
+    border-bottom: none;
+    font-size: 1.9rem;
+    padding-bottom: 0;
+    margin-bottom: 20px;
+}
+
+.gh-wn-entry p,
+.gh-wn-entry li {
+    line-height: 1.6em;
+}
+
+.gh-wn-entry li {
+    margin-bottom: 12px;
+}
+
+.gh-wn-entry p {
+    margin: 0 0 20px;
+    padding: 0;
+}
+
+.gh-wn-entry figure {
+    margin-bottom: 24px;
+    overflow: hidden;
+}
+
+.gh-wn-entry img {
+    height: auto;
+}
+
+.gh-wn-entry hr {
+    border-top: 1px solid var(--whitegrey-l1);
+    margin: 24px 0;
+}
+
+
+/* Bookmark card details */
+.gh-wn-entry .kg-bookmark-card {
+    margin-bottom: 20px;
+}
+
+.gh-wn-entry .kg-bookmark-container {
+    display: flex;
+    font-family: var(--font-family);
+    color: var(--darkgrey);
+    text-decoration: none;
+    min-height: 148px;
+    box-shadow: 0px 2px 5px -1px rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.09);
+    border-radius: 3px;
+}
+
+.gh-wn-entry .kg-bookmark-content {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    align-items: flex-start;
+    justify-content: flex-start;
+    padding: 16px;
+}
+
+.gh-wn-entry .kg-bookmark-title {
+    font-size: 1.3rem;
+    line-height: 1.5em;
+    font-weight: 600;
+    color: color(var(--midgrey) l(-30%));
+}
+
+.gh-wn-entry .kg-bookmark-container:hover .kg-bookmark-title {
+    color: var(--blue);
+}
+
+.gh-wn-entry .kg-bookmark-description {
+    display: -webkit-box;
+    font-size: 1.25rem;
+    line-height: 1.5em;
+    color: color(var(--midgrey) l(-10%));
+    font-weight: 400;
+    margin-top: 12px;
+    max-height: 36px;
+    overflow-y: hidden;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+.gh-wn-entry .kg-bookmark-thumbnail {
+    position: relative;
+    min-width: 40%;
+    max-height: 100%;
+}
+
+.gh-wn-entry .kg-bookmark-thumbnail img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    border-radius: 0 3px 3px 0;
+}
+
+.gh-wn-entry .kg-bookmark-metadata {
+    display: flex;
+    align-items: center;
+    font-size: 1.25rem;
+    font-weight: 400;
+    color: color(var(--midgrey) l(-10%));
+    margin-top: 14px;
+    flex-wrap: wrap;
+}
+
+.gh-wn-entry .kg-bookmark-icon {
+    width: 18px;
+    height: 18px;
+    margin-right: 8px;
+}
+
+.gh-wn-entry .kg-bookmark-author {
+    line-height: 1.5em;
+}
+
+.gh-wn-entry .kg-bookmark-author:after {
+    content: "•";
+    margin: 0 6px;
+}
+
+.gh-wn-entry .kg-bookmark-publisher {
+    overflow: hidden;
+    line-height: 1.5em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 160px;
+}
+
+.gh-wn-entry .gh-wn-footer {
+    margin: 0 -32px -32px;
+    padding: 14px 32px 16px;
+    border-top: 1px solid var(--whitegrey);
+    justify-content: space-between;
+}
+
+.gh-wn-footer {
+    position: relative;
+    margin-top: 14px;
+    margin-bottom: -13px;
+}
+
+.gh-wn-footer:before {
+    position: absolute;
+    content: "";
+    top: -14px;
+    left: -32px;
+    right: -32px;
+    height: 6px;
+    background: rgba(255,255,255,0);
+    box-shadow:
+        0 -0.3px 1px rgba(0, 0, 0, 0.03),
+        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;
+    }
+}
+
+@media (max-width: 1120px) {
+    .gh-wn-content {
+        max-width: 680px;
+    }
+
+    .gh-about-box {
+        position: relative;
+        top: unset;
+        right: unset;
+    }
+
+    .gh-about-container {
+        grid-template-columns: unset;
+        grid-template-rows: auto;
+        grid-gap: 32px;
+    }
+
+    .gh-whats-new {
+        grid-row: 3/4;
+    }
+
+
+    .gh-about-header-actions a {
+        display: none;
+    }
+
+    .gh-wn-entry iframe {
+        max-width: 100%;
+    }
+}
+
+/* Custom card styles
+/* ---------------------------------------------------------- */
+
+.gh-whats-new .kg-audio-card {
+    display: flex;
+    width: 100%;
+    min-height: 96px;
+    border-radius: 3px;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+    margin-bottom: 1.5em;
+}
+
+.gh-whats-new .kg-audio-card+.gh-whats-new .kg-audio-card {
+    margin-top: 1em;
+}
+
+.gh-whats-new .kg-audio-thumbnail {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 80px;
+    min-width: 80px;
+    margin: 8px;
+    background: transparent;
+    object-fit: cover;
+    aspect-ratio: 1/1;
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-audio-thumbnail.placeholder {
+    background: var(--accent-color);
+}
+
+.gh-whats-new .kg-audio-thumbnail.placeholder svg {
+    width: 24px;
+    height: 24px;
+    fill: white;
+}
+
+.gh-whats-new .kg-audio-player-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    flex: 1;
+    --seek-before-width: 0%;
+    --volume-before-width: 100%;
+    --buffered-width: 0%;
+}
+
+.gh-whats-new .kg-audio-title {
+    width: 100%;
+    margin: 8px 0 0 0;
+    padding: 8px 12px;
+    border: none;
+    font-family: inherit;
+    font-size: 1.15em;
+    font-weight: 700;
+    line-height: 1.15em;
+    background: transparent;
+}
+
+.gh-whats-new .kg-audio-player {
+    display: flex;
+    flex-grow: 1;
+    align-items: center;
+    padding: 8px 12px;
+}
+
+.gh-whats-new .kg-audio-current-time {
+    min-width: 38px;
+    padding: 0 4px;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 500;
+    line-height: 1.4em;
+    white-space: nowrap;
+}
+
+.gh-whats-new .kg-audio-time {
+    width: 56px;
+    color: #ababab;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 500;
+    line-height: 1.4em;
+    white-space: nowrap;
+}
+
+.gh-whats-new .kg-audio-duration {
+    padding: 0 4px;
+}
+
+.gh-whats-new .kg-audio-play-icon,
+.gh-whats-new .kg-audio-pause-icon {
+    position: relative;
+    bottom: 1px;
+    padding: 0px 4px 0 0;
+    font-size: 0;
+    background: transparent;
+}
+
+.gh-whats-new .kg-audio-hide {
+    display: none !important;
+}
+
+.gh-whats-new .kg-audio-play-icon svg,
+.gh-whats-new .kg-audio-pause-icon svg {
+    width: 14px;
+    height: 14px;
+    fill: currentColor;
+}
+
+.gh-whats-new .kg-audio-seek-slider {
+    flex-grow: 1;
+    margin: 0 4px;
+    width: 100%;
+}
+
+@media (max-width: 640px) {
+    .gh-whats-new .kg-audio-seek-slider {
+        display: none;
+    }
+}
+
+.gh-whats-new .kg-audio-playback-rate {
+    min-width: 37px;
+    padding: 0 4px;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 600;
+    line-height: 1.4em;
+    text-align: left;
+    background: transparent;
+    white-space: nowrap;
+}
+
+@media (max-width: 640px) {
+    .gh-whats-new .kg-audio-playback-rate {
+        padding-left: 8px;
+    }
+}
+
+.gh-whats-new .kg-audio-mute-icon,
+.gh-whats-new .kg-audio-unmute-icon {
+    position: relative;
+    bottom: -1px;
+    padding: 0 4px;
+    font-size: 0;
+    background: transparent;
+}
+
+@media (max-width: 640px) {
+    .gh-whats-new .kg-audio-mute-icon,
+    .gh-whats-new .kg-audio-unmute-icon  {
+        margin-left: auto;
+    }
+}
+
+.gh-whats-new .kg-audio-mute-icon svg,
+.gh-whats-new .kg-audio-unmute-icon svg {
+    width: 16px;
+    height: 16px;
+    fill: currentColor;
+}
+
+.gh-whats-new .kg-audio-volume-slider {
+    flex-grow: 1;
+    width: 100%;
+    min-width: 50px;
+    max-width: 80px;
+}
+
+@media (max-width: 400px) {
+    .gh-whats-new .kg-audio-volume-slider {
+        display: none;
+    }
+}
+
+.gh-whats-new .kg-audio-seek-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--seek-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: currentColor;
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-audio-volume-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--volume-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: currentColor;
+    border-radius: 2px;
+}
+
+/* Resetting browser styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-audio-player-container input[type=range] {
+    position: relative;
+    -webkit-appearance: none;
+    background: transparent;
+}
+
+.gh-whats-new .kg-audio-player-container input[type=range]:focus {
+    outline: none;
+}
+
+.gh-whats-new .kg-audio-player-container input[type=range]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+}
+
+.gh-whats-new .kg-audio-player-container input[type=range]::-ms-track {
+    cursor: pointer;
+    border-color: transparent;
+    color: transparent;
+    background: transparent;
+}
+
+.gh-whats-new .kg-audio-player-container button {
+    display: flex;
+    align-items: center;
+    border: 0;
+    cursor: pointer;
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"] {
+    height: auto;
+    padding: 0;
+    border: 0;
+}
+
+/* Chrome & Safari styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-webkit-slider-runnable-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(124, 139, 154, 0.25);
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-webkit-slider-thumb {
+    position: relative;
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    margin: -5px 0 0 0;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]:active::-webkit-slider-thumb {
+    transform: scale(1.2);
+}
+
+/* Firefox styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-moz-range-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(124, 139, 154, 0.25);
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-moz-range-progress {
+    background: currentColor;
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-moz-range-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]:active::-moz-range-thumb {
+    transform: scale(1.2);
+}
+
+/* Edge & IE styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-track {
+    width: 100%;
+    height: 3px;
+    border: solid transparent;
+    color: transparent;
+    cursor: pointer;
+    background: transparent;
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-fill-lower {
+    background: #fff;
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-fill-upper {
+    background: currentColor;
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.gh-whats-new .kg-audio-player-container input[type="range"]:active::-ms-thumb {
+    transform: scale(1.2);
+}
+
+.gh-whats-new .kg-product-card {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    width: 100%;
+    margin-bottom: 1.5em;
+}
+
+.gh-whats-new .kg-product-card-container {
+    display: grid;
+    grid-template-columns: auto min-content;
+    align-items: center;
+    grid-row-gap: 16px;
+    background: transparent;
+    max-width: 550px;
+    width: 100%;
+}
+
+.gh-whats-new .kg-product-card-image {
+    grid-column: 1 / 3;
+    justify-self: center;
+}
+
+.gh-whats-new .kg-product-card-title-container {
+    grid-column: 1 / 2;
+}
+
+.gh-whats-new .kg-product-card h4.kg-product-card-title {
+    font-family: var(--font-family);
+    text-decoration: none;
+    font-weight: 700;
+    font-size: 1.4em;
+    margin-top: 0;
+    margin-bottom: 0;
+    line-height: 1.15em;
+    text-transform: none;
+    color: inherit;
+}
+
+.gh-whats-new .kg-product-card-description {
+    grid-column: 1 / 3;
+}
+
+.gh-whats-new .kg-product-card .kg-product-card-description p,
+.gh-whats-new .kg-product-card .kg-product-card-description ol,
+.gh-whats-new .kg-product-card .kg-product-card-description ul {
+    font-family: var(--font-family);
+    font-size: 0.9em;
+    line-height: 1.5em;
+    opacity: .7;
+}
+
+.gh-whats-new .kg-product-card .kg-product-card-description p:not(:first-of-type) {
+    margin-top: 0.8em;
+    margin-bottom: 0;
+}
+
+.gh-whats-new .kg-product-card .kg-product-card-description p:first-of-type {
+    margin-top: -4px;
+}
+
+.gh-whats-new .kg-product-card .kg-product-card-description ul,
+.gh-whats-new .kg-product-card .kg-product-card-description ol {
+    margin-top: 0.95em;
+}
+
+.gh-whats-new .kg-product-card .kg-product-card-description li+li {
+    margin-top: 0.2em;
+}
+
+.gh-whats-new .kg-product-card-rating {
+    display: flex;
+    align-items: center;
+    grid-column: 2 / 3;
+    align-self: start;
+    justify-self: end;
+    padding-left: 16px;
+}
+
+@media (max-width: 400px) {
+    .gh-whats-new .kg-product-card-title-container {
+        grid-column: 1 / 3;
+    }
+
+    .gh-whats-new .kg-product-card-rating {
+        grid-column: 1 / 3;
+        justify-self: start;
+        margin-top: -15px;
+        padding-left: 0;
+    }
+}
+
+.gh-whats-new .kg-product-card-rating-star {
+    height: 28px;
+    width: 20px;
+}
+
+.gh-whats-new .kg-product-card-rating-star svg {
+    width: 16px;
+    height: 16px;
+    fill: currentColor;
+    opacity: 0.15;
+}
+
+.gh-whats-new .kg-product-card-rating-star svg path {
+    fill: unset;
+}
+
+.gh-whats-new .kg-product-card-rating-active.kg-product-card-rating-star svg {
+    opacity: 1;
+}
+
+.gh-whats-new .kg-product-card a.kg-product-card-button {
+    justify-content: center;
+    grid-column: 1 / 3;
+    display: flex;
+    position: static;
+    align-items: center;
+    font-family: var(--font-family);
+    font-size: 0.95em;
+    font-weight: 600;
+    line-height: 1em;
+    text-decoration: none;
+    width: 100%;
+    height: 2.4em;
+    border-radius: 5px;
+    padding: 0 1.2em;
+    transition: opacity 0.2s ease-in-out;
+    margin: 0;
+}
+
+.gh-whats-new .kg-product-card a.kg-product-card-btn-accent {
+    background-color: var(--accent-color);
+    color: #fff;
+}
+
+.gh-whats-new .kg-blockquote-alt {
+    font-size: 1.5em;
+    font-style: italic;
+    line-height: 1.7em;
+    text-align: center;
+    padding: 0 2.5em;
+}
+
+@media (max-width: 800px) {
+    .gh-whats-new .kg-blockquote-alt {
+        font-size: 1.4em;
+        padding-left: 2em;
+        padding-right: 2em;
+    }
+}
+
+@media (max-width: 600px) {
+    .gh-whats-new .kg-blockquote-alt {
+        font-size: 1.2em;
+        padding-left: 1.75em;
+        padding-right: 1.75em;
+    }
+}
+
+.gh-whats-new .kg-button-card {
+    display: flex;
+    position: static;
+    align-items: center;
+    width: 100%;
+    justify-content: flex-start;
+    padding: 30px 0;
+}
+
+.gh-whats-new .kg-button-card.kg-align-left {
+    justify-content: flex-start;
+}
+
+.gh-whats-new .kg-button-card a.kg-btn {
+    display: flex;
+    position: static;
+    align-items: center;
+    padding: 0 1.2em;
+    height: 2.4em;
+    line-height: 1em;
+    font-family: var(--font-family);
+    font-size: 0.95em;
+    font-weight: 600;
+    text-decoration: none;
+    border-radius: 5px;
+    transition: opacity 0.2s ease-in-out;
+}
+
+.gh-whats-new .kg-button-card a.kg-btn:hover {
+    opacity: 0.85;
+}
+
+.gh-whats-new .kg-button-card a.kg-btn-accent {
+    background-color: var(--accent-color);
+    color: #fff;
+}
+
+.gh-whats-new .kg-callout-card {
+    display: flex;
+    padding: 1.2em 1.6em;
+    border-radius: 3px;
+}
+
+.gh-whats-new .kg-callout-card-grey {
+    background: rgba(124, 139, 154, 0.13);
+}
+
+.gh-whats-new .kg-callout-card-white {
+    background: transparent;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+}
+
+.gh-whats-new .kg-callout-card-blue {
+    background: rgba(33, 172, 232, 0.12);
+}
+
+.gh-whats-new .kg-callout-card-green {
+    background: rgba(52, 183, 67, 0.12);
+}
+
+.gh-whats-new .kg-callout-card-yellow {
+    background: rgba(240, 165, 15, 0.13);
+}
+
+.gh-whats-new .kg-callout-card-red {
+    background: rgba(209, 46, 46, 0.11);
+}
+
+.gh-whats-new .kg-callout-card-pink {
+    background: rgba(225, 71, 174, 0.11);
+}
+
+.gh-whats-new .kg-callout-card-purple {
+    background: rgba(135, 85, 236, 0.12);
+}
+
+.gh-whats-new .kg-callout-card-accent {
+    background: var(--ghost-accent-color);
+    color: #fff;
+}
+
+.gh-whats-new .kg-callout-card-accent a {
+    color: #fff;
+}
+
+.gh-whats-new .kg-callout-card div.kg-callout-emoji {
+    padding-right: .8em;
+    line-height: 1.25em;
+    font-size: 1.15em;
+}
+
+.gh-whats-new .kg-callout-card div.kg-callout-text {
+    font-size: .95em;
+    line-height: 1.5em;
+}
+
+.gh-whats-new .kg-callout-card + .kg-callout-card {
+    margin-top: 1em;
+}
+
+.gh-whats-new .kg-file-card {
+    display: flex;
+}
+
+.gh-whats-new .kg-file-card a.kg-file-card-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    color: inherit;
+    padding: 6px;
+    min-height: 92px;
+    border: 1px solid rgb(124 139 154 / 25%);
+    border-radius: 3px;
+    transition: all ease-in-out 0.35s;
+    text-decoration: none;
+    width: 100%;
+}
+
+.gh-whats-new .kg-file-card a.kg-file-card-container:hover {
+    border: 1px solid rgb(124 139 154 / 35%);
+}
+
+.gh-whats-new .kg-file-card-contents {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin: 4px 8px;
+}
+
+.gh-whats-new .kg-file-card-title {
+    font-size: 1.15em;
+    font-weight: 700;
+    line-height: 1.3em;
+}
+
+.gh-whats-new .kg-file-card-caption {
+    font-size: 0.95em;
+    line-height: 1.5em;
+    opacity: 0.6;
+}
+
+.gh-whats-new .kg-file-card-metadata {
+    display: inline;
+    font-size: 0.825em;
+    line-height: 1.5em;
+    margin-top: 2px;
+}
+
+.gh-whats-new .kg-file-card-filename {
+    display: inline;
+    font-weight: 500;
+}
+
+.gh-whats-new .kg-file-card-filesize {
+    display: inline-block;
+    font-size: 0.925em;
+    opacity: 0.6;
+}
+
+.gh-whats-new .kg-file-card-filesize:before {
+    display: inline-block;
+    content: "\2022";
+    margin-right: 4px;
+}
+
+.gh-whats-new .kg-file-card-icon {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 80px;
+    min-width: 80px;
+    height: 100%;
+}
+
+.gh-whats-new .kg-file-card-icon:before {
+    position: absolute;
+    display: block;
+    content: "";
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: currentColor;
+    opacity: 0.06;
+    transition: opacity ease-in-out 0.35s;
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-file-card a.kg-file-card-container:hover .kg-file-card-icon:before {
+    opacity: 0.08;
+}
+
+.gh-whats-new .kg-file-card-icon svg {
+    width: 24px;
+    height: 24px;
+    color: var(--ghost-accent-color);
+}
+
+/* Size variations */
+.gh-whats-new .kg-file-card-medium a.kg-file-card-container {
+    min-height: 72px;
+}
+
+.gh-whats-new .kg-file-card-medium .kg-file-card-caption {
+    opacity: 1.0;
+    font-weight: 500;
+}
+
+.gh-whats-new .kg-file-card-small a.kg-file-card-container {
+    min-height: 52px;
+}
+
+.gh-whats-new .kg-file-card-small .kg-file-card-metadata {
+    font-size: 1.0em;
+    margin-top: 0;
+}
+
+.gh-whats-new .kg-file-card-small .kg-file-card-icon svg {
+    width: 20px;
+    height: 20px;
+}
+
+.gh-whats-new .kg-file-card + .kg-file-card {
+    margin-top: 1em;
+}
+
+.gh-whats-new .kg-nft-card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.gh-whats-new .kg-nft-card a.kg-nft-card-container {
+    position: static;
+    display: flex;
+    flex: auto;
+    flex-direction: column;
+    text-decoration: none;
+    font-family: var(--font-family);
+    font-size: 14px;
+    font-weight: 400;
+    box-shadow: 0 2px 6px -2px rgb(0 0 0 / 10%), 0 0 1px rgb(0 0 0 / 40%);
+    width: 100%;
+    max-width: 512px;
+    color: #222;
+    background: #fff;
+    border-radius: 5px;
+    transition: none;
+}
+
+.gh-whats-new .kg-nft-card * {
+    position: static;
+}
+
+.gh-whats-new .kg-nft-metadata {
+    padding: 20px;
+    width: 100%;
+}
+
+.gh-whats-new .kg-nft-image {
+    border-radius: 5px 5px 0 0;
+    width: 100%;
+}
+
+.gh-whats-new .kg-nft-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    gap: 20px;
+}
+
+.gh-whats-new .kg-nft-header h4.kg-nft-title {
+    font-family: inherit;
+    font-size: 19px;
+    font-weight: 700;
+    line-height: 1.3em;
+    min-width: unset;
+    max-width: unset;
+    margin: 0;
+    color: #222;
+}
+
+.gh-whats-new .kg-nft-opensea-logo {
+    margin-top: 2px;
+    width: 100px;
+    object-fit: scale-down;
+}
+
+.gh-whats-new .kg-nft-creator {
+    font-family: inherit;
+    line-height: 1.4em;
+    margin: 4px 0 0;
+    color: #ababab;
+}
+
+.gh-whats-new .kg-nft-creator span {
+    font-weight: 500;
+    color: #222;
+}
+
+.gh-whats-new .kg-nft-card p.kg-nft-description {
+    font-family: inherit;
+    font-size: 14px;
+    line-height: 1.4em;
+    margin: 20px 0 0;
+    color: #222;
+}
+
+.gh-whats-new .kg-toggle-card {
+    background: transparent;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+    border-radius: 4px;
+    padding: 1.2em;
+}
+
+.gh-whats-new .kg-toggle-card[data-kg-toggle-state="close"] .kg-toggle-content{
+    height: 0;
+    overflow: hidden;
+    transition: opacity .5s ease, top .35s ease;
+    opacity: 0;
+    top: -0.5em;
+    position: relative;
+}
+
+.gh-whats-new .kg-toggle-content {
+    height: auto;
+    opacity: 1;
+    transition: opacity 1s ease, top .35s ease;
+    top: 0;
+    position: relative;
+}
+
+.gh-whats-new .kg-toggle-card[data-kg-toggle-state="close"] svg {
+    transform: unset;
+}
+
+.gh-whats-new .kg-toggle-heading {
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.gh-whats-new .kg-toggle-card h4.kg-toggle-heading-text {
+    font-size: 1.15em;
+    font-weight: 700;
+    line-height: 1.3em;
+    margin-top: 0;
+    margin-bottom: 0;
+    text-transform: none;
+    color: inherit;
+}
+
+.gh-whats-new .kg-toggle-content p:first-of-type {
+    margin-top: 0.5em;
+}
+
+.gh-whats-new .kg-toggle-card .kg-toggle-content p,
+.gh-whats-new .kg-toggle-card .kg-toggle-content ol,
+.gh-whats-new .kg-toggle-card .kg-toggle-content ul {
+    font-size: 0.95em;
+    line-height: 1.5em;
+    margin-top: 0.95em;
+}
+
+.gh-whats-new .kg-toggle-card li + li {
+    margin-top: 0.5em;
+}
+
+.gh-whats-new .kg-toggle-card-icon {
+    height: 24px;
+    width: 24px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: 1em;
+    background: none;
+    border: 0;
+}
+
+.gh-whats-new .kg-toggle-heading svg {
+    width: 14px;
+    color: rgba(124, 139, 154, 0.5);
+    transition: all 0.3s;
+    transform: rotate(-180deg);
+}
+
+.gh-whats-new .kg-toggle-heading path {
+    fill: none;
+    stroke: currentcolor;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+    stroke-width: 1.5;
+    fill-rule: evenodd;
+}
+
+.gh-whats-new .kg-toggle-card + .kg-toggle-card {
+    margin-top: 1em;
+}
+
+.gh-whats-new .kg-video-card {
+    position: relative;
+    --seek-before-width: 0%;
+    --volume-before-width: 100%;
+    --buffered-width: 0%;
+}
+
+.gh-whats-new .kg-video-card video {
+    display: block;
+    max-width: 100%;
+    height: auto;
+}
+
+.gh-whats-new .kg-video-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.gh-whats-new .kg-video-overlay {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-image: linear-gradient(180deg,rgba(0,0,0,0.3) 0,transparent 70%,transparent 100%);
+    z-index: 99;
+    transition: opacity .2s ease-in-out;
+}
+
+.gh-whats-new .kg-video-large-play-icon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 72px;
+    height: 72px;
+    padding: 0;
+    background: rgba(0, 0, 0, 0.5);
+    border-radius: 50%;
+    transition: opacity .2s ease-in-out;
+}
+
+.gh-whats-new .kg-video-large-play-icon svg {
+    width: 20px;
+    height: auto;
+    margin-left: 2px;
+    fill: #fff;
+}
+
+.gh-whats-new .kg-video-player-container {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 80px;
+    background: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,.5));
+    z-index: 99;
+    transition: opacity .2s ease-in-out;
+
+}
+
+.gh-whats-new .kg-video-player {
+    position: absolute;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    width: 100%;
+    z-index: 99;
+    padding: 12px 16px;
+}
+
+.gh-whats-new .kg-video-current-time {
+    min-width: 38px;
+    padding: 0 4px;
+    color: #fff;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 500;
+    line-height: 1.4em;
+    white-space: nowrap;
+}
+
+.gh-whats-new .kg-video-time {
+    color: rgba(255, 255, 255, 0.6);
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 500;
+    line-height: 1.4em;
+    white-space: nowrap;
+}
+
+.gh-whats-new .kg-video-duration {
+    padding: 0 4px;
+}
+
+.gh-whats-new .kg-video-play-icon,
+.gh-whats-new .kg-video-pause-icon {
+    position: relative;
+    padding: 0px 4px 0 0;
+    font-size: 0;
+    background: transparent;
+}
+
+.gh-whats-new .kg-video-hide {
+    display: none !important;
+}
+
+.gh-whats-new .kg-video-hide-animated {
+    opacity: 0 !important;
+    transition: opacity .2s ease-in-out;
+    cursor: initial;
+}
+
+.gh-whats-new .kg-video-play-icon svg,
+.gh-whats-new .kg-video-pause-icon svg {
+    width: 14px;
+    height: 14px;
+    fill: #fff;
+}
+
+.gh-whats-new .kg-video-seek-slider {
+    flex-grow: 1;
+    margin: 0 4px;
+}
+
+@media (max-width: 520px) {
+    .gh-whats-new .kg-video-seek-slider {
+        display: none;
+    }
+}
+
+.gh-whats-new .kg-video-playback-rate {
+    min-width: 37px;
+    padding: 0 4px;
+    color: #fff;
+    font-family: inherit;
+    font-size: .85em;
+    font-weight: 600;
+    line-height: 1.4em;
+    text-align: left;
+    background: transparent;
+    white-space: nowrap;
+}
+
+@media (max-width: 520px) {
+    .gh-whats-new .kg-video-playback-rate {
+        padding-left: 8px;
+    }
+}
+
+.gh-whats-new .kg-video-mute-icon,
+.gh-whats-new .kg-video-unmute-icon {
+    position: relative;
+    bottom: -1px;
+    padding: 0 4px;
+    font-size: 0;
+    background: transparent;
+}
+
+@media (max-width: 520px) {
+    .gh-whats-new .kg-video-mute-icon,
+    .gh-whats-new .kg-video-unmute-icon  {
+        margin-left: auto;
+    }
+}
+
+.gh-whats-new .kg-video-mute-icon svg,
+.gh-whats-new .kg-video-unmute-icon svg {
+    width: 16px;
+    height: 16px;
+    fill: #fff;
+}
+
+.gh-whats-new .kg-video-volume-slider {
+    width: 80px;
+}
+
+@media (max-width: 300px) {
+    .gh-whats-new .kg-video-volume-slider {
+        display: none;
+    }
+}
+
+.gh-whats-new .kg-video-seek-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--seek-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: #EBEEF0;
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-video-volume-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--volume-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: #EBEEF0;
+    border-radius: 2px;
+}
+
+/* Resetting browser styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-video-card input[type=range] {
+    position: relative;
+    -webkit-appearance: none;
+    background: transparent;
+}
+
+.gh-whats-new .kg-video-card input[type=range]:focus {
+    outline: none;
+}
+
+.gh-whats-new .kg-video-card input[type=range]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+}
+
+.gh-whats-new .kg-video-card input[type=range]::-ms-track {
+    cursor: pointer;
+    border-color: transparent;
+    color: transparent;
+    background: transparent;
+}
+
+.gh-whats-new .kg-video-card button {
+    display: flex;
+    align-items: center;
+    border: 0;
+    cursor: pointer;
+}
+
+.gh-whats-new .kg-video-card input[type="range"] {
+    height: auto;
+    padding: 0;
+    border: 0;
+}
+
+/* Chrome & Safari styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-video-card input[type="range"]::-webkit-slider-runnable-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-video-card input[type="range"]::-webkit-slider-thumb {
+    position: relative;
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    margin: -5px 0 0 0;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.gh-whats-new .kg-video-card input[type="range"]:active::-webkit-slider-thumb {
+    transform: scale(1.2);
+}
+
+/* Firefox styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-video-card input[type="range"]::-moz-range-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-video-card input[type="range"]::-moz-range-progress {
+    background: #EBEEF0;
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-video-card input[type="range"]::-moz-range-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.gh-whats-new .kg-video-card input[type="range"]:active::-moz-range-thumb {
+    transform: scale(1.2);
+}
+
+/* Edge & IE styles
+/* --------------------------------------------------------------- */
+
+.gh-whats-new .kg-video-card input[type="range"]::-ms-track {
+    width: 100%;
+    height: 3px;
+    border: solid transparent;
+    color: transparent;
+    cursor: pointer;
+    background: transparent;
+}
+
+.gh-whats-new .kg-video-card input[type="range"]::-ms-fill-lower {
+    background: #fff;
+}
+
+.gh-whats-new .kg-video-card input[type="range"]::-ms-fill-upper {
+    background: #EBEEF0;
+}
+
+.gh-whats-new .kg-video-card input[type="range"]::-ms-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.gh-whats-new .kg-video-card input[type="range"]:active::-ms-thumb {
+    transform: scale(1.2);
+}
+
+/* File card styles */
+.gh-whats-new .kg-file-card {
+    display: flex;
+}
+
+.gh-whats-new .kg-file-card a.kg-file-card-container {
+    display: flex;
+    align-items: stretch;
+    justify-content: space-between;
+    color: inherit;
+    padding: 6px;
+    min-height: 92px;
+    border: 1px solid rgb(124 139 154 / 25%);
+    border-radius: 3px;
+    transition: all ease-in-out 0.35s;
+    text-decoration: none;
+    width: 100%;
+}
+
+.gh-whats-new .kg-file-card a.kg-file-card-container:hover {
+    border: 1px solid rgb(124 139 154 / 35%);
+}
+
+.gh-whats-new .kg-file-card-contents {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin: 4px 8px;
+    width: 100%
+}
+
+.gh-whats-new .kg-file-card-title {
+    font-size: 1.15em;
+    font-weight: 700;
+    line-height: 1.3em;
+}
+
+.gh-whats-new .kg-file-card-caption {
+    font-size: 0.95em;
+    line-height: 1.3em;
+    opacity: 0.6;
+}
+
+.gh-whats-new .kg-file-card-title + .kg-file-card-caption {
+    margin-top: -6px;
+}
+
+.gh-whats-new .kg-file-card-metadata {
+    display: inline;
+    font-size: 0.825em;
+    line-height: 1.3em;
+    margin-top: 2px;
+}
+
+.gh-whats-new .kg-file-card-filename {
+    display: inline;
+    font-weight: 500;
+}
+
+.gh-whats-new .kg-file-card-filesize {
+    display: inline-block;
+    font-size: 0.925em;
+    opacity: 0.6;
+}
+
+.gh-whats-new .kg-file-card-filesize:before {
+    display: inline-block;
+    content: "\2022";
+    margin-right: 4px;
+}
+
+.gh-whats-new .kg-file-card-icon {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 80px;
+    min-width: 80px;
+    height: 100%;
+}
+
+.gh-whats-new .kg-file-card-icon:before {
+    position: absolute;
+    display: block;
+    content: "";
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: currentColor;
+    opacity: 0.06;
+    transition: opacity ease-in-out 0.35s;
+    border-radius: 2px;
+}
+
+.gh-whats-new .kg-file-card a.kg-file-card-container:hover .kg-file-card-icon:before {
+    opacity: 0.08;
+}
+
+.gh-whats-new .kg-file-card-icon svg {
+    width: 24px;
+    height: 24px;
+    color: var(--ghost-accent-color);
+}
+
+.gh-whats-new .kg-file-card-medium a.kg-file-card-container {
+    min-height: 72px;
+}
+
+.gh-whats-new .kg-file-card-medium .kg-file-card-caption {
+    opacity: 1.0;
+    font-weight: 500;
+}
+
+.gh-whats-new .kg-file-card-small a.kg-file-card-container {
+    align-items: center;
+    min-height: 52px;
+}
+
+.gh-whats-new .kg-file-card-small .kg-file-card-metadata {
+    font-size: 1.0em;
+    margin-top: 0;
+}
+
+.gh-whats-new .kg-file-card-small .kg-file-card-icon svg {
+    width: 20px;
+    height: 20px;
+}
+
+.gh-whats-new .kg-file-card + .kg-file-card {
+    margin-top: 1em;
+}
+
+/* Header card */
+
+.gh-whats-new .kg-header-card {
+    padding: 12vmin 4em;
+    min-height: 20vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    margin-bottom: 1.5em;
+}
+
+.gh-whats-new .kg-header-card.kg-size-small {
+    padding-top: 8vmin;
+    padding-bottom: 8vmin;
+    min-height: 12vh;
+}
+
+.gh-whats-new .kg-header-card.kg-size-large {
+    padding-top: 12vmin;
+    padding-bottom: 12vmin;
+    min-height: 40vh;
+}
+
+.gh-whats-new .kg-header-card.kg-align-left {
+    text-align: left;
+    align-items: flex-start;
+}
+
+.gh-whats-new .kg-header-card.kg-style-dark {
+    background: #151515;
+    color: #ffffff;
+}
+
+.gh-whats-new .kg-header-card.kg-style-light {
+    background-color: #fafafa;
+}
+
+.gh-whats-new .kg-header-card.kg-style-accent {
+    background-color: var(--accent-color);
+}
+
+.gh-whats-new .kg-header-card.kg-style-image {
+    position: relative;
+    background-color: #e7e7e7;
+    background-size: cover;
+    background-position: center;
+}
+
+.gh-whats-new .kg-header-card.kg-style-image::before {
+    position: absolute;
+    display: block;
+    content: "";
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background: linear-gradient(0deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2));
+}
+
+.gh-whats-new .kg-header-card h2.kg-header-card-header {
+    font-size: 5em;
+    font-weight: 700;
+    line-height: 1.1em;
+    letter-spacing: -0.01em;
+    margin: 0;
+}
+
+.gh-whats-new .kg-header-card h2.kg-header-card-header strong {
+    font-weight: 800;
+}
+
+.gh-whats-new .kg-header-card.kg-size-small h2.kg-header-card-header {
+    font-size: 4em;
+}
+
+.gh-whats-new .kg-header-card.kg-size-large h2.kg-header-card-header {
+    font-size: 6em;
+}
+
+.gh-whats-new .kg-header-card h3.kg-header-card-subheader {
+    font-size: 1.5em;
+    font-weight: 500;
+    line-height: 1.4em;
+    margin: 0;
+    max-width: 40em;
+}
+
+.gh-whats-new .kg-header-card h2 + h3.kg-header-card-subheader {
+    margin: 0.35em 0 0;
+}
+
+.gh-whats-new .kg-header-card h3.kg-header-card-subheader strong {
+    font-weight: 600;
+}
+
+.gh-whats-new .kg-header-card.kg-size-small h3.kg-header-card-subheader {
+    font-size: 1.25em;
+}
+
+.gh-whats-new .kg-header-card.kg-size-large h3.kg-header-card-subheader {
+    font-size: 1.75em;
+}
+
+.gh-whats-new .kg-header-card:not(.kg-style-light) h2.kg-header-card-header,
+.gh-whats-new .kg-header-card:not(.kg-style-light) h3.kg-header-card-subheader {
+    color: #ffffff;
+}
+
+.gh-whats-new .kg-header-card.kg-style-accent h3.kg-header-card-subheader,
+.gh-whats-new .kg-header-card.kg-style-image h3.kg-header-card-subheader {
+    opacity: 1.0;
+}
+
+.gh-whats-new .kg-header-card.kg-style-image h2.kg-header-card-header,
+.gh-whats-new .kg-header-card.kg-style-image h3.kg-header-card-subheader,
+.gh-whats-new .kg-header-card.kg-style-image a.kg-header-card-button {
+    z-index: 99;
+}
+
+.gh-whats-new .kg-header-card h2.kg-header-card-header a,
+.gh-whats-new .kg-header-card h3.kg-header-card-subheader a {
+    color: var(--ghost-accent-color);
+}
+
+.gh-whats-new .kg-header-card.kg-style-accent h2.kg-header-card-header a,
+.gh-whats-new .kg-header-card.kg-style-accent h3.kg-header-card-subheader a,
+.gh-whats-new .kg-header-card.kg-style-image h2.kg-header-card-header a,
+.gh-whats-new .kg-header-card.kg-style-image h3.kg-header-card-subheader a {
+    color: #fff;
+}
+
+.gh-whats-new .kg-header-card a.kg-header-card-button {
+    display: flex;
+    position: static;
+    align-items: center;
+    fill: #fff;
+    background: #fff;
+    border-radius: 3px;
+    outline: none;
+    font-family: var(--font-family);
+    font-size: 1.05em;
+    font-weight: 600;
+    line-height: 1em;
+    text-align: center;
+    text-decoration: none;
+    letter-spacing: .2px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: #151515;
+    height: 2.7em;
+    padding: 0 1.2em;
+    transition: opacity .2s ease;
+}
+
+.gh-whats-new .kg-header-card h2 + a.kg-header-card-button,
+.gh-whats-new .kg-header-card h3 + a.kg-header-card-button {
+    margin: 1.75em 0 0;
+}
+
+.gh-whats-new .kg-header-card a.kg-header-card-button:hover {
+    opacity: 0.85;
+}
+
+.gh-whats-new .kg-header-card.kg-size-large a.kg-header-card-button {
+    font-size: 1.1em;
+    height: 2.9em;
+}
+
+.gh-whats-new .kg-header-card.kg-size-large h2 + a.kg-header-card-button,
+.gh-whats-new .kg-header-card.kg-size-large h3 + a.kg-header-card-button {
+    margin-top: 2em;
+}
+
+.gh-whats-new .kg-header-card.kg-size-small a.kg-header-card-button {
+    height: 2.4em;
+    font-size: 1em;
+}
+
+.gh-whats-new .kg-header-card.kg-size-small h2 + a.kg-header-card-button,
+.gh-whats-new .kg-header-card.kg-size-small h3 + a.kg-header-card-button {
+    margin-top: 1.5em;
+}
+
+.gh-whats-new .kg-header-card.kg-style-image a.kg-header-card-button,
+.gh-whats-new .kg-header-card.kg-style-dark a.kg-header-card-button {
+    background: #fff;
+    color: #151515;
+}
+
+.gh-whats-new .kg-header-card.kg-style-light a.kg-header-card-button {
+    background: var(--ghost-accent-color);
+    color: #fff;
+}
+
+.gh-whats-new .kg-header-card.kg-style-accent a.kg-header-card-button {
+    background: #fff;
+    color: #151515;
+}
+
diff --git a/apps/admin-x-activitypub/src/App.tsx b/apps/admin-x-activitypub/src/App.tsx
new file mode 100644
index 00000000000..62145ea0ea9
--- /dev/null
+++ b/apps/admin-x-activitypub/src/App.tsx
@@ -0,0 +1,32 @@
+import MainContent from './MainContent';
+import {DesignSystemApp, DesignSystemAppProps} from '@tryghost/admin-x-design-system';
+import {FrameworkProvider, TopLevelFrameworkProps} from '@tryghost/admin-x-framework';
+import {RoutingProvider} from '@tryghost/admin-x-framework/routing';
+
+interface AppProps {
+    framework: TopLevelFrameworkProps;
+    designSystem: DesignSystemAppProps;
+}
+
+const modals = {
+    paths: {
+        'follow-site': 'FollowSite',
+        'profile/following': 'ViewFollowing',
+        'profile/followers': 'ViewFollowers'
+    },
+    load: async () => import('./components/modals')
+};
+
+const App: React.FC<AppProps> = ({framework, designSystem}) => {
+    return (
+        <FrameworkProvider {...framework}>
+            <RoutingProvider basePath='activitypub' modals={modals}>
+                <DesignSystemApp className='admin-x-activitypub' {...designSystem}>
+                    <MainContent />
+                </DesignSystemApp>
+            </RoutingProvider>
+        </FrameworkProvider>
+    );
+};
+
+export default App;
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/MainContent.tsx b/apps/admin-x-activitypub/src/MainContent.tsx
new file mode 100644
index 00000000000..807ec785fb9
--- /dev/null
+++ b/apps/admin-x-activitypub/src/MainContent.tsx
@@ -0,0 +1,63 @@
+import Activities from './components/Activities';
+import Inbox from './components/Inbox';
+import Profile from './components/Profile';
+import Search from './components/Search';
+import {ActivityPubAPI} from './api/activitypub';
+import {useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+import {useQuery} from '@tanstack/react-query';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+export function useBrowseInboxForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`inbox:${handle}`],
+        async queryFn() {
+            return api.getInbox();
+        }
+    });
+}
+
+export function useFollowersForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`followers:${handle}`],
+        async queryFn() {
+            return api.getFollowers();
+        }
+    });
+}
+
+const MainContent = () => {
+    const {route} = useRouting();
+    const mainRoute = route.split('/')[0];
+    switch (mainRoute) {
+    case 'search':
+        return <Search />;
+        break;
+    case 'activity':
+        return <Activities />;
+        break;
+    case 'profile':
+        return <Profile />;
+        break;
+    default:
+        return <Inbox />;
+        break;
+    }
+};
+
+export default MainContent;
diff --git a/apps/admin-x-activitypub/src/api/activitypub.test.ts b/apps/admin-x-activitypub/src/api/activitypub.test.ts
new file mode 100644
index 00000000000..7d505974470
--- /dev/null
+++ b/apps/admin-x-activitypub/src/api/activitypub.test.ts
@@ -0,0 +1,446 @@
+import {Activity, ActivityPubAPI} from './activitypub';
+
+function NotFound() {
+    return new Response(null, {
+        status: 404
+    });
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function JSONResponse(data: any, contentType = 'application/json', status = 200) {
+    return new Response(JSON.stringify(data), {
+        status,
+        headers: {
+            'Content-Type': contentType
+        }
+    });
+}
+
+type Spec = {
+    response: Response,
+    assert?: (resource: URL, init?: RequestInit) => Promise<void>
+};
+
+function Fetch(specs: Record<string, Spec>) {
+    return async function (resource: URL, init?: RequestInit): Promise<Response> {
+        const spec = specs[resource.href];
+        if (!spec) {
+            return NotFound();
+        }
+        if (spec.assert) {
+            await spec.assert(resource, init);
+        }
+        return spec.response;
+    };
+}
+
+describe('ActivityPubAPI', function () {
+    describe('getInbox', function () {
+        test('It passes the token to the inbox endpoint', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/inbox/index': {
+                    async assert(_resource, init) {
+                        const headers = new Headers(init?.headers);
+                        expect(headers.get('Authorization')).toContain('fake-token');
+                    },
+                    response: JSONResponse({
+                        type: 'Collection',
+                        items: []
+                    })
+                }
+            });
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            await api.getInbox();
+        });
+
+        test('Returns an empty array when the inbox is empty', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/inbox/index': {
+                    response: JSONResponse({
+                        type: 'Collection',
+                        items: []
+                    })
+                }
+            });
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getInbox();
+            const expected: never[] = [];
+
+            expect(actual).toEqual(expected);
+        });
+
+        test('Returns all the items array when the inbox is not empty', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/inbox/index': {
+                    response:
+                     JSONResponse({
+                         type: 'Collection',
+                         items: [{
+                             type: 'Create',
+                             object: {
+                                 type: 'Note'
+                             }
+                         }]
+                     })
+                }
+            });
+
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getInbox();
+            const expected: Activity[] = [
+                {
+                    type: 'Create',
+                    object: {
+                        type: 'Note'
+                    }
+                }
+            ];
+
+            expect(actual).toEqual(expected);
+        });
+
+        test('Returns an array when the items key is a single object', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/inbox/index': {
+                    response:
+                     JSONResponse({
+                         type: 'Collection',
+                         items: {
+                             type: 'Create',
+                             object: {
+                                 type: 'Note'
+                             }
+                         }
+                     })
+                }
+            });
+
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getInbox();
+            const expected: Activity[] = [
+                {
+                    type: 'Create',
+                    object: {
+                        type: 'Note'
+                    }
+                }
+            ];
+
+            expect(actual).toEqual(expected);
+        });
+    });
+
+    describe('getFollowing', function () {
+        test('It passes the token to the following endpoint', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/following/index': {
+                    async assert(_resource, init) {
+                        const headers = new Headers(init?.headers);
+                        expect(headers.get('Authorization')).toContain('fake-token');
+                    },
+                    response: JSONResponse({
+                        type: 'Collection',
+                        items: []
+                    })
+                }
+            });
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            await api.getFollowing();
+        });
+
+        test('Returns an empty array when the following is empty', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/following/index': {
+                    response: JSONResponse({
+                        type: 'Collection',
+                        items: []
+                    })
+                }
+            });
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getFollowing();
+            const expected: never[] = [];
+
+            expect(actual).toEqual(expected);
+        });
+
+        test('Returns all the items array when the following is not empty', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/following/index': {
+                    response:
+                     JSONResponse({
+                         type: 'Collection',
+                         items: [{
+                             type: 'Person'
+                         }]
+                     })
+                }
+            });
+
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getFollowing();
+            const expected: Activity[] = [
+                {
+                    type: 'Person'
+                }
+            ];
+
+            expect(actual).toEqual(expected);
+        });
+
+        test('Returns an array when the items key is a single object', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/following/index': {
+                    response:
+                     JSONResponse({
+                         type: 'Collection',
+                         items: {
+                             type: 'Person'
+                         }
+                     })
+                }
+            });
+
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getFollowing();
+            const expected: Activity[] = [
+                {
+                    type: 'Person'
+                }
+            ];
+
+            expect(actual).toEqual(expected);
+        });
+    });
+
+    describe('getFollowers', function () {
+        test('It passes the token to the followers endpoint', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/followers/index': {
+                    async assert(_resource, init) {
+                        const headers = new Headers(init?.headers);
+                        expect(headers.get('Authorization')).toContain('fake-token');
+                    },
+                    response: JSONResponse({
+                        type: 'Collection',
+                        orderedItems: []
+                    })
+                }
+            });
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            await api.getFollowers();
+        });
+
+        test('Returns an empty array when the followers is empty', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/followers/index': {
+                    response: JSONResponse({
+                        type: 'Collection',
+                        orderedItems: []
+                    })
+                }
+            });
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getFollowers();
+            const expected: never[] = [];
+
+            expect(actual).toEqual(expected);
+        });
+
+        test('Returns all the items array when the followers is not empty', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/followers/index': {
+                    response:
+                     JSONResponse({
+                         type: 'Collection',
+                         orderedItems: [{
+                             type: 'Person'
+                         }]
+                     })
+                }
+            });
+
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            const actual = await api.getFollowers();
+            const expected: Activity[] = [
+                {
+                    type: 'Person'
+                }
+            ];
+
+            expect(actual).toEqual(expected);
+        });
+    });
+
+    describe('follow', function () {
+        test('It passes the token to the follow endpoint', async function () {
+            const fakeFetch = Fetch({
+                'https://auth.api/': {
+                    response: JSONResponse({
+                        identities: [{
+                            token: 'fake-token'
+                        }]
+                    })
+                },
+                'https://activitypub.api/.ghost/activitypub/actions/follow/@user@domain.com': {
+                    async assert(_resource, init) {
+                        const headers = new Headers(init?.headers);
+                        expect(headers.get('Authorization')).toContain('fake-token');
+                    },
+                    response: JSONResponse({})
+                }
+            });
+            const api = new ActivityPubAPI(
+                new URL('https://activitypub.api'),
+                new URL('https://auth.api'),
+                'index',
+                fakeFetch
+            );
+
+            await api.follow('@user@domain.com');
+        });
+    });
+});
diff --git a/apps/admin-x-activitypub/src/api/activitypub.ts b/apps/admin-x-activitypub/src/api/activitypub.ts
new file mode 100644
index 00000000000..0549e5994f5
--- /dev/null
+++ b/apps/admin-x-activitypub/src/api/activitypub.ts
@@ -0,0 +1,109 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type Actor = any;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type Activity = any;
+
+export class ActivityPubAPI {
+    constructor(
+        private readonly apiUrl: URL,
+        private readonly authApiUrl: URL,
+        private readonly handle: string,
+        private readonly fetch: (resource: URL, init?: RequestInit) => Promise<Response> = window.fetch.bind(window)
+    ) {}
+
+    private async getToken(): Promise<string | null> {
+        try {
+            const response = await this.fetch(this.authApiUrl);
+            const json = await response.json();
+            return json?.identities?.[0]?.token || null;
+        } catch (err) {
+            // TODO: Ping sentry?
+            return null;
+        }
+    }
+
+    private async fetchJSON(url: URL, method: 'GET' | 'POST' = 'GET'): Promise<object | null> {
+        const token = await this.getToken();
+        const response = await this.fetch(url, {
+            method,
+            headers: {
+                Authorization: `Bearer ${token}`,
+                Accept: 'application/activity+json'
+            }
+        });
+        const json = await response.json();
+        return json;
+    }
+
+    get inboxApiUrl() {
+        return new URL(`.ghost/activitypub/inbox/${this.handle}`, this.apiUrl);
+    }
+
+    async getInbox(): Promise<Activity[]> {
+        const json = await this.fetchJSON(this.inboxApiUrl);
+        if (json === null) {
+            return [];
+        }
+        if ('items' in json) {
+            return Array.isArray(json.items) ? json.items : [json.items];
+        }
+        return [];
+    }
+
+    get followingApiUrl() {
+        return new URL(`.ghost/activitypub/following/${this.handle}`, this.apiUrl);
+    }
+
+    async getFollowing(): Promise<Activity[]> {
+        const json = await this.fetchJSON(this.followingApiUrl);
+        if (json === null) {
+            return [];
+        }
+        if ('items' in json) {
+            return Array.isArray(json.items) ? json.items : [json.items];
+        }
+        return [];
+    }
+
+    async getFollowingCount(): Promise<number> {
+        const json = await this.fetchJSON(this.followingApiUrl);
+        if (json === null) {
+            return 0;
+        }
+        if ('totalItems' in json && typeof json.totalItems === 'number') {
+            return json.totalItems;
+        }
+        return 0;
+    }
+
+    get followersApiUrl() {
+        return new URL(`.ghost/activitypub/followers/${this.handle}`, this.apiUrl);
+    }
+
+    async getFollowers(): Promise<Activity[]> {
+        const json = await this.fetchJSON(this.followersApiUrl);
+        if (json === null) {
+            return [];
+        }
+        if ('orderedItems' in json) {
+            return json.orderedItems as Activity[];
+        }
+        return [];
+    }
+
+    async getFollowersCount(): Promise<number> {
+        const json = await this.fetchJSON(this.followersApiUrl);
+        if (json === null) {
+            return 0;
+        }
+        if ('totalItems' in json && typeof json.totalItems === 'number') {
+            return json.totalItems;
+        }
+        return 0;
+    }
+
+    async follow(username: string): Promise<void> {
+        const url = new URL(`.ghost/activitypub/actions/follow/${username}`, this.apiUrl);
+        await this.fetchJSON(url, 'POST');
+    }
+}
diff --git a/apps/admin-x-activitypub/src/assets/images/ap-welcome.png b/apps/admin-x-activitypub/src/assets/images/ap-welcome.png
new file mode 100644
index 00000000000..189768bcc5d
Binary files /dev/null and b/apps/admin-x-activitypub/src/assets/images/ap-welcome.png differ
diff --git a/apps/admin-x-activitypub/src/components/Activities.tsx b/apps/admin-x-activitypub/src/components/Activities.tsx
new file mode 100644
index 00000000000..9f784beed20
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/Activities.tsx
@@ -0,0 +1,132 @@
+import APAvatar, {AvatarBadge} from './global/APAvatar';
+import ActivityItem from './activities/ActivityItem';
+import MainNavigation from './navigation/MainNavigation';
+import React from 'react';
+import {Button} from '@tryghost/admin-x-design-system';
+import {useBrowseInboxForUser, useFollowersForUser} from '../MainContent';
+
+interface ActivitiesProps {}
+
+// eslint-disable-next-line no-shadow
+enum ACTVITY_TYPE {
+    LIKE = 'Like',
+    FOLLOW = 'Follow'
+}
+
+type Actor = {
+    id: string
+    name: string
+    preferredUsername: string
+    url: string
+}
+
+type ActivityObject = {
+    name: string
+    url: string
+}
+
+type Activity = {
+    id: string
+    type: ACTVITY_TYPE
+    object?: ActivityObject
+    actor: Actor
+}
+
+const getActorUsername = (actor: Actor): string => {
+    const url = new URL(actor.url);
+    const domain = url.hostname;
+
+    return `@${actor.preferredUsername}@${domain}`;
+};
+
+const getActivityDescription = (activity: Activity): string => {
+    switch (activity.type) {
+    case ACTVITY_TYPE.FOLLOW:
+        return 'Followed you';
+    case ACTVITY_TYPE.LIKE:
+        if (activity.object) {
+            return `Liked your article "${activity.object.name}"`;
+        }
+    }
+
+    return '';
+};
+
+const getActivityUrl = (activity: Activity): string | null => {
+    if (activity.object) {
+        return activity.object.url;
+    }
+
+    return null;
+};
+
+const getActorUrl = (activity: Activity): string | null => {
+    if (activity.actor) {
+        return activity.actor.url;
+    }
+
+    return null;
+};
+
+const getActivityBadge = (activity: Activity): AvatarBadge => {
+    switch (activity.type) {
+    case ACTVITY_TYPE.FOLLOW:
+        return 'user-fill';
+    case ACTVITY_TYPE.LIKE:
+        if (activity.object) {
+            return 'heart-fill';
+        }
+    }    
+};
+
+const isFollower = (id: string, followerIds: string[]): boolean => {
+    return followerIds.includes(id);
+};
+
+const Activities: React.FC<ActivitiesProps> = ({}) => {
+    const user = 'index';
+    const {data: activityData} = useBrowseInboxForUser(user);
+    const activities = (activityData || [])
+        .filter((activity) => {
+            return [ACTVITY_TYPE.FOLLOW, ACTVITY_TYPE.LIKE].includes(activity.type);
+        })
+        .reverse(); // Endpoint currently returns items oldest-newest
+    const {data: followerData} = useFollowersForUser(user);
+    const followers = followerData || [];
+
+    return (
+        <>
+            <MainNavigation title='Activities' />
+            <div className='z-0 flex w-full flex-col items-center'>
+                {activities.length === 0 && (
+                    <div className='mt-8 font-bold'>This is an empty state when there are no activities</div>
+                )}
+                {activities.length > 0 && (
+                    <div className='mt-8 flex w-full max-w-[560px] flex-col'>
+                        {activities?.map(activity => (
+                            <ActivityItem key={activity.id} url={getActivityUrl(activity) || getActorUrl(activity)}>
+                                <APAvatar author={activity.actor} badge={getActivityBadge(activity)} />
+                                <div>
+                                    <div className='text-grey-600'>
+                                        <span className='mr-1 font-bold text-black'>{activity.actor.name}</span>
+                                        {getActorUsername(activity.actor)}
+                                    </div>
+                                    <div className='text-sm'>{getActivityDescription(activity)}</div>
+                                </div>
+                                {isFollower(activity.actor.id, followers) === false && (
+                                    <Button className='ml-auto' label='Follow' link onClick={(e) => {
+                                        e?.preventDefault();
+
+                                        alert('Implement me!');
+                                    }} />
+                                )}
+                            </ActivityItem>
+                        ))}
+                    </div>
+                )}
+            </div>
+        </>
+    );
+};
+
+export default Activities;
diff --git a/apps/admin-x-activitypub/src/components/Inbox.tsx b/apps/admin-x-activitypub/src/components/Inbox.tsx
new file mode 100644
index 00000000000..482c956fa23
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/Inbox.tsx
@@ -0,0 +1,92 @@
+import ActivityPubWelcomeImage from '../assets/images/ap-welcome.png';
+import ArticleModal from './feed/ArticleModal';
+import FeedItem from './feed/FeedItem';
+import MainNavigation from './navigation/MainNavigation';
+import NiceModal from '@ebay/nice-modal-react';
+import React, {useState} from 'react';
+import {Activity} from './activities/ActivityItem';
+import {ActorProperties, ObjectProperties} from '@tryghost/admin-x-framework/api/activitypub';
+import {Button, Heading} from '@tryghost/admin-x-design-system';
+import {useBrowseInboxForUser} from '../MainContent';
+
+interface InboxProps {}
+
+const Inbox: React.FC<InboxProps> = ({}) => {
+    const {data: activities = []} = useBrowseInboxForUser('index');
+    const [, setArticleContent] = useState<ObjectProperties | null>(null);
+    const [, setArticleActor] = useState<ActorProperties | null>(null);
+    const [layout, setLayout] = useState('inbox');
+
+    const inboxTabActivities = activities.filter((activity: Activity) => {
+        const isCreate = activity.type === 'Create' && ['Article', 'Note'].includes(activity.object.type);
+        const isAnnounce = activity.type === 'Announce' && activity.object.type === 'Note';
+
+        return isCreate || isAnnounce;
+    });
+
+    const handleViewContent = (object: ObjectProperties, actor: ActorProperties) => {
+        setArticleContent(object);
+        setArticleActor(actor);
+        NiceModal.show(ArticleModal, {
+            object: object,
+            actor: actor
+        });
+    };
+
+    const handleLayoutChange = (newLayout: string) => {
+        setLayout(newLayout);
+    };
+
+    return (
+        <>
+            <MainNavigation page='home' title="Home" onLayoutChange={handleLayoutChange} />
+            <div className='z-0 my-5 flex w-full flex-col'>
+                <div className='w-full'>
+                    {inboxTabActivities.length > 0 ? (
+                        <ul className='mx-auto flex max-w-[640px] flex-col'>
+                            {inboxTabActivities.reverse().map((activity, index) => (
+                                <li
+                                    key={activity.id}
+                                    data-test-view-article
+                                    onClick={() => handleViewContent(activity.object, activity.actor)}
+                                >
+                                    <FeedItem
+                                        actor={activity.actor}
+                                        layout={layout}
+                                        object={activity.object}
+                                        type={activity.type}
+                                    />
+                                    {index < inboxTabActivities.length - 1 && (
+                                        <div className="my-4 h-px w-full bg-grey-200"></div>
+                                    )}
+                                </li>
+                            ))}
+                        </ul>
+                    ) : (
+                        <div className='flex items-center justify-center text-center'>
+                            <div className='flex max-w-[32em] flex-col items-center justify-center gap-4'>
+                                <img
+                                    alt='Ghost site logos'
+                                    className='w-[220px]'
+                                    src={ActivityPubWelcomeImage}
+                                />
+                                <Heading className='text-balance' level={2}>
+                        Welcome to ActivityPub
+                                </Heading>
+                                <p className='text-pretty text-grey-800'>
+                        We’re so glad to have you on board! At the moment, you can follow other Ghost sites and enjoy their content right here inside Ghost.
+                                </p>
+                                <p className='text-pretty text-grey-800'>
+                        You can see all of the users on the right—find your favorite ones and give them a follow.
+                                </p>
+                                <Button color='green' label='Learn more' link={true} />
+                            </div>
+                        </div>
+                    )}
+                </div>
+            </div>
+        </>
+    );
+};
+
+export default Inbox;
diff --git a/apps/admin-x-activitypub/src/components/Profile.tsx b/apps/admin-x-activitypub/src/components/Profile.tsx
new file mode 100644
index 00000000000..859df3e0997
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/Profile.tsx
@@ -0,0 +1,122 @@
+import APAvatar from './global/APAvatar';
+import MainNavigation from './navigation/MainNavigation';
+import React, {useState} from 'react';
+import {ActivityPubAPI} from '../api/activitypub';
+import {Heading, NoValueLabel, Tab, TabView} from '@tryghost/admin-x-design-system';
+import {useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+import {useQuery} from '@tanstack/react-query';
+
+interface ProfileProps {}
+
+function useFollowersCountForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`followersCount:${handle}`],
+        async queryFn() {
+            return api.getFollowersCount();
+        }
+    });
+}
+
+function useFollowingCountForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`followingCount:${handle}`],
+        async queryFn() {
+            return api.getFollowingCount();
+        }
+    });
+}
+
+const Profile: React.FC<ProfileProps> = ({}) => {
+    const {data: followersCount = 0} = useFollowersCountForUser('index');
+    const {data: followingCount = 0} = useFollowingCountForUser('index');
+
+    type ProfileTab = 'posts' | 'likes' | 'following' | 'followers';
+
+    const [selectedTab, setSelectedTab] = useState<ProfileTab>('posts');
+
+    const tabs = [
+        {
+            id: 'posts',
+            title: 'Posts',
+            contents: (<div><NoValueLabel icon='pen'>
+                You haven’t posted anything yet.
+            </NoValueLabel></div>),
+            counter: 240
+        },
+        {
+            id: 'likes',
+            title: 'Likes',
+            contents: (<div><NoValueLabel icon='heart'>
+                You haven’t liked anything yet.
+            </NoValueLabel></div>),
+            counter: 27
+        },
+        {
+            id: 'following',
+            title: 'Following',
+            contents: (<div><NoValueLabel icon='user-add'>
+                You haven’t followed anyone yet.
+            </NoValueLabel></div>),
+            counter: followingCount
+        },
+        {
+            id: 'followers',
+            title: 'Followers',
+            contents: (<div><NoValueLabel icon='user-add'>
+                Nobody’s following you yet. Their loss!
+            </NoValueLabel></div>),
+            counter: followersCount
+        }
+    ].filter(Boolean) as Tab<ProfileTab>[];
+
+    return (
+        <>
+            <MainNavigation title='Profile' />
+            <div className='z-0 flex w-full flex-col items-center'>
+                <div className='mx-auto mt-8 w-full max-w-[560px]' id='ap-sidebar'>
+                    <div className='h-[200px] w-full rounded-lg bg-gradient-to-tr from-grey-200 to-grey-100'>
+                    </div>
+                    <div className='-mt-8 px-4'>
+                        <div className='inline-flex rounded-lg border-4 border-white'>
+                            <APAvatar size='lg' />
+                        </div>
+                        <Heading className='mt-4' level={3}>John Doe</Heading>
+                        <span className='mt-1 text-[1.5rem] text-grey-800'>@index@site.com</span>
+                        <p className='mt-3 text-[1.5rem]'>This is a summary/bio/etc which could be kinda long in certain cases but not always, so...</p>
+                        <a className='mt-3 block text-[1.5rem] underline' href='#'>www.coolsite.com</a>
+                        <TabView<'posts' | 'likes' | 'following' | 'followers'> containerClassName='mt-6' selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
+                    </div>
+
+                    {/* <div className='grid grid-cols-2 gap-4'>
+                        <div className='group/stat flex cursor-pointer flex-col gap-1' onClick={() => updateRoute('/profile/following')}>
+                            <span className='text-3xl font-bold leading-none' data-test-following-count>{followingCount}</span>
+                            <span className='text-base leading-none text-grey-800 group-hover/stat:text-grey-900' data-test-following-modal>Following<span className='ml-1 opacity-0 transition-opacity group-hover/stat:opacity-100'>&rarr;</span></span>
+                        </div>
+                        <div className='group/stat flex cursor-pointer flex-col gap-1' onClick={() => updateRoute('/profile/followers')}>
+                            <span className='text-3xl font-bold leading-none' data-test-following-count>{followersCount}</span>
+                            <span className='text-base leading-none text-grey-800 group-hover/stat:text-grey-900' data-test-followers-modal>Followers<span className='ml-1 opacity-0 transition-opacity group-hover/stat:opacity-100'>&rarr;</span></span>
+                        </div>
+                    </div> */}
+                </div>
+            </div>
+        </>
+    );
+};
+
+export default Profile;
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/components/Search.tsx b/apps/admin-x-activitypub/src/components/Search.tsx
new file mode 100644
index 00000000000..71956458c4e
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/Search.tsx
@@ -0,0 +1,52 @@
+import APAvatar from './global/APAvatar';
+import ActivityItem from './activities/ActivityItem';
+import MainNavigation from './navigation/MainNavigation';
+import React from 'react';
+import {Button, Icon} from '@tryghost/admin-x-design-system';
+
+interface SearchProps {}
+
+const Search: React.FC<SearchProps> = ({}) => {
+    return (
+        <>
+            <MainNavigation title='Search' />
+            <div className='z-0 flex w-full flex-col items-center pt-8'>
+                <div className='mb-6 flex w-full max-w-[560px] items-center gap-2 rounded-full bg-grey-100 px-3 py-2 text-grey-500'><Icon name='magnifying-glass' size={18} />Search the Fediverse</div>
+                <ActivityItem>
+                    <APAvatar/>
+                    <div>
+                        <div className='text-grey-600'><span className='font-bold text-black'>Lydia Mango</span> @username@domain.com</div>
+                        <div className='text-sm'>1,535 followers</div>
+                    </div>
+                    <Button className='ml-auto' label='Follow' link />
+                </ActivityItem>
+                <ActivityItem>
+                    <APAvatar/>
+                    <div>
+                        <div className='text-grey-600'><span className='font-bold text-black'>Tiana Passaquindici Arcand</span> @username@domain.com</div>
+                        <div className='text-sm'>4,545 followers</div>
+                    </div>
+                    <Button className='ml-auto' label='Follow' link />
+                </ActivityItem>
+                <ActivityItem>
+                    <APAvatar/>
+                    <div>
+                        <div className='text-grey-600'><span className='font-bold text-black'>Gretchen Press</span> @username@domain.com</div>
+                        <div className='text-sm'>1,156 followers</div>
+                    </div>
+                    <Button className='ml-auto' label='Follow' link />
+                </ActivityItem>
+                <ActivityItem>
+                    <APAvatar/>
+                    <div>
+                        <div className='text-grey-600'><span className='font-bold text-black'>Leo Lubin</span> @username@domain.com</div>
+                        <div className='text-sm'>1,584 followers</div>
+                    </div>
+                    <Button className='ml-auto' label='Follow' link />
+                </ActivityItem>
+            </div>
+        </>
+    );
+};
+
+export default Search;
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/components/_ObsoleteListIndex.tsx b/apps/admin-x-activitypub/src/components/_ObsoleteListIndex.tsx
new file mode 100644
index 00000000000..021cbbf1b65
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/_ObsoleteListIndex.tsx
@@ -0,0 +1,538 @@
+import ActivityPubWelcomeImage from '../assets/images/ap-welcome.png';
+import React, {useEffect, useRef, useState} from 'react';
+import articleBodyStyles from './articleBodyStyles';
+import getRelativeTimestamp from '../utils/get-relative-timestamp';
+import getUsername from '../utils/get-username';
+import {ActivityPubAPI} from '../api/activitypub';
+import {ActorProperties, ObjectProperties} from '@tryghost/admin-x-framework/api/activitypub';
+import {Avatar, Button, ButtonGroup, Heading, Icon, List, ListItem, Page, SelectOption, SettingValue, ViewContainer, ViewTab} from '@tryghost/admin-x-design-system';
+import {useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+import {useQuery} from '@tanstack/react-query';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+interface ViewArticleProps {
+    object: ObjectProperties,
+    onBackToList: () => void;
+}
+
+type Activity = {
+    type: string,
+    object: {
+        type: string
+    }
+}
+
+export function useBrowseInboxForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`inbox:${handle}`],
+        async queryFn() {
+            return api.getInbox();
+        }
+    });
+}
+
+function useFollowersCountForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`followersCount:${handle}`],
+        async queryFn() {
+            return api.getFollowersCount();
+        }
+    });
+}
+
+function useFollowingCountForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`followingCount:${handle}`],
+        async queryFn() {
+            return api.getFollowingCount();
+        }
+    });
+}
+
+const ActivityPubComponent: React.FC = () => {
+    const {updateRoute} = useRouting();
+
+    // TODO: Replace with actual user ID
+    const {data: activities = []} = useBrowseInboxForUser('index');
+    const {data: followersCount = 0} = useFollowersCountForUser('index');
+    const {data: followingCount = 0} = useFollowingCountForUser('index');
+
+    const [articleContent, setArticleContent] = useState<ObjectProperties | null>(null);
+    const [, setArticleActor] = useState<ActorProperties | null>(null);
+
+    const handleViewContent = (object: ObjectProperties, actor: ActorProperties) => {
+        setArticleContent(object);
+        setArticleActor(actor);
+    };
+
+    const handleBackToList = () => {
+        setArticleContent(null);
+    };
+
+    const [selectedOption, setSelectedOption] = useState<SelectOption>({label: 'Feed', value: 'feed'});
+
+    const [selectedTab, setSelectedTab] = useState('inbox');
+
+    const inboxTabActivities = activities.filter((activity: Activity) => {
+        const isCreate = activity.type === 'Create' && ['Article', 'Note'].includes(activity.object.type);
+        const isAnnounce = activity.type === 'Announce' && activity.object.type === 'Note';
+
+        return isCreate || isAnnounce;
+    });
+    const activityTabActivities = activities.filter((activity: Activity) => activity.type === 'Create' && activity.object.type === 'Article');
+    const likeTabActivies = activities.filter((activity: Activity) => activity.type === 'Like');
+
+    const tabs: ViewTab[] = [
+        {
+            id: 'inbox',
+            title: 'Inbox',
+            contents: (
+                <div className='w-full'>
+                    {inboxTabActivities.length > 0 ? (
+                        <ul className='mx-auto flex max-w-[540px] flex-col py-8'>
+                            {inboxTabActivities.reverse().map(activity => (
+                                <li
+                                    key={activity.id}
+                                    data-test-view-article
+                                    onClick={() => handleViewContent(activity.object, activity.actor)}
+                                >
+                                    <ObjectContentDisplay
+                                        actor={activity.actor}
+                                        layout={selectedOption.value}
+                                        object={activity.object}
+                                        type={activity.type}
+                                    />
+                                </li>
+                            ))}
+                        </ul>
+                    ) : (
+                        <div className='flex items-center justify-center text-center'>
+                            <div className='flex max-w-[32em] flex-col items-center justify-center gap-4'>
+                                <img
+                                    alt='Ghost site logos'
+                                    className='w-[220px]'
+                                    src={ActivityPubWelcomeImage}
+                                />
+                                <Heading className='text-balance' level={2}>
+                                    Welcome to ActivityPub
+                                </Heading>
+                                <p className='text-pretty text-grey-800'>
+                                    We’re so glad to have you on board! At the moment, you can follow other Ghost sites and enjoy their content right here inside Ghost.
+                                </p>
+                                <p className='text-pretty text-grey-800'>
+                                    You can see all of the users on the right—find your favorite ones and give them a follow.
+                                </p>
+                                <Button color='green' label='Learn more' link={true} />
+                            </div>
+                        </div>
+                    )}
+                </div>
+            )
+        },
+        {
+            id: 'activity',
+            title: 'Activity',
+            contents: (
+                <div className='grid grid-cols-6 items-start gap-8 pt-8'>
+                    <ul className='order-2 col-span-6 flex flex-col lg:order-1 lg:col-span-4'>
+                        {activityTabActivities.reverse().map(activity => (
+                            <li
+                                key={activity.id}
+                                data-test-view-article
+                                onClick={() => handleViewContent(activity.object, activity.actor)}
+                            >
+                                <ObjectContentDisplay
+                                    actor={activity.actor}
+                                    layout={selectedOption.value}
+                                    object={activity.object}
+                                    type={activity.object.type}
+                                />
+                            </li>
+                        ))}
+                    </ul>
+                </div>
+            )
+        },
+        {
+            id: 'likes',
+            title: 'Likes',
+            contents: (
+                <div className='grid grid-cols-6 items-start gap-8 pt-8'>
+                    <List className='col-span-4'>
+                        {likeTabActivies.reverse().map(activity => (
+                            <ListItem
+                                avatar={<Avatar image={activity.actor.icon?.url} size='sm' />}
+                                id='list-item'
+                                title={
+                                    <div>
+                                        <span className='font-medium'>{activity.actor.name}</span>
+                                        <span className='text-grey-800'> liked your post </span>
+                                        <span className='font-medium'>{activity.object.name}</span>
+                                    </div>
+                                }
+                            />
+                        ))}
+                    </List>
+                </div>
+            )
+        },
+        {
+            id: 'profile',
+            title: 'Profile',
+            contents: (
+                <div>
+                    <div className='rounded-xl bg-grey-50 p-6' id='ap-sidebar'>
+                        <div className='mb-4 border-b border-b-grey-200 pb-4'><SettingValue key={'your-username'} heading={'Your username'} value={'@index@localplaceholder.com'}/></div>
+                        <div className='grid grid-cols-2 gap-4'>
+                            <div className='group/stat flex cursor-pointer flex-col gap-1' onClick={() => updateRoute('/view-following')}>
+                                <span className='text-3xl font-bold leading-none' data-test-following-count>{followingCount}</span>
+                                <span className='text-base leading-none text-grey-800 group-hover/stat:text-grey-900' data-test-following-modal>Following<span className='ml-1 opacity-0 transition-opacity group-hover/stat:opacity-100'>&rarr;</span></span>
+                            </div>
+                            <div className='group/stat flex cursor-pointer flex-col gap-1' onClick={() => updateRoute('/view-followers')}>
+                                <span className='text-3xl font-bold leading-none' data-test-following-count>{followersCount}</span>
+                                <span className='text-base leading-none text-grey-800 group-hover/stat:text-grey-900' data-test-followers-modal>Followers<span className='ml-1 opacity-0 transition-opacity group-hover/stat:opacity-100'>&rarr;</span></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            )
+        }
+    ];
+
+    return (
+        <>
+            <Page>
+                {!articleContent ? (
+                    <ViewContainer
+                        actions={[<ButtonGroup buttons={[
+                            {
+                                icon: 'listview',
+                                size: 'sm',
+                                iconColorClass: selectedOption.value === 'feed' ? 'text-black' : 'text-grey-500',
+                                onClick: () => {
+                                    setSelectedOption({label: 'Feed', value: 'feed'});
+                                }
+
+                            },
+                            {
+                                icon: 'cardview',
+                                size: 'sm',
+                                iconColorClass: selectedOption.value === 'inbox' ? 'text-black' : 'text-grey-500',
+                                onClick: () => {
+                                    setSelectedOption({label: 'Inbox', value: 'inbox'});
+                                }
+                            }
+                        ]} clearBg={true} link outlineOnMobile />]}
+                        firstOnPage={true}
+                        primaryAction={{
+                            title: 'Follow',
+                            onClick: () => {
+                                updateRoute('follow-site');
+                            },
+                            icon: 'add'
+                        }}
+                        selectedTab={selectedTab}
+                        stickyHeader={true}
+                        tabs={tabs}
+                        title='ActivityPub'
+                        toolbarBorder={true}
+                        type='page'
+                        onTabChange={setSelectedTab}
+                    >
+                    </ViewContainer>
+
+                ) : (
+                    <ViewArticle object={articleContent} onBackToList={handleBackToList} />
+                )}
+
+            </Page>
+        </>
+    );
+};
+
+const ArticleBody: React.FC<{heading: string, image: string|undefined, html: string}> = ({heading, image, html}) => {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+
+    const iframeRef = useRef<HTMLIFrameElement>(null);
+
+    const cssContent = articleBodyStyles(siteData?.url.replace(/\/$/, ''));
+
+    const htmlContent = `
+  <html>
+  <head>
+    ${cssContent}
+  </head>
+  <body>
+    <header class='gh-article-header gh-canvas'>
+        <h1 class='gh-article-title is-title' data-test-article-heading>${heading}</h1>
+${image &&
+        `<figure class='gh-article-image'>
+            <img src='${image}' alt='${heading}' />
+        </figure>`
+}
+    </header>
+    <div class='gh-content gh-canvas is-body'>
+      ${html}
+    </div>
+  </body>
+  </html>
+`;
+
+    useEffect(() => {
+        const iframe = iframeRef.current;
+        if (iframe) {
+            iframe.srcdoc = htmlContent;
+        }
+    }, [htmlContent]);
+
+    return (
+        <div>
+            <iframe
+                ref={iframeRef}
+                className={`h-[calc(100vh_-_3vmin_-_4.8rem_-_2px)]`}
+                height='100%'
+                id='gh-ap-article-iframe'
+                title='Embedded Content'
+                width='100%'
+            >
+            </iframe>
+        </div>
+    );
+};
+
+function renderAttachment(object: ObjectProperties) {
+    let attachment;
+    if (object.image) {
+        attachment = object.image;
+    }
+
+    if (object.type === 'Note' && !attachment) {
+        attachment = object.attachment;
+    }
+
+    if (!attachment) {
+        return null;
+    }
+
+    if (Array.isArray(attachment)) {
+        const attachmentCount = attachment.length;
+
+        let gridClass = '';
+        if (attachmentCount === 1) {
+            gridClass = 'grid-cols-1'; // Single image, full width
+        } else if (attachmentCount === 2) {
+            gridClass = 'grid-cols-2'; // Two images, side by side
+        } else if (attachmentCount === 3 || attachmentCount === 4) {
+            gridClass = 'grid-cols-2'; // Three or four images, two per row
+        }
+
+        return (
+            <div className={`attachment-gallery mt-2 grid auto-rows-[150px] ${gridClass} gap-2`}>
+                {attachment.map((item, index) => (
+                    <img key={item.url} alt={`attachment-${index}`} className={`h-full w-full rounded-md object-cover ${attachmentCount === 3 && index === 0 ? 'row-span-2' : ''}`} src={item.url} />
+                ))}
+            </div>
+        );
+    }
+
+    switch (attachment.mediaType) {
+    case 'image/jpeg':
+    case 'image/png':
+    case 'image/gif':
+        return <img alt='attachment' className='mt-2 rounded-md outline outline-1 -outline-offset-1 outline-black/10' src={attachment.url} />;
+    case 'video/mp4':
+    case 'video/webm':
+        return <div className='relative mb-4 mt-2'>
+            <video className='h-[300px] w-full rounded object-cover' src={attachment.url}/>
+        </div>;
+
+    case 'audio/mpeg':
+    case 'audio/ogg':
+        return <div className='relative mb-4 mt-2 w-full'>
+            <audio className='w-full' src={attachment.url} controls/>
+        </div>;
+    default:
+        return null;
+    }
+}
+
+const ObjectContentDisplay: React.FC<{actor: ActorProperties, object: ObjectProperties, layout: string, type: string }> = ({actor, object, layout, type}) => {
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(object.content || '', 'text/html');
+
+    const plainTextContent = doc.body.textContent;
+    let previewContent = '';
+    if (object.preview) {
+        const previewDoc = parser.parseFromString(object.preview.content || '', 'text/html');
+        previewContent = previewDoc.body.textContent || '';
+    } else if (object.type === 'Note') {
+        previewContent = plainTextContent || '';
+    }
+
+    const timestamp =
+        new Date(object?.published ?? new Date()).toLocaleDateString('default', {year: 'numeric', month: 'short', day: '2-digit'}) + ', ' + new Date(object?.published ?? new Date()).toLocaleTimeString('default', {hour: '2-digit', minute: '2-digit'});
+
+    const date = new Date(object?.published ?? new Date());
+
+    const [isClicked, setIsClicked] = useState(false);
+    const [isLiked, setIsLiked] = useState(false);
+
+    const handleLikeClick = (event: React.MouseEvent<HTMLElement> | undefined) => {
+        event?.stopPropagation();
+        setIsClicked(true);
+        setIsLiked(!isLiked);
+        setTimeout(() => setIsClicked(false), 300); // Reset the animation class after 300ms
+    };
+
+    let author = actor;
+    if (type === 'Announce' && object.type === 'Note') {
+        author = typeof object.attributedTo === 'object' ? object.attributedTo as ActorProperties : actor;
+    }
+
+    if (layout === 'feed') {
+        return (
+            <>
+                {object && (
+                    <div className='group/article relative cursor-pointer pt-4'>
+                        {(type === 'Announce' && object.type === 'Note') && <div className='z-10 mb-2 flex items-center gap-3 text-grey-700'>
+                            <div className='z-10 flex w-10 justify-end'><Icon colorClass='text-grey-700' name='reload' size={'sm'}></Icon></div>
+                            <span className='z-10'>{actor.name} reposted</span>
+                        </div>}
+                        <div className='flex items-start gap-3'>
+                            <img className='z-10 w-10 rounded' src={author.icon?.url}/>
+                            <div className='border-1 z-10 -mt-1 flex w-full flex-col items-start justify-between border-b border-b-grey-200 pb-4' data-test-activity>
+                                <div className='relative z-10 mb-2 flex w-full flex-col overflow-visible text-[1.5rem]'>
+                                    <div className='flex'>
+                                        <span className='truncate whitespace-nowrap font-bold' data-test-activity-heading>{author.name}</span>
+                                        <span className='whitespace-nowrap text-grey-700 before:mx-1 before:content-["·"]' title={`${timestamp}`}>{getRelativeTimestamp(date)}</span>
+                                    </div>
+                                    <div className='flex'>
+                                        <span className='truncate text-grey-700'>{getUsername(author)}</span>
+                                    </div>
+                                </div>
+                                <div className='relative z-10 w-full gap-4'>
+                                    <div className='flex flex-col'>
+                                        {object.name && <Heading className='mb-1 leading-tight' level={4} data-test-activity-heading>{object.name}</Heading>}
+                                        <div dangerouslySetInnerHTML={({__html: object.content})} className='ap-note-content text-pretty text-[1.5rem] text-grey-900'></div>
+                                        {/* <p className='text-pretty text-md text-grey-900'>{object.content}</p> */}
+                                        {renderAttachment(object)}
+                                        <div className='mt-3 flex gap-2'>
+                                            <Button className={`self-start text-grey-500 transition-all hover:text-grey-800 ${isClicked ? 'bump' : ''} ${isLiked ? 'ap-red-heart text-red *:!fill-red hover:text-red' : ''}`} hideLabel={true} icon='heart' id='like' size='md' unstyled={true} onClick={handleLikeClick}/>
+                                            <span className={`text-grey-800 ${isLiked ? 'opacity-100' : 'opacity-0'}`}>1</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div className='absolute -inset-x-3 -inset-y-0 z-0 rounded transition-colors group-hover/article:bg-grey-100'></div>
+                    </div>
+                )}
+            </>
+        );
+    } else if (layout === 'inbox') {
+        return (
+            <>
+                {object && (
+                    <div className='border-1 group/article relative z-10 flex cursor-pointer flex-col items-start justify-between border-b border-b-grey-200 py-5' data-test-activity>
+                        <div className='relative z-10 mb-3 grid w-full grid-cols-[20px_auto_1fr_auto] items-center gap-2 text-base'>
+                            <img className='w-5' src={actor.icon?.url}/>
+                            <span className='truncate font-semibold'>{actor.name}</span>
+                            {/* <span className='truncate text-grey-800'>{getUsername(actor)}</span> */}
+                            <span className='ml-auto text-right text-grey-800'>{timestamp}</span>
+                        </div>
+                        <div className='relative z-10 grid w-full grid-cols-[auto_170px] gap-4'>
+                            <div className='flex flex-col'>
+                                <div className='flex w-full justify-between gap-4'>
+                                    <Heading className='mb-1 line-clamp-2 leading-tight' level={5} data-test-activity-heading>{object.name}</Heading>
+                                </div>
+                                <p className='mb-6 line-clamp-2 max-w-prose text-pretty text-md text-grey-800'>{previewContent}</p>
+                                <div className='flex gap-2'>
+                                    <Button className={`self-start text-grey-500 transition-all hover:text-grey-800 ${isClicked ? 'bump' : ''} ${isLiked ? 'ap-red-heart text-red *:!fill-red hover:text-red' : ''}`} hideLabel={true} icon='heart' id='like' size='md' unstyled={true} onClick={handleLikeClick}/>
+                                    <span className={`text-grey-800 ${isLiked ? 'opacity-100' : 'opacity-0'}`}>1</span>
+                                </div>
+                            </div>
+                            {/* {image && <div className='relative min-w-[33%] grow'>
+                                <img className='absolute h-full w-full rounded object-cover' height='140px' src={image} width='170px'/>
+                            </div>} */}
+                        </div>
+                        <div className='absolute -inset-x-3 -inset-y-1 z-0 rounded transition-colors group-hover/article:bg-grey-50'></div>
+                        {/* <div className='absolute inset-0 z-0 rounded from-white to-grey-50 transition-colors group-hover/article:bg-gradient-to-r'></div> */}
+                    </div>
+                )}
+            </>
+        );
+    }
+};
+
+const ViewArticle: React.FC<ViewArticleProps> = ({object, onBackToList}) => {
+    const {updateRoute} = useRouting();
+
+    const [isClicked, setIsClicked] = useState(false);
+    const [isLiked, setIsLiked] = useState(false);
+
+    const handleLikeClick = (event: React.MouseEvent<HTMLElement> | undefined) => {
+        event?.stopPropagation();
+        setIsClicked(true);
+        setIsLiked(!isLiked);
+        setTimeout(() => setIsClicked(false), 300); // Reset the animation class after 300ms
+    };
+
+    return (
+        <Page>
+            <ViewContainer
+                toolbarBorder={false}
+                type='page'
+            >
+                <div className='grid grid-cols-[1fr_minmax(320px,_700px)_1fr] gap-x-6 pb-4'>
+                    <div>
+                        <Button icon='chevron-left' iconSize='xs' label='Inbox' data-test-back-button onClick={onBackToList}/>
+                    </div>
+                    <div className='flex items-center justify-between'>
+                    </div>
+                    <div className='flex items-center justify-end gap-2'>
+                        <div className='flex flex-row-reverse items-center gap-3'>
+                            <Button className={`self-start text-grey-500 transition-all hover:text-grey-800 ${isClicked ? 'bump' : ''} ${isLiked ? 'ap-red-heart text-red *:!fill-red hover:text-red' : ''}`} hideLabel={true} icon='heart' id='like' size='md' unstyled={true} onClick={handleLikeClick}/>
+                            <span className={`text-grey-800 ${isLiked ? 'opacity-100' : 'opacity-0'}`}>1</span>
+                        </div>
+                        <Button hideLabel={true} icon='arrow-top-right' iconSize='xs' label='Visit site' onClick={() => updateRoute('/')}/>
+                    </div>
+                </div>
+                <div className='mx-[-4.8rem] mb-[-4.8rem] w-auto'>
+                    {object.type === 'Note' && (
+                        <div className='mx-auto max-w-[600px]'>
+                            {object.content && <div dangerouslySetInnerHTML={({__html: object.content})} className='ap-note-content text-pretty text-[1.5rem] text-grey-900'></div>}
+                            {renderAttachment(object)}
+                        </div>)}
+                    {object.type === 'Article' && <ArticleBody heading={object.name} html={object.content} image={object?.image}/>}
+                </div>
+            </ViewContainer>
+        </Page>
+    );
+};
+
+export default ActivityPubComponent;
diff --git a/apps/admin-x-activitypub/src/components/activities/ActivityItem.tsx b/apps/admin-x-activitypub/src/components/activities/ActivityItem.tsx
new file mode 100644
index 00000000000..6db9b4186c1
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/activities/ActivityItem.tsx
@@ -0,0 +1,39 @@
+import React, {ReactNode} from 'react';
+
+export type Activity = {
+    type: string,
+    object: {
+        type: string
+    }
+}
+
+interface ActivityItemProps {
+    children?: ReactNode;
+    url?: string | null;
+}
+
+const ActivityItem: React.FC<ActivityItemProps> = ({children, url = null}) => {
+    const childrenArray = React.Children.toArray(children);
+
+    const Item = (
+        <div className='flex w-full max-w-[560px] flex-col hover:bg-grey-75'>
+            <div className='flex w-full items-center gap-4 border-b border-grey-100 px-2 py-4'>
+                {childrenArray[0]}
+                {childrenArray[1]}
+                {childrenArray[2]}
+            </div>
+        </div>
+    );
+
+    if (url) {
+        return (
+            <a href={url} rel='noreferrer' target='_blank'>
+                {Item}
+            </a>
+        );
+    }
+
+    return Item;
+};
+
+export default ActivityItem;
diff --git a/apps/admin-x-activitypub/src/components/articleBodyStyles.ts b/apps/admin-x-activitypub/src/components/articleBodyStyles.ts
new file mode 100644
index 00000000000..4475737005c
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/articleBodyStyles.ts
@@ -0,0 +1,5911 @@
+const articleBodyStyles = (siteUrl: string|undefined) => {
+    return `<style>
+    /* Table of contents
+/* ------------------------------------------------------------
+
+This is a development CSS file which is built to a minified
+production stylesheet in assets/built/screen.css
+
+1. Variables
+2. Fonts
+3. Resets
+4. Globals
+5. Layout
+6. Navigation
+  6.1. Navigation styles
+  6.2. Navigation layouts
+  6.3. Dropdown menu
+  6.4. Mobile menu
+7. Card
+8. Header
+  8.1. Magazine layout
+  8.2. Highlight layout
+  8.3. Classic layout
+9. CTA
+10. Featured posts
+11. Container
+  11.1. With sidebar
+  11.2. Without sidebar
+12. Post list
+  12.1. List style
+  12.2. Grid style
+  12.3. No image list
+13. Sidebar
+14. Post/page
+  14.1. Article
+  14.2. Page template
+  14.3. Page without header
+15. Content
+16. Cards
+17. Comments
+18. Recent posts
+19. Archive
+20. Design settings
+21. Footer
+  21.1. Footer styles
+  21.2. Footer bar
+  21.3. Footer signup
+22. Lightbox
+
+*/
+
+/* 1. Variables
+/* ---------------------------------------------------------- */
+
+:root {
+    --color-white: #fff;
+    --color-lighter-gray: rgb(0 0 0 / 0.05);
+    --color-light-gray: #e6e6e6;
+    --color-mid-gray: #ccc;
+    --color-dark-gray: #444;
+    --color-darker-gray: #15171a;
+    --color-black: #000;
+    --color-primary-text: var(--color-darker-gray);
+    --color-secondary-text: rgb(0 0 0 / 0.55);
+    --color-border: rgb(0 0 0 / 0.08);
+    --color-dark-border: rgb(0 0 0 / 0.55);
+    --font-sans: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    --font-serif: "EB Garamond", Georgia, Times, serif;
+    --font-serif-alt: Georgia, Times, serif;
+    --font-mono: "JetBrains Mono", Menlo, Consolas, Monaco, "Liberation Mono", "Lucida Console", monospace;
+    --container-width: 1320px;
+    --container-gap: clamp(24px, 1.7032rem + 1.9355vw, 48px);
+    --grid-gap: 42px;
+}
+
+:root.has-light-text,
+:is(.gh-navigation, .gh-footer).has-accent-color {
+    --color-lighter-gray: rgb(255 255 255 / 0.1);
+    --color-darker-gray: #fff;
+    --color-secondary-text: rgb(255 255 255 / 0.64);
+    --color-border: rgb(255 255 255 / 0.15);
+    --color-dark-border: rgb(255 255 255 / 0.5);
+}
+
+/* 2. Fonts
+/* ---------------------------------------------------------- */
+
+@font-face {
+    font-family: "Inter";
+    font-style: normal;
+    font-weight: 100 900;
+    font-display: swap;
+    src: url(../fonts/inter-roman.woff2) format("woff2");
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+    font-family: "EB Garamond";
+    font-style: normal;
+    font-weight: 400 800;
+    font-display: swap;
+    src: url(../fonts/eb-garamond-roman.woff2) format("woff2");
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+    font-family: "EB Garamond";
+    font-style: italic;
+    font-weight: 400 800;
+    font-display: swap;
+    src: url(../fonts/eb-garamond-italic.woff2) format("woff2");
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+    font-family: "JetBrains Mono";
+    font-style: normal;
+    font-weight: 100 800;
+    font-display: swap;
+    src: url(../fonts/jetbrains-mono-roman.woff2) format("woff2");
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+    font-family: "JetBrains Mono";
+    font-style: italic;
+    font-weight: 100 800;
+    font-display: swap;
+    src: url(../fonts/jetbrains-mono-italic.woff2) format("woff2");
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* 3. Resets
+/* ---------------------------------------------------------- */
+
+*, *::before, *::after {
+    box-sizing: border-box;
+}
+
+* {
+    margin: 0;
+}
+
+html {
+    font-size: 62.5%;
+}
+
+body {
+    line-height: 1.6;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+img, picture, video, canvas, svg {
+    display: block;
+    height: auto;
+    max-width: 100%;
+}
+
+iframe {
+    display: block;
+}
+
+input, button, textarea, select {
+    font: inherit;
+}
+
+p, h1, h2, h3, h4, h5, h6 {
+    overflow-wrap: break-word;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    line-height: 1.2;
+}
+
+/* 4. Globals
+/* ---------------------------------------------------------- */
+
+body {
+    font-family: var(--font-sans);
+    font-size: 1.6rem;
+    background-color: var(--background-color);
+    color: var(--color-primary-text);
+}
+
+a {
+    color: var(--color-darker-gray);
+    text-decoration: none;
+}
+
+a:hover {
+    opacity: 0.8;
+}
+
+.gh-button {
+    display: inline-flex;
+    gap: 0.4em;
+    align-items: center;
+    justify-content: center;
+    padding: 0.8em 1.4em;
+    font-size: 1.5rem;
+    font-weight: 600;
+    letter-spacing: -0.004em;
+    line-height: 1;
+    color: var(--color-white);
+    cursor: pointer;
+    background-color: var(--ghost-accent-color);
+    border: 0;
+    border-radius: 100px;
+}
+
+.gh-button:hover {
+    opacity: 0.95;
+}
+
+.gh-icon-button {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    padding: 0;
+    color: var(--color-darker-gray);
+    cursor: pointer;
+    background-color: transparent;
+    border: 0;
+    outline: none;
+}
+
+.gh-icon-button:hover :is(svg, span) {
+    opacity: 0.8;
+}
+
+.gh-icon-button svg {
+    width: 20px;
+    height: 20px;
+}
+
+.gh-form {
+    display: flex;
+    align-items: center;
+    position: relative;
+    max-width: 560px;
+    width: 100%;
+    height: 56px;
+    font-size: 1.7rem;
+    font-weight: 450;
+    letter-spacing: -0.008em;
+    border-radius: 40px;
+    background-color: var(--color-lighter-gray);
+    transition: background-color 0.2s ease;
+}
+
+.gh-form.success {
+    pointer-events: none;
+}
+
+.gh-form.error {
+    box-shadow: 0 0 0 1px red;
+}
+
+.gh-form:hover {
+    background-color: rgb(0 0 0 / 0.065);
+}
+
+.has-light-text .gh-form:hover,
+.gh-footer.has-accent-color .gh-form:hover {
+    background-color: rgb(255 255 255 / 0.15);
+}
+
+.gh-form-input {
+    position: absolute;
+    inset: 0;
+    padding-inline: 26px;
+    width: 100%;
+    height: 100%;
+    font-size: inherit;
+    letter-spacing: inherit;
+    line-height: 1.1;
+    border: 0;
+    background-color: transparent;
+    outline: none;
+    transition: 0.3s ease-in-out;
+}
+
+.gh-form-input::placeholder,
+button.gh-form-input {
+    color: rgb(0 0 0 / 0.3);
+}
+
+:is(.has-serif-title, .has-mono-title) .gh-form-input {
+    padding-inline: 20px;
+}
+
+.gh-form.gh-form.success .gh-form-input {
+    opacity: 0.5;
+}
+
+.has-light-text .gh-form-input,
+.gh-footer.has-accent-color .gh-form-input {
+    color: #fff;
+}
+
+.has-light-text .gh-form-input::placeholder,
+.has-light-text button.gh-form-input,
+.gh-footer.has-accent-color .gh-form-input::placeholder {
+    color: rgb(255 255 255 / 0.55);
+}
+
+.gh-header.is-classic.has-image .gh-form-input {
+    color: #15171a;
+}
+
+.gh-header.is-classic.has-image .gh-form-input::placeholder,
+.gh-header.is-classic.has-image button.gh-form-input,
+.gh-header.is-classic.has-image .gh-form > svg {
+    color: rgb(0 0 0 / 0.5);
+}
+
+button.gh-form-input {
+    padding-inline-start: 56px;
+    text-align: left;
+    color: var(--color-secondary-text);
+    cursor: pointer;
+}
+
+:is(.has-serif-title,.has-mono-title) button.gh-form-input {
+    padding-inline-start: 50px;
+}
+
+.gh-form .gh-button {
+    position: absolute;
+    right: 6px;
+    padding-inline: 32px;
+    height: 44px;
+    font-size: inherit;
+}
+
+.gh-form > svg {
+    position: relative;
+    left: 22px;
+    width: 20px;
+    height: 20px;
+    color: var(--color-secondary-text);
+}
+
+:is(.has-serif-title,.has-mono-title) .gh-form > svg {
+    left: 16px;
+}
+
+.gh-form .gh-button svg {
+    display: none;
+    position: absolute;
+    margin-top: 1px;
+}
+
+.gh-form:is(.loading, .success) .gh-button span {
+    visibility: hidden;
+}
+
+.gh-form.loading .gh-button svg:first-of-type {
+    display: block;
+}
+
+.gh-form.success .gh-button svg:last-of-type {
+    display: block;
+}
+
+.gh-form [data-members-error] {
+    position: absolute;
+    top: 100%;
+    margin-top: 10px;
+    width: 100%;
+    font-size: 1.4rem;
+    line-height: 1.4;
+}
+
+@media (max-width: 576px) {
+    .gh-form {
+        font-size: 1.6rem;
+    }
+
+    .gh-form .gh-button {
+        padding-inline: 12px;
+    }
+
+    .gh-form .gh-button span span {
+        display: none;
+    }
+
+    .gh-form .gh-button span svg {
+        display: inline;
+        position: static;
+        margin-top: 2px;
+        width: 20px;
+        height: 20px;
+    }
+}
+
+/* 5. Layout
+/* ---------------------------------------------------------- */
+
+.gh-viewport {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+}
+
+.gh-outer {
+    padding: 0 max(4vmin, 20px);
+}
+
+.gh-outer .gh-outer {
+    padding: 0;
+}
+
+.gh-inner {
+    margin: 0 auto;
+    max-width: var(--container-width);
+    width: 100%;
+}
+
+.gh-main {
+    flex-grow: 1;
+}
+
+.gh-canvas,
+.kg-width-full.kg-content-wide {
+    --main: min(var(--content-width, 720px), 100% - var(--container-gap) * 2);
+    --wide: minmax(0, calc((var(--container-width, 1200px) - var(--content-width, 720px)) / 2));
+    --full: minmax(var(--container-gap), 1fr);
+
+    display: grid;
+    grid-template-columns:
+        [full-start] var(--full)
+        [wide-start] var(--wide)
+        [main-start] var(--main) [main-end]
+        var(--wide) [wide-end]
+        var(--full) [full-end];
+}
+
+.gh-canvas > * {
+    grid-column: main;
+}
+
+.kg-width-wide,
+.kg-content-wide > div {
+    grid-column: wide;
+}
+
+.kg-width-full {
+    grid-column: full;
+}
+
+.kg-article-container {
+    padding-bottom: 4.8rem;
+}
+
+/* 6. Navigation
+/* ---------------------------------------------------------- */
+
+.gh-navigation {
+    height: 100px;
+    font-size: 1.5rem;
+    font-weight: 550;
+    background-color: var(--background-color);
+    color: var(--color-darker-gray);
+}
+
+.gh-navigation :is(.gh-navigation-logo, a:not(.gh-button), .gh-icon-button) {
+    color: inherit;
+}
+
+.gh-navigation-inner {
+    display: grid;
+    grid-auto-flow: row dense;
+    column-gap: 24px;
+    align-items: center;
+    height: 100%;
+}
+
+.gh-navigation-brand {
+    line-height: 1;
+}
+
+.gh-navigation-logo {
+    position: relative;
+    font-size: calc(2.4rem * var(--factor, 1));
+    font-weight: 725;
+    letter-spacing: -0.015em;
+    white-space: nowrap;
+}
+
+.gh-navigation-logo img {
+    max-height: 40px;
+}
+
+.gh-navigation-menu {
+    display: flex;
+    gap: 24px;
+    align-items: center;
+}
+
+.gh-navigation .nav {
+    display: inline-flex;
+    gap: 28px;
+    align-items: center;
+    padding: 0;
+    margin: 0;
+    white-space: nowrap;
+    list-style: none;
+}
+
+.gh-navigation .gh-more-toggle {
+    position: relative;
+    margin: 0 -6px;
+    font-size: inherit;
+    text-transform: inherit;
+}
+
+.gh-navigation .gh-more-toggle svg {
+    width: 24px;
+    height: 24px;
+}
+
+.gh-navigation-actions {
+    display: flex;
+    gap: 24px;
+    align-items: center;
+    justify-content: flex-end;
+    background-color: var(--background-color);
+}
+
+.gh-navigation.has-accent-color .gh-navigation-actions {
+    background-color: var(--ghost-accent-color);
+}
+
+.gh-navigation-members {
+    display: flex;
+    gap: 20px;
+    align-items: center;
+    white-space: nowrap;
+}
+
+.gh-navigation-members .gh-button {
+    font-size: inherit;
+    font-weight: 600;
+}
+
+.gh-search {
+    margin-right: -2px;
+    margin-left: -2px;
+}
+
+@media (max-width: 767px) {
+    .gh-navigation-logo {
+        white-space: normal;
+    }
+
+    .gh-navigation-members {
+        flex-direction: column-reverse;
+        gap: 16px;
+        width: 100%;
+    }
+
+    .gh-navigation-actions .gh-search {
+        display: none;
+    }
+}
+
+@media (min-width: 768px) {
+    .gh-navigation-brand .gh-search {
+        display: none;
+    }
+
+    .gh-navigation:not(.is-dropdown-loaded) .gh-navigation-menu .nav > li {
+        opacity: 0;
+    }
+}
+
+/* 6.1. Navigation styles */
+
+.gh-navigation.has-accent-color {
+    background-color: var(--ghost-accent-color);
+}
+
+.gh-navigation.has-accent-color .gh-button {
+    background-color: #fff;
+    color: #15171a;
+}
+
+/* 6.2. Navigation layouts */
+
+/*
+======================================================================
+LOGO   Home About Collection Author Portal             Login Subscribe
+======================================================================
+*/
+
+.gh-navigation.is-left-logo .gh-navigation-inner {
+    grid-template-columns: auto 1fr auto;
+}
+
+@media (min-width: 768px) {
+    .gh-navigation.is-left-logo .gh-navigation-logo:not(:has(img)) {
+        top: -2px;
+    }
+}
+
+@media (min-width: 992px) {
+    .gh-navigation.is-left-logo .gh-navigation-menu {
+        margin-right: 100px;
+        margin-left: 16px;
+    }
+}
+
+/*
+======================================================================
+Home About Collection            LOGO                  Login Subscribe
+======================================================================
+*/
+
+.gh-navigation.is-middle-logo .gh-navigation-inner {
+    grid-template-columns: 1fr auto 1fr;
+}
+
+.gh-navigation.is-middle-logo .gh-navigation-brand {
+    grid-column-start: 2;
+}
+
+.gh-navigation.is-middle-logo .gh-navigation-actions {
+    gap: 28px;
+}
+
+@media (min-width: 992px) {
+    .gh-navigation.is-middle-logo .gh-navigation-menu {
+        margin-right: 64px;
+    }
+}
+
+/*
+======================================================================
+Search                         LOGO                    Login Subscribe
+                 Home About Collection Author Portal
+======================================================================
+*/
+
+.gh-navigation.is-stacked {
+    position: relative;
+    height: auto;
+}
+
+.gh-navigation.is-stacked .gh-navigation-inner {
+    grid-template-columns: 1fr auto 1fr;
+}
+
+.gh-navigation.is-stacked .gh-navigation-brand {
+    display: flex;
+    align-items: center;
+    grid-row-start: 1;
+    grid-column-start: 2;
+    min-height: 80px;
+}
+
+@media (max-width: 767px) {
+    .gh-navigation.is-stacked .gh-navigation-brand {
+        min-height: unset;
+    }
+}
+
+@media (min-width: 992px) {
+    .gh-navigation.is-stacked .gh-navigation-inner {
+        padding: 0;
+    }
+
+    .gh-navigation.is-stacked .gh-navigation-brand {
+        display: flex;
+        align-items: center;
+        height: 80px;
+    }
+
+    .gh-navigation.is-stacked .gh-navigation-menu {
+        grid-row-start: 2;
+        grid-column: 1 / 4;
+        justify-content: center;
+        height: 60px;
+        margin: 0 48px;
+    }
+
+    .gh-navigation.is-stacked .gh-navigation-menu::before,
+    .gh-navigation.is-stacked .gh-navigation-menu::after {
+        position: absolute;
+        top: 80px;
+        left: 0;
+        width: 100%;
+        height: 1px;
+        content: "";
+        background-color: var(--color-border);
+    }
+
+    .gh-navigation.is-stacked .gh-navigation-menu::after {
+        top: 140px;
+    }
+
+    .gh-navigation.is-stacked .gh-navigation-actions {
+        grid-row-start: 1;
+        grid-column: 1 / 4;
+        justify-content: space-between;
+    }
+
+    .gh-navigation.is-stacked .gh-navigation-actions .gh-search {
+        display: flex;
+        gap: 10px;
+        width: auto;
+    }
+}
+
+/* 6.3. Dropdown menu */
+
+.gh-dropdown {
+    position: absolute;
+    top: 100%;
+    right: -16px;
+    z-index: 90;
+    width: 200px;
+    padding: 12px 0;
+    margin-top: 24px;
+    text-align: left;
+    visibility: hidden;
+    background-color: #fff;
+    border-radius: 5px;
+    box-shadow: 0 0 0 1px rgb(0 0 0 / 0.04), 0 7px 20px -5px rgb(0 0 0 / 0.15);
+    opacity: 0;
+    transition: opacity 0.3s, transform 0.2s;
+    transform: translate3d(0, 6px, 0);
+}
+
+.gh-dropdown.is-left {
+    right: auto;
+    left: -16px;
+}
+
+.is-dropdown-mega .gh-dropdown {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-auto-flow: column;
+    column-gap: 40px;
+    width: auto;
+    padding: 20px 32px;
+}
+
+.is-dropdown-open .gh-dropdown {
+    visibility: visible;
+    opacity: 1;
+    transform: translateY(0);
+}
+
+.gh-dropdown li a {
+    display: block;
+    padding: 7px 20px;
+    line-height: 1.5;
+    white-space: normal;
+    color: #15171a !important;
+}
+
+.is-dropdown-mega .gh-dropdown li a {
+    padding: 8px 0;
+}
+
+/* 6.4. Mobile menu */
+
+.gh-burger {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    display: none;
+    margin-right: -7px;
+    margin-left: 4px;
+}
+
+.gh-burger svg {
+    width: 24px;
+    height: 24px;
+}
+
+.gh-burger svg:last-child {
+    display: none;
+}
+
+.is-open .gh-burger svg:first-child {
+    display: none;
+}
+
+.is-open .gh-burger svg:last-child {
+    display: block;
+}
+
+@media (max-width: 767px) {
+    .gh-burger {
+        display: flex;
+    }
+
+    #gh-navigation {
+        height: 64px;
+    }
+
+    #gh-navigation .gh-navigation-inner {
+        grid-template-rows: auto 1fr auto;
+        grid-template-columns: 1fr;
+        gap: 48px;
+    }
+
+    #gh-navigation .gh-navigation-brand {
+        display: grid;
+        grid-template-columns: 1fr auto auto;
+        grid-column-start: 1;
+        align-items: center;
+        height: 64px;
+    }
+
+    #gh-navigation .gh-navigation-logo {
+        font-size: 2.2rem;
+    }
+
+    #gh-navigation .gh-navigation-menu,
+    #gh-navigation .gh-navigation-actions {
+        position: fixed;
+        justify-content: center;
+        visibility: hidden;
+        opacity: 0;
+    }
+
+    #gh-navigation .gh-navigation-menu {
+        transition: none;
+        transform: translateY(0);
+    }
+
+    #gh-navigation .nav {
+        gap: 20px;
+        align-items: center;
+        line-height: 1.4;
+    }
+
+    #gh-navigation .nav a {
+        font-size: 1.75rem;
+        font-weight: 600;
+        text-transform: none;
+    }
+
+    #gh-navigation .nav li {
+        opacity: 0;
+        transform: translateY(-4px);
+    }
+
+    #gh-navigation .gh-navigation-actions {
+        text-align: center;
+    }
+
+    #gh-navigation :is(.gh-button, a[data-portal="signin"]) {
+        opacity: 0;
+        transform: translateY(8px);
+    }
+
+    #gh-navigation .gh-button {
+        width: 100%;
+        font-size: 1.75rem;
+        text-transform: none;
+    }
+
+    #gh-navigation a[data-portal="signin"] {
+        font-size: 1.75rem;
+    }
+
+    #gh-main {
+        transition: opacity 0.4s;
+    }
+
+    .is-open#gh-navigation {
+        position: fixed;
+        inset: 0;
+        z-index: 3999999;
+        height: 100%;
+        overflow-y: scroll;
+        -webkit-overflow-scrolling: touch;
+    }
+
+    .is-open#gh-navigation .gh-navigation-menu,
+    .is-open#gh-navigation .gh-navigation-actions {
+        position: static;
+        visibility: visible;
+        opacity: 1;
+    }
+
+    .is-open#gh-navigation .nav {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .is-open#gh-navigation .nav li {
+        opacity: 1;
+        transition: transform 0.2s, opacity 0.2s;
+        transform: translateY(0);
+    }
+
+    .is-open#gh-navigation .gh-navigation-actions {
+        position: sticky;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        display: inline-flex;
+        flex-direction: column;
+        gap: 12px;
+        align-items: center;
+        padding: var(--container-gap) 0;
+    }
+
+    .is-open#gh-navigation :is(.gh-button, a[data-portal="signin"]) {
+        opacity: 1;
+        transition: transform 0.4s, opacity 0.4s;
+        transition-delay: 0.2s;
+        transform: translateY(0);
+    }
+
+    .is-open#gh-navigation a[data-portal="signin"] {
+        transition-delay: 0.4s;
+    }
+
+    .is-open#gh-main {
+        opacity: 0;
+    }
+}
+
+/* 7. Card
+/* ---------------------------------------------------------- */
+
+.gh-card {
+    position: relative;
+}
+
+.gh-card-link {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+}
+
+.gh-card-link:hover {
+    opacity: 1;
+}
+
+.gh-card-image {
+    position: relative;
+    flex-shrink: 0;
+    aspect-ratio: 16 / 9;
+}
+
+.gh-card-image img {
+    position: absolute;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.gh-card-wrapper {
+    flex-grow: 1;
+}
+
+.gh-card-tag {
+    display: none;
+    margin-bottom: 4px;
+    font-size: 1.2rem;
+    font-weight: 500;
+    letter-spacing: 0.01em;
+    text-transform: uppercase;
+}
+
+.gh-card-title {
+    font-size: calc(1.9rem * var(--factor, 1));
+    font-weight: 725;
+    letter-spacing: -0.014em;
+    line-height: 1.3;
+}
+
+.gh-card-link:hover .gh-card-title {
+    opacity: 0.8;
+}
+
+.gh-card-excerpt {
+    display: -webkit-box;
+    overflow-y: hidden;
+    margin-top: 8px;
+    font-size: 1.45rem;
+    line-height: 1.4;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+.gh-card-meta {
+    display: flex;
+    gap: 4px;
+    flex-wrap: wrap;
+    align-items: center;
+    padding-bottom: 1px;
+    font-size: 1.25rem;
+    font-weight: 500;
+    line-height: 1.05;
+    letter-spacing: -0.004em;
+    color: var(--color-secondary-text);
+}
+
+.gh-card-meta svg {
+    width: 16px;
+    height: 16px;
+    margin-right: 2px;
+    margin-top: -2px;
+}
+
+.gh-card-meta:not(:empty) {
+    margin-top: 12px;
+}
+
+.gh-card-author + .gh-card-date::before {
+    content: "—";
+    margin-right: 4px;
+}
+
+/* 8. Header
+/* ---------------------------------------------------------- */
+
+.gh-header {
+    position: relative;
+    margin-top: 40px;
+}
+
+.gh-header-inner {
+    position: relative;
+    overflow: hidden;
+}
+
+/* 8.1. Magazine layout */
+
+.gh-header.is-magazine .gh-header-inner {
+    display: grid;
+    grid-template-columns: repeat(16, 1fr);
+    gap: var(--grid-gap);
+}
+
+.gh-header.is-magazine .gh-header-inner > div {
+    display: flex;
+    flex-direction: column;
+    gap: var(--grid-gap);
+    grid-row: 1;
+}
+
+.gh-header.is-magazine .gh-header-left {
+    grid-column: 1 / span 4;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card {
+    position: relative;
+    grid-column: 5 / span 8;
+}
+
+.gh-header.is-magazine .gh-header-right {
+    grid-column: 13 / -1;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card .gh-card-link {
+    gap: 28px;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card .gh-card-image {
+    aspect-ratio: 1.618033;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card .gh-card-tag {
+    display: block;
+    margin-bottom: 12px;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card .gh-card-title {
+    font-size: clamp(2.8rem, 1.36vw + 2.25rem, 4rem);
+    font-weight: 700;
+    line-height: 1.1;
+    letter-spacing: -0.022em;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card .gh-card-excerpt {
+    margin-top: clamp(12px, 0.45vw + 10.18px, 16px);
+    font-size: 1.8rem;
+    letter-spacing: -0.02em;
+    max-width: 90%;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card .gh-card-meta:not(:empty) {
+    margin-top: 14px;
+}
+
+.gh-header.is-magazine :is(.gh-header-left, .gh-header-right) .gh-card:last-child .gh-card-image {
+    display: none;
+}
+
+.gh-header.is-magazine .gh-header-inner > div .gh-card-excerpt {
+    display: none;
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card::before,
+.gh-header.is-magazine .gh-header-inner > .gh-card::after {
+    position: absolute;
+    top: 0;
+    left: calc(var(--grid-gap) / -2);
+    content: "";
+    width: 1px;
+    height: 100%;
+    background-color: var(--color-border);
+}
+
+.gh-header.is-magazine .gh-header-inner > .gh-card::after {
+    right: calc(var(--grid-gap) / -2);
+    left: auto;
+}
+
+.gh-header.is-magazine .gh-header-inner > div .gh-card + .gh-card::before {
+    position: absolute;
+    top: calc(var(--grid-gap) / -2);
+    left: 0;
+    content: "";
+    width: 100%;
+    height: 1px;
+    background-color: var(--color-border);
+}
+
+@media (max-width: 1199px) {
+    .gh-header.is-magazine .gh-header-inner {
+        grid-template-columns: repeat(12, 1fr);
+    }
+
+    .gh-header.is-magazine .gh-header-inner > .gh-card {
+        grid-column: 1 / span 8;
+    }
+
+    .gh-header.is-magazine .gh-header-left {
+        grid-column: 9 / -1;
+    }
+
+    .gh-header.is-magazine .gh-header-inner > div.gh-header-right {
+        grid-column: 1 / -1;
+        grid-row: 2;
+        flex-direction: row;
+    }
+
+    .gh-header.is-magazine .gh-header-right .gh-card {
+        flex: 1;
+    }
+
+    .gh-header.is-magazine .gh-header-right .gh-card:last-child .gh-card-image {
+        display: block;
+    }
+
+    .gh-header.is-magazine .gh-header-right {
+        position: relative;
+    }
+
+    .gh-header.is-magazine .gh-header-right::before {
+        position: absolute;
+        top: calc(var(--grid-gap) / -2);
+        left: 0;
+        content: "";
+        width: 100%;
+        height: 1px;
+        background-color: var(--color-border);
+    }
+
+    .gh-header.is-magazine .gh-header-right .gh-card::before {
+        display: none;
+    }
+
+    .gh-header.is-magazine .gh-header-right .gh-card::after {
+        position: absolute;
+        top: 0;
+        right: calc(var(--grid-gap) / -2);
+        content: "";
+        width: 1px;
+        height: 100%;
+        background-color: var(--color-border);
+    }
+}
+
+@media (max-width: 991px) {
+    .gh-header.is-magazine .gh-header-left .gh-card:nth-child(2) .gh-card-image {
+        display: none;
+    }
+}
+
+@media (max-width: 767px) {
+    .gh-header.is-magazine .gh-header-inner {
+        display: flex;
+        flex-direction: column;
+        gap: var(--grid-gap);
+    }
+
+    .gh-header.is-magazine .gh-header-inner > div.gh-header-right {
+        flex-direction: column;
+    }
+
+    .gh-header.is-magazine .gh-card-image {
+        display: block !important;
+    }
+
+    .gh-header.is-magazine .gh-card::before {
+        display: block !important;
+        position: absolute;
+        top: calc(var(--grid-gap) / -2);
+        left: 0;
+        content: "";
+        width: 100%;
+        height: 1px;
+        background-color: var(--color-border);
+    }
+}
+
+/* 8.2. Highlight layout */
+
+.gh-header.is-highlight .gh-header-inner {
+    display: grid;
+    grid-template-columns: repeat(16, 1fr);
+    gap: var(--grid-gap);
+}
+
+.gh-header.is-highlight .gh-header-left {
+    position: relative;
+    grid-column: span 8;
+}
+
+.gh-header.is-highlight .gh-header-left .gh-card {
+    grid-column: span 8;
+    grid-row: span 3;
+}
+
+.gh-header.is-highlight .gh-header-left .gh-card .gh-card-link {
+    gap: 28px;
+}
+
+.gh-header.is-highlight .gh-header-left .gh-card .gh-card-image {
+    aspect-ratio: 3 / 2;
+}
+
+.gh-header.is-highlight .gh-header-left .gh-card .gh-card-tag {
+    display: block;
+    margin-bottom: 12px;
+}
+
+.gh-header.is-highlight .gh-header-left .gh-card .gh-card-title {
+    font-size: clamp(2.8rem, 1.36vw + 2.25rem, 4rem);
+    font-weight: 700;
+    line-height: 1.1;
+    letter-spacing: -0.022em;
+}
+
+.gh-header.is-highlight .gh-header-left .gh-card .gh-card-excerpt {
+    margin-top: clamp(12px, 0.45vw + 10.18px, 16px);
+    font-size: 1.8rem;
+}
+
+.gh-header.is-highlight .gh-header-left .gh-card .gh-card-meta:not(:empty) {
+    margin-top: 14px;
+}
+
+.gh-header.is-highlight .gh-header-middle {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    gap: var(--grid-gap);
+    grid-column: 9 / span 4;
+}
+
+.gh-header.is-highlight .gh-header-middle .gh-card:last-child .gh-card-image {
+    display: none;
+}
+
+.gh-header.is-highlight .gh-header-middle .gh-card .gh-card-excerpt {
+    display: none;
+}
+
+.gh-header.is-highlight .gh-header-right {
+    grid-column: 13 / -1;
+}
+
+.gh-header.is-highlight .gh-featured {
+    margin-top: 0;
+    padding: 0;
+}
+
+.gh-header.is-highlight .gh-featured-feed {
+    display: flex;
+    flex-direction: column;
+}
+
+.gh-header.is-highlight .gh-featured-feed .gh-card-title {
+    font-size: clamp(1.4rem, 0.23vw + 1.31rem, 1.6rem);
+}
+
+.gh-header.is-highlight .gh-header-left::after,
+.gh-header.is-highlight .gh-header-middle::after {
+    position: absolute;
+    top: 0;
+    right: calc(var(--grid-gap) / -2);
+    content: "";
+    width: 1px;
+    height: 100%;
+    background-color: var(--color-border);
+}
+
+.gh-header.is-highlight .gh-card::before {
+    position: absolute;
+    top: calc(var(--grid-gap) / -2);
+    left: 0;
+    content: "";
+    width: 100%;
+    height: 1px;
+    background-color: var(--color-border);
+}
+
+.gh-header.is-highlight .gh-featured .gh-card:first-child::before {
+    display: none;
+}
+
+@media (max-width: 1199px) {
+    .gh-header.is-highlight .gh-header-inner {
+        grid-template-columns: repeat(9, 1fr);
+    }
+
+    .gh-header.is-highlight .gh-header-left {
+        grid-column: span 6;
+    }
+
+    .gh-header.is-highlight .gh-header-middle {
+        grid-column: 7 / -1;
+    }
+
+    .gh-header.is-highlight .gh-header-right {
+        grid-column: 1 / -1;
+    }
+
+    .gh-header.is-highlight .gh-featured-feed {
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+    }
+
+    .gh-header.is-highlight .gh-featured-feed .gh-card:before {
+        width: calc(100% + var(--grid-gap));
+    }
+
+    .gh-header.is-highlight .gh-featured-feed .gh-card::after {
+        position: absolute;
+        top: 0;
+        left: calc(var(--grid-gap) / -2);
+        content: "";
+        width: 1px;
+        height: 100%;
+        background-color: var(--color-border);
+    }
+}
+
+@media (max-width: 991px) {
+    .gh-header.is-highlight .gh-header-middle .gh-card:nth-child(2) .gh-card-image {
+        display: none;
+    }
+}
+
+@media (max-width: 767px) {
+    .gh-header.is-highlight .gh-header-inner {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .gh-header.is-highlight .gh-featured-feed {
+        display: flex;
+        /* gap: var(--grid-gap); */
+    }
+
+    .gh-header.is-highlight .gh-card-image {
+        display: block !important;
+    }
+
+    .gh-header.is-highlight .gh-header-middle .gh-card .gh-card-excerpt {
+        display: -webkit-box;
+    }
+}
+
+/* 8.3. Classic layout */
+
+.gh-header.is-classic {
+    display: flex;
+    margin-top: 0;
+    padding-block: 160px;
+}
+
+.gh-header.is-classic .gh-header-inner {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 48px;
+    overflow: unset;
+    margin: auto;
+    max-width: 1020px;
+    text-align: center;
+}
+
+.gh-header.is-classic .gh-header-title {
+    font-size: calc(clamp(3rem, 1.82vw + 2.27rem, 4.6rem) * var(--factor, 1));
+    line-height: 1.1;
+    letter-spacing: -0.028em;
+}
+
+.gh-header.is-classic.has-image {
+    margin-top: 0;
+}
+
+.gh-header.is-classic.has-image::before {
+    position: absolute;
+    inset: 0;
+    content: "";
+    opacity: 0.3;
+    background-color: var(--color-black);
+    transition: opacity 1.5s ease;
+}
+
+.gh-header.is-classic.has-image .gh-header-inner {
+    color: #fff;
+}
+
+.gh-header.is-classic.has-image .gh-header-image {
+    position: absolute;
+    inset: 0;
+    z-index: -1;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.gh-header.is-classic.has-image .gh-form {
+    background-color: #fff;
+}
+
+/* 9. CTA
+/* ---------------------------------------------------------- */
+
+.gh-cta {
+    display: none;
+    margin-top: max(4vw, 40px);
+}
+
+.gh-header:is(.is-highlight, .is-magazine) + .gh-cta {
+    display: block;
+}
+
+.gh-cta-inner {
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 36px;
+    padding: clamp(48px, 3.64vw + 33.45px, 80px) clamp(40px, 2.73vw + 29.09px, 64px);
+    text-align: center;
+    background-color: var(--color-lighter-gray);
+}
+
+.gh-cta-content {
+    max-width: 640px;
+}
+
+.gh-cta-title {
+    font-size: clamp(2.8rem,1.36vw + 2.25rem,4rem);
+    font-weight: 700;
+    line-height: 1.1;
+    letter-spacing: -0.021em;
+}
+
+.gh-cta-description {
+    margin-top: 12px;
+    font-size: 1.8rem;
+    line-height: 1.4;
+    letter-spacing: -0.015em;
+}
+
+/* 10. Featured posts
+/* ---------------------------------------------------------- */
+
+.gh-featured {
+    margin-top: 100px;
+}
+
+.gh-navigation + .gh-featured {
+    margin-top: 64px;
+}
+
+.gh-header.is-classic:not(.has-image) + .gh-featured {
+    margin-top: 0;
+}
+
+.gh-featured-inner {
+    overflow: hidden;
+}
+
+.gh-featured-title {
+    margin-bottom: 20px;
+    padding-bottom: 12px;
+    font-size: 1.2rem;
+    font-weight: 550;
+    letter-spacing: 0.025em;
+    text-transform: uppercase;
+    border-bottom: 1px solid var(--color-border);
+}
+
+.gh-featured-feed {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: var(--grid-gap);
+}
+
+.gh-featured-feed .gh-card {
+    container-type: inline-size;
+    container-name: featured-card;
+}
+
+.gh-featured-feed .gh-card-link {
+    display: flex;
+    flex-direction: row-reverse;
+    align-items: flex-start;
+}
+
+.gh-featured-feed .gh-card-image {
+    width: 72px;
+    aspect-ratio: 1;
+}
+
+@container featured-card (width < 240px) {
+    .gh-featured-feed .gh-card-image {
+        display: none;
+    }
+}
+
+@container featured-card (240px <= width <= 270px) {
+    .gh-featured-feed .gh-card-image {
+        width: 64px;
+    }
+}
+
+.gh-featured-feed .gh-card-wrapper {
+    container-type: inline-size;
+    container-name: featured-card-wrapper;
+}
+
+.gh-featured-feed .gh-card-title {
+    font-size: 1.6rem;
+    font-weight: 650;
+    letter-spacing: -0.011em;
+}
+
+@container featured-card-wrapper (width < 170px) {
+    .gh-featured-feed .gh-card-title {
+        font-size: 1.6rem;
+    }
+}
+
+.gh-featured-feed .gh-card-excerpt {
+    display: none;
+}
+
+.gh-featured-feed .gh-card-meta:not(:empty) {
+    margin-top: 10px;
+}
+
+.gh-featured-feed .gh-card::before {
+    position: absolute;
+    top: 0;
+    left: calc(var(--grid-gap) / -2);
+    content: "";
+    width: 1px;
+    height: 100%;
+    background-color: var(--color-border);
+}
+
+@media (max-width: 1199px) {
+    .gh-viewport > .gh-featured .gh-featured-feed {
+        grid-template-columns: repeat(3, 1fr);
+    }
+
+    .gh-viewport > .gh-featured .gh-featured-feed .gh-card:nth-child(4) {
+        display: none;
+    }
+}
+
+@media (max-width: 767px) {
+    .gh-viewport > .gh-featured .gh-featured-feed {
+        display: flex;
+        flex-direction: column;
+    }
+}
+
+/* 11. Container
+/* ---------------------------------------------------------- */
+
+.gh-container {
+    flex-grow: 1;
+    margin-top: 64px;
+}
+
+.gh-container-inner {
+    display: grid;
+    grid-template-columns: repeat(16, 1fr);
+    column-gap: var(--grid-gap);
+}
+
+:is(.gh-featured, .gh-cta) + .gh-container {
+    margin-top: max(4vw, 40px);
+}
+
+.gh-header.is-classic:not(.has-image) + .gh-container {
+    margin-top: 0;
+}
+
+.gh-navigation + .gh-container .gh-container-title,
+:is(.paged, .tag-template, .author-template) .gh-container:not(.has-sidebar) .gh-container-title {
+    display: none;
+}
+
+.gh-more {
+    display: none;
+    grid-column: 1 / -1;
+    margin-top: 48px;
+    font-size: calc(1.9rem * var(--factor, 1));
+    font-weight: 725;
+    letter-spacing: -0.014em;
+}
+
+.gh-container.has-sidebar .gh-more {
+    grid-column: span 12;
+}
+
+.home-template .gh-more {
+    display: block;
+}
+
+.gh-more a {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+}
+
+.gh-more svg {
+    margin-top: -1px;
+    width: 18px;
+    height: 18px;
+}
+
+.has-serif-title .gh-more svg {
+    margin-top: 0;
+}
+
+/* 11.1. With sidebar */
+
+.gh-container.has-sidebar .gh-main {
+    grid-column: 1 / span 12;
+    position: relative;
+}
+
+.gh-container.has-sidebar .gh-sidebar {
+    grid-column: 13 / -1;
+}
+
+.gh-container.has-sidebar .gh-main::after {
+    position: absolute;
+    top: 0;
+    right: calc(var(--grid-gap) / -2);
+    content: "";
+    width: 1px;
+    height: 100%;
+    background-color: var(--color-border);
+}
+
+/* 11.2. Without sidebar */
+
+.gh-container:not(.has-sidebar) :is(.gh-container-title, .gh-main, .gh-more) {
+    grid-column: 3 / span 12;
+}
+
+.gh-container.is-list.no-image:not(.has-sidebar) :is(.gh-container-title, .gh-main, .gh-more) {
+    grid-column: 4 / span 10;
+}
+
+.gh-header:is(.is-highlight, .is-magazine) ~ .gh-container.is-grid:not(.has-sidebar) :is(.gh-container-title, .gh-main, .gh-more) {
+    grid-column: 1 / -1;
+}
+
+@media (max-width: 1199px) {
+    .gh-container-inner {
+        display: block;
+        overflow: hidden;
+    }
+
+    .gh-container.has-sidebar .gh-sidebar {
+        display: none;
+    }
+}
+
+/* 12. Post list
+/* ---------------------------------------------------------- */
+
+.gh-container-title {
+    grid-column: 1 / -1;
+    margin-bottom: calc(var(--grid-gap) / 2);
+    padding-bottom: 12px;
+    font-size: 1.2rem;
+    font-weight: 550;
+    letter-spacing: 0.025em;
+    text-transform: uppercase;
+    border-bottom: 1px solid var(--color-border);
+}
+
+.gh-container:not(:has(.gh-card)) .gh-container-title {
+    display: none;
+}
+
+.gh-container .gh-feed {
+    gap: var(--grid-gap);
+}
+
+.gh-container .gh-card-meta:not(:empty) {
+    margin-top: 16px;
+}
+
+/* 12.1. List style */
+
+.gh-container.is-list .gh-feed {
+    display: flex;
+    flex-direction: column;
+    container-type: inline-size;
+    container-name: list-feed;
+}
+
+.gh-container.is-list .gh-card-link {
+    flex-direction: row;
+    align-items: center;
+    gap: 24px;
+}
+
+.gh-container.is-list .no-image .gh-card-link {
+    padding-block: 20px;
+}
+
+.gh-container.is-list .gh-card-image {
+    flex-shrink: 0;
+    width: 220px;
+    aspect-ratio: 1.618033;
+}
+
+@container list-feed (width < 600px) {
+    .gh-container.is-list .gh-card-image {
+        width: 160px;
+    }
+}
+
+.gh-container.is-list .gh-card:not(.no-image) .gh-card-wrapper {
+    max-width: 600px;
+}
+
+.gh-container.is-list .gh-card-title {
+    --factor: 1.05;
+}
+
+.gh-container.is-list .no-image .gh-card-title {
+    --factor: 1.2;
+}
+
+.gh-container.is-list .gh-card-excerpt {
+    margin-top: 6px;
+}
+
+.gh-container.is-list .gh-card + .gh-card::before {
+    position: absolute;
+    top: calc(var(--grid-gap) / -2);
+    left: 0;
+    content: "";
+    width: 100%;
+    height: 1px;
+    background-color: var(--color-border);
+}
+
+.home-template .gh-container.is-list .gh-card:first-child:before {
+    display: none;
+}
+
+@media (max-width: 767px) {
+    .gh-container.is-list .gh-card-link {
+        flex-direction: column;
+        align-items: flex-start;
+    }
+
+    .gh-container.is-list .gh-card-image {
+        width: 100%;
+    }
+}
+
+/* 12.2. Grid style */
+
+.gh-container.is-grid .gh-feed {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(248px, 1fr));
+    row-gap: calc(var(--grid-gap) * 1.5);
+    overflow: hidden;
+}
+
+.gh-container.is-grid .gh-card::before {
+    position: absolute;
+    top: calc(var(--grid-gap) / -2);
+    right: calc(var(--grid-gap) / -2);
+    left: calc(var(--grid-gap) / -2);
+    content: "";
+    height: 1px;
+    background-color: var(--color-border);
+}
+
+.gh-container.is-grid .gh-card::after {
+    position: absolute;
+    top: 0;
+    left: calc(var(--grid-gap) / -2);
+    content: "";
+    width: 1px;
+    height: 100%;
+    background-color: var(--color-border);
+}
+
+@media (max-width: 767px) {
+    .gh-container.is-grid .gh-feed {
+        grid-template-columns: repeat(2, 1fr);
+    }
+}
+
+@media (max-width: 576px) {
+    .gh-container.is-grid .gh-feed {
+        display: flex;
+        flex-direction: column;
+    }
+}
+
+/* 12.3. No image list */
+
+.gh-container.is-list.no-image .gh-card-image {
+    display: none;
+}
+
+/* 13. Sidebar
+/* ---------------------------------------------------------- */
+
+.gh-sidebar-inner {
+    position: sticky;
+    top: calc(var(--grid-gap) / 2);
+}
+
+.gh-sidebar-title {
+    grid-column: 1 / -1;
+    margin-bottom: calc(var(--grid-gap) / 2);
+    padding-bottom: 12px;
+    font-size: 1.2rem;
+    font-weight: 550;
+    letter-spacing: 0.025em;
+    text-transform: uppercase;
+    border-bottom: 1px solid var(--color-border);
+}
+
+.gh-about {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 48px 24px;
+    min-height: 380px;
+    text-align: center;
+    background-color: var(--color-lighter-gray);
+}
+
+.gh-about-icon {
+    margin-bottom: 24px;
+    width: 60px;
+    height: 60px;
+    border-radius: 50%;
+}
+
+.gh-about-title {
+    font-size: calc(2.4rem * var(--factor, 1));
+    font-weight: 700;
+    letter-spacing: -0.019em;
+}
+
+.gh-about-description {
+    margin-top: 12px;
+    font-size: 1.45rem;
+    line-height: 1.4;
+}
+
+.gh-about .gh-button {
+    margin-top: 32px;
+}
+
+.gh-recommendations {
+    margin-top: 48px;
+}
+
+.gh-recommendations .recommendations {
+    display: flex;
+    flex-direction: column;
+    gap: 26px;
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+.gh-recommendations .recommendation:first-child {
+    margin-top: 4px;
+}
+
+.gh-recommendations .recommendation a {
+    display: grid;
+    grid-template-columns: 24px auto;
+    gap: 4px 12px;
+}
+
+.gh-recommendations .recommendation a:hover {
+    opacity: 1;
+}
+
+.gh-recommendations .recommendation-favicon {
+    grid-row: span 2;
+    width: 100%;
+    border-radius: 4px;
+}
+
+.gh-recommendations .recommendation-title {
+    margin-top: -2px;
+    font-size: 1.5rem;
+    font-weight: 650;
+    letter-spacing: -0.009em;
+}
+
+.gh-recommendations .recommendation a:hover .recommendation-title {
+    opacity: 0.8;
+}
+
+.gh-recommendations .recommendation-url {
+    order: 1;
+    overflow: hidden;
+    font-size: 1.4rem;
+    line-height: 1.25;
+    color: var(--color-secondary-text);
+    text-overflow: ellipsis;
+}
+
+.gh-recommendations .recommendation-description {
+    display: -webkit-box;
+    display: none;
+    overflow-y: hidden;
+    grid-column: 2;
+    font-size: 1.4rem;
+    line-height: 1.4;
+    color: var(--color-secondary-text);
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+.gh-recommendations button {
+    display: inline-flex;
+    align-items: center;
+    gap: 2px;
+    margin-top: 24px;
+    padding: 0;
+    cursor: pointer;
+    font-size: 1.2rem;
+    font-weight: 550;
+    letter-spacing: 0.025em;
+    text-transform: uppercase;
+    background-color: transparent;
+    border: 0;
+}
+
+.gh-recommendations button svg {
+    margin-top: -1px;
+    width: 12px;
+}
+
+.gh-recommendations button:hover {
+    opacity: 0.8;
+}
+
+/* 14. Post/page
+/* ---------------------------------------------------------- */
+
+/* 14.1. Article */
+
+.gh-article {
+    --container-width: 1120px;
+
+    word-break: break-word;
+}
+
+.gh-article-header {
+    margin: clamp(40px, 3.64vw + 25.45px, 72px) 0 40px;
+}
+
+.gh-article-tag {
+    margin-bottom: 12px;
+    font-size: 1.3rem;
+    font-weight: 500;
+    letter-spacing: 0.01em;
+    text-transform: uppercase;
+    color: var(--ghost-accent-color);
+}
+
+.gh-article-title {
+    font-size: calc(clamp(3.4rem, 1.36vw + 2.85rem, 4.6rem) * var(--factor, 1));
+    line-height: 1.1;
+    letter-spacing: -0.022em;
+}
+
+.gh-article-excerpt {
+    margin-top: clamp(12px, 0.45vw + 10.18px, 16px);
+    max-width: 720px;
+    font-size: clamp(1.5rem, 0.45vw + 1.32rem, 1.9rem);
+    line-height: 1.4;
+    letter-spacing: -0.018em;
+}
+
+.gh-article-meta {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-top: 20px;
+    margin-left: 6px;
+}
+
+.gh-article-author-image {
+    display: flex;
+    margin-right: 8px;
+}
+
+.gh-article-author-image a {
+    position: relative;
+    margin: 0 -8px;
+    width: 56px;
+    height: 56px;
+    overflow: hidden;
+    background-color: var(--color-light-gray);
+    border-radius: 50%;
+    border: 3px solid var(--background-color);
+}
+
+.gh-article-author-image a:first-child {
+    z-index: 10;
+}
+
+.gh-article-author-image a:nth-child(2) {
+    z-index: 9;
+}
+
+.gh-article-author-image a:nth-child(3) {
+    z-index: 8;
+}
+
+.gh-article-author-image :is(img, svg) {
+    position: absolute;
+    inset: 0;
+    object-fit: cover;
+}
+
+.gh-article-meta-wrapper {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.gh-article-author-name {
+    font-size: 1.6rem;
+    font-weight: 650;
+    letter-spacing: -0.013em;
+}
+
+.gh-article-meta-content {
+    font-size: 1.35rem;
+    font-weight: 500;
+    line-height: 1.2;
+    letter-spacing: -0.006em;
+    color: var(--color-secondary-text);
+}
+
+.gh-article-image {
+    grid-column: main;
+    margin-top: 40px;
+}
+
+.gh-article-image img {
+    width: 100%;
+}
+
+/* 14.2. Page template */
+
+.page-template .gh-article-header {
+    margin-block: 72px 32px;
+}
+
+/* 14.3. Page without header */
+
+.page-template .gh-content:only-child > *:first-child:not(.kg-width-full) {
+    margin-top: 64px;
+}
+
+.page-template .gh-content > *:last-child:not(.kg-width-full) {
+    margin-bottom: 6vw;
+}
+
+.page-template .gh-footer {
+    margin-top: 0;
+}
+
+/* 15. Content
+/* ---------------------------------------------------------- */
+
+/* Content refers to styling all page and post content that is
+created within the Ghost editor. The main content handles
+headings, text, images and lists. We deal with cards lower down. */
+
+.gh-content {
+    font-size: var(--content-font-size, 1.7rem);
+    letter-spacing: -0.01em;
+    padding-bottom: 48px;
+}
+
+/* Default vertical spacing */
+.gh-content > * + * {
+    margin-top: calc(28px * var(--content-spacing-factor, 1));
+    margin-bottom: 0;
+}
+
+/* Remove space between full-width cards */
+.gh-content > .kg-width-full + .kg-width-full:not(.kg-width-full.kg-card-hascaption + .kg-width-full) {
+    margin-top: 0;
+}
+
+/* Add back a top margin to all headings,
+unless a heading is the very first element in the post content */
+.gh-content > [id]:not(:first-child) {
+    margin-top: calc(56px * var(--content-spacing-factor, 1));
+}
+
+/* Add drop cap setting */
+.post-template .gh-content.drop-cap > p:first-of-type:first-letter {
+    margin :0 0.2em 0em 0;
+    font-size: 3.1em;
+    float:left;
+    line-height: 1;
+    margin-left: -1px;
+    font-weight: 700;
+}
+
+.has-serif-body.post-template .gh-content.drop-cap > p:first-of-type:first-letter {
+    font-size: 3.2em;
+}
+
+/* Add a small margin between a heading and paragraph after it */
+.gh-content > [id] + p {
+    margin-top: calc(12px * var(--content-spacing-factor, 1));
+}
+
+/* A larger margin before/after dividers, blockquotes and embeds */
+.gh-content > :is(hr, blockquote, iframe) {
+    position: relative;
+    margin-top: calc(48px * var(--content-spacing-factor, 1)) !important;
+}
+
+.gh-content > :is(hr, blockquote, iframe) + * {
+    margin-top: calc(48px * var(--content-spacing-factor, 1)) !important;
+}
+
+/* Now the content typography styles */
+.gh-content h1 {
+    font-size: calc(2.2em * var(--factor, 1));
+    letter-spacing: -0.02em;
+}
+
+.gh-content h2 {
+    font-size: calc(1.6em * var(--factor, 1));
+    letter-spacing: -0.02em;
+}
+
+.gh-content h3 {
+    font-size: calc(1.3em * var(--factor, 1));
+    letter-spacing: -0.017em;
+}
+
+.gh-content a {
+    color: var(--ghost-accent-color);
+    text-decoration: underline;
+}
+
+.gh-content .kg-callout-card .kg-callout-text,
+.gh-content .kg-toggle-card .kg-toggle-content > :is(ul, ol, p) {
+    font-size: 0.95em;
+}
+
+.has-serif-body .gh-content > blockquote,
+.has-serif-body .gh-content > ol,
+.has-serif-body .gh-content > ul,
+.has-serif-body .gh-content > dl,
+.has-serif-body .gh-content > p,
+.has-serif-body .gh-content .kg-callout-text,
+.has-serif-body .gh-content .kg-toggle-content > ol,
+.has-serif-body .gh-content .kg-toggle-content > ul,
+.has-serif-body .gh-content .kg-toggle-content > p {
+    font-family: var(--font-serif-alt);
+}
+
+.gh-content :is(ul, ol) {
+    padding-left: 28px;
+}
+
+.gh-content :is(li + li, li :is(ul, ol)) {
+    margin-top: 8px;
+}
+
+.gh-content ol ol li {
+    list-style-type: lower-alpha;
+}
+
+.gh-content ol ol ol li {
+    list-style-type: lower-roman;
+}
+
+.gh-content hr {
+    width: 100%;
+    height: 1px;
+    background-color: var(--color-border);
+    border: 0;
+}
+
+.gh-content .gh-table {
+    overflow-x: scroll;
+    -webkit-overflow-scrolling: touch;
+}
+
+.gh-content .gh-table table {
+    width: 100%;
+    font-family: var(--font-sans);
+    font-size: 1.5rem;
+    white-space: nowrap;
+    vertical-align: top;
+    border-spacing: 0;
+    border-collapse: collapse;
+}
+
+.gh-content .gh-table table th {
+    font-size: 1.2rem;
+    font-weight: 700;
+    color: var(--color-darkgrey);
+    text-align: left;
+    text-transform: uppercase;
+    letter-spacing: 0.2px;
+}
+
+.gh-content .gh-table table :is(th, td),
+.gh-content .gh-table table td {
+    padding: 6px 12px;
+    border-bottom: 1px solid var(--color-border);
+}
+
+.gh-content .gh-table table :is(th, td):first-child {
+    padding-left: 0;
+}
+
+.gh-content .gh-table table :is(th, td):last-child {
+    padding-right: 0;
+}
+
+.gh-content pre {
+    overflow: auto;
+    padding: 16px;
+    font-size: 1.5rem;
+    line-height: 1.5em;
+    background: var(--color-lighter-gray);
+    border-radius: 6px;
+    font-family: var(--font-mono);
+}
+
+.gh-content :not(pre) > code {
+    vertical-align: baseline;
+    padding: 0.15em 0.4em;
+    font-weight: 400;
+    font-size: 0.95em;
+    line-height: 1em;
+    background: var(--color-lighter-gray);
+    border-radius: 0.25em;
+    font-family: var(--font-mono);
+}
+
+/* 16. Cards
+/* ---------------------------------------------------------- */
+
+/* Add extra margin before/after any cards, except for when immediately preceeded by a heading */
+
+.gh-content :not(.kg-card):not(table):not([id]) + :is(.kg-card, table) {
+    margin-top: calc(48px * var(--content-spacing-factor, 1));
+}
+
+.gh-content :is(.kg-card, table) + :not(.kg-card):not(table):not([id]) {
+    margin-top: calc(48px * var(--content-spacing-factor, 1));
+}
+
+.gh-content :not(.kg-card):not([id]) + .kg-card.kg-width-full {
+    margin-top: calc(68px * var(--content-spacing-factor, 1));
+}
+
+.gh-content .kg-card.kg-width-full + :not(.kg-card):not([id]) {
+    margin-top: calc(68px * var(--content-spacing-factor, 1));
+}
+
+/* Image */
+
+.kg-image {
+    margin-right: auto;
+    margin-left: auto;
+}
+
+/* Embed */
+
+.kg-embed-card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+    position: relative; padding-top: 56.5%;
+}
+
+.kg-embed-card iframe {
+    position: absolute;width: 100%;height: 100%;left: 0px;top: 0px;
+}
+
+/* Gallery */
+
+.kg-image[width][height],
+.kg-gallery-image {
+    cursor: pointer;
+}
+
+.kg-image-card a:hover,
+.kg-gallery-image a:hover {
+    opacity: 1 !important;
+}
+
+/* Toggle */
+
+.kg-card.kg-toggle-card .kg-toggle-heading-text {
+    font-size: 2rem;
+    font-weight: 700;
+}
+
+.has-serif-title .kg-toggle-card .kg-toggle-heading-text {
+    font-family: var(--font-serif);
+}
+
+.has-mono-title .kg-toggle-card .kg-toggle-heading-text {
+    font-family: var(--font-mono);
+}
+
+/* Callout */
+
+.kg-callout-card.kg-card {
+    border-radius: 0.25em;
+}
+
+.kg-callout-card-accent a {
+    text-decoration: underline;
+}
+
+/* Blockquote */
+
+blockquote:not([class]) {
+    padding-left: 2rem;
+    border-left: 4px solid var(--ghost-accent-color);
+}
+
+blockquote.kg-blockquote-alt {
+    font-style: normal;
+    font-weight: 400;
+    color: var(--color-secondary-text);
+}
+
+/* Button */
+
+.kg-card.kg-button-card .kg-btn {
+    height: unset;
+    padding: .6em 1.2em;
+    text-align: center;
+    font-size: 1em;
+    line-height: 1.2em;
+}
+
+/* Header */
+
+.has-serif-title .kg-card.kg-header-card h2.kg-header-card-header {
+    font-family: var(--font-serif);
+}
+
+.has-mono-title .kg-card.kg-header-card h2.kg-header-card-header {
+    font-family: var(--font-mono);
+}
+
+.has-serif-body .kg-header-card h3.kg-header-card-subheader {
+    font-family: var(--font-serif);
+}
+
+/* Bookmark */
+
+.kg-bookmark-card .kg-bookmark-container {
+    border-radius: 0.25em !important;
+}
+
+.kg-bookmark-card .kg-bookmark-container:hover {
+    opacity: 1;
+}
+
+.kg-bookmark-card .kg-bookmark-content {
+    padding: 1.15em;
+}
+
+.kg-bookmark-card .kg-bookmark-title {
+    font-size: 0.9em;
+}
+
+.kg-bookmark-card .kg-bookmark-description {
+    max-height: none;
+    margin-top: 0.3em;
+    font-size: 0.8em;
+}
+
+.kg-bookmark-card .kg-bookmark-metadata {
+    font-size: 0.8em;
+}
+
+.kg-bookmark-card .kg-bookmark-thumbnail img {
+    border-radius: 0 0.2em 0.2em 0;
+}
+
+/* Product */
+
+.kg-product-card.kg-card .kg-product-card-image {
+    margin-bottom: 12px;
+}
+
+.kg-product-card.kg-card a.kg-product-card-button {
+    height: 2.8em;
+    margin-top: 12px;
+}
+
+.has-serif-title .kg-product-card.kg-card .kg-product-card-title {
+    font-family: var(--font-serif);
+}
+
+.has-mono-title .kg-product-card.kg-card .kg-product-card-title {
+    font-family: var(--font-mono);
+}
+
+.has-serif-body .kg-product-card-description :is(p, ul, ol) {
+    font-family: var(--font-serif-alt);
+}
+
+/* File */
+
+.kg-file-card.kg-card .kg-file-card-container {
+    padding: 0.6em;
+}
+
+.kg-file-card.kg-card .kg-file-card-contents {
+    margin: 4px 8px 6px;
+}
+
+.kg-file-card.kg-card .kg-file-card-metadata {
+    font-size: 0.9em;
+}
+
+.kg-file-card.kg-card .kg-file-card-filesize::before {
+    margin-right: 6px;
+    margin-left: 6px;
+}
+
+/* Caption */
+
+figcaption {
+    margin-top: 12px;
+    font-size: 1.4rem;
+    text-align: center;
+}
+
+.kg-card.kg-width-full figcaption {
+    padding: 0 16px;
+}
+
+figcaption a {
+    color: var(--ghost-accent-color);
+    text-decoration: underline;
+}
+
+/* 17. Comments
+/* ---------------------------------------------------------- */
+
+.gh-comments {
+    margin-top: 48px;
+}
+
+/* 18. Recent posts
+/* ---------------------------------------------------------- */
+
+.post-template .gh-container {
+    margin-top: 120px;
+}
+
+.post-template .gh-container-inner {
+    display: block;
+}
+
+.post-template .gh-container.is-grid .gh-feed {
+    grid-template-columns: repeat(4, 1fr);
+}
+
+.post-template .gh-container .gh-container-title {
+    display: block;
+}
+
+/* 19. Archive
+/* ---------------------------------------------------------- */
+
+.gh-archive {
+    display: grid;
+    grid-template-columns: repeat(16, 1fr);
+    gap: var(--grid-gap);
+    margin-block: 80px 24px;
+}
+
+.gh-archive.has-image {
+    margin-top: 48px;
+}
+
+.gh-archive-inner {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: var(--grid-gap);
+    grid-column: 1 / -1;
+    padding-bottom: clamp(40px, 2.73vw + 29.09px, 64px);
+    border-bottom: 1px solid var(--color-border);
+}
+
+.gh-archive.has-image .gh-archive-inner {
+    align-items: center;
+    grid-column: 1 / -1;
+}
+
+.gh-archive:not(.has-sidebar):not(.has-image) .gh-archive-inner {
+    grid-column: 3 / span 12;
+}
+
+.gh-archive .gh-article-image {
+    grid-column: auto;
+    margin-top: 0;
+}
+
+:is(.tag-template, .author-template) .gh-container {
+    margin-top: 0;
+}
+
+.author-template .gh-archive-inner {
+    display: flex;
+    flex-direction: row-reverse;
+    justify-content: flex-end;
+    gap: 24px;
+}
+
+.author-template .gh-article-image {
+    margin-top: 0;
+    width: 120px;
+    height: 120px;
+    border-radius: 50%;
+}
+
+.author-template .gh-article-title {
+    font-size: 3.6rem;
+}
+
+.gh-author-meta {
+    display: flex;
+    gap: 10px;
+    margin-top: 14px;
+    font-size: 1.5rem;
+    font-weight: 550;
+    color: var(--color-secondary-text);
+}
+
+.gh-author-meta a {
+    color: inherit;
+}
+
+.gh-author-social {
+    display: flex;
+    gap: 10px;
+    align-items: center;
+    padding-left: 3px;
+}
+
+.gh-author-social svg {
+    width: 20px;
+    height: 20px;
+}
+
+@media (max-width: 1199px) {
+    .gh-archive {
+        display: block;
+    }
+}
+
+@media (max-width: 767px) {
+    .gh-archive-inner {
+        display: flex;
+        flex-direction: column-reverse;
+        align-items: flex-start;
+    }
+
+    .author-template .gh-archive-inner {
+        flex-direction: column-reverse;
+    }
+}
+
+/* 20. Design settings
+/* ---------------------------------------------------------- */
+
+.has-serif-title {
+    --factor: 1.15;
+}
+
+.has-mono-title {
+    --factor: 1.1;
+}
+
+.has-sans-title :is(.is-title, .gh-content :is(h2, h3)) {
+    font-family: var(--font-sans);
+}
+
+.has-serif-title :is(.is-title, .gh-content :is(h2, h3)) {
+    font-family: var(--font-serif);
+    font-weight: 550;
+}
+
+.has-mono-title :is(.is-title, .gh-content :is(h2, h3)) {
+    font-family: var(--font-mono);
+}
+
+.has-sans-body .is-body {
+    font-family: var(--font-sans);
+}
+
+.has-serif-body .is-body {
+    font-family: var(--font-serif-alt);
+}
+
+.has-serif-title .gh-header.is-classic .gh-header-title {
+    font-weight: 550;
+    letter-spacing: -0.015em;
+}
+
+.has-mono-title .gh-header.is-classic .gh-header-title {
+    letter-spacing: -0.01em;
+}
+
+.has-serif-title .gh-form {
+    border-radius: 0;
+}
+
+.has-serif-title .gh-card-title {
+    line-height: 1.15;
+    letter-spacing: -0.006em;
+    font-size: calc(2.0rem*var(--factor, 1))
+}
+
+.has-serif-title .gh-featured-feed .gh-card-title {
+    font-size: calc(1.6rem*var(--factor, 1))
+}
+
+.has-mono-title .gh-featured-feed .gh-card-title {
+    font-size: calc(1.5rem*var(--factor, 1));
+    letter-spacing: 0;
+}
+
+.has-serif-title .gh-header.is-highlight .gh-featured-feed .gh-card-title {
+    font-size: clamp(1.6rem, 0.23vw + 1.51rem, 1.8rem);
+}
+
+.has-mono-title .gh-card-title {
+    font-size: calc(1.8rem*var(--factor, 1));
+    line-height: 1.2;
+}
+
+.has-serif-title .gh-about-title {
+    letter-spacing: -0.009em;
+}
+
+.has-serif-title .gh-footer-signup-header {
+    letter-spacing: -0.019em;
+}
+
+.has-serif-title .gh-article-title {
+    letter-spacing: -0.019em;
+}
+
+.has-serif-body {
+    --content-font-size: 1.9rem;
+}
+
+.has-serif-body .gh-card-excerpt {
+    font-size: 1.65rem;
+    line-height: 1.4;
+    letter-spacing: 0.0005em;
+}
+
+.has-serif-body .gh-header.is-magazine .gh-header-inner > .gh-card .gh-card-excerpt,
+.has-serif-body .gh-header.is-highlight .gh-card:first-child .gh-card-excerpt {
+    font-size: 1.8rem;
+    letter-spacing: -0.001em;
+}
+
+.has-serif-title .gh-header.is-magazine .gh-header-inner>.gh-card .gh-card-title,
+.has-serif-title .gh-header.is-highlight .gh-header-left .gh-card-title {
+    font-weight: 550;
+    font-size: clamp(3.2rem,1.82vw + 2.47rem,4.9rem)
+}
+
+.has-serif-body .gh-about-description {
+    font-size: 1.6rem;
+}
+
+.has-serif-body .gh-article-excerpt {
+    letter-spacing: 0;
+}
+
+.has-serif-body .gh-footer-signup-subhead {
+    letter-spacing: 0;
+}
+
+.has-serif-title :is(.gh-button, .gh-form) {
+    border-radius: 0;
+}
+
+.has-mono-title :is(.gh-button) {
+    border-radius: 0;
+}
+
+.has-mono-title :is(.gh-form) {
+    border-radius: 0;
+}
+
+.has-serif-title .gh-cta-title {
+    font-size: 4.8rem;
+}
+
+/* 21. Footer
+/* ---------------------------------------------------------- */
+
+.gh-footer {
+    margin-top: 12vw;
+    font-size: 1.5rem;
+    color: var(--color-darker-gray);
+}
+
+.gh-footer a:not(.gh-button) {
+    color: inherit;
+}
+
+/* 21.1 Footer styles */
+
+.gh-footer.has-accent-color {
+    background-color: var(--ghost-accent-color);
+}
+
+.gh-footer.has-accent-color .gh-footer-bar {
+    border-top: 0;
+}
+
+.gh-footer.has-accent-color .gh-button {
+    background-color: #fff;
+    color: #15171a;
+}
+
+/* 21.2. Footer bar */
+
+.gh-footer-bar {
+    display: grid;
+    grid-template-columns: 1fr auto 1fr;
+    align-items: center;
+    column-gap: 32px;
+    margin-bottom: 100px;
+    padding-block: 28px;
+    font-weight: 550;
+    border-block: 1px solid var(--color-border);
+}
+
+.gh-footer-logo {
+    position: relative;
+    font-size: calc(2.4rem * var(--factor, 1));
+    font-weight: 725;
+    letter-spacing: -0.015em;
+    white-space: nowrap;
+}
+
+.gh-footer-logo img {
+    max-height: 40px;
+}
+
+.gh-footer-menu .nav {
+    display: flex;
+    justify-content: center;
+    gap: 8px 28px;
+    flex-wrap: wrap;
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+.gh-footer-copyright {
+    text-align: right;
+    white-space: nowrap;
+}
+
+.gh-footer-copyright a {
+    text-decoration: underline;
+}
+
+/* 21.3. Footer signup */
+
+.gh-footer-signup {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-bottom: 160px;
+    text-align: center;
+}
+
+.gh-footer-signup-header {
+    font-size: calc(clamp(2.8rem,1.36vw + 2.25rem,4rem) * var(--factor, 1));
+    font-weight: 700;
+    letter-spacing: -0.03em;
+}
+
+.gh-footer-signup-subhead {
+    margin-top: 12px;
+    max-width: 640px;
+    font-size: 1.8rem;
+    font-weight: 450;
+    line-height: 1.4;
+    letter-spacing: -0.014em;
+    opacity: 0.75;
+}
+
+.gh-footer-signup .gh-form {
+    margin-top: 40px;
+}
+
+@media (max-width: 991px) {
+    .gh-footer-bar {
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+    }
+}
+
+/* 22. Lightbox
+/* ---------------------------------------------------------- */
+
+.pswp {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 3999999;
+    display: none;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    -ms-touch-action: none;
+    touch-action: none;
+    outline: none;
+    backface-visibility: hidden;
+    -webkit-text-size-adjust: 100%;
+}
+
+.pswp img {
+    max-width: none;
+}
+
+.pswp--animate_opacity {
+    opacity: 0.001;
+    transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
+    will-change: opacity;
+}
+
+.pswp--open {
+    display: block;
+}
+
+.pswp--zoom-allowed .pswp__img {
+    cursor: zoom-in;
+}
+
+.pswp--zoomed-in .pswp__img {
+    cursor: grab;
+}
+
+.pswp--dragging .pswp__img {
+    cursor: grabbing;
+}
+
+.pswp__bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.85);
+    opacity: 0;
+    transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
+    transform: translateZ(0);
+    backface-visibility: hidden;
+    will-change: opacity;
+}
+
+.pswp__scroll-wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+.pswp__container,
+.pswp__zoom-wrap {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    touch-action: none;
+    backface-visibility: hidden;
+}
+
+.pswp__container,
+.pswp__img {
+    user-select: none;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-touch-callout: none;
+}
+
+.pswp__zoom-wrap {
+    position: absolute;
+    width: 100%;
+    transition: transform 333ms cubic-bezier(0.4, 0, 0.22, 1);
+    transform-origin: left top;
+}
+
+.pswp--animated-in .pswp__bg,
+.pswp--animated-in .pswp__zoom-wrap {
+    transition: none;
+}
+
+.pswp__item {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    overflow: hidden;
+}
+
+.pswp__img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: auto;
+    height: auto;
+}
+
+.pswp__img--placeholder {
+    backface-visibility: hidden;
+}
+
+.pswp__img--placeholder--blank {
+    background: var(--color-black);
+}
+
+.pswp--ie .pswp__img {
+    top: 0;
+    left: 0;
+    width: 100% !important;
+    height: auto !important;
+}
+
+.pswp__error-msg {
+    position: absolute;
+    top: 50%;
+    left: 0;
+    width: 100%;
+    margin-top: -8px;
+    font-size: 14px;
+    line-height: 16px;
+    color: var(--color-secondary-text);
+    text-align: center;
+}
+
+.pswp__error-msg a {
+    color: var(--color-secondary-text);
+    text-decoration: underline;
+}
+
+.pswp__button {
+    position: relative;
+    display: block;
+    float: right;
+    width: 44px;
+    height: 44px;
+    padding: 0;
+    margin: 0;
+    overflow: visible;
+    appearance: none;
+    cursor: pointer;
+    background: none;
+    border: 0;
+    box-shadow: none;
+    transition: opacity 0.2s;
+}
+
+.pswp__button:focus,
+.pswp__button:hover {
+    opacity: 1;
+}
+
+.pswp__button:active {
+    outline: none;
+    opacity: 0.9;
+}
+
+.pswp__button::-moz-focus-inner {
+    padding: 0;
+    border: 0;
+}
+
+.pswp__ui--over-close .pswp__button--close {
+    opacity: 1;
+}
+
+.pswp__button,
+.pswp__button--arrow--left::before,
+.pswp__button--arrow--right::before {
+    width: 44px;
+    height: 44px;
+    background: url("../images/default-skin.png") 0 0 no-repeat;
+    background-size: 264px 88px;
+}
+
+@media (-webkit-min-device-pixel-ratio: 1.1), (-webkit-min-device-pixel-ratio: 1.09375), (min-resolution: 105dpi), (min-resolution: 1.1dppx) {
+    .pswp--svg .pswp__button,
+    .pswp--svg .pswp__button--arrow--left::before,
+    .pswp--svg .pswp__button--arrow--right::before {
+        background-image: url("../images/default-skin.svg");
+    }
+
+    .pswp--svg .pswp__button--arrow--left,
+    .pswp--svg .pswp__button--arrow--right {
+        background: none;
+    }
+}
+
+.pswp__button--close {
+    background-position: 0 -44px;
+}
+
+.pswp__button--share {
+    background-position: -44px -44px;
+}
+
+.pswp__button--fs {
+    display: none;
+}
+
+.pswp--supports-fs .pswp__button--fs {
+    display: block;
+}
+
+.pswp--fs .pswp__button--fs {
+    background-position: -44px 0;
+}
+
+.pswp__button--zoom {
+    display: none;
+    background-position: -88px 0;
+}
+
+.pswp--zoom-allowed .pswp__button--zoom {
+    display: block;
+}
+
+.pswp--zoomed-in .pswp__button--zoom {
+    background-position: -132px 0;
+}
+
+.pswp--touch .pswp__button--arrow--left,
+.pswp--touch .pswp__button--arrow--right {
+    visibility: hidden;
+}
+
+.pswp__button--arrow--left,
+.pswp__button--arrow--right {
+    position: absolute;
+    top: 50%;
+    width: 70px;
+    height: 100px;
+    margin-top: -50px;
+    background: none;
+}
+
+.pswp__button--arrow--left {
+    left: 0;
+}
+
+.pswp__button--arrow--right {
+    right: 0;
+}
+
+.pswp__button--arrow--left::before,
+.pswp__button--arrow--right::before {
+    position: absolute;
+    top: 35px;
+    width: 32px;
+    height: 30px;
+    content: "";
+}
+
+.pswp__button--arrow--left::before {
+    left: 6px;
+    background-position: -138px -44px;
+}
+
+.pswp__button--arrow--right::before {
+    right: 6px;
+    background-position: -94px -44px;
+}
+
+.pswp__counter {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 44px;
+    padding: 0 15px;
+    font-size: 11px;
+    font-weight: 700;
+    line-height: 44px;
+    color: var(--color-white);
+    user-select: none;
+}
+
+.pswp__caption {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    min-height: 44px;
+}
+
+.pswp__caption__center {
+    max-width: 420px;
+    padding: 25px 15px 30px;
+    margin: 0 auto;
+    font-size: 11px;
+    line-height: 1.6;
+    color: var(--color-white);
+    text-align: center;
+}
+
+.pswp__caption__center .post-caption-title {
+    margin-bottom: 7px;
+    font-size: 15px;
+    font-weight: 500;
+    text-transform: uppercase;
+}
+
+.pswp__caption__center .post-caption-meta-item + .post-caption-meta-item::before {
+    padding: 0 4px;
+    content: "b";
+}
+
+.pswp__caption--empty {
+    display: none;
+}
+
+.pswp__caption--fake {
+    visibility: hidden;
+}
+
+.pswp__preloader {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 44px;
+    height: 44px;
+    margin-left: -22px;
+    opacity: 0;
+    transition: opacity 0.25s ease-out;
+    direction: ltr;
+    will-change: opacity;
+}
+
+.pswp__preloader__icn {
+    width: 20px;
+    height: 20px;
+    margin: 12px;
+}
+
+.pswp__preloader--active {
+    opacity: 1;
+}
+
+.pswp__preloader--active .pswp__preloader__icn {
+    background: url("../images/preloader.gif") 0 0 no-repeat;
+}
+
+.pswp--css_animation .pswp__preloader--active {
+    opacity: 1;
+}
+
+.pswp--css_animation .pswp__preloader--active .pswp__preloader__icn {
+    animation: clockwise 500ms linear infinite;
+}
+
+.pswp--css_animation .pswp__preloader--active .pswp__preloader__donut {
+    animation: donut-rotate 1000ms cubic-bezier(0.4, 0, 0.22, 1) infinite;
+}
+
+.pswp--css_animation .pswp__preloader__icn {
+    position: absolute;
+    top: 15px;
+    left: 15px;
+    width: 14px;
+    height: 14px;
+    margin: 0;
+    background: none;
+    opacity: 0.75;
+}
+
+.pswp--css_animation .pswp__preloader__cut {
+    position: relative;
+    width: 7px;
+    height: 14px;
+    overflow: hidden;
+}
+
+.pswp--css_animation .pswp__preloader__donut {
+    position: absolute;
+    top: 0;
+    left: 0;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    margin: 0;
+    background: none;
+    border: 2px solid var(--color-white);
+    border-bottom-color: transparent;
+    border-left-color: transparent;
+    border-radius: 50%;
+}
+
+@media screen and (max-width: 1024px) {
+    .pswp__preloader {
+        position: relative;
+        top: auto;
+        left: auto;
+        float: right;
+        margin: 0;
+    }
+}
+
+@keyframes clockwise {
+    0% {
+        transform: rotate(0deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
+@keyframes donut-rotate {
+    0% {
+        transform: rotate(0);
+    }
+
+    50% {
+        transform: rotate(-140deg);
+    }
+
+    100% {
+        transform: rotate(0);
+    }
+}
+
+.pswp__ui {
+    z-index: 1550;
+    visibility: visible;
+    opacity: 1;
+    -webkit-font-smoothing: auto;
+}
+
+.pswp__top-bar {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 44px;
+}
+
+.pswp__caption,
+.pswp__top-bar,
+.pswp--has_mouse .pswp__button--arrow--left,
+.pswp--has_mouse .pswp__button--arrow--right {
+    backface-visibility: hidden;
+    transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
+    will-change: opacity;
+}
+
+.pswp--has_mouse .pswp__button--arrow--left,
+.pswp--has_mouse .pswp__button--arrow--right {
+    visibility: visible;
+}
+
+.pswp__ui--idle .pswp__top-bar {
+    opacity: 0;
+}
+
+.pswp__ui--idle .pswp__button--arrow--left,
+.pswp__ui--idle .pswp__button--arrow--right {
+    opacity: 0;
+}
+
+.pswp__ui--hidden .pswp__top-bar,
+.pswp__ui--hidden .pswp__caption,
+.pswp__ui--hidden .pswp__button--arrow--left,
+.pswp__ui--hidden .pswp__button--arrow--right {
+    opacity: 0.001;
+}
+
+.pswp__ui--one-slide .pswp__button--arrow--left,
+.pswp__ui--one-slide .pswp__button--arrow--right,
+.pswp__ui--one-slide .pswp__counter {
+    display: none;
+}
+
+.pswp__element--disabled {
+    display: none !important;
+}
+
+.pswp--minimal--dark .pswp__top-bar {
+    background: none;
+}
+
+.kg-callout-card,
+.kg-callout-card * {
+    box-sizing: border-box;
+}
+
+.kg-callout-card {
+    display: flex;
+    padding: 1.2em 1.6em;
+    border-radius: 3px;
+}
+
+.kg-callout-card-grey {
+    background: rgba(124, 139, 154, 0.13);
+}
+
+.kg-callout-card-white {
+    background: transparent;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+}
+
+.kg-callout-card-blue {
+    background: rgba(33, 172, 232, 0.12);
+}
+
+.kg-callout-card-green {
+    background: rgba(52, 183, 67, 0.12);
+}
+
+.kg-callout-card-yellow {
+    background: rgba(240, 165, 15, 0.13);
+}
+
+.kg-callout-card-red {
+    background: rgba(209, 46, 46, 0.11);
+}
+
+.kg-callout-card-pink {
+    background: rgba(225, 71, 174, 0.11);
+}
+
+.kg-callout-card-purple {
+    background: rgba(135, 85, 236, 0.12);
+}
+
+.kg-callout-card-accent {
+    background: var(--ghost-accent-color);
+    color: #fff;
+}
+
+.kg-callout-card.kg-callout-card-accent a {
+    color: #fff;
+    text-decoration: underline;
+}
+
+.kg-callout-card div.kg-callout-emoji {
+    padding-right: .8em;
+    line-height: 1.25em;
+    font-size: 1.15em;
+}
+
+.kg-callout-card div.kg-callout-text {
+    font-size: .95em;
+    line-height: 1.5em;
+}
+
+.kg-callout-card + .kg-callout-card {
+    margin-top: 1em;
+}
+
+.kg-audio-card,
+.kg-audio-card * {
+    box-sizing: border-box;
+}
+
+.kg-audio-card {
+    display: flex;
+    width: 100%;
+    min-height: 96px;
+    border-radius: 6px;
+    padding: 4px;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+}
+
+.kg-audio-card+.kg-audio-card {
+    margin-top: 1em;
+}
+
+.kg-audio-thumbnail {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 80px;
+    min-width: 80px;
+    margin: 8px;
+    background: transparent;
+    object-fit: cover;
+    aspect-ratio: 1/1;
+    border-radius: 3px;
+}
+
+.kg-audio-thumbnail.placeholder {
+    background: var(--ghost-accent-color);
+}
+
+.kg-audio-thumbnail.placeholder svg {
+    width: 24px;
+    height: 24px;
+    fill: white;
+}
+
+.kg-audio-player-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 100%;
+    --seek-before-width: 0%;
+    --volume-before-width: 100%;
+    --buffered-width: 0%;
+}
+
+.kg-audio-title {
+    width: 100%;
+    margin: 8px 0 0 0;
+    padding: 8px 12px;
+    border: none;
+    font-family: inherit;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 1.15em;
+    background: transparent;
+}
+
+.kg-audio-player {
+    display: flex;
+    flex-grow: 1;
+    align-items: center;
+    padding: 8px 12px;
+}
+
+.kg-audio-current-time {
+    min-width: 38px;
+    padding: 0 4px;
+    font-family: inherit;
+    font-size: 12.5px;
+    font-weight: 500;
+    line-height: 1em;
+    white-space: nowrap;
+}
+
+.kg-audio-time {
+    width: 56px;
+    color: #ababab;
+    font-family: inherit;
+    font-size: 12.5px;
+    font-weight: 500;
+    line-height: 1em;
+    white-space: nowrap;
+}
+
+.kg-audio-duration {
+    padding: 0 4px;
+}
+
+.kg-audio-play-icon,
+.kg-audio-pause-icon {
+    position: relative;
+    bottom: 1px;
+    padding: 0px 4px 0 0;
+    font-size: 0;
+    background: transparent;
+}
+
+.kg-audio-hide {
+    display: none !important;
+}
+
+.kg-audio-play-icon svg,
+.kg-audio-pause-icon svg {
+    width: 14px;
+    height: 14px;
+    fill: currentColor;
+}
+
+.kg-audio-seek-slider {
+    flex-grow: 1;
+    margin: 0 4px;
+}
+
+@media (max-width: 640px) {
+    .kg-audio-seek-slider {
+        display: none;
+    }
+}
+
+.kg-audio-playback-rate {
+    min-width: 37px;
+    padding: 0 4px;
+    font-family: inherit;
+    font-size: 12.5px;
+    font-weight: 600;
+    line-height: 1em;
+    text-align: left;
+    background: transparent;
+    white-space: nowrap;
+}
+
+@media (max-width: 640px) {
+    .kg-audio-playback-rate {
+        padding-left: 8px;
+    }
+}
+
+.kg-audio-mute-icon,
+.kg-audio-unmute-icon {
+    position: relative;
+    bottom: -1px;
+    padding: 0 4px;
+    font-size: 0;
+    background: transparent;
+}
+
+@media (max-width: 640px) {
+    .kg-audio-mute-icon,
+    .kg-audio-unmute-icon  {
+        margin-left: auto;
+    }
+}
+
+.kg-audio-mute-icon svg,
+.kg-audio-unmute-icon svg {
+    width: 16px;
+    height: 16px;
+    fill: currentColor;
+}
+
+.kg-audio-volume-slider {
+    width: 80px;
+}
+
+@media (max-width: 400px) {
+    .kg-audio-volume-slider {
+        display: none;
+    }
+}
+
+.kg-audio-seek-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--seek-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: currentColor;
+    border-radius: 2px;
+}
+
+.kg-audio-volume-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--volume-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: currentColor;
+    border-radius: 2px;
+}
+
+/* Resetting browser styles
+/* --------------------------------------------------------------- */
+
+.kg-audio-player-container input[type=range] {
+    position: relative;
+    -webkit-appearance: none;
+    background: transparent;
+}
+
+.kg-audio-player-container input[type=range]:focus {
+    outline: none;
+}
+
+.kg-audio-player-container input[type=range]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+}
+
+.kg-audio-player-container input[type=range]::-ms-track {
+    cursor: pointer;
+    border-color: transparent;
+    color: transparent;
+    background: transparent;
+}
+
+.kg-audio-player-container button {
+    display: flex;
+    align-items: center;
+    border: 0;
+    cursor: pointer;
+}
+
+.kg-audio-player-container input[type="range"] {
+    height: auto;
+    padding: 0;
+    border: 0;
+}
+
+/* Chrome & Safari styles
+/* --------------------------------------------------------------- */
+
+.kg-audio-player-container input[type="range"]::-webkit-slider-runnable-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(124, 139, 154, 0.25);
+    border-radius: 2px;
+}
+
+.kg-audio-player-container input[type="range"]::-webkit-slider-thumb {
+    position: relative;
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    margin: -5px 0 0 0;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-audio-player-container input[type="range"]:active::-webkit-slider-thumb {
+    transform: scale(1.2);
+}
+
+/* Firefox styles
+/* --------------------------------------------------------------- */
+
+.kg-audio-player-container input[type="range"]::-moz-range-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(124, 139, 154, 0.25);
+    border-radius: 2px;
+}
+
+.kg-audio-player-container input[type="range"]::-moz-range-progress {
+    background: currentColor;
+    border-radius: 2px;
+}
+
+.kg-audio-player-container input[type="range"]::-moz-range-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-audio-player-container input[type="range"]:active::-moz-range-thumb {
+    transform: scale(1.2);
+}
+
+/* Edge & IE styles
+/* --------------------------------------------------------------- */
+
+.kg-audio-player-container input[type="range"]::-ms-track {
+    width: 100%;
+    height: 3px;
+    border: solid transparent;
+    color: transparent;
+    cursor: pointer;
+    background: transparent;
+}
+
+.kg-audio-player-container input[type="range"]::-ms-fill-lower {
+    background: #fff;
+}
+
+.kg-audio-player-container input[type="range"]::-ms-fill-upper {
+    background: currentColor;
+}
+
+.kg-audio-player-container input[type="range"]::-ms-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-audio-player-container input[type="range"]:active::-ms-thumb {
+    transform: scale(1.2);
+}
+
+.kg-blockquote-alt {
+    font-size: 1.5em;
+    font-style: italic;
+    line-height: 1.7em;
+    text-align: center;
+    padding: 0 2.5em;
+  }
+
+  @media (max-width: 800px) {
+    .kg-blockquote-alt {
+      font-size: 1.4em;
+      padding-left: 2em;
+      padding-right: 2em;
+    }
+  }
+
+  @media (max-width: 600px) {
+    .kg-blockquote-alt {
+      font-size: 1.2em;
+      padding-left: 1.75em;
+      padding-right: 1.75em;
+    }
+  }
+
+  .kg-bookmark-card,
+.kg-bookmark-card * {
+    box-sizing: border-box;
+}
+
+.kg-bookmark-card,
+.kg-bookmark-publisher {
+    position: relative;
+    /* width: 100%; */
+}
+
+.kg-bookmark-card a.kg-bookmark-container,
+.kg-bookmark-card a.kg-bookmark-container:hover {
+    display: flex;
+    text-decoration: none;
+    border-radius: 6px;
+    border: 1px solid rgb(124 139 154 / 25%);
+    overflow: hidden;
+    color: inherit;
+}
+
+.kg-bookmark-content {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    flex-basis: 100%;
+    align-items: flex-start;
+    justify-content: flex-start;
+    padding: 20px;
+    overflow: hidden;
+}
+
+.kg-bookmark-title {
+    font-size: 15px;
+    line-height: 1.4em;
+    font-weight: 600;
+}
+
+.kg-bookmark-description {
+    display: -webkit-box;
+    font-size: 14px;
+    line-height: 1.5em;
+    margin-top: 3px;
+    font-weight: 400;
+    max-height: 44px;
+    overflow-y: hidden;
+    opacity: 0.7;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+.kg-bookmark-metadata {
+    display: flex;
+    align-items: center;
+    margin-top: 22px;
+    width: 100%;
+    font-size: 14px;
+    font-weight: 500;
+    white-space: nowrap;
+}
+
+.kg-bookmark-metadata > *:not(img) {
+    opacity: 0.7;
+}
+
+.kg-bookmark-icon {
+    width: 20px;
+    height: 20px;
+    margin-right: 6px;
+}
+
+.kg-bookmark-author,
+.kg-bookmark-publisher {
+    display: inline;
+}
+
+.kg-bookmark-publisher {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: 240px;
+    white-space: nowrap;
+    display: block;
+    line-height: 1.65em;
+}
+
+.kg-bookmark-metadata > span:nth-of-type(2) {
+    font-weight: 400;
+}
+
+.kg-bookmark-metadata > span:nth-of-type(2):before {
+    content: "•";
+    margin: 0 6px;
+}
+
+.kg-bookmark-metadata > span:last-of-type {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.kg-bookmark-thumbnail {
+    position: relative;
+    flex-grow: 1;
+    min-width: 33%;
+}
+
+.kg-bookmark-thumbnail img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-radius: 0 2px 2px 0;
+}
+
+.kg-button-card,
+.kg-button-card * {
+    box-sizing: border-box;
+}
+
+.kg-button-card {
+    display: flex;
+    position: static;
+    align-items: center;
+    width: 100%;
+    justify-content: center;
+}
+
+.kg-button-card.kg-align-left {
+    justify-content: flex-start;
+}
+
+.kg-button-card a.kg-btn {
+    display: flex;
+    position: static;
+    align-items: center;
+    padding: 0 1.2em;
+    height: 2.4em;
+    line-height: 1em;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    font-size: 0.95em;
+    font-weight: 600;
+    text-decoration: none;
+    border-radius: 5px;
+    transition: opacity 0.2s ease-in-out;
+}
+
+.kg-button-card a.kg-btn:hover {
+    opacity: 0.85;
+}
+
+.kg-button-card a.kg-btn-accent {
+    background-color: var(--ghost-accent-color);
+    color: #fff;
+}
+
+.kg-collection-card {
+    width: 100%;
+    margin-top: 6vmin;
+}
+
+.kg-collection-card + * {
+    margin-top: 6vmin;
+}
+
+.kg-collection-card-title {
+    margin: .8rem 0 1.6rem 0;
+    font-size: 1.5rem;
+    font-weight: 700;
+    text-transform: uppercase;
+}
+
+a.kg-collection-card-post-wrapper {
+    text-decoration: none;
+    color: var(--text-color);
+}
+
+a.kg-collection-card-post-wrapper:hover {
+    opacity: 1;
+}
+
+
+.kg-collection-card-post {
+    display: flex;
+    gap: 3.2rem;
+}
+
+.kg-collection-card-img {
+    position: relative;
+    aspect-ratio: 3/2;
+}
+
+.kg-collection-card-img img {
+    position: absolute;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+a.kg-collection-card-post-wrapper:hover img {
+    opacity: .92;
+    transition: all .2s ease;
+}
+
+.kg-collection-card-content {
+    display: flex;
+    flex-direction: column;
+    font-size: 1.6rem;
+}
+
+h2.kg-collection-card-post-title {
+    margin: 0;
+    font-size: 2.4rem;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+}
+
+p.kg-collection-card-post-excerpt {
+    margin-top: 1.2rem;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    line-height: 1.4;
+}
+
+.kg-collection-card-post-meta {
+    display: flex;
+    opacity: .5;
+    margin-top: 1.2rem;
+    font-size: 1.3rem;
+    font-weight: 500;
+}
+
+/* List layout */
+
+.kg-collection-card-list {
+    display: flex;
+    flex-direction: column;
+    gap: 3.2rem;
+}
+
+@media (max-width: 767px) {
+    .kg-collection-card-list .kg-collection-card-post {
+        flex-direction: column;
+    }
+}
+
+.kg-collection-card-list .kg-collection-card-img {
+    flex: 0 0 30%;
+}
+
+/* Grid layout */
+
+.kg-collection-card-grid {
+    display: grid;
+    grid-template-columns: repeat(1,minmax(0,1fr));
+    gap: 2.4rem;
+}
+
+@media (min-width: 640px) {
+    .kg-collection-card-grid:not(.columns-1) {
+        grid-template-columns: repeat(2,minmax(0,1fr));
+    }
+}
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid:not(.columns-1):not(.columns-2) {
+        grid-template-columns: repeat(3,minmax(0,1fr));
+        gap: 3.2rem
+    }
+
+    .kg-collection-card-grid.columns-1 {
+        gap: 4.8rem
+    }
+
+    .kg-collection-card-grid.columns-2 {
+        gap: 4rem
+    }
+}
+
+@media (min-width: 1280px) {
+    .kg-collection-card-grid:not(.columns-1):not(.columns-2):not(.columns-3) {
+        grid-template-columns: repeat(4,minmax(0,1fr));
+    }
+}
+
+.kg-collection-card-grid .kg-collection-card-post {
+    flex-direction: column;
+    gap: 1.2rem;
+}
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid.columns-1 .kg-collection-card-post {
+        gap: 2rem
+    }
+
+    .kg-collection-card-grid.columns-2 .kg-collection-card-post {
+        gap: 1.6rem
+    }
+}
+
+.kg-collection-card-grid.columns-1 .kg-collection-card-img,
+.kg-collection-card-grid.columns-2 .kg-collection-card-img {
+    aspect-ratio: 16/9;
+}
+
+.kg-collection-card-grid .kg-collection-card-content {
+    font-size: 1.5rem;
+}
+
+@media (min-width: 640px) {
+    .kg-collection-card-grid .kg-collection-card-content {
+        font-size: 1.6rem;
+    }
+}
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid.columns-1 .kg-collection-card-content {
+        font-size: 1.8rem;
+    }
+
+    .kg-collection-card-grid.columns-3 .kg-collection-card-content,
+    .kg-collection-card-grid.columns-4 .kg-collection-card-content {
+        font-size: 1.5rem;
+    }
+}
+
+.kg-collection-card-grid h2.kg-collection-card-post-title {
+    font-size: 1.7rem;
+}
+
+.kg-collection-card-grid .kg-collection-card-post-meta {
+    font-size: 1.25rem;
+}
+
+@media (min-width: 640px) {
+    .kg-collection-card-grid h2.kg-collection-card-post-title {
+        font-size: 1.9rem;
+    }
+
+    .kg-collection-card-grid.columns-1 h2.kg-collection-card-post-title {
+        font-size: 2.4rem;
+    }
+
+    .kg-collection-card-grid:not(.columns-3):not(.columns-4) .kg-collection-card-post-meta {
+        font-size: 1.3rem;
+    }
+}
+
+@media (min-width: 1024px) {
+    .kg-collection-card-grid.columns-1 h2.kg-collection-card-post-title {
+        font-size: 3.6rem;
+    }
+
+    .kg-collection-card-grid.columns-2 h2.kg-collection-card-post-title {
+        font-size: 2.4rem;
+    }
+
+    .kg-collection-card-grid.columns-1 .kg-collection-card-post-meta {
+        font-size: 1.4rem;
+    }
+}
+
+@media (min-width: 1280px) {
+    .kg-collection-card-grid.columns-4 h2.kg-collection-card-post-title {
+        font-size: 1.7rem;
+    }
+}
+
+.kg-file-card,
+.kg-file-card * {
+    box-sizing: border-box;
+}
+
+.kg-file-card {
+    display: flex;
+}
+
+.kg-file-card a.kg-file-card-container {
+    display: flex;
+    align-items: stretch;
+    justify-content: space-between;
+    color: inherit;
+    padding: 12px;
+    min-height: 92px;
+    border: 1px solid rgb(124 139 154 / 25%);
+    border-radius: 5px;
+    transition: all ease-in-out 0.35s;
+    text-decoration: none;
+    width: 100%;
+}
+
+.kg-file-card a.kg-file-card-container:hover {
+    border: 1px solid rgb(124 139 154 / 35%);
+}
+
+.kg-file-card-contents {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin: 4px 8px;
+    width: 100%
+}
+
+.kg-file-card-title {
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 1.3em;
+}
+
+.kg-file-card-caption {
+    font-size: 14px;
+    line-height: 1.3em;
+    opacity: 0.7;
+}
+
+.kg-file-card-title + .kg-file-card-caption {
+    flex-grow: 1;
+    margin-top: 3px;
+}
+
+.kg-file-card-metadata {
+    display: inline;
+    font-size: 14px;
+    line-height: 1.3em;
+    margin-top: 5px;
+}
+
+.kg-file-card-filename {
+    display: inline;
+    font-weight: 500;
+}
+
+.kg-file-card-filesize {
+    display: inline-block;
+    font-size: 14px;
+    opacity: 0.6;
+}
+
+.kg-file-card-filesize:before {
+    display: inline-block;
+    content: "escape";
+    margin-left: 6px;
+    margin-right: 6px;
+}
+
+.kg-file-card-icon {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 80px;
+    min-width: 80px;
+    height: 100%;
+    min-height: 80px;
+}
+
+.kg-file-card-icon:before {
+    position: absolute;
+    display: block;
+    content: "";
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: currentColor;
+    opacity: 0.06;
+    transition: opacity ease-in-out 0.35s;
+    border-radius: 3px;
+}
+
+.kg-file-card a.kg-file-card-container:hover .kg-file-card-icon:before {
+    opacity: 0.08;
+}
+
+.kg-file-card-icon svg {
+    width: 24px;
+    height: 24px;
+    color: var(--ghost-accent-color);
+}
+
+/* Size variations */
+.kg-file-card-medium a.kg-file-card-container {
+    min-height: 72px;
+}
+
+.kg-file-card-medium .kg-file-card-caption {
+    opacity: 1.0;
+    font-weight: 500;
+}
+
+.kg-file-card-small a.kg-file-card-container {
+    align-items: center;
+    min-height: 52px;
+}
+
+.kg-file-card-small .kg-file-card-metadata {
+    font-size: 14px;
+    margin-top: 0;
+}
+
+.kg-file-card-small .kg-file-card-icon svg {
+    width: 20px;
+    height: 20px;
+}
+
+.kg-file-card + .kg-file-card {
+    margin-top: 1em;
+}
+
+.kg-gallery-card,
+.kg-gallery-card * {
+    box-sizing: border-box;
+}
+
+.kg-gallery-card,
+.kg-image-card {
+    --gap: 1.2rem;
+}
+
+.kg-image-card:not(.kg-card-hascaption) + .kg-image-card,
+.kg-image-card:not(.kg-card-hascaption) + .kg-gallery-card,
+.kg-gallery-card:not(.kg-card-hascaption) + .kg-image-card,
+.kg-gallery-card:not(.kg-card-hascaption) + .kg-gallery-card {
+    margin-top: var(--gap);
+}
+
+.kg-gallery-container {
+    position: relative;
+}
+
+.kg-gallery-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+}
+
+.kg-gallery-image img {
+    display: block;
+    margin: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.kg-gallery-row:not(:first-of-type) {
+    margin: var(--gap) 0 0;
+}
+
+.kg-gallery-image:not(:first-of-type) {
+    margin: 0 0 0 var(--gap);
+}
+
+@media (max-width: 600px) {
+    .kg-gallery-card,
+    .kg-image-card {
+        --gap: 0.6rem;
+    }
+}
+
+.kg-header-card,
+.kg-header-card * {
+    box-sizing: border-box;
+}
+
+.kg-header-card {
+    padding: 12vmin 4em;
+    min-height: 60vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+}
+
+.kg-header-card.kg-size-small {
+    padding-top: 14vmin;
+    padding-bottom: 14vmin;
+    min-height: 40vh;
+}
+
+.kg-header-card.kg-size-large {
+    padding-top: 18vmin;
+    padding-bottom: 18vmin;
+    min-height: 80vh;
+}
+
+.kg-header-card.kg-align-left {
+    text-align: left;
+    align-items: flex-start;
+}
+
+.kg-header-card.kg-style-dark {
+    background: #151515;
+    color: #ffffff;
+}
+
+.kg-header-card.kg-style-light {
+    background-color: #fafafa;
+}
+
+.kg-header-card.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-header-card.kg-style-image {
+    position: relative;
+    background-color: #e7e7e7;
+    background-size: cover;
+    background-position: center;
+}
+
+.kg-header-card.kg-style-image::before {
+    position: absolute;
+    display: block;
+    content: "";
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background: linear-gradient(0deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2));
+}
+
+.kg-header-card h2.kg-header-card-header {
+    font-size: 5em;
+    font-weight: 700;
+    line-height: 1.1em;
+    letter-spacing: -0.01em;
+    margin: 0;
+}
+
+.kg-header-card h2.kg-header-card-header strong {
+    font-weight: 800;
+}
+
+.kg-header-card.kg-size-small h2.kg-header-card-header {
+    font-size: 4em;
+}
+
+.kg-header-card.kg-size-large h2.kg-header-card-header {
+    font-size: 6em;
+}
+
+.kg-header-card h3.kg-header-card-subheader {
+    font-size: 1.5em;
+    font-weight: 500;
+    line-height: 1.4em;
+    margin: 0;
+    max-width: 40em;
+}
+
+.kg-header-card h2 + h3.kg-header-card-subheader {
+    margin: 0.35em 0 0;
+}
+
+.kg-header-card h3.kg-header-card-subheader strong {
+    font-weight: 600;
+}
+
+.kg-header-card.kg-size-small h3.kg-header-card-subheader {
+    font-size: 1.25em;
+}
+
+.kg-header-card.kg-size-large h3.kg-header-card-subheader {
+    font-size: 1.75em;
+}
+
+.kg-header-card:not(.kg-style-light) h2.kg-header-card-header,
+.kg-header-card:not(.kg-style-light) h3.kg-header-card-subheader {
+    color: #ffffff;
+}
+
+.kg-header-card.kg-style-accent h3.kg-header-card-subheader,
+.kg-header-card.kg-style-image h3.kg-header-card-subheader {
+    opacity: 1.0;
+}
+
+.kg-header-card.kg-style-image h2.kg-header-card-header,
+.kg-header-card.kg-style-image h3.kg-header-card-subheader,
+.kg-header-card.kg-style-image a.kg-header-card-button {
+    z-index: 999;
+}
+
+.kg-header-card h2.kg-header-card-header a,
+.kg-header-card h3.kg-header-card-subheader a {
+    color: var(--ghost-accent-color);
+}
+
+.kg-header-card.kg-style-accent h2.kg-header-card-header a,
+.kg-header-card.kg-style-accent h3.kg-header-card-subheader a,
+.kg-header-card.kg-style-image h2.kg-header-card-header a,
+.kg-header-card.kg-style-image h3.kg-header-card-subheader a {
+    color: #fff;
+}
+
+.kg-header-card a.kg-header-card-button {
+    display: flex;
+    position: static;
+    align-items: center;
+    fill: #fff;
+    background: #fff;
+    border-radius: 3px;
+    outline: none;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    font-size: 1.05em;
+    font-weight: 600;
+    line-height: 1em;
+    text-align: center;
+    text-decoration: none;
+    letter-spacing: .2px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: #151515;
+    height: 2.7em;
+    padding: 0 1.2em;
+    transition: opacity .2s ease;
+}
+
+.kg-header-card h2 + a.kg-header-card-button,
+.kg-header-card h3 + a.kg-header-card-button {
+    margin: 1.75em 0 0;
+}
+
+.kg-header-card a.kg-header-card-button:hover {
+    opacity: 0.85;
+}
+
+.kg-header-card.kg-size-large a.kg-header-card-button {
+    font-size: 1.1em;
+    height: 2.9em;
+}
+
+.kg-header-card.kg-size-large h2 + a.kg-header-card-button,
+.kg-header-card.kg-size-large h3 + a.kg-header-card-button {
+    margin-top: 2em;
+}
+
+.kg-header-card.kg-size-small a.kg-header-card-button {
+    height: 2.4em;
+    font-size: 1em;
+}
+
+.kg-header-card.kg-size-small h2 + a.kg-header-card-button,
+.kg-header-card.kg-size-small h3 + a.kg-header-card-button {
+    margin-top: 1.5em;
+}
+
+.kg-header-card.kg-style-image a.kg-header-card-button,
+.kg-header-card.kg-style-dark a.kg-header-card-button {
+    background: #fff;
+    color: #151515;
+}
+
+.kg-header-card.kg-style-light a.kg-header-card-button {
+    background: var(--ghost-accent-color);
+    color: #fff;
+}
+
+.kg-header-card.kg-style-accent a.kg-header-card-button {
+    background: #fff;
+    color: #151515;
+}
+
+@media (max-width: 640px) {
+    .kg-header-card {
+        padding-left: 1em;
+        padding-right: 1em;
+    }
+
+    .kg-header-card h2.kg-header-card-header {
+        font-size: 3.5em;
+    }
+
+    .kg-header-card.kg-size-large h2.kg-header-card-header {
+        font-size: 4em;
+    }
+
+    .kg-header-card.kg-size-small h2.kg-header-card-header {
+        font-size: 3em;
+    }
+
+    .kg-header-card h3.kg-header-card-subheader {
+        font-size: 1.25em;
+    }
+
+    .kg-header-card.kg-size-large h3.kg-header-card-subheader {
+        font-size: 1.5em;
+    }
+
+    .kg-header-card.kg-size-small h3.kg-header-card-subheader {
+        font-size: 1em;
+    }
+}
+
+.kg-nft-card,
+.kg-nft-card * {
+    box-sizing: border-box;
+}
+
+.kg-nft-card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.kg-nft-card a.kg-nft-card-container {
+    position: static;
+    display: flex;
+    flex: auto;
+    flex-direction: column;
+    text-decoration: none;
+    font-family: -apple-system, BlinkMacSystemFont,
+                'avenir next', avenir,
+                'helvetica neue', helvetica,
+                ubuntu,
+                roboto, noto,
+                'segoe ui', arial,
+                sans-serif;
+    font-size: 14px;
+    font-weight: 400;
+    box-shadow: 0 2px 6px -2px rgb(0 0 0 / 10%), 0 0 1px rgb(0 0 0 / 40%);
+    width: 100%;
+    max-width: 512px;
+    color: #222;
+    background: #fff;
+    border-radius: 5px;
+    transition: none;
+}
+
+.kg-nft-card * {
+    position: static;
+}
+
+.kg-nft-metadata {
+    padding: 20px;
+    width: 100%;
+}
+
+.kg-nft-image {
+    border-radius: 5px 5px 0 0;
+    width: 100%;
+}
+
+.kg-nft-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    gap: 20px;
+}
+
+.kg-nft-header h4.kg-nft-title {
+    font-family: inherit;
+    font-size: 19px;
+    font-weight: 700;
+    line-height: 1.3em;
+    min-width: unset;
+    max-width: unset;
+    margin: 0;
+    color: #222;
+}
+
+.kg-nft-opensea-logo {
+    margin-top: 2px;
+    width: 100px;
+    object-fit: scale-down;
+}
+
+.kg-nft-creator {
+    font-family: inherit;
+    line-height: 1.4em;
+    margin: 4px 0 0;
+    color: #ababab;
+}
+
+.kg-nft-creator span {
+    font-weight: 500;
+    color: #222;
+}
+
+.kg-nft-card p.kg-nft-description {
+    font-family: inherit;
+    font-size: 14px;
+    line-height: 1.4em;
+    margin: 20px 0 0;
+    color: #222;
+}
+
+.kg-product-card,
+.kg-product-card * {
+    box-sizing: border-box;
+}
+
+.kg-product-card {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    width: 100%;
+}
+
+.kg-product-card-container {
+    display: grid;
+    grid-template-columns: auto min-content;
+    align-items: center;
+    grid-row-gap: 16px;
+    background: transparent;
+    max-width: 550px;
+    padding: 20px;
+    width: 100%;
+    border-radius: 5px;
+    box-shadow: inset 0 0 0 1px rgb(124 139 154 / 25%);
+}
+
+.kg-product-card-image {
+    grid-column: 1 / 3;
+    justify-self: center;
+    height: auto;
+}
+
+.kg-product-card-title-container {
+    grid-column: 1 / 2;
+}
+
+.kg-product-card h4.kg-product-card-title {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    text-decoration: none;
+    font-weight: 600;
+    font-size: 21px;
+    margin-top: 0;
+    margin-bottom: 0;
+    line-height: 1.15em;
+}
+
+.kg-product-card-description {
+    grid-column: 1 / 3;
+}
+
+.kg-product-card .kg-product-card-description p,
+.kg-product-card .kg-product-card-description ol,
+.kg-product-card .kg-product-card-description ul {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    font-size: 14px;
+    line-height: 1.5em;
+    opacity: .7;
+    margin-bottom: 0;
+}
+
+.kg-product-card .kg-product-card-description p:first-of-type {
+    margin-top: -4px;
+}
+
+.kg-product-card .kg-product-card-description p:not(:first-of-type),
+.kg-product-card .kg-product-card-description ul,
+.kg-product-card .kg-product-card-description ol {
+    margin-top: 0.95em;
+}
+
+.kg-product-card .kg-product-card-description li+li {
+    margin-top: 0.5em;
+}
+
+.kg-product-card-rating {
+    display: flex;
+    align-items: center;
+    grid-column: 2 / 3;
+    align-self: start;
+    justify-self: end;
+    padding-left: 16px;
+}
+
+@media (max-width: 400px) {
+    .kg-product-card-title-container {
+        grid-column: 1 / 3;
+    }
+
+    .kg-product-card-rating {
+        grid-column: 1 / 3;
+        justify-self: start;
+        margin-top: -15px;
+        padding-left: 0;
+    }
+}
+
+.kg-product-card-rating-star {
+    height: 20px;
+    width: 20px;
+}
+
+.kg-product-card-rating-star svg {
+    width: 16px;
+    height: 16px;
+    fill: currentColor;
+    opacity: 0.15;
+}
+
+.kg-product-card-rating-active.kg-product-card-rating-star svg {
+    opacity: 1;
+}
+
+.kg-product-card a.kg-product-card-button {
+    justify-content: center;
+    grid-column: 1 / 3;
+    display: flex;
+    position: static;
+    align-items: center;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 1em;
+    text-decoration: none;
+    width: 100%;
+    height: 38px;
+    border-radius: 6px;
+    padding: 0 12px;
+    transition: opacity 0.2s ease-in-out;
+}
+
+.kg-product-card a.kg-product-card-btn-accent {
+    background-color: var(--ghost-accent-color);
+    color: #fff;
+}
+
+.kg-signup-card {
+    position: relative;
+}
+
+.kg-signup-card,
+.kg-signup-card * {
+    box-sizing: border-box;
+}
+
+.kg-signup-card a,
+.kg-signup-card a span {
+    color: currentColor;
+}
+
+.kg-signup-card.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-layout-split .kg-signup-card-content {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+}
+
+.kg-signup-card-text {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    height: 100%;
+    padding: min(4vmax, 80px);
+    background-size: cover;
+    background-position: center;
+    text-align: left;
+}
+
+.kg-width-wide .kg-signup-card-text {
+    padding: min(6.4vmax, 120px);
+}
+
+.kg-width-full .kg-signup-card-text {
+    padding: min(12vmax, 260px) 0;
+}
+
+.kg-layout-split .kg-signup-card-text {
+    padding: min(12vmax, 260px) min(4vmax, 80px);
+}
+
+.kg-layout-split.kg-content-wide .kg-signup-card-text {
+    padding: min(10vmax, 220px) 0 min(10vmax, 220px) min(4vmax, 80px);
+}
+
+.kg-layout-split.kg-content-wide.kg-swapped .kg-signup-card-text {
+    padding: min(10vmax, 220px) min(4vmax, 80px) min(10vmax, 220px) 0;
+}
+
+.kg-swapped .kg-signup-card-text {
+    grid-row: 1;
+}
+
+.kg-signup-card-text.kg-align-center {
+    align-items: center;
+    text-align: center;
+}
+
+.kg-signup-card.kg-style-image h2.kg-signup-card-heading,
+.kg-signup-card.kg-style-image .kg-signup-card-subheading,
+.kg-signup-card.kg-style-image .kg-signup-card-button {
+    z-index: 999;
+}
+
+/* Background image */
+
+.kg-signup-card > picture > .kg-signup-card-image {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    object-position: center;
+    background-color: #FFFFFF;
+    pointer-events: none;
+}
+
+/* Split layout image */
+
+.kg-signup-card-content .kg-signup-card-image {
+    width: 100%;
+    /* this will force the image to follow the signup card height */
+    height: 0;
+    min-height: 100%;
+    /**/
+    object-fit: cover;
+    object-position: center;
+}
+
+.kg-content-wide .kg-signup-card-content .kg-signup-card-image {
+    height: 100%;
+    padding: 5.6em 0;
+    object-fit: contain;
+}
+
+/* Heading */
+
+.kg-signup-card h2.kg-signup-card-heading {
+    margin: 0;
+    font-size: clamp(1.7em, 4vw, 2.5em);
+    font-weight: 700;
+    line-height: 1.05em;
+    letter-spacing: -0.01em;
+}
+
+.kg-signup-card.kg-width-wide h2.kg-signup-card-heading {
+    font-size: clamp(1.7em, 5vw, 3.3em);
+}
+
+.kg-signup-card.kg-width-full h2.kg-signup-card-heading {
+    font-size: clamp(1.9em, 5.6vw, 4.2em);
+}
+
+.kg-signup-card.kg-width-full.kg-layout-split h2.kg-signup-card-heading {
+    font-size: clamp(1.9em, 4vw, 3.3em);
+}
+
+/* Subheading */
+
+.kg-signup-card-subheading {
+    margin: 0 0 2em;
+}
+
+.kg-signup-card .kg-signup-card-subheading {
+    max-width: 40em;
+    margin: 0;
+    font-size: clamp(1.05em, 2vw, 1.4em);
+    font-weight: 500;
+    line-height: 1.2em;
+}
+
+.kg-signup-card h2 + .kg-signup-card-subheading {
+    margin: 0.6em 0 0;
+}
+
+.kg-signup-card .kg-signup-card-subheading strong {
+    font-weight: 600;
+}
+
+.kg-signup-card.kg-width-wide .kg-signup-card-subheading {
+    font-size: clamp(1.05em, 2vw, 1.55em);
+}
+
+.kg-signup-card.kg-width-full .kg-signup-card-subheading:not(.kg-layout-split .kg-signup-card-subheading) {
+    max-width: min(65vmax, 1200px);
+    font-size: clamp(1.05em, 2vw, 1.7em);
+}
+
+.kg-signup-card.kg-width-full.kg-layout-split .kg-signup-card-subheading {
+    font-size: clamp(1.05em, 2vw, 1.55em);
+}
+
+/* Subscribe form */
+
+.kg-signup-card-form {
+    position: relative;
+    display: flex;
+    flex-shrink: 0;
+    width: 100%;
+}
+
+.kg-align-center .kg-signup-card-form {
+    justify-content: center;
+}
+
+.kg-signup-card-heading + .kg-signup-card-form,
+.kg-signup-card-subheading + .kg-signup-card-form {
+    margin: min(2.4vmax, 48px) 0 0;
+}
+
+.kg-width-wide .kg-signup-card-heading + .kg-signup-card-form,
+.kg-width-wide .kg-signup-card-subheading + .kg-signup-card-form {
+    margin: min(3.2vmax, 64px) 0 0;
+}
+
+.kg-width-full .kg-signup-card-heading + .kg-signup-card-form,
+.kg-width-full .kg-signup-card-subheading + .kg-signup-card-form {
+    margin: min(4vmax, 80px) 0 0;
+}
+
+.kg-signup-card-fields {
+    display: flex;
+    width: 100%;
+    padding: 3px;
+    background: #FFFFFF;
+    border: 1px solid #E6E6E6;
+    border-radius: 4px;
+}
+
+.kg-width-wide .kg-signup-card-fields,
+.kg-width-full .kg-signup-card-fields {
+    width: 100%;
+    max-width: 500px;
+}
+
+.kg-signup-card-input {
+    width: 100%;
+    height: 2.9em;
+    min-height: 46px;
+    margin: 0 3px 0 0;
+    padding: 12px 16px;
+    border: none;
+    background: #FFFFFF;
+    font-size: 1.1em;
+}
+
+.kg-signup-card-input:focus,
+.kg-signup-card-input:focus-visible {
+    outline: none;
+}
+
+.kg-signup-card-button {
+    display: flex;
+    position: relative;
+    align-items: center;
+    height: 2.9em;
+    min-height: 46px;
+    padding: 0 1.2em;
+    outline: none;
+    border: none;
+    font-size: 1em;
+    font-weight: 600;
+    line-height: 1em;
+    text-align: center;
+    text-decoration: none;
+    letter-spacing: .2px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    border-radius: 3px;
+    transition: opacity .2s ease;
+    cursor: pointer;
+}
+
+.kg-signup-card-button.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-signup-card h2 + .kg-signup-card-button,
+.kg-signup-card p + .kg-signup-card-button {
+    margin: 1.5em 0 0;
+}
+
+.kg-signup-card .kg-signup-card-button:hover {
+    opacity: 0.85;
+}
+
+.kg-signup-card.kg-width-wide .kg-signup-card-button {
+    font-size: 1.05em;
+}
+
+.kg-signup-card.kg-width-wide h2 + .kg-signup-card-button,
+.kg-signup-card.kg-width-wide p + .kg-signup-card-button {
+    margin-top: 1.75em;
+}
+
+.kg-signup-card.kg-width-full .kg-signup-card-button {
+    font-size: 1.1em;
+}
+
+.kg-signup-card.kg-width-full h2 + .kg-signup-card-button,
+.kg-signup-card.kg-width-full p + .kg-signup-card-button {
+    margin-top: 2em;
+}
+
+/* Subscribe form states */
+
+.kg-signup-card-success,
+.kg-signup-card-error {
+    display: none;
+}
+
+.kg-signup-card-form.success .kg-signup-card-fields {
+    display: none;
+}
+
+.kg-signup-card-form.success .kg-signup-card-success {
+    display: flex;
+    align-items: center;
+    height: 3em;
+    font-size: 1.25em;
+    font-weight: 500;
+    line-height: 1.4em;
+}
+
+.kg-signup-card-form.error .kg-signup-card-fields {
+    border: 1px solid #FF0000;
+    box-shadow: inset 0 0 0 1px rgba(255, 0, 0, 0.2);
+}
+
+.kg-signup-card-form.error .kg-signup-card-error {
+    position: absolute;
+    bottom: calc(-1rem - 1.6em);
+    display: block;
+    font-size: inherit;
+}
+
+.kg-signup-card-button-loading {
+    position: absolute;
+    inset: 0;
+    align-items: center;
+    justify-content: center;
+    display: none;
+}
+
+.kg-signup-card-form.loading .kg-signup-card-button-default {
+    color: transparent;
+}
+
+.kg-signup-card-form.loading .kg-signup-card-button-loading {
+    display: flex;
+}
+
+/* Disclaimer */
+
+.kg-signup-card-disclaimer {
+    margin: 1rem 0 0;
+}
+
+.kg-signup-card-form.success + .kg-signup-card-disclaimer,
+.kg-signup-card-form.error + .kg-signup-card-disclaimer {
+    visibility: hidden;
+}
+
+
+/* Responsive styles */
+
+@media (max-width: 640px) {
+    .kg-layout-split .kg-signup-card-content {
+        grid-template-columns: 1fr;
+    }
+
+    .kg-width-wide .kg-signup-card-text {
+        padding: min(6.4vmax, 120px) min(4vmax, 80px);
+    }
+
+    .kg-layout-split.kg-content-wide .kg-signup-card-text,
+    .kg-layout-split.kg-content-wide.kg-swapped .kg-signup-card-text {
+        padding: min(9.6vmax, 180px) 0;
+    }
+
+    .kg-signup-card.kg-width-full .kg-signup-card-subheading:not(.kg-layout-split .kg-signup-card-subheading) {
+        max-width: unset;
+    }
+
+    .kg-signup-card-content .kg-signup-card-image:not(.kg-content-wide .kg-signup-card-content .kg-signup-card-image) {
+        height: auto;
+        min-height: unset;
+        aspect-ratio: 1 / 1;
+    }
+
+    .kg-content-wide .kg-signup-card-content .kg-signup-card-image {
+        padding: 1.7em 0 0;
+    }
+
+    .kg-content-wide.kg-swapped .kg-signup-card-content .kg-signup-card-image {
+        padding: 0 0 1.7em;
+    }
+
+    .kg-signup-card-input {
+        height: 2.9em;
+        padding: 6px 12px;
+        font-size: 1em;
+    }
+
+    .kg-signup-card-button {
+        height: 2.9em;
+    }
+
+    .kg-signup-card.kg-width-wide .kg-signup-card-button,
+    .kg-signup-card.kg-width-full .kg-signup-card-button {
+        font-size: 1em;
+    }
+}
+
+.kg-toggle-card,
+.kg-toggle-card * {
+    box-sizing: border-box;
+}
+
+.kg-toggle-card {
+    background: transparent;
+    box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+    border-radius: 4px;
+    padding: 1.2em;
+}
+
+
+
+.kg-toggle-content {
+    height: auto;
+    opacity: 1;
+    transition: opacity 1s ease, top .35s ease;
+    top: 0;
+    position: relative;
+}
+
+.kg-toggle-card[data-kg-toggle-state="close"] svg {
+    transform: unset;
+}
+
+.kg-toggle-heading {
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.kg-toggle-card h4.kg-toggle-heading-text {
+    font-size: 1.15em;
+    font-weight: 700;
+    line-height: 1.3em;
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+.kg-toggle-content p:first-of-type {
+    margin-top: 0.5em;
+}
+
+.kg-toggle-card .kg-toggle-content p,
+.kg-toggle-card .kg-toggle-content ol,
+.kg-toggle-card .kg-toggle-content ul {
+    font-size: 0.95em;
+    line-height: 1.5em;
+    margin-top: 0.95em;
+    margin-bottom: 0;
+}
+
+.kg-toggle-card li + li {
+    margin-top: 0.5em;
+}
+
+.kg-toggle-card-icon {
+    height: 24px;
+    width: 24px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: 1em;
+    padding: 0;
+    background: none;
+    border: 0;
+    cursor: pointer;
+}
+
+.kg-toggle-heading svg {
+    width: 14px;
+    color: rgba(124, 139, 154, 0.5);
+    transition: all 0.3s;
+    transform: rotate(-180deg);
+}
+
+.kg-toggle-heading path {
+    fill: none;
+    stroke: currentcolor;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+    stroke-width: 1.5;
+    fill-rule: evenodd;
+}
+
+.kg-toggle-card + .kg-toggle-card {
+    margin-top: 1em;
+}
+
+.kg-video-card,
+.kg-video-card * {
+    box-sizing: border-box;
+}
+
+.kg-video-card {
+    position: relative;
+    --seek-before-width: 0%;
+    --volume-before-width: 100%;
+    --buffered-width: 0%;
+}
+
+.kg-video-card video {
+    display: block;
+    max-width: 100%;
+    height: auto;
+}
+
+.kg-video-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.kg-video-overlay {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-image: linear-gradient(180deg,rgba(0,0,0,0.3) 0,transparent 70%,transparent 100%);
+    z-index: 999;
+    transition: opacity .2s ease-in-out;
+}
+
+.kg-video-large-play-icon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 72px;
+    height: 72px;
+    padding: 0;
+    background: rgba(0, 0, 0, 0.5);
+    border-radius: 50%;
+    transition: opacity .2s ease-in-out;
+}
+
+.kg-video-large-play-icon svg {
+    width: 20px;
+    height: auto;
+    margin-left: 2px;
+    fill: #fff;
+}
+
+.kg-video-player-container {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 80px;
+    background: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,.5));
+    z-index: 999;
+    transition: opacity .2s ease-in-out;
+
+}
+
+.kg-video-player {
+    position: absolute;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    width: 100%;
+    z-index: 9999;
+    padding: 12px 16px;
+}
+
+.kg-video-current-time {
+    min-width: 38px;
+    padding: 0 4px;
+    color: #fff;
+    font-family: inherit;
+    font-size: 12.5px;
+    font-weight: 500;
+    line-height: 1.4em;
+    white-space: nowrap;
+}
+
+.kg-video-time {
+    color: rgba(255, 255, 255, 0.6);
+    font-family: inherit;
+    font-size: 12.5px;
+    font-weight: 500;
+    line-height: 1.4em;
+    white-space: nowrap;
+}
+
+.kg-video-duration {
+    padding: 0 4px;
+}
+
+.kg-video-play-icon,
+.kg-video-pause-icon {
+    position: relative;
+    padding: 0px 4px 0 0;
+    font-size: 0;
+    background: transparent;
+}
+
+.kg-video-hide {
+    display: none !important;
+}
+
+.kg-video-hide-animated {
+    opacity: 0 !important;
+    transition: opacity .2s ease-in-out;
+    cursor: initial;
+}
+
+.kg-video-play-icon svg,
+.kg-video-pause-icon svg {
+    width: 14px;
+    height: 14px;
+    fill: #fff;
+}
+
+.kg-video-seek-slider {
+    flex-grow: 1;
+    margin: 0 4px;
+}
+
+@media (max-width: 520px) {
+    .kg-video-seek-slider {
+        display: none;
+    }
+}
+
+.kg-video-playback-rate {
+    min-width: 37px;
+    padding: 0 4px;
+    color: #fff;
+    font-family: inherit;
+    font-size: 12.5px;
+    font-weight: 600;
+    line-height: 1.4em;
+    text-align: left;
+    background: transparent;
+    white-space: nowrap;
+}
+
+@media (max-width: 520px) {
+    .kg-video-playback-rate {
+        padding-left: 8px;
+    }
+}
+
+.kg-video-mute-icon,
+.kg-video-unmute-icon {
+    position: relative;
+    bottom: -1px;
+    padding: 0 4px;
+    font-size: 0;
+    background: transparent;
+}
+
+@media (max-width: 520px) {
+    .kg-video-mute-icon,
+    .kg-video-unmute-icon  {
+        margin-left: auto;
+    }
+}
+
+.kg-video-mute-icon svg,
+.kg-video-unmute-icon svg {
+    width: 16px;
+    height: 16px;
+    fill: #fff;
+}
+
+.kg-video-volume-slider {
+    width: 80px;
+}
+
+@media (max-width: 300px) {
+    .kg-video-volume-slider {
+        display: none;
+    }
+}
+
+.kg-video-seek-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--seek-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: #EBEEF0;
+    border-radius: 2px;
+}
+
+.kg-video-volume-slider::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    width: var(--volume-before-width) !important;
+    height: 4px;
+    cursor: pointer;
+    background-color: #EBEEF0;
+    border-radius: 2px;
+}
+
+/* Resetting browser styles
+/* --------------------------------------------------------------- */
+
+.kg-video-card input[type=range] {
+    position: relative;
+    -webkit-appearance: none;
+    background: transparent;
+}
+
+.kg-video-card input[type=range]:focus {
+    outline: none;
+}
+
+.kg-video-card input[type=range]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+}
+
+.kg-video-card input[type=range]::-ms-track {
+    cursor: pointer;
+    border-color: transparent;
+    color: transparent;
+    background: transparent;
+}
+
+.kg-video-card button {
+    display: flex;
+    align-items: center;
+    border: 0;
+    cursor: pointer;
+}
+
+.kg-video-card input[type="range"] {
+    height: auto;
+    padding: 0;
+    border: 0;
+}
+
+/* Chrome & Safari styles
+/* --------------------------------------------------------------- */
+
+.kg-video-card input[type="range"]::-webkit-slider-runnable-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 2px;
+}
+
+.kg-video-card input[type="range"]::-webkit-slider-thumb {
+    position: relative;
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    margin: -5px 0 0 0;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-video-card input[type="range"]:active::-webkit-slider-thumb {
+    transform: scale(1.2);
+}
+
+/* Firefox styles
+/* --------------------------------------------------------------- */
+
+.kg-video-card input[type="range"]::-moz-range-track {
+    width: 100%;
+    height: 4px;
+    cursor: pointer;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 2px;
+}
+
+.kg-video-card input[type="range"]::-moz-range-progress {
+    background: #EBEEF0;
+    border-radius: 2px;
+}
+
+.kg-video-card input[type="range"]::-moz-range-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-video-card input[type="range"]:active::-moz-range-thumb {
+    transform: scale(1.2);
+}
+
+/* Edge & IE styles
+/* --------------------------------------------------------------- */
+
+.kg-video-card input[type="range"]::-ms-track {
+    width: 100%;
+    height: 3px;
+    border: solid transparent;
+    color: transparent;
+    cursor: pointer;
+    background: transparent;
+}
+
+.kg-video-card input[type="range"]::-ms-fill-lower {
+    background: #fff;
+}
+
+.kg-video-card input[type="range"]::-ms-fill-upper {
+    background: #EBEEF0;
+}
+
+.kg-video-card input[type="range"]::-ms-thumb {
+    box-sizing: content-box;
+    width: 13px;
+    height: 13px;
+    border: 0;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 50%;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24);
+}
+
+.kg-video-card input[type="range"]:active::-ms-thumb {
+    transform: scale(1.2);
+}
+.kg-header-card.kg-v2 {
+    position: relative;
+    padding: 0;
+    min-height: initial;
+    text-align: initial;
+}
+
+.kg-header-card.kg-v2,
+.kg-header-card.kg-v2 * {
+    box-sizing: border-box;
+}
+
+.kg-header-card.kg-v2 a,
+.kg-header-card.kg-v2 a span {
+    color: currentColor;
+}
+
+.kg-header-card.kg-style-accent.kg-v2 {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-header-card-content {
+    width: 100%;
+}
+
+.kg-layout-split .kg-header-card-content {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+}
+
+.kg-header-card-text {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    height: 100%;
+    padding: min(6.4vmax, 120px) min(4vmax, 80px);
+    background-size: cover;
+    background-position: center;
+    text-align: left;
+}
+
+.kg-width-wide .kg-header-card-text {
+    padding: min(10vmax, 220px) min(6.4vmax, 140px);
+}
+
+.kg-width-full .kg-header-card-text {
+    padding: min(12vmax, 260px) 0;
+}
+
+.kg-layout-split .kg-header-card-text {
+    padding: min(12vmax, 260px) min(4vmax, 80px);
+}
+
+.kg-layout-split.kg-content-wide .kg-header-card-text {
+    padding: min(10vmax, 220px) 0 min(10vmax, 220px) min(4vmax, 80px);
+}
+
+.kg-layout-split.kg-content-wide.kg-swapped .kg-header-card-text {
+    padding: min(10vmax, 220px) min(4vmax, 80px) min(10vmax, 220px) 0;
+}
+
+.kg-swapped .kg-header-card-text {
+    grid-row: 1;
+}
+
+.kg-header-card-text.kg-align-center {
+    align-items: center;
+    text-align: center;
+}
+
+.kg-header-card.kg-style-image h2.kg-header-card-heading,
+.kg-header-card.kg-style-image .kg-header-card-subheading,
+.kg-header-card.kg-style-image.kg-v2 .kg-header-card-button {
+    z-index: 999;
+}
+
+/* Background image */
+
+.kg-header-card > picture > .kg-header-card-image {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    object-position: center;
+    background-color: #FFFFFF;
+    pointer-events: none;
+}
+
+/* Split layout image */
+
+.kg-header-card-content .kg-header-card-image {
+    width: 100%;
+    /* this will force the image to follow the signup card height */
+    height: 0;
+    min-height: 100%;
+    /**/
+    object-fit: cover;
+    object-position: center;
+}
+
+.kg-content-wide .kg-header-card-content .kg-header-card-image {
+    height: 100%;
+    padding: 5.6em 0;
+    object-fit: contain;
+}
+
+/* Heading */
+
+.kg-header-card h2.kg-header-card-heading {
+    margin: 0;
+    font-size: clamp(1.7em, 4vw, 2.5em);
+    font-weight: 700;
+    line-height: 1.05em;
+    letter-spacing: -0.01em;
+}
+
+.kg-header-card.kg-width-wide h2.kg-header-card-heading {
+    font-size: clamp(1.7em, 5vw, 3.3em);
+}
+
+.kg-header-card.kg-width-full h2.kg-header-card-heading {
+    font-size: clamp(1.9em, 5.6vw, 4.2em);
+}
+
+.kg-header-card.kg-width-full.kg-layout-split h2.kg-header-card-heading {
+    font-size: clamp(1.9em, 4vw, 3.3em);
+}
+
+/* Subheading */
+
+.kg-header-card-subheading {
+    margin: 0 0 2em;
+}
+
+.kg-header-card .kg-header-card-subheading {
+    max-width: 40em;
+    margin: 0;
+    font-size: clamp(1.05em, 2vw, 1.4em);
+    font-weight: 500;
+    line-height: 1.2em;
+}
+
+.kg-header-card h2 + .kg-header-card-subheading {
+    margin: 0.6em 0 0;
+}
+
+.kg-header-card .kg-header-card-subheading strong {
+    font-weight: 600;
+}
+
+.kg-header-card.kg-width-wide .kg-header-card-subheading {
+    font-size: clamp(1.05em, 2vw, 1.55em);
+}
+
+.kg-header-card.kg-width-full .kg-header-card-subheading:not(.kg-layout-split .kg-header-card-subheading) {
+    max-width: min(65vmax, 1200px);
+    font-size: clamp(1.05em, 2vw, 1.7em);
+}
+
+.kg-header-card.kg-width-full.kg-layout-split .kg-header-card-subheading {
+    font-size: clamp(1.05em, 2vw, 1.55em);
+}
+
+.kg-header-card.kg-v2 .kg-header-card-button {
+    display: flex;
+    position: relative;
+    align-items: center;
+    height: 2.9em;
+    min-height: 46px;
+    padding: 0 1.2em;
+    outline: none;
+    border: none;
+    font-size: 1em;
+    font-weight: 600;
+    line-height: 1em;
+    text-align: center;
+    text-decoration: none;
+    letter-spacing: .2px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    border-radius: 3px;
+    transition: opacity .2s ease;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-button.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-header-card.kg-v2 h2 + .kg-header-card-button,
+.kg-header-card.kg-v2 p + .kg-header-card-button {
+    margin: 1.5em 0 0;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-button:hover {
+    opacity: 0.85;
+}
+
+.kg-header-card.kg-v2.kg-width-wide .kg-header-card-button {
+    font-size: 1.05em;
+}
+
+.kg-header-card.kg-v2.kg-width-wide h2 + .kg-header-card-button,
+.kg-header-card.kg-v2.kg-width-wide p + .kg-header-card-button {
+    margin-top: 1.75em;
+}
+
+.kg-header-card.kg-v2.kg-width-full .kg-header-card-button {
+    font-size: 1.1em;
+}
+
+.kg-header-card.kg-v2.kg-width-full h2 + .kg-header-card-button,
+.kg-header-card.kg-v2.kg-width-full p + .kg-header-card-button {
+    margin-top: 2em;
+}
+
+/* Responsive styles */
+
+@media (max-width: 640px) {
+    .kg-layout-split .kg-header-card-content {
+        grid-template-columns: 1fr;
+    }
+
+    .kg-width-wide .kg-header-card-text {
+        padding: min(6.4vmax, 120px) min(4vmax, 80px);
+    }
+
+    .kg-layout-split.kg-content-wide .kg-header-card-text,
+    .kg-layout-split.kg-content-wide.kg-swapped .kg-header-card-text {
+        padding: min(9.6vmax, 180px) 0;
+    }
+
+    .kg-header-card.kg-width-full .kg-header-card-subheading:not(.kg-layout-split .kg-header-card-subheading) {
+        max-width: unset;
+    }
+
+    .kg-header-card-content .kg-header-card-image:not(.kg-content-wide .kg-header-card-content .kg-header-card-image) {
+        height: auto;
+        min-height: unset;
+        aspect-ratio: 1 / 1;
+    }
+
+    .kg-content-wide .kg-header-card-content .kg-header-card-image {
+        padding: 1.7em 0 0;
+    }
+
+    .kg-content-wide.kg-swapped .kg-header-card-content .kg-header-card-image {
+        padding: 0 0 1.7em;
+    }
+
+    .kg-header-card.kg-v2 .kg-header-card-button {
+        height: 2.9em;
+    }
+
+    .kg-header-card.kg-v2.kg-width-wide .kg-header-card-button,
+    .kg-header-card.kg-v2.kg-width-full .kg-header-card-button {
+        font-size: 1em;
+    }
+}
+
+  </style><link rel="stylesheet" type="text/css" href="${siteUrl}/assets/styles/reader.css" />`;
+};
+
+export default articleBodyStyles;
diff --git a/apps/admin-x-activitypub/src/components/feed/ArticleModal.tsx b/apps/admin-x-activitypub/src/components/feed/ArticleModal.tsx
new file mode 100644
index 00000000000..1f1fd1386c9
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/feed/ArticleModal.tsx
@@ -0,0 +1,108 @@
+import FeedItem from './FeedItem';
+import MainHeader from '../navigation/MainHeader';
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import React, {useEffect, useRef} from 'react';
+import articleBodyStyles from '../articleBodyStyles';
+import {ActorProperties, ObjectProperties} from '@tryghost/admin-x-framework/api/activitypub';
+import {Button, Modal} from '@tryghost/admin-x-design-system';
+import {useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+
+interface ArticleModalProps {
+    object: ObjectProperties;
+    actor: ActorProperties;
+}
+
+const ArticleBody: React.FC<{heading: string, image: string|undefined, html: string}> = ({heading, image, html}) => {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+
+    const iframeRef = useRef<HTMLIFrameElement>(null);
+
+    const cssContent = articleBodyStyles(siteData?.url.replace(/\/$/, ''));
+
+    const htmlContent = `
+  <html>
+  <head>
+    ${cssContent}
+  </head>
+  <body>
+    <header class='gh-article-header gh-canvas'>
+        <h1 class='gh-article-title is-title' data-test-article-heading>${heading}</h1>
+${image &&
+        `<figure class='gh-article-image'>
+            <img src='${image}' alt='${heading}' />
+        </figure>`
+}
+    </header>
+    <div class='gh-content gh-canvas is-body'>
+      ${html}
+    </div>
+  </body>
+  </html>
+`;
+
+    useEffect(() => {
+        const iframe = iframeRef.current;
+        if (iframe) {
+            iframe.srcdoc = htmlContent;
+        }
+    }, [htmlContent]);
+
+    return (
+        <div>
+            <iframe
+                ref={iframeRef}
+                className={`h-[calc(100vh_-_3vmin_-_4.8rem_-_2px)]`}
+                height='100%'
+                id='gh-ap-article-iframe'
+                title='Embedded Content'
+                width='100%'
+            >
+            </iframe>
+        </div>
+    );
+};
+
+const ArticleModal: React.FC<ArticleModalProps> = ({object, actor}) => {
+    const modal = useModal();
+    return (
+        <Modal
+            align='right'
+            animate={true}
+            footer={<></>}
+            height={'full'}
+            padding={false}
+            size='bleed'
+            width={640}
+        >
+            <MainHeader>
+                <div className='col-[1/2] flex items-center justify-between px-8'>
+                    <Button icon='chevron-left' size='sm' unstyled onClick={() => modal.remove()}/>
+                </div>
+                <div className='col-[2/3] flex grow items-center justify-center px-8 text-center'>
+                    <span className='text-lg font-semibold text-grey-900'>{object.type}</span>
+                </div>
+                <div className='col-[3/4] flex items-center justify-end px-8'>
+                    <Button icon='close' size='sm' unstyled onClick={() => modal.remove()}/>
+                </div>
+            </MainHeader>
+            <div className='mt-10 w-auto'>
+                {object.type === 'Note' && (
+                    <div className='mx-auto max-w-[580px]'>
+                        <FeedItem actor={actor} layout='modal' object={object} type='Note'/>
+                        {/* {object.content && <div dangerouslySetInnerHTML={({__html: object.content})} className='ap-note-content text-pretty text-[1.5rem] text-grey-900'></div>} */}
+                        {/* {renderAttachment(object)} */}
+                        <FeedItem actor={actor} last={false} layout='reply' object={object} type='Note'/>
+                        <FeedItem actor={actor} last={true} layout='reply' object={object} type='Note'/>
+                        <div className="mx-[-32px] my-4 h-px w-[120%] bg-grey-200"></div>
+                        <FeedItem actor={actor} last={false} layout='reply' object={object} type='Note'/>
+                        <FeedItem actor={actor} last={false} layout='reply' object={object} type='Note'/>
+                        <FeedItem actor={actor} last={true} layout='reply' object={object} type='Note'/>
+                    </div>)}
+                {object.type === 'Article' && <ArticleBody heading={object.name} html={object.content} image={object?.image}/>}
+            </div>
+        </Modal>
+    );
+};
+
+export default NiceModal.create(ArticleModal);
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/components/feed/FeedItem.tsx b/apps/admin-x-activitypub/src/components/feed/FeedItem.tsx
new file mode 100644
index 00000000000..87d41de12ce
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/feed/FeedItem.tsx
@@ -0,0 +1,321 @@
+import APAvatar from '../global/APAvatar';
+import React, {useState} from 'react';
+import getRelativeTimestamp from '../../utils/get-relative-timestamp';
+import getUsername from '../../utils/get-username';
+import {ActorProperties, ObjectProperties} from '@tryghost/admin-x-framework/api/activitypub';
+import {Button, Heading, Icon} from '@tryghost/admin-x-design-system';
+
+export function renderFeedAttachment(object: ObjectProperties, layout: string) {
+    let attachment;
+    if (object.image) {
+        attachment = object.image;
+    }
+
+    if (object.type === 'Note' && !attachment) {
+        attachment = object.attachment;
+    }
+
+    if (!attachment) {
+        return null;
+    }
+
+    if (Array.isArray(attachment)) {
+        const attachmentCount = attachment.length;
+
+        let gridClass = '';
+        if (layout === 'modal') {
+            gridClass = 'grid-cols-1'; // Single image, full width
+        } else if (attachmentCount === 2) {
+            gridClass = 'grid-cols-2 auto-rows-[150px]'; // Two images, side by side
+        } else if (attachmentCount === 3 || attachmentCount === 4) {
+            gridClass = 'grid-cols-2 auto-rows-[150px]'; // Three or four images, two per row
+        }
+
+        return (
+            <div className={`attachment-gallery mt-2 grid ${gridClass} gap-2`}>
+                {attachment.map((item, index) => (
+                    <img key={item.url} alt={`attachment-${index}`} className={`h-full w-full rounded-md object-cover ${attachmentCount === 3 && index === 0 ? 'row-span-2' : ''}`} src={item.url} />
+                ))}
+            </div>
+        );
+    }
+
+    switch (attachment.mediaType) {
+    case 'image/jpeg':
+    case 'image/png':
+    case 'image/gif':
+        return <img alt='attachment' className='mt-2 rounded-md outline outline-1 -outline-offset-1 outline-black/10' src={attachment.url} />;
+    case 'video/mp4':
+    case 'video/webm':
+        return <div className='relative mb-4 mt-2'>
+            <video className='h-[300px] w-full rounded object-cover' src={attachment.url} controls/>
+        </div>;
+
+    case 'audio/mpeg':
+    case 'audio/ogg':
+        return <div className='relative mb-4 mt-2 w-full'>
+            <audio className='w-full' src={attachment.url} controls/>
+        </div>;
+    default:
+        return null;
+    }
+}
+
+function renderInboxAttachment(object: ObjectProperties) {
+    let attachment;
+    if (object.image) {
+        attachment = object.image;
+    }
+
+    if (object.type === 'Note' && !attachment) {
+        attachment = object.attachment;
+    }
+
+    if (!attachment) {
+        return null;
+    }
+
+    if (Array.isArray(attachment)) {
+        const attachmentCount = attachment.length;
+        // let gridClass = '';
+        // if (attachmentCount === 2) {
+        //     gridClass = 'grid-cols-2 auto-rows-[150px]'; // Two images, side by side
+        // } else if (attachmentCount === 3 || attachmentCount === 4) {
+        //     gridClass = 'grid-cols-2 auto-rows-[150px]'; // Three or four images, two per row
+        // }
+        return (
+            <div className='min-w-[160px]'>
+                <div className='relative'>
+                    <img className={`h-[100px] w-[160px] rounded-md object-cover`} src={attachment[0].url} />
+                    <div className='absolute bottom-1 right-1 z-10 rounded-full border border-[rgba(255,255,255,0.25)] bg-black px-2 py-0.5 font-semibold text-white'>+ {attachmentCount - 1}</div>
+                </div>
+            </div>
+        );
+    }
+
+    switch (attachment.mediaType) {
+    case 'image/jpeg':
+    case 'image/png':
+    case 'image/gif':
+        return (
+            <div className='min-w-[160px]'>
+                <img className={`h-[100px] w-[160px] rounded-md object-cover`} src={attachment.url} />
+            </div>
+        );
+    case 'video/mp4':
+    case 'video/webm':
+        return (
+            <div className='min-w-[160px]'>
+                <div className='relative mb-4 mt-2'>
+                    <video className='h-[300px] w-full rounded object-cover' src={attachment.url} controls/>
+                </div>
+            </div>
+        );
+
+    case 'audio/mpeg':
+    case 'audio/ogg':
+        return (
+            <div className='min-w-[160px]'>
+                <div className='relative mb-4 mt-2 w-full'>
+                    <audio className='w-full' src={attachment.url} controls/>
+                </div>
+            </div>
+        );
+    default:
+        return null;
+    }
+}
+
+interface FeedItemProps {
+    actor: ActorProperties;
+    object: ObjectProperties;
+    layout: string;
+    type: string;
+    last?: boolean;
+}
+
+const FeedItem: React.FC<FeedItemProps> = ({actor, object, layout, type, last}) => {
+    const timestamp =
+        new Date(object?.published ?? new Date()).toLocaleDateString('default', {year: 'numeric', month: 'short', day: '2-digit'}) + ', ' + new Date(object?.published ?? new Date()).toLocaleTimeString('default', {hour: '2-digit', minute: '2-digit'});
+
+    const date = new Date(object?.published ?? new Date());
+
+    const [isClicked, setIsClicked] = useState(false);
+    const [isLiked, setIsLiked] = useState(false);
+
+    const handleLikeClick = (event: React.MouseEvent<HTMLElement> | undefined) => {
+        event?.stopPropagation();
+        setIsClicked(true);
+        setIsLiked(!isLiked);
+        setTimeout(() => setIsClicked(false), 300); // Reset the animation class after 300ms
+    };
+
+    let author = actor;
+    if (type === 'Announce' && object.type === 'Note') {
+        author = typeof object.attributedTo === 'object' ? object.attributedTo as ActorProperties : actor;
+    }
+
+    if (layout === 'feed') {
+        return (
+            <>
+                {object && (
+                    <div className={`group/article relative cursor-pointer pt-5`}>
+                        {(type === 'Announce' && object.type === 'Note') && <div className='z-10 mb-2 flex items-center gap-3 text-grey-700'>
+                            <div className='z-10 flex w-10 justify-end'><Icon colorClass='text-grey-700' name='reload' size={'sm'}></Icon></div>
+                            <span className='z-10'>{actor.name} reposted</span>
+                        </div>}
+                        <div className={`border-1 z-10 -my-1 grid grid-cols-[auto_1fr] grid-rows-[auto_1fr] gap-x-3 gap-y-2 border-b-grey-200 pb-4`} data-test-activity>
+                            <div className='relative z-10 pt-[3px]'>
+                                <APAvatar author={author}/>
+                            </div>
+                            {/* <div className='border-1 z-10 -mt-1 flex w-full flex-col items-start justify-between border-b border-b-grey-200 pb-4' data-test-activity> */}
+                            <div className='relative z-10 flex w-full flex-col overflow-visible text-[1.5rem]'>
+                                <div className='flex'>
+                                    <span className='truncate whitespace-nowrap font-bold' data-test-activity-heading>{author.name}</span>
+                                    <span className='whitespace-nowrap text-grey-700 before:mx-1 before:content-["·"]' title={`${timestamp}`}>{getRelativeTimestamp(date)}</span>
+                                </div>
+                                <div className='flex'>
+                                    <span className='truncate text-grey-700'>{getUsername(author)}</span>
+                                </div>
+                            </div>
+                            <div className={`relative z-10 col-start-2 col-end-3 w-full gap-4`}>
+                                <div className='flex flex-col'>
+                                    {object.name && <Heading className='mb-1 leading-tight' level={4} data-test-activity-heading>{object.name}</Heading>}
+                                    <div dangerouslySetInnerHTML={({__html: object.content})} className='ap-note-content text-pretty text-[1.5rem] text-grey-900'></div>
+                                    {renderFeedAttachment(object, layout)}
+                                    <div className='mt-3 flex gap-2'>
+                                        <Button className={`self-start text-grey-500 transition-all hover:text-grey-800 ${isClicked ? 'bump' : ''} ${isLiked ? 'ap-red-heart text-red *:!fill-red hover:text-red' : ''}`} hideLabel={true} icon='heart' id='like' size='md' unstyled={true} onClick={handleLikeClick}/>
+                                        <span className={`text-grey-800 ${isLiked ? 'opacity-100' : 'opacity-0'}`}>1</span>
+                                    </div>
+                                </div>
+                            </div>
+                            {/* </div> */}
+                        </div>
+                        <div className={`absolute -inset-x-3 -inset-y-0 z-0 rounded transition-colors ${(layout === 'feed') ? 'group-hover/article:bg-grey-75' : ''} `}></div>
+                    </div>
+                )}
+            </>
+        );
+    } else if (layout === 'modal') {
+        return (
+            <>
+                {object && (
+                    <div>
+                        <div className={`group/article relative cursor-pointer`}>
+                            {(type === 'Announce' && object.type === 'Note') && <div className='z-10 mb-2 flex items-center gap-3 text-grey-700'>
+                                <div className='z-10 flex w-10 justify-end'><Icon colorClass='text-grey-700' name='reload' size={'sm'}></Icon></div>
+                                <span className='z-10'>{actor.name} reposted</span>
+                            </div>}
+                            <div className={`z-10 -my-1 grid grid-cols-[auto_1fr] grid-rows-[auto_1fr] gap-3 pb-4`} data-test-activity>
+                                <div className='relative z-10 pt-[3px]'>
+                                    <APAvatar author={author}/>
+                                </div>
+                                {/* <div className='border-1 z-10 -mt-1 flex w-full flex-col items-start justify-between border-b border-b-grey-200 pb-4' data-test-activity> */}
+                                <div className='relative z-10 flex w-full flex-col overflow-visible text-[1.5rem]'>
+                                    <div className='flex'>
+                                        <span className='truncate whitespace-nowrap font-bold' data-test-activity-heading>{author.name}</span>
+                                        <span className='whitespace-nowrap text-grey-700 before:mx-1 before:content-["·"]' title={`${timestamp}`}>{getRelativeTimestamp(date)}</span>
+                                    </div>
+                                    <div className='flex'>
+                                        <span className='truncate text-grey-700'>{getUsername(author)}</span>
+                                    </div>
+                                </div>
+                                <div className={`relative z-10 col-start-1 col-end-3 w-full gap-4`}>
+                                    <div className='flex flex-col'>
+                                        {object.name && <Heading className='mb-1 leading-tight' level={4} data-test-activity-heading>{object.name}</Heading>}
+                                        <div dangerouslySetInnerHTML={({__html: object.content})} className='ap-note-content text-pretty text-[1.6rem] text-grey-900'></div>
+                                        {renderFeedAttachment(object, layout)}
+                                        {/* <div className='mt-3 flex gap-2'>
+                                        <Button className={`self-start text-grey-500 transition-all hover:text-grey-800 ${isClicked ? 'bump' : ''} ${isLiked ? 'ap-red-heart text-red *:!fill-red hover:text-red' : ''}`} hideLabel={true} icon='heart' id='like' size='md' unstyled={true} onClick={handleLikeClick}/>
+                                        <span className={`text-grey-800 ${isLiked ? 'opacity-100' : 'opacity-0'}`}>1</span>
+                                    </div> */}
+                                        <div className='mt-3 flex gap-1'>
+                                            <Button className={`self-start text-grey-900`} hideLabel={true} icon='comment' id='like' size='md' unstyled={true} onClick={handleLikeClick}/>
+                                            <span className={`text-grey-900`}>2</span>
+                                        </div>
+                                    </div>
+                                </div>
+                                {/* </div> */}
+                            </div>
+                            <div className={`absolute -inset-x-3 -inset-y-0 z-0 rounded transition-colors`}></div>
+                        </div>
+                        <div className="mx-[-32px] my-4 h-px w-[120%] bg-grey-200"></div>
+                    </div>
+                    
+                )}
+            </>
+        );
+    } else if (layout === 'reply') {
+        return (
+            <>
+                {object && (
+                    <div className={`group/article relative cursor-pointer pt-5`}>
+                        {(type === 'Announce' && object.type === 'Note') && <div className='z-10 mb-2 flex items-center gap-3 text-grey-700'>
+                            <div className='z-10 flex w-10 justify-end'><Icon colorClass='text-grey-700' name='reload' size={'sm'}></Icon></div>
+                            <span className='z-10'>{actor.name} reposted</span>
+                        </div>}
+                        <div className={`border-1 z-10 -my-1 grid grid-cols-[auto_1fr] grid-rows-[auto_1fr] gap-x-3 gap-y-2 border-b-grey-200 pb-4`} data-test-activity>
+                            <div className='relative z-10 pt-[3px]'>
+                                <APAvatar author={author}/>
+                            </div>
+                            {/* <div className='border-1 z-10 -mt-1 flex w-full flex-col items-start justify-between border-b border-b-grey-200 pb-4' data-test-activity> */}
+                            <div className='relative z-10 flex w-full flex-col overflow-visible text-[1.5rem]'>
+                                <div className='flex'>
+                                    <span className='truncate whitespace-nowrap font-bold' data-test-activity-heading>{author.name}</span>
+                                    <span className='whitespace-nowrap text-grey-700 before:mx-1 before:content-["·"]' title={`${timestamp}`}>{getRelativeTimestamp(date)}</span>
+                                </div>
+                                <div className='flex'>
+                                    <span className='truncate text-grey-700'>{getUsername(author)}</span>
+                                </div>
+                            </div>
+                            <div className={`relative z-10 col-start-2 col-end-3 w-full gap-4`}>
+                                <div className='flex flex-col'>
+                                    {object.name && <Heading className='mb-1 leading-tight' level={4} data-test-activity-heading>{object.name}</Heading>}
+                                    <div dangerouslySetInnerHTML={({__html: object.content})} className='ap-note-content text-pretty text-[1.5rem] text-grey-900'></div>
+                                    {renderFeedAttachment(object, layout)}
+                                    <div className='mt-3 flex gap-1'>
+                                        <Button className={`self-start text-grey-900`} hideLabel={true} icon='comment' id='like' size='md' unstyled={true} onClick={handleLikeClick}/>
+                                        <span className={`text-grey-900`}>1</span>
+                                    </div>
+                                </div>
+                            </div>
+                            {/* </div> */}
+                        </div>
+                        <div className={`absolute -inset-x-3 -inset-y-0 z-0 rounded transition-colors`}></div>
+                        {!last && <div className="absolute bottom-0 left-[18px] top-[6.5rem] z-0 mb-[-9px] w-[2px] rounded-sm bg-grey-200"></div>}
+                    </div>
+                )}
+            </>
+        );
+    } else if (layout === 'inbox') {
+        return (
+            <>
+                {object && (
+                    <div className='group/article relative -mx-4 -mt-px cursor-pointer rounded-md px-4 hover:bg-grey-75'>
+                        <div className='z-10 flex items-start gap-3 py-4 group-hover/article:border-transparent'>
+                            <APAvatar author={author} size='xs'/>
+                            <div className='z-10 w-full'>
+                                <div className='mb-1'>
+                                    <span className='truncate whitespace-nowrap font-semibold' data-test-activity-heading>{author.name}</span>
+                                    <span className='truncate text-grey-700'>&nbsp;{getUsername(author)}</span>
+                                    <span className='whitespace-nowrap text-grey-700 before:mx-1 before:content-["·"]' title={`${timestamp}`}>{getRelativeTimestamp(date)}</span>
+                                </div>
+                                <div className='flex w-full items-start justify-between gap-5'>
+                                    <div className='grow'>
+                                        {object.name && <Heading className='leading-tight' level={5} data-test-activity-heading>{object.name}</Heading>}
+                                        <div dangerouslySetInnerHTML={({__html: object.content})} className='ap-note-content mt-1 line-clamp-3 text-pretty text-[1.5rem] text-grey-900'></div>
+                                    </div>
+                                    {renderInboxAttachment(object)}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                )}
+            </>
+        );
+    }
+
+    return (<></>);
+};
+
+export default FeedItem;
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/components/global/APAvatar.tsx b/apps/admin-x-activitypub/src/components/global/APAvatar.tsx
new file mode 100644
index 00000000000..8b3a23bc9e8
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/global/APAvatar.tsx
@@ -0,0 +1,78 @@
+import React from 'react';
+import {ActorProperties} from '@tryghost/admin-x-framework/api/activitypub';
+import {Icon} from '@tryghost/admin-x-design-system';
+
+type AvatarSize = 'xs' | 'sm' | 'lg';
+export type AvatarBadge = 'user-fill' | 'heart-fill' | undefined;
+
+interface APAvatarProps {
+    author?: ActorProperties;
+    size?: AvatarSize;
+    badge?: AvatarBadge;
+}
+
+const APAvatar: React.FC<APAvatarProps> = ({author, size, badge}) => {
+    let iconSize = 18;
+    let containerClass = '';
+    let imageClass = 'z-10 rounded w-10 h-10';
+    const badgeClass = `w-6 h-6 rounded-full absolute -bottom-2 -right-2 border-2 border-white content-box flex items-center justify-center `;
+    let badgeColor = '';
+
+    switch (badge) {
+    case 'user-fill':
+        badgeColor = ' bg-blue-500';
+        break;
+    case 'heart-fill':
+        badgeColor = ' bg-red-500';
+        break;
+    }
+    
+    switch (size) {
+    case 'xs':
+        iconSize = 12;
+        containerClass = 'z-10 rounded bg-grey-100 flex items-center justify-center p-[3px] w-6 h-6';
+        imageClass = 'z-10 rounded w-6 h-6';
+        break;
+    case 'sm':
+        containerClass = 'z-10 rounded bg-grey-100 flex items-center justify-center p-[10px] w-10 h-10';
+        break;
+    case 'lg':
+        containerClass = 'z-10 rounded bg-grey-100 flex items-center justify-center p-[10px] w-22 h-22';
+        break;
+    default:
+        containerClass = 'z-10 rounded bg-grey-100 flex items-center justify-center p-[10px] w-10 h-10';
+        break;
+    }
+
+    return (
+        <>
+            {author && author.icon?.url ? (
+                <div className='relative'>
+                    <img 
+                        className={imageClass} 
+                        src={author.icon.url}
+                    />
+                    {badge && (
+                        <div className={`${badgeClass} ${badgeColor}`}>
+                            <Icon
+                                colorClass='text-white'
+                                name={badge} 
+                                size='xs'
+                            />
+                        </div>
+                    )}
+                </div>
+            ) : (
+                <div className={containerClass}>
+                    <Icon 
+                        colorClass='text-grey-600' 
+                        name='user' 
+                        size={iconSize} 
+                    />
+                </div>
+            )}
+        </>
+    );
+};
+
+export default APAvatar;
diff --git a/apps/admin-x-activitypub/src/components/inbox/FollowSiteModal.tsx b/apps/admin-x-activitypub/src/components/inbox/FollowSiteModal.tsx
new file mode 100644
index 00000000000..76ea0e4bb2a
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/inbox/FollowSiteModal.tsx
@@ -0,0 +1,75 @@
+import NiceModal from '@ebay/nice-modal-react';
+import {ActivityPubAPI} from '../../api/activitypub';
+import {Modal, TextField, showToast} from '@tryghost/admin-x-design-system';
+import {useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+import {useMutation} from '@tanstack/react-query';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {useState} from 'react';
+
+function useFollow(handle: string, onSuccess: () => void, onError: () => void) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useMutation({
+        async mutationFn(username: string) {
+            return api.follow(username);
+        },
+        onSuccess,
+        onError
+    });
+}
+
+const FollowSite = NiceModal.create(() => {
+    const {updateRoute} = useRouting();
+    const modal = NiceModal.useModal();
+    const [profileName, setProfileName] = useState('');
+    const [errorMessage, setError] = useState(null);
+
+    async function onSuccess() {
+        showToast({
+            message: 'Site followed',
+            type: 'success'
+        });
+
+        modal.remove();
+        updateRoute('');
+    }
+    async function onError() {
+        setError(errorMessage);
+    }
+    const mutation = useFollow('index', onSuccess, onError);
+
+    return (
+        <Modal
+            afterClose={() => {
+                mutation.reset();
+                updateRoute('');
+            }}
+            cancelLabel='Cancel'
+            okLabel='Follow'
+            size='sm'
+            title='Follow a Ghost site'
+            onOk={() => mutation.mutate(profileName)}
+        >
+            <div className='mt-3 flex flex-col gap-4'>
+                <TextField
+                    autoFocus={true}
+                    error={Boolean(errorMessage)}
+                    hint={errorMessage}
+                    placeholder='@username@hostname'
+                    title='Profile name'
+                    value={profileName}
+                    data-test-new-follower
+                    onChange={e => setProfileName(e.target.value)}
+                />
+            </div>
+        </Modal>
+    );
+});
+
+export default FollowSite;
diff --git a/apps/admin-x-activitypub/src/components/modals.tsx b/apps/admin-x-activitypub/src/components/modals.tsx
new file mode 100644
index 00000000000..93361b1c0a8
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/modals.tsx
@@ -0,0 +1,11 @@
+import FollowSite from './inbox/FollowSiteModal';
+import ViewFollowers from './profile/ViewFollowersModal';
+import ViewFollowing from './profile/ViewFollowingModal';
+import {ModalComponent} from '@tryghost/admin-x-framework/routing';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const modals = {FollowSite, ViewFollowing, ViewFollowers} satisfies {[key: string]: ModalComponent<any>};
+
+export default modals;
+
+export type ModalName = keyof typeof modals;
diff --git a/apps/admin-x-activitypub/src/components/navigation/MainHeader.tsx b/apps/admin-x-activitypub/src/components/navigation/MainHeader.tsx
new file mode 100644
index 00000000000..db4ab93ba77
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/navigation/MainHeader.tsx
@@ -0,0 +1,17 @@
+import React, {ReactNode} from 'react';
+
+interface MainHeaderProps {
+    children?: ReactNode;
+}
+
+const MainHeader: React.FC<MainHeaderProps> = ({children}) => {
+    return (
+        <div className='sticky top-0 z-50 border-b border-grey-200 bg-white py-8'>
+            <div className='grid h-8 grid-cols-3'>
+                {children}
+            </div>
+        </div>
+    );
+};
+
+export default MainHeader;
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/components/navigation/MainNavigation.tsx b/apps/admin-x-activitypub/src/components/navigation/MainNavigation.tsx
new file mode 100644
index 00000000000..0d8f72abba8
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/navigation/MainNavigation.tsx
@@ -0,0 +1,63 @@
+import MainHeader from './MainHeader';
+import React, {useEffect, useState} from 'react';
+import {Button, Tooltip} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+interface MainNavigationProps {
+    title?: string;
+    page?: string;
+    onLayoutChange?: (layout: string) => void;
+}
+
+const MainNavigation: React.FC<MainNavigationProps> = ({
+    title = 'Home',
+    page = '',
+    onLayoutChange
+}) => {
+    const {route, updateRoute} = useRouting();
+    const mainRoute = route.split('/')[0];
+    const [layout, setLayout] = useState('inbox');
+
+    useEffect(() => {
+        if (onLayoutChange) {
+            onLayoutChange(layout);
+        }
+    }, [layout, onLayoutChange]);
+
+    return (
+        <MainHeader>
+            <div className='col-[1/2] px-8'>
+                <h2 className='mt-1 text-xl font-bold'>
+                    {title}
+                </h2>
+            </div>
+            <div className='col-[2/3] flex items-center justify-center gap-9'>
+                <Button icon='home' iconColorClass={mainRoute === '' ? 'text-black' : 'text-grey-500'} iconSize={18} unstyled onClick={() => updateRoute('')} />
+                <Button icon='magnifying-glass' iconColorClass={mainRoute === 'search' ? 'text-black' : 'text-grey-500'} iconSize={18} unstyled onClick={() => updateRoute('search')} />
+                <Button icon='bell' iconColorClass={mainRoute === 'activity' ? 'text-black' : 'text-grey-500'} iconSize={18} unstyled onClick={() => updateRoute('activity')} />
+                <Button icon='user' iconColorClass={mainRoute === 'profile' ? 'text-black' : 'text-grey-500'} iconSize={18} unstyled onClick={() => updateRoute('profile')} />
+            </div>
+            <div className='col-[3/4] flex items-center justify-end gap-2 px-8'>
+                {page === 'home' &&
+                <div className='mr-3'>
+                    <Tooltip content="Inbox">
+                        <Button className='!px-2' icon='listview' iconColorClass={layout === 'inbox' ? 'text-black' : 'text-grey-400'} size='sm' onClick={() => {
+                            setLayout('inbox');
+                        }} />
+                    </Tooltip>
+                    <Tooltip content="Feed">
+                        <Button className='!px-2' icon='card-list' iconColorClass={layout === 'feed' ? 'text-black' : 'text-grey-400'} size='sm' onClick={() => {
+                            setLayout('feed');
+                        }} />
+                    </Tooltip>
+                </div>
+                }
+                <Button color='black' icon='add' label="Follow" onClick={() => {
+                    updateRoute('follow-site');
+                }} />
+            </div>
+        </MainHeader>
+    );
+};
+
+export default MainNavigation;
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/components/profile/ViewFollowersModal.tsx b/apps/admin-x-activitypub/src/components/profile/ViewFollowersModal.tsx
new file mode 100644
index 00000000000..db0dd424f34
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/profile/ViewFollowersModal.tsx
@@ -0,0 +1,74 @@
+import NiceModal from '@ebay/nice-modal-react';
+import getUsername from '../../utils/get-username';
+import {ActivityPubAPI} from '../../api/activitypub';
+import {Avatar, Button, List, ListItem, Modal} from '@tryghost/admin-x-design-system';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+import {useMutation, useQuery} from '@tanstack/react-query';
+
+function useFollowersForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`followers:${handle}`],
+        async queryFn() {
+            return api.getFollowers();
+        }
+    });
+}
+
+function useFollow(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useMutation({
+        async mutationFn(username: string) {
+            return api.follow(username);
+        }
+    });
+}
+
+const ViewFollowersModal: React.FC<RoutingModalProps> = ({}) => {
+    const {updateRoute} = useRouting();
+    // const modal = NiceModal.useModal();
+    const mutation = useFollow('index');
+
+    const {data: items = []} = useFollowersForUser('index');
+
+    const followers = Array.isArray(items) ? items : [items];
+    return (
+        <Modal
+            afterClose={() => {
+                mutation.reset();
+                updateRoute('profile');
+            }}
+            cancelLabel=''
+            footer={false}
+            okLabel=''
+            size='md'
+            title='Followers'
+            topRightContent='close'
+        >
+            <div className='mt-3 flex flex-col gap-4 pb-12'>
+                <List>
+                    {followers.map(item => (
+                        <ListItem action={<Button color='grey' label='Follow back' link={true} onClick={() => mutation.mutate(getUsername(item))} />} avatar={<Avatar image={item.icon} size='sm' />} detail={getUsername(item)} id='list-item' title={item.name}></ListItem>
+                    ))}
+                </List>
+            </div>
+        </Modal>
+    );
+};
+
+export default NiceModal.create(ViewFollowersModal);
diff --git a/apps/admin-x-activitypub/src/components/profile/ViewFollowingModal.tsx b/apps/admin-x-activitypub/src/components/profile/ViewFollowingModal.tsx
new file mode 100644
index 00000000000..6b58dc94bd2
--- /dev/null
+++ b/apps/admin-x-activitypub/src/components/profile/ViewFollowingModal.tsx
@@ -0,0 +1,71 @@
+import NiceModal from '@ebay/nice-modal-react';
+import getUsername from '../../utils/get-username';
+import {ActivityPubAPI} from '../../api/activitypub';
+import {Avatar, Button, List, ListItem, Modal} from '@tryghost/admin-x-design-system';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+import {useQuery} from '@tanstack/react-query';
+
+function useFollowingForUser(handle: string) {
+    const site = useBrowseSite();
+    const siteData = site.data?.site;
+    const siteUrl = siteData?.url ?? window.location.origin;
+    const api = new ActivityPubAPI(
+        new URL(siteUrl),
+        new URL('/ghost/api/admin/identities/', window.location.origin),
+        handle
+    );
+    return useQuery({
+        queryKey: [`following:${handle}`],
+        async queryFn() {
+            return api.getFollowing();
+        }
+    });
+}
+
+const ViewFollowingModal: React.FC<RoutingModalProps> = ({}) => {
+    const {updateRoute} = useRouting();
+
+    const {data: items = []} = useFollowingForUser('index');
+
+    const following = Array.isArray(items) ? items : [items];
+    return (
+        <Modal
+            afterClose={() => {
+                updateRoute('profile');
+            }}
+            cancelLabel=''
+            footer={false}
+            okLabel=''
+            size='md'
+            title='Following'
+            topRightContent='close'
+        >
+            <div className='mt-3 flex flex-col gap-4 pb-12'>
+                <List>
+                    {following.map(item => (
+                        <ListItem action={<Button color='grey' label='Unfollow' link={true} />} avatar={<Avatar image={item.icon} size='sm' />} detail={getUsername(item)} id='list-item' title={item.name}></ListItem>
+                    ))}
+                </List>
+                {/* <Table>
+                    <TableRow>
+                        <TableCell>
+                            <div className='group flex items-center gap-3 hover:cursor-pointer'>
+                                <div className={`flex grow flex-col`}>
+                                    <div className="mb-0.5 flex items-center gap-3">
+                                        <img className='w-5' src='https://www.platformer.news/content/images/size/w256h256/2024/05/Logomark_Blue_800px.png'/>
+                                        <span className='line-clamp-1 font-medium'>Platformer Platformer Platformer Platformer Platformer</span>
+                                        <span className='line-clamp-1'>@index@platformerplatformerplatformerplatformer.news</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </TableCell>
+                        <TableCell className='w-[1%] whitespace-nowrap'><div className='mt-1 whitespace-nowrap text-right text-sm text-grey-700'>Unfollow</div></TableCell>
+                    </TableRow>
+                </Table> */}
+            </div>
+        </Modal>
+    );
+};
+
+export default NiceModal.create(ViewFollowingModal);
diff --git a/apps/admin-x-activitypub/src/index.tsx b/apps/admin-x-activitypub/src/index.tsx
new file mode 100644
index 00000000000..cb20f2b5899
--- /dev/null
+++ b/apps/admin-x-activitypub/src/index.tsx
@@ -0,0 +1,6 @@
+import './styles/index.css';
+import App from './App';
+
+export {
+    App as AdminXApp
+};
diff --git a/apps/admin-x-activitypub/src/standalone.tsx b/apps/admin-x-activitypub/src/standalone.tsx
new file mode 100644
index 00000000000..dd723c833c7
--- /dev/null
+++ b/apps/admin-x-activitypub/src/standalone.tsx
@@ -0,0 +1,5 @@
+import './styles/index.css';
+import App from './App.tsx';
+import renderStandaloneApp from '@tryghost/admin-x-framework/test/render';
+
+renderStandaloneApp(App, {});
diff --git a/apps/admin-x-activitypub/src/styles/index.css b/apps/admin-x-activitypub/src/styles/index.css
new file mode 100644
index 00000000000..d9a471ebfb4
--- /dev/null
+++ b/apps/admin-x-activitypub/src/styles/index.css
@@ -0,0 +1,39 @@
+@import '@tryghost/admin-x-design-system/styles.css';
+
+.admin-x-base.admin-x-activitypub {
+    animation-name: none;
+}
+
+@keyframes bump {
+    0% {
+      transform: scale(1);
+    }
+    50% {
+      transform: scale(1.1);
+    }
+    100% {
+      transform: scale(1);
+    }
+  }
+  
+.bump {
+animation: bump 0.3s ease-in-out;
+}
+
+.ap-red-heart path {
+    fill: #F50B23;
+}
+
+.ap-note-content a {
+  color: rgb(236 72 153) !important;
+}
+
+.ap-note-content a:hover {
+  color: rgb(190, 25, 99) !important;
+  text-decoration: underline !important;
+}
+
+.ap-note-content p + p {
+  margin-top: 1.5rem !important;
+}
+
diff --git a/apps/admin-x-activitypub/src/utils/get-relative-timestamp.ts b/apps/admin-x-activitypub/src/utils/get-relative-timestamp.ts
new file mode 100644
index 00000000000..b36554270f0
--- /dev/null
+++ b/apps/admin-x-activitypub/src/utils/get-relative-timestamp.ts
@@ -0,0 +1,33 @@
+export const getRelativeTimestamp = (date: Date): string => {
+    const now = new Date();
+    const seconds = Math.floor((now.getTime() - date.getTime()) / 1000);
+  
+    let interval = Math.floor(seconds / 31536000);
+    if (interval >= 1) {
+        return `${interval}y`;
+    }
+  
+    interval = Math.floor(seconds / 2592000);
+    if (interval >= 1) {
+        return `${interval}m`;
+    }
+  
+    interval = Math.floor(seconds / 86400);
+    if (interval >= 1) {
+        return `${interval}d`;
+    }
+  
+    interval = Math.floor(seconds / 3600);
+    if (interval >= 1) {
+        return `${interval}h`;
+    }
+  
+    interval = Math.floor(seconds / 60);
+    if (interval >= 1) {
+        return `${interval}m`;
+    }
+  
+    return `${seconds} seconds`;
+};
+
+export default getRelativeTimestamp;
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/src/utils/get-username.ts b/apps/admin-x-activitypub/src/utils/get-username.ts
new file mode 100644
index 00000000000..2fd6099e337
--- /dev/null
+++ b/apps/admin-x-activitypub/src/utils/get-username.ts
@@ -0,0 +1,12 @@
+function getUsername(actor: {preferredUsername: string; id: string|null;}) {
+    if (!actor.preferredUsername || !actor.id) {
+        return '@unknown@unknown';
+    }
+    try {
+        return `@${actor.preferredUsername}@${(new URL(actor.id)).hostname}`;
+    } catch (err) {
+        return '@unknown@unknown';
+    }
+}
+
+export default getUsername;
diff --git a/apps/admin-x-activitypub/tailwind.config.cjs b/apps/admin-x-activitypub/tailwind.config.cjs
new file mode 100644
index 00000000000..c85c4230ddb
--- /dev/null
+++ b/apps/admin-x-activitypub/tailwind.config.cjs
@@ -0,0 +1,6 @@
+const adminXPreset = require('@tryghost/admin-x-design-system/tailwind.cjs');
+
+module.exports = {
+    presets: [adminXPreset('.admin-x-activitypub')],
+    content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}', '../../node_modules/@tryghost/admin-x-design-system/es/**/*.{js,ts,jsx,tsx}']
+};
\ No newline at end of file
diff --git a/apps/admin-x-activitypub/test/.eslintrc.cjs b/apps/admin-x-activitypub/test/.eslintrc.cjs
new file mode 100644
index 00000000000..42f8e77355a
--- /dev/null
+++ b/apps/admin-x-activitypub/test/.eslintrc.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/ts-test'
+    ]
+};
diff --git a/apps/admin-x-activitypub/test/acceptance/app.test.ts b/apps/admin-x-activitypub/test/acceptance/app.test.ts
new file mode 100644
index 00000000000..90fa60d8428
--- /dev/null
+++ b/apps/admin-x-activitypub/test/acceptance/app.test.ts
@@ -0,0 +1,10 @@
+import {expect, test} from '@playwright/test';
+// import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('Demo', async () => {
+    test('Renders the list page', async ({page}) => {
+        await page.goto('/');
+
+        await expect(page.locator('body')).toContainText('ActivityPub Inbox');
+    });
+});
diff --git a/apps/admin-x-activitypub/test/acceptance/listIndex.test.ts b/apps/admin-x-activitypub/test/acceptance/listIndex.test.ts
new file mode 100644
index 00000000000..8e855d1e215
--- /dev/null
+++ b/apps/admin-x-activitypub/test/acceptance/listIndex.test.ts
@@ -0,0 +1,52 @@
+import {expect, test} from '@playwright/test';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('ListIndex', async () => {
+    test('Renders the list page', async ({page}) => {
+        const userId = 'index';
+        await mockApi({
+            page,
+            requests: {
+                useBrowseInboxForUser: {method: 'GET', path: `/inbox/${userId}`, response: responseFixtures.activitypubInbox},
+                useBrowseFollowingForUser: {method: 'GET', path: `/following/${userId}`, response: responseFixtures.activitypubFollowing}
+            },
+            options: {useActivityPub: true}
+        });
+
+        // Printing browser consol logs
+        page.on('console', (msg) => {
+            console.log(`Browser console log: ${msg.type()}: ${msg.text()}`); /* eslint-disable-line no-console */
+        });
+
+        await page.goto('/');
+
+        await expect(page.locator('body')).toContainText('ActivityPub Inbox');
+
+        // following list
+        const followingUser = await page.locator('[data-test-following] > li').textContent();
+        await expect(followingUser).toEqual('@index@main.ghost.org');
+        const followingCount = await page.locator('[data-test-following-count]').textContent();
+        await expect(followingCount).toEqual('1');
+
+        // following button
+        const followingList = await page.locator('[data-test-following-modal]');
+        await expect(followingList).toBeVisible();
+
+        // activities
+        const activity = await page.locator('[data-test-activity-heading]').textContent();
+        await expect(activity).toEqual('Testing ActivityPub');
+
+        // click on article
+        const articleBtn = await page.locator('[data-test-view-article]');
+        await articleBtn.click();
+
+        // article is expanded
+        const frameLocator = page.frameLocator('#gh-ap-article-iframe');
+        const textElement = await frameLocator.locator('[data-test-article-heading]').innerText();
+        expect(textElement).toContain('Testing ActivityPub');
+
+        // go back to list
+        const backBtn = await page.locator('[data-test-back-button]');
+        await backBtn.click();
+    });
+});
diff --git a/apps/admin-x-activitypub/test/unit/utils/get-username.test.tsx b/apps/admin-x-activitypub/test/unit/utils/get-username.test.tsx
new file mode 100644
index 00000000000..8ca868b1c9b
--- /dev/null
+++ b/apps/admin-x-activitypub/test/unit/utils/get-username.test.tsx
@@ -0,0 +1,36 @@
+import getUsername from '../../../src/utils/get-username';
+
+describe('getUsername', function () {
+    it('returns the formatted username', async function () {
+        const user = {
+            preferredUsername: 'index',
+            id: 'https://www.platformer.news/'
+        };
+
+        const result = getUsername(user);
+
+        expect(result).toBe('@index@www.platformer.news');
+    });
+
+    it('returns a default username if the user object is missing data', async function () {
+        const user = {
+            preferredUsername: '',
+            id: ''
+        };
+
+        const result = getUsername(user);
+
+        expect(result).toBe('@unknown@unknown');
+    });
+
+    it('returns a default username if url parsing fails', async function () {
+        const user = {
+            preferredUsername: 'index',
+            id: 'not-a-url'
+        };
+
+        const result = getUsername(user);
+
+        expect(result).toBe('@unknown@unknown');
+    });
+});
diff --git a/apps/admin-x-activitypub/tsconfig.json b/apps/admin-x-activitypub/tsconfig.json
new file mode 100644
index 00000000000..585a4118825
--- /dev/null
+++ b/apps/admin-x-activitypub/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+    "types": ["vite/client", "jest"],
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src", "test"]
+}
diff --git a/apps/admin-x-activitypub/vite.config.mjs b/apps/admin-x-activitypub/vite.config.mjs
new file mode 100644
index 00000000000..25210751192
--- /dev/null
+++ b/apps/admin-x-activitypub/vite.config.mjs
@@ -0,0 +1,18 @@
+import adminXViteConfig from '@tryghost/admin-x-framework/vite';
+import pkg from './package.json';
+import {resolve} from 'path';
+
+export default (function viteConfig() {
+    return adminXViteConfig({
+        packageName: pkg.name,
+        entry: resolve(__dirname, 'src/index.tsx'),
+        overrides: {
+            test: {
+                include: [
+                    './test/unit/**/*',
+                    './src/**/*.test.ts'
+                ]
+            }
+        }
+    });
+});
diff --git a/apps/admin-x-demo/.eslintignore b/apps/admin-x-demo/.eslintignore
new file mode 100644
index 00000000000..9944eccea22
--- /dev/null
+++ b/apps/admin-x-demo/.eslintignore
@@ -0,0 +1 @@
+tailwind.config.cjs
diff --git a/apps/admin-x-demo/.eslintrc.cjs b/apps/admin-x-demo/.eslintrc.cjs
new file mode 100644
index 00000000000..919b0f2cdf6
--- /dev/null
+++ b/apps/admin-x-demo/.eslintrc.cjs
@@ -0,0 +1,56 @@
+/* eslint-env node */
+module.exports = {
+    root: true,
+    extends: [
+        'plugin:ghost/ts',
+        'plugin:react/recommended',
+        'plugin:react-hooks/recommended'
+    ],
+    plugins: [
+        'ghost',
+        'react-refresh',
+        'tailwindcss'
+    ],
+    settings: {
+        react: {
+            version: 'detect'
+        }
+    },
+    rules: {
+        // sort multiple import lines into alphabetical groups
+        'ghost/sort-imports-es6-autofix/sort-imports-es6': ['error', {
+            memberSyntaxSortOrder: ['none', 'all', 'single', 'multiple']
+        }],
+
+        // TODO: re-enable this (maybe fixed fast refresh?)
+        'react-refresh/only-export-components': 'off',
+
+        // 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',
+
+        // TODO: re-enable these if deemed useful
+        '@typescript-eslint/no-non-null-assertion': 'off',
+        '@typescript-eslint/no-empty-function': 'off',
+
+        // custom react rules
+        '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-demo/.gitignore b/apps/admin-x-demo/.gitignore
new file mode 100644
index 00000000000..68565785a7f
--- /dev/null
+++ b/apps/admin-x-demo/.gitignore
@@ -0,0 +1,3 @@
+dist
+playwright-report
+test-results
diff --git a/apps/admin-x-demo/index.html b/apps/admin-x-demo/index.html
new file mode 100644
index 00000000000..60bd860b4a7
--- /dev/null
+++ b/apps/admin-x-demo/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>AdminX Standalone</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/standalone.tsx"></script>
+</body>
+</html>
diff --git a/apps/admin-x-demo/package.json b/apps/admin-x-demo/package.json
new file mode 100644
index 00000000000..a314be47621
--- /dev/null
+++ b/apps/admin-x-demo/package.json
@@ -0,0 +1,62 @@
+{
+  "name": "@tryghost/admin-x-demo",
+  "version": "0.0.20",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/TryGhost/Ghost/tree/main/apps/admin-x-demo"
+  },
+  "author": "Ghost Foundation",
+  "files": [
+    "LICENSE",
+    "README.md",
+    "dist/"
+  ],
+  "main": "./dist/admin-x-demo.umd.cjs",
+  "module": "./dist/admin-x-demo.js",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "dev": "vite build --watch",
+    "dev:start": "vite",
+    "build": "tsc && vite build",
+    "lint": "yarn run lint:code && yarn run lint:test",
+    "lint:code": "eslint --ext .js,.ts,.cjs,.tsx --cache src",
+    "lint:test": "eslint -c test/.eslintrc.cjs --ext .js,.ts,.cjs,.tsx --cache test",
+    "test:unit": "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"
+  },
+  "devDependencies": {
+    "@testing-library/react": "14.3.1",
+    "@tryghost/admin-x-design-system": "0.0.0",
+    "@tryghost/admin-x-framework": "0.0.0",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
+  },
+  "nx": {
+    "targets": {
+      "dev": {
+        "dependsOn": [
+          "^build"
+        ]
+      },
+      "test:unit": {
+        "dependsOn": [
+          "^build"
+        ]
+      },
+      "test:acceptance": {
+        "dependsOn": [
+          "^build"
+        ]
+      }
+    }
+  }
+}
diff --git a/apps/admin-x-demo/playwright.config.mjs b/apps/admin-x-demo/playwright.config.mjs
new file mode 100644
index 00000000000..8fa59553e54
--- /dev/null
+++ b/apps/admin-x-demo/playwright.config.mjs
@@ -0,0 +1,3 @@
+import {adminXPlaywrightConfig} from '@tryghost/admin-x-framework/playwright';
+
+export default adminXPlaywrightConfig();
diff --git a/apps/admin-x-demo/postcss.config.cjs b/apps/admin-x-demo/postcss.config.cjs
new file mode 100644
index 00000000000..8799f4acf82
--- /dev/null
+++ b/apps/admin-x-demo/postcss.config.cjs
@@ -0,0 +1 @@
+module.exports = require('@tryghost/admin-x-design-system/postcss.config.cjs');
diff --git a/apps/admin-x-demo/src/App.tsx b/apps/admin-x-demo/src/App.tsx
new file mode 100644
index 00000000000..b39172f6792
--- /dev/null
+++ b/apps/admin-x-demo/src/App.tsx
@@ -0,0 +1,30 @@
+import MainContent from './MainContent';
+import {DesignSystemApp, DesignSystemAppProps} from '@tryghost/admin-x-design-system';
+import {FrameworkProvider, TopLevelFrameworkProps} from '@tryghost/admin-x-framework';
+import {RoutingProvider} from '@tryghost/admin-x-framework/routing';
+
+interface AppProps {
+    framework: TopLevelFrameworkProps;
+    designSystem: DesignSystemAppProps;
+}
+
+const modals = {
+    paths: {
+        'demo-modal': 'DemoModal'
+    },
+    load: async () => import('./components/modals')
+};
+
+const App: React.FC<AppProps> = ({framework, designSystem}) => {
+    return (
+        <FrameworkProvider {...framework}>
+            <RoutingProvider basePath='demo-x' modals={modals}>
+                <DesignSystemApp className='admin-x-demo' {...designSystem}>
+                    <MainContent />
+                </DesignSystemApp>
+            </RoutingProvider>
+        </FrameworkProvider>
+    );
+};
+
+export default App;
diff --git a/apps/admin-x-demo/src/DetailPage.tsx b/apps/admin-x-demo/src/DetailPage.tsx
new file mode 100644
index 00000000000..d93365cda81
--- /dev/null
+++ b/apps/admin-x-demo/src/DetailPage.tsx
@@ -0,0 +1,147 @@
+import {Avatar, Breadcrumbs, Button, Heading, Page, Toggle, ViewContainer} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+const DetailPage: React.FC = () => {
+    const {updateRoute} = useRouting();
+
+    return (
+        <Page
+            breadCrumbs={
+                <Breadcrumbs
+                    items={[
+                        {
+                            label: 'Members',
+                            onClick: () => {
+                                updateRoute('');
+                            }
+                        },
+                        {
+                            label: 'Emerson Vaccaro'
+                        }
+                    ]}
+                    onBack={() => {
+                        updateRoute('');
+                    }}
+                />
+            }
+            fullBleedPage={false}
+        >
+            <ViewContainer
+                firstOnPage={false}
+                headerContent={
+                    <div>
+                        <Avatar bgColor='#A5D5F7' image='https://i.pravatar.cc/150' label='EV' labelColor='white' size='2xl' />
+                        <Heading className='mt-2' level={1}>Emerson Vaccaro</Heading>
+                        <div className=''>Colombus, OH</div>
+                    </div>
+                }
+                primaryAction={
+                    {
+                        icon: 'ellipsis',
+                        color: 'outline'
+                    }
+                }
+                type='page'
+            >
+                <div className='grid grid-cols-3 border-b border-grey-200 pb-5 tablet:grid-cols-4'>
+                    <div className='col-span-3 -ml-5 mb-5 hidden h-full gap-4 px-5 tablet:!visible tablet:col-span-1 tablet:mb-0 tablet:!flex tablet:flex-col tablet:gap-0'>
+                        <span>Last seen on <strong>22 June 2023</strong></span>
+                        <span className='tablet:mt-2'>Created on <strong>27 Jan 2021</strong></span>
+                    </div>
+                    <div className='flex h-full flex-col tablet:px-5'>
+                        <Heading level={6}>Emails received</Heading>
+                        <span className='mt-1 text-4xl font-bold leading-none'>181</span>
+                    </div>
+                    <div className='flex h-full flex-col tablet:px-5'>
+                        <Heading level={6}>Emails opened</Heading>
+                        <span className='mt-1 text-4xl font-bold leading-none'>104</span>
+                    </div>
+                    <div className='-mr-5 flex h-full flex-col tablet:px-5'>
+                        <Heading level={6}>Average open rate</Heading>
+                        <span className='mt-1 text-4xl font-bold leading-none'>57%</span>
+                    </div>
+                </div>
+                <div className='grid grid-cols-2 items-baseline border-b border-grey-200 py-5 tablet:grid-cols-4'>
+                    <div className='-ml-5 flex h-full flex-col gap-6 border-r border-grey-200 px-5'>
+                        <div className='flex justify-between'>
+                            <Heading level={5}>Member data</Heading>
+                            <Button color='green' label='Edit' link />
+                        </div>
+                        <div>
+                            <Heading level={6}>Name</Heading>
+                            <div>Emerson Vaccaro</div>
+                        </div>
+                        <div>
+                            <Heading level={6}>Email</Heading>
+                            <div>emerson@vaccaro.com</div>
+                        </div>
+                        <div>
+                            <Heading level={6}>Labels</Heading>
+                            <div className='mt-2 flex gap-1'>
+                                <div className='inline-block rounded-sm bg-grey-200 px-1.5 text-xs font-medium'>VIP</div>
+                                <div className='inline-block rounded-sm bg-grey-200 px-1.5 text-xs font-medium'>Inner Circle</div>
+                            </div>
+                        </div>
+                        <div>
+                            <Heading level={6}>Notes</Heading>
+                            <div className='text-grey-500'>No notes.</div>
+                        </div>
+                    </div>
+                    <div className='flex h-full flex-col gap-6 border-grey-200 px-5 tablet:border-r'>
+                        <Heading level={5}>Newsletters</Heading>
+                        <div className='flex flex-col gap-3'>
+                            <div className='flex items-center gap-2'>
+                                <Toggle />
+                                <span>Daily news</span>
+                            </div>
+                            <div className='flex items-center gap-2'>
+                                <Toggle />
+                                <span>Weekly roundup</span>
+                            </div>
+                            <div className='flex items-center gap-2'>
+                                <Toggle checked />
+                                <span>The Inner Circle</span>
+                            </div>
+                            <div className='mt-5 rounded border border-red p-4 text-sm text-red'>
+                                This member cannot receive emails due to permanent failure (bounce).
+                            </div>
+                        </div>
+                    </div>
+                    <div className='-ml-5 flex h-full flex-col gap-6 border-r border-grey-200 px-5 pt-10 tablet:ml-0 tablet:pt-0'>
+                        <Heading level={5}>Subscriptions</Heading>
+                        <div className='flex items-center gap-3'>
+                            <div className='flex h-16 w-16 flex-col items-center justify-center rounded-md bg-grey-200'>
+                                <Heading level={5}>$5</Heading>
+                                <span className='text-xs text-grey-700'>Yearly</span>
+                            </div>
+                            <div className='flex flex-col'>
+                                <span className='font-semibold'>Gold</span>
+                                <span className='text-sm text-grey-500'>Renews 21 Jan 2024</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div className='-mr-5 flex h-full flex-col gap-6 px-5 pt-10 tablet:pt-0'>
+                        <div className='flex justify-between'>
+                            <Heading level={5}>Activity</Heading>
+                            <Button color='green' label='View all' link />
+                        </div>
+                        <div className='flex flex-col text-sm'>
+                            <span className='font-semibold'>Logged in</span>
+                            <span className='text-sm text-grey-500'>13 days ago</span>
+                        </div>
+                        <div className='flex flex-col text-sm'>
+                            <span className='font-semibold'>Subscribed to Daily News</span>
+                            <span className='text-sm text-grey-500'>17 days ago</span>
+                        </div>
+                        <div className='flex flex-col text-sm'>
+                            <span className='font-semibold'>Logged in</span>
+                            <span className='text-sm text-grey-500'>21 days ago</span>
+                        </div>
+                    </div>
+                </div>
+            </ViewContainer>
+        </Page>
+    );
+};
+
+export default DetailPage;
diff --git a/apps/admin-x-demo/src/ListPage.tsx b/apps/admin-x-demo/src/ListPage.tsx
new file mode 100644
index 00000000000..5432c8f570d
--- /dev/null
+++ b/apps/admin-x-demo/src/ListPage.tsx
@@ -0,0 +1,246 @@
+import {Avatar, Button, ButtonGroup, DynamicTable, DynamicTableColumn, DynamicTableRow, Heading, Hint, Page, SortMenu, Tooltip, ViewContainer, showToast} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {useState} from 'react';
+
+const ListPage = () => {
+    const {updateRoute} = useRouting();
+    const [view, setView] = useState<string>('list');
+
+    const dummyActions = [
+        <Button label='Filter' onClick={() => {
+            showToast({message: 'Were you really expecting a filter? 😛'});
+        }} />,
+        <SortMenu
+            direction='desc'
+            items={[
+                {
+                    id: 'date-added',
+                    label: 'Date added',
+                    selected: true
+                },
+                {
+                    id: 'name',
+                    label: 'Name'
+                },
+                {
+                    id: 'redemptions',
+                    label: 'Open Rate'
+                }
+            ]}
+            position="start"
+            onDirectionChange={() => {}}
+            onSortChange={() => {}}
+        />,
+        <Tooltip content="Search members">
+            <Button icon='magnifying-glass' size='sm' onClick={() => {
+                alert('Clicked search');
+            }} />
+        </Tooltip>,
+        <ButtonGroup buttons={[
+            {
+                icon: 'listview',
+                size: 'sm',
+                iconColorClass: (view === 'list' ? 'text-black' : 'text-grey-500'),
+                onClick: () => {
+                    setView('list');
+                }
+            },
+            {
+                icon: 'cardview',
+                size: 'sm',
+                iconColorClass: (view === 'card' ? 'text-black' : 'text-grey-500'),
+                onClick: () => {
+                    setView('card');
+                }
+            }
+        ]} clearBg={false} link />
+    ];
+
+    const testColumns: DynamicTableColumn[] = [
+        {
+            title: 'Member',
+            noWrap: true,
+            minWidth: '1%',
+            maxWidth: '1%'
+        },
+        {
+            title: 'Status'
+        },
+        {
+            title: 'Open rate'
+        },
+        {
+            title: 'Location',
+            noWrap: true
+        },
+        {
+            title: 'Created',
+            noWrap: true
+        },
+        {
+            title: 'Signed up on post',
+            noWrap: true,
+            maxWidth: '150px'
+        },
+        {
+            title: 'Newsletter'
+        },
+        {
+            title: 'Billing period'
+        },
+        {
+            title: 'Email sent'
+        },
+        {
+            title: '',
+            hidden: true,
+            disableRowClick: true
+        }
+    ];
+
+    const testRows = (noOfRows: number) => {
+        const data: DynamicTableRow[] = [];
+        for (let i = 0; i < noOfRows; i++) {
+            data.push(
+                {
+                    onClick: () => {
+                        updateRoute('detail');
+                    },
+                    cells: [
+                        (<div className='flex items-center gap-3 whitespace-nowrap pr-10'>
+                            <Avatar image={`https://i.pravatar.cc/150?img=${i}`} />
+                            <div>
+                                {i % 3 === 0 && <div className='whitespace-nowrap text-md'>Jamie Larson</div>}
+                                {i % 3 === 1 && <div className='whitespace-nowrap text-md'>Giana Septimus</div>}
+                                {i % 3 === 2 && <div className='whitespace-nowrap text-md'>Zaire Bator</div>}
+                                <div className='text-grey-700'>jamie@larson.com</div>
+                            </div>
+                        </div>),
+                        'Free',
+                        '40%',
+                        'London, UK',
+                        <div>
+                            <div>22 June 2023</div>
+                            <div className='text-grey-500'>5 months ago</div>
+                        </div>,
+                        'Lorem ipsum dolor sit amet, consectetur adipiscing elit',
+                        'Subscribed',
+                        'Monthly',
+                        '1,303',
+                        <Button color='green' label='Edit' link onClick={() => {
+                            alert('Clicked Edit in row:' + i);
+                        }} />
+                    ]
+                }
+            );
+        }
+        return data;
+    };
+
+    const dummyCards = (noOfCards: number) => {
+        const cards = [];
+
+        for (let i = 0; i < noOfCards; i++) {
+            cards.push(
+                <div className='flex min-h-[20vh] cursor-pointer flex-col items-center gap-5 rounded-sm bg-grey-100 p-7 pt-9 transition-all hover:bg-grey-200' onClick={() => {
+                    updateRoute('detail');
+                }}>
+                    <Avatar image={`https://i.pravatar.cc/150?img=${i}`} size='xl' />
+                    <div className='flex flex-col items-center'>
+                        <Heading level={5}>
+                            {i % 3 === 0 && 'Jamie Larson'}
+                            {i % 3 === 1 && 'Giana Septimus'}
+                            {i % 3 === 2 && 'Zaire Bator'}
+                        </Heading>
+                        <div className='mt-1 text-sm text-grey-700'>
+                            {i % 3 === 0 && 'jamie@larson.com'}
+                            {i % 3 === 1 && 'giana@septimus.com'}
+                            {i % 3 === 2 && 'zaire@bator.com'}
+                        </div>
+                    </div>
+                    <div className='flex w-full flex-col gap-4 border-t border-grey-300 pt-5'>
+                        {i % 3 === 0 && (<>
+                            <div className='flex gap-4'>
+                                <div className='basis-1/2 text-center'>
+                                    <Heading level={6}>Open rate</Heading>
+                                    <div className='text-lg'>83%</div>
+                                </div>
+                                <div className='basis-1/2 text-center'>
+                                    <Heading level={6}>Click rate</Heading>
+                                    <div className='text-lg'>19%</div>
+                                </div>
+                            </div>
+                        </>)}
+                        {i % 3 === 1 && (<>
+                            <div className='flex gap-4'>
+                                <div className='basis-1/2 text-center'>
+                                    <Heading level={6}>Open rate</Heading>
+                                    <div className='text-lg'>68%</div>
+                                </div>
+                                <div className='basis-1/2 text-center'>
+                                    <Heading level={6}>Click rate</Heading>
+                                    <div className='text-lg'>21%</div>
+                                </div>
+                            </div>
+                        </>)}
+                        {i % 3 === 2 && (<>
+                            <div className='flex gap-4'>
+                                <div className='basis-1/2 text-center'>
+                                    <Heading level={6}>Open rate</Heading>
+                                    <div className='text-lg'>89%</div>
+                                </div>
+                                <div className='basis-1/2 text-center'>
+                                    <Heading level={6}>Click rate</Heading>
+                                    <div className='text-lg'>34%</div>
+                                </div>
+                            </div>
+                        </>)}
+                    </div>
+                </div>
+            );
+        }
+        return cards;
+    };
+
+    let contents = <></>;
+    switch (view) {
+    case 'list':
+        contents = <DynamicTable
+            cellClassName='text-sm'
+            columns={testColumns}
+            footer={
+                <Hint>30 members</Hint>
+            }
+            rows={testRows(30)}
+            stickyFooter
+            stickyHeader
+        />;
+        break;
+    case 'card':
+        contents = <div className='grid grid-cols-4 gap-8 py-8'>{dummyCards(30)}</div>;
+        break;
+    }
+
+    const demoPage = (
+        <Page>
+            <ViewContainer
+                actions={dummyActions}
+                primaryAction={{
+                    title: 'About',
+                    onClick: () => {
+                        updateRoute('demo-modal');
+                    }
+                }}
+                title='AdminX Demo App'
+                toolbarBorder={view === 'card'}
+                type='page'
+            >
+                {contents}
+            </ViewContainer>
+        </Page>
+    );
+
+    return demoPage;
+};
+
+export default ListPage;
diff --git a/apps/admin-x-demo/src/MainContent.tsx b/apps/admin-x-demo/src/MainContent.tsx
new file mode 100644
index 00000000000..060411d46db
--- /dev/null
+++ b/apps/admin-x-demo/src/MainContent.tsx
@@ -0,0 +1,15 @@
+import DetailPage from './DetailPage';
+import ListPage from './ListPage';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+const MainContent = () => {
+    const {route} = useRouting();
+
+    if (route === 'detail') {
+        return <DetailPage />;
+    } else {
+        return <ListPage />;
+    }
+};
+
+export default MainContent;
diff --git a/apps/admin-x-demo/src/components/DemoModal.tsx b/apps/admin-x-demo/src/components/DemoModal.tsx
new file mode 100644
index 00000000000..68b8b3c0ad8
--- /dev/null
+++ b/apps/admin-x-demo/src/components/DemoModal.tsx
@@ -0,0 +1,33 @@
+import NiceModal from '@ebay/nice-modal-react';
+import {Heading, Modal} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+const DemoModal = NiceModal.create(() => {
+    const {updateRoute} = useRouting();
+    const modal = NiceModal.useModal();
+
+    return (
+        <Modal
+            afterClose={() => {
+                updateRoute('');
+            }}
+            cancelLabel=''
+            okLabel='Close'
+            size='sm'
+            title='About'
+            onOk={() => {
+                updateRoute('');
+                modal.remove();
+            }}
+        >
+            <div className='mt-3 flex flex-col gap-4'>
+                <p>{`You're looking at a React app inside Ghost Admin. It uses common AdminX framework and Design System packages, and works seamlessly with the current Admin's routing.`}</p>
+                <p>{`At the moment the look and feel follows the current Admin's style to blend in with existing pages. However the system is built in a very flexible way to allow easy updates in the future.`}</p>
+                <Heading className='-mb-2 mt-4' level={5}>Contents</Heading>
+                <p>{`The demo uses a mocked list of members — it's `}<strong>not</strong> {`the actual or future design of members in Ghost Admin. Instead, the pages showcase common design patterns like a list and detail, navigation, modals and toasts.`}</p>
+            </div>
+        </Modal>
+    );
+});
+
+export default DemoModal;
diff --git a/apps/admin-x-demo/src/components/modals.tsx b/apps/admin-x-demo/src/components/modals.tsx
new file mode 100644
index 00000000000..353df21d33d
--- /dev/null
+++ b/apps/admin-x-demo/src/components/modals.tsx
@@ -0,0 +1,9 @@
+import DemoModal from './DemoModal';
+import {ModalComponent} from '@tryghost/admin-x-framework/routing';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const modals = {DemoModal} satisfies {[key: string]: ModalComponent<any>};
+
+export default modals;
+
+export type ModalName = keyof typeof modals;
diff --git a/apps/admin-x-demo/src/index.tsx b/apps/admin-x-demo/src/index.tsx
new file mode 100644
index 00000000000..b9bcbb9c5fb
--- /dev/null
+++ b/apps/admin-x-demo/src/index.tsx
@@ -0,0 +1,6 @@
+import './styles/index.css';
+import App from './App.tsx';
+
+export {
+    App as AdminXApp
+};
diff --git a/apps/admin-x-demo/src/standalone.tsx b/apps/admin-x-demo/src/standalone.tsx
new file mode 100644
index 00000000000..dd723c833c7
--- /dev/null
+++ b/apps/admin-x-demo/src/standalone.tsx
@@ -0,0 +1,5 @@
+import './styles/index.css';
+import App from './App.tsx';
+import renderStandaloneApp from '@tryghost/admin-x-framework/test/render';
+
+renderStandaloneApp(App, {});
diff --git a/apps/admin-x-demo/src/styles/index.css b/apps/admin-x-demo/src/styles/index.css
new file mode 100644
index 00000000000..d1f1f198edf
--- /dev/null
+++ b/apps/admin-x-demo/src/styles/index.css
@@ -0,0 +1 @@
+@import '@tryghost/admin-x-design-system/styles.css';
diff --git a/apps/admin-x-demo/tailwind.config.cjs b/apps/admin-x-demo/tailwind.config.cjs
new file mode 100644
index 00000000000..23c889a089a
--- /dev/null
+++ b/apps/admin-x-demo/tailwind.config.cjs
@@ -0,0 +1,6 @@
+const adminXPreset = require('@tryghost/admin-x-design-system/tailwind.cjs');
+
+module.exports = {
+    presets: [adminXPreset('.admin-x-demo')],
+    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-demo/test/.eslintrc.cjs b/apps/admin-x-demo/test/.eslintrc.cjs
new file mode 100644
index 00000000000..42f8e77355a
--- /dev/null
+++ b/apps/admin-x-demo/test/.eslintrc.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/ts-test'
+    ]
+};
diff --git a/apps/admin-x-demo/test/acceptance/example.test.ts b/apps/admin-x-demo/test/acceptance/example.test.ts
new file mode 100644
index 00000000000..a3b454c793f
--- /dev/null
+++ b/apps/admin-x-demo/test/acceptance/example.test.ts
@@ -0,0 +1,18 @@
+import {expect, test} from '@playwright/test';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('Demo', async () => {
+    test('Renders the list page', async ({page}) => {
+        await mockApi({page, requests: {
+            browseSettings: {
+                method: 'GET',
+                path: /^\/settings\/\?group=/,
+                response: responseFixtures.settings
+            }
+        }});
+
+        await page.goto('/');
+
+        await expect(page.locator('body')).toContainText('AdminX Demo App');
+    });
+});
diff --git a/apps/admin-x-demo/test/unit/example.test.tsx b/apps/admin-x-demo/test/unit/example.test.tsx
new file mode 100644
index 00000000000..e84c7562658
--- /dev/null
+++ b/apps/admin-x-demo/test/unit/example.test.tsx
@@ -0,0 +1,10 @@
+import ListPage from '../../src/ListPage';
+import {render, screen} from '@testing-library/react';
+
+describe('Demo', function () {
+    it('renders a component', async function () {
+        render(<ListPage />);
+
+        expect(screen.getAllByRole('heading')[0].textContent).toEqual('AdminX Demo App');
+    });
+});
diff --git a/apps/admin-x-demo/tsconfig.json b/apps/admin-x-demo/tsconfig.json
new file mode 100644
index 00000000000..621d5ec558b
--- /dev/null
+++ b/apps/admin-x-demo/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src", "test"]
+}
diff --git a/apps/admin-x-demo/vite.config.mjs b/apps/admin-x-demo/vite.config.mjs
new file mode 100644
index 00000000000..ae5b996d87f
--- /dev/null
+++ b/apps/admin-x-demo/vite.config.mjs
@@ -0,0 +1,10 @@
+import adminXViteConfig from '@tryghost/admin-x-framework/vite';
+import pkg from './package.json';
+import {resolve} from 'path';
+
+export default (function viteConfig() {
+    return adminXViteConfig({
+        packageName: pkg.name,
+        entry: resolve(__dirname, 'src/index.tsx')
+    });
+});
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-design-system/.storybook/main.tsx b/apps/admin-x-design-system/.storybook/main.tsx
new file mode 100644
index 00000000000..53b7664ef08
--- /dev/null
+++ b/apps/admin-x-design-system/.storybook/main.tsx
@@ -0,0 +1,27 @@
+import type { StorybookConfig } from "@storybook/react-vite";
+
+const config: StorybookConfig = {
+	stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
+	addons: [
+		"@storybook/addon-links",
+		"@storybook/addon-essentials",
+		"@storybook/addon-interactions",
+		{
+			name: '@storybook/addon-styling',
+		},
+	],
+	framework: {
+		name: "@storybook/react-vite",
+		options: {},
+	},
+	docs: {
+		autodocs: "tag",
+	},
+    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-design-system/.storybook/preview.tsx b/apps/admin-x-design-system/.storybook/preview.tsx
new file mode 100644
index 00000000000..ce01ac67ad4
--- /dev/null
+++ b/apps/admin-x-design-system/.storybook/preview.tsx
@@ -0,0 +1,107 @@
+import React from 'react';
+
+import '../styles.css';
+import './storybook.css';
+
+import type { Preview } from "@storybook/react";
+import DesignSystemProvider from '../src/providers/DesignSystemProvider';
+import adminxTheme from './adminx-theme';
+
+// import { MINIMAL_VIEWPORTS } from '@storybook/addon-viewport';
+
+const customViewports = {
+	sm: {
+		name: 'sm',
+		styles: {
+		width: '480px',
+		height: '801px',
+		},
+	},
+	md: {
+		name: 'md',
+		styles: {
+		width: '640px',
+		height: '801px',
+		},
+	},
+	lg: {
+		name: 'lg',
+		styles: {
+		width: '1024px',
+		height: '801px',
+		},
+	},
+	xl: {
+		name: 'xl',
+		styles: {
+		width: '1320px',
+		height: '801px',
+		},
+	},
+	tablet: {
+		name: 'tablet',
+		styles: {
+		width: '860px',
+		height: '801px',
+		},
+	},
+};
+
+const preview: Preview = {
+	parameters: {
+		actions: { argTypesRegex: "^on[A-Z].*" },
+		controls: {
+			matchers: {
+				color: /(background|color)$/i,
+				date: /Date$/,
+			},
+		},
+		options: {
+			storySort: {
+				method: 'alphabetical',
+				order: ['Welcome', 'Foundations', ['Style Guide', 'Colors', 'Icons', 'ErrorHandling'], 'Global', ['Form', 'Chrome', 'Modal', 'Layout', ['View Container', 'Page Header', 'Page'], 'List', 'Table', '*'], 'Settings', ['Setting Section', 'Setting Group', '*'], 'Experimental'],
+			},
+		},
+		docs: {
+			theme: adminxTheme,
+		},
+		viewport: {
+			viewports: {
+				...customViewports,
+			},
+		},
+	},
+	decorators: [
+		(Story, context) => {
+			let {scheme} = context.globals;
+
+			return (
+			<div className={`admin-x-design-system admin-x-base ${scheme === 'dark' ? 'dark' : ''}`} style={{
+				// padding: '24px',
+				// width: 'unset',
+				height: 'unset',
+				// overflow: 'unset',
+				background: (scheme === 'dark' ? '#131416' : '')
+			}}>
+				{/* 👇 Decorators in Storybook also accept a function. Replace <Story/> with Story() to enable it  */}
+				<DesignSystemProvider fetchKoenigLexical={async () => {}}>
+					<Story />
+				</DesignSystemProvider>
+			</div>);
+	},
+	],
+	globalTypes: {
+		scheme: {
+			name: "Scheme",
+			description: "Select light or dark mode",
+			defaultValue: "light",
+			toolbar: {
+				icon: "mirror",
+				items: ["light", "dark"],
+				dynamicTitle: true
+			}
+		}
+	}
+};
+
+export default preview;
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 82%
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..1b4aa6f2a0c 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,8 @@
     display: grid;
     grid-template-columns: auto 240px;
     gap: 32px;
+}
+
+.sbdocs-a {
+    color: #30CF43 !important;
 }
\ 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..07888275e31
--- /dev/null
+++ b/apps/admin-x-design-system/package.json
@@ -0,0 +1,93 @@
+{
+  "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": "tsc -p tsconfig.declaration.json && vite build",
+    "prepare": "yarn build",
+    "test": "yarn test:unit && yarn test:types",
+    "test:unit": "yarn nx build && vitest run",
+    "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.9",
+    "@radix-ui/react-tooltip": "1.1.2",
+    "@storybook/addon-essentials": "7.6.20",
+    "@storybook/addon-interactions": "7.6.20",
+    "@storybook/addon-links": "7.6.20",
+    "@storybook/addon-styling": "1.3.7",
+    "@storybook/blocks": "7.6.20",
+    "@storybook/react": "7.6.20",
+    "@storybook/react-vite": "7.6.4",
+    "@storybook/testing-library": "0.2.2",
+    "@testing-library/react": "14.3.1",
+    "@testing-library/react-hooks": "8.0.1",
+    "@types/lodash-es": "4.17.12",
+    "@vitejs/plugin-react": "4.2.1",
+    "c8": "8.0.1",
+    "chai": "4.3.8",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-plugin-react-refresh": "0.4.3",
+    "eslint-plugin-tailwindcss": "3.13.0",
+    "jsdom": "24.1.3",
+    "lodash-es": "4.17.21",
+    "mocha": "10.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "rollup-plugin-node-builtins": "2.1.2",
+    "sinon": "17.0.0",
+    "storybook": "7.6.20",
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5",
+    "validator": "13.12.0",
+    "vite": "4.5.3",
+    "vite-plugin-svgr": "3.3.0"
+  },
+  "dependencies": {
+    "@dnd-kit/core": "6.1.0",
+    "@dnd-kit/sortable": "7.0.2",
+    "@ebay/nice-modal-react": "1.2.13",
+    "@radix-ui/react-avatar": "1.1.0",
+    "@radix-ui/react-checkbox": "1.1.1",
+    "@radix-ui/react-form": "0.0.3",
+    "@radix-ui/react-popover": "1.1.1",
+    "@radix-ui/react-radio-group": "1.2.0",
+    "@radix-ui/react-separator": "1.1.0",
+    "@radix-ui/react-switch": "1.1.0",
+    "@radix-ui/react-tabs": "1.1.0",
+    "@radix-ui/react-tooltip": "1.1.2",
+    "@sentry/react": "7.119.0",
+    "@tailwindcss/forms": "0.5.7",
+    "@tailwindcss/line-clamp": "0.4.4",
+    "@uiw/react-codemirror": "4.23.0",
+    "autoprefixer": "10.4.19",
+    "clsx": "2.1.1",
+    "postcss": "8.4.39",
+    "postcss-import": "16.1.0",
+    "react-colorful": "5.6.1",
+    "react-hot-toast": "2.4.1",
+    "react-select": "5.8.0",
+    "tailwindcss": "3.4.10"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  }
+}
diff --git a/apps/admin-x-design-system/postcss.config.cjs b/apps/admin-x-design-system/postcss.config.cjs
new file mode 100644
index 00000000000..ab7c4939b1d
--- /dev/null
+++ b/apps/admin-x-design-system/postcss.config.cjs
@@ -0,0 +1,8 @@
+module.exports = {
+    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 95%
rename from apps/admin-x-settings/src/styles/preflight.css
rename to apps/admin-x-design-system/preflight.css
index ff179a06507..26c65f53c18 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)
@@ -151,6 +150,19 @@
         text-indent: 0; /* 1 */
         border-color: inherit; /* 2 */
         border-collapse: collapse; /* 3 */
+        margin: 0;
+        width: auto;
+        max-width: auto;
+    }
+
+    table td, table th {
+        padding: unset;
+        vertical-align: middle;
+        text-align: left;
+        line-height: auto;
+        -webkit-user-select: text;
+        -moz-user-select: text;
+        user-select: text;
     }
 
     /*
@@ -194,7 +206,7 @@
     */
 
     button,
-        [type='button'],
+        /* [type='button'], */
         [type='reset'],
         [type='submit'] {
         -webkit-appearance: button; /* 1 */
@@ -202,6 +214,8 @@
         background-image: none; /* 2 */
     }
 
+
+
     /*
     Use the modern Firefox focus style for all focusable elements.
     */
@@ -329,7 +343,7 @@
     input::placeholder,
     textarea::placeholder {
         opacity: 1; /* 1 */
-        color: theme('colors.grey.500'); /* 2 */
+        @apply text-grey-500; /* 2 */
     }
 
     button:focus-visible,
@@ -364,5 +378,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 91%
rename from apps/admin-x-settings/src/admin-x-ds/Boilerplate.stories.tsx
rename to apps/admin-x-design-system/src/Boilerplate.stories.tsx
index af0ba5b8a3f..523f76b978c 100644
--- a/apps/admin-x-settings/src/admin-x-ds/Boilerplate.stories.tsx
+++ b/apps/admin-x-design-system/src/Boilerplate.stories.tsx
@@ -3,7 +3,7 @@ import type {Meta, StoryObj} from '@storybook/react';
 import BoilerPlate from './Boilerplate';
 
 const meta = {
-    title: 'Meta / Boilerplate story',
+    title: 'Meta / Boilerplate',
     component: BoilerPlate,
     tags: ['autodocs']
 } satisfies Meta<typeof BoilerPlate>;
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..9ea7f4a730e
--- /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 darkMode={darkMode} 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-design-system/src/assets/icons/ai-tagging-spark.svg b/apps/admin-x-design-system/src/assets/icons/ai-tagging-spark.svg
new file mode 100644
index 00000000000..e09d87e917b
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/ai-tagging-spark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-0.75 -0.75 24 24" height="24" width="24"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M13.341093749999999 17.55496875c2.03146875 -0.408375 3.667125 -2.0639062499999996 4.07615625 -4.14796875 0.40903125 2.0840625 2.0442187499999998 3.73959375 4.07578125 4.14796875m0 0.00234375c-2.0315624999999997 0.408375 -3.667125 2.0639062499999996 -4.07615625 4.14796875 -0.40903125 -2.0840625 -2.0443125 -3.73959375 -4.07578125 -4.14796875" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m19.54621875 12.32025 0.56521875 -0.56521875c0.53071875 -0.53071875 0.8272499999999999 -1.25146875 0.8236875 -2.00203125l-0.0271875 -5.777896875000001c-0.00721875 -1.5429374999999999 -1.25625 -2.791940625 -2.7991875 -2.799225l-5.778 -0.027290625c-0.7505625 -0.003553125 -1.4713124999999998 0.293034375 -2.00203125 0.82374375L1.32765 10.97353125c-0.732223125 0.7321875 -0.7322203125000001 1.91934375 0.000009375 2.6516249999999997l7.13105625 7.131c0.732234375 0.73228125 1.9194093749999999 0.73228125 2.6516906249999996 0l0.94190625 -0.94190625" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="M17.75428125 4.329000000000001c-0.1393125 -0.13935 -0.41803125 -0.139359375 -0.5574375 0 -0.1393125 0.13935 -0.1393125 0.418059375 0 0.557409375" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="M17.7553125 4.328221875c0.13940625 0.13935 0.13940625 0.418059375 0 0.55741875 -0.1393125 0.13935 -0.41803125 0.13934062500000002 -0.55734375 -0.000009375" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/bell.svg b/apps/admin-x-design-system/src/assets/icons/bell.svg
new file mode 100644
index 00000000000..e9b771d42dc
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/bell.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Alarm-Bell--Streamline-Streamline--3.0" height="24" width="24"><desc>Alarm Bell Streamline Icon: https://streamlinehq.com</desc><defs></defs><title>alarm-bell</title><path d="M10 21.75a2.087 2.087 0 0 0 4.005 0" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m12 3 0 -2.25" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M12 3a7.5 7.5 0 0 1 7.5 7.5c0 7.046 1.5 8.25 1.5 8.25H3s1.5 -1.916 1.5 -8.25A7.5 7.5 0 0 1 12 3Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/card-list.svg b/apps/admin-x-design-system/src/assets/icons/card-list.svg
new file mode 100644
index 00000000000..39c5de18307
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/card-list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Layout-Agenda--Streamline-Ultimate" height="24" width="24"><desc>Layout Agenda Streamline Icon: https://streamlinehq.com</desc><defs></defs><title>layout-agenda</title><path d="M2.25 0.747h19.5s1.5 0 1.5 1.5v6s0 1.5 -1.5 1.5H2.25s-1.5 0 -1.5 -1.5v-6s0 -1.5 1.5 -1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.25 14.247h19.5s1.5 0 1.5 1.5v6s0 1.5 -1.5 1.5H2.25s-1.5 0 -1.5 -1.5v-6s0 -1.5 1.5 -1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/cardview.svg b/apps/admin-x-design-system/src/assets/icons/cardview.svg
new file mode 100644
index 00000000000..88d8b62e056
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/cardview.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.75 -0.75 24 24" height="24" width="24"><defs></defs><title>layout-module-1</title><path d="M2.109375 0.7003125h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.109375 13.356562499999999h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M14.765625 0.7003125h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M14.765625 13.356562499999999h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/column-layout.svg b/apps/admin-x-design-system/src/assets/icons/column-layout.svg
new file mode 100644
index 00000000000..f56aaa7590b
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/column-layout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" id="Layout--Streamline-Ultimate" height="24" width="24"><desc>Layout Streamline Icon: https://streamlinehq.com</desc><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m1.5 2.99707 0 18.00003c0 0.8284 0.67157 1.5 1.5 1.5l18 0c0.8284 0 1.5 -0.6716 1.5 -1.5l0 -18.00003c0 -0.82843 -0.6716 -1.5 -1.5 -1.5l-18 0c-0.82843 0 -1.5 0.67157 -1.5 1.5Z" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m12.0029 22.4971 0 -21.00003" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m12.0029 11.9971 10 0" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/download.svg b/apps/admin-x-design-system/src/assets/icons/download.svg
new file mode 100644
index 00000000000..d9753519323
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/download.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="m11.2509375 3.515625 0 11.25" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m7.0321875 10.546875 4.21875 4.21875 4.21875 -4.21875" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M21.797812500000003 14.765625v1.40625a2.8125 2.8125 0 0 1 -2.8125 2.8125h-15.46875a2.8125 2.8125 0 0 1 -2.8125 -2.8125v-1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/error-fill.svg b/apps/admin-x-design-system/src/assets/icons/error-fill.svg
new file mode 100644
index 00000000000..dfa0fd2ea0c
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/error-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24" id="Alert-Triangle--Streamline-Ultimate"><desc>Alert Triangle Streamline Icon: https://streamlinehq.com</desc><path d="m23.77 20.57 -10 -19A2 2 0 0 0 12 0.5a2 2 0 0 0 -1.77 1.07l-10 19a2 2 0 0 0 0.06 2A2 2 0 0 0 2 23.5h20a2 2 0 0 0 1.77 -2.93ZM11 8.5a1 1 0 0 1 2 0v6a1 1 0 0 1 -2 0ZM12.05 20a1.53 1.53 0 0 1 -1.52 -1.47A1.48 1.48 0 0 1 12 17a1.53 1.53 0 0 1 1.52 1.47A1.48 1.48 0 0 1 12.05 20Z" fill="currentColor" stroke-width="1"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/export.svg b/apps/admin-x-design-system/src/assets/icons/export.svg
new file mode 100644
index 00000000000..12ef11c4850
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/export.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-0.75 -0.75 24 24" height="24" width="24"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M18.09646875 20.3938125c0.674625 0 1.219125 -0.54459375 1.219125 -1.21921875V5.666521875c0 -0.325096875 -0.13003125 -0.6420750000000001 -0.36571875 -0.8696531249999999l-2.43825 -2.34075c-0.227625 -0.227578125 -0.5364375 -0.349490625 -0.85340625 -0.349490625H4.4042625c-0.674596875 0 -1.21914375 0.544546875 -1.21914375 1.21914375V19.17459375c0 0.674625 0.544546875 1.21921875 1.21914375 1.21921875H18.09646875Z" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m8.476865625 12.861375 2.774446875 2.77453125 2.77453125 -2.77453125" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m11.2490625 15.63534375 0 -8.770715625" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/heart-fill.svg b/apps/admin-x-design-system/src/assets/icons/heart-fill.svg
new file mode 100644
index 00000000000..89de5d87f3b
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/heart-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" id="Hearts-Card--Streamline-Ultimate.svg" height="24" width="24"><desc>Hearts Card Streamline Icon: https://streamlinehq.com</desc><path fill="currentColor" fill-rule="evenodd" d="M7.284 2.513a6.376 6.376 0 0 0 -4.146 11.22l8.014 7.42a1.25 1.25 0 0 0 1.698 0l8.024 -7.43A6.376 6.376 0 1 0 12 4.599a6.36 6.36 0 0 0 -4.716 -2.086Z" clip-rule="evenodd" stroke-width="1"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/home.svg b/apps/admin-x-design-system/src/assets/icons/home.svg
new file mode 100644
index 00000000000..9f44dc3facb
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="House-Entrance--Streamline-Streamline--3.0" height="24" width="24"><desc>House Entrance Streamline Icon: https://streamlinehq.com</desc><defs></defs><title>house-entrance</title><path d="M22.868 8.947 12 0.747l-10.878 8.2a1.177 1.177 0 0 0 -0.377 0.8v12.522a0.981 0.981 0 0 0 0.978 0.978h6.522V18a3.75 3.75 0 0 1 7.5 0v5.25h6.521a0.982 0.982 0 0 0 0.979 -0.978V9.747a1.181 1.181 0 0 0 -0.377 -0.8Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/hyperlink-circle.svg b/apps/admin-x-design-system/src/assets/icons/hyperlink-circle.svg
new file mode 100644
index 00000000000..86106cffb93
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/hyperlink-circle.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" id="Hyperlink-Circle--Streamline-Ultimate" height="20" width="20"><desc>Hyperlink Circle Streamline Icon: https://streamlinehq.com</desc><path d="M10.426416666666666 16.262500000000003C9.295 18.64975 6.448083333333334 19.675166666666666 4.054333333333333 18.55766666666667H4.054333333333333C1.6670833333333335 17.42625 0.6416666666666667 14.579250000000002 1.75925 12.185500000000001L3.2155 9.090583333333333C4.3465 6.7035 7.193166666666667 5.678 9.586583333333333 6.7955000000000005H9.586583333333333C10.948333333333334 7.437916666666666 11.928416666666667 8.6835 12.232583333333334 10.158083333333334" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M9.573916666666667 3.7375000000000003C10.705333333333334 1.3502500000000002 13.552333333333333 0.3248333333333333 15.946083333333334 1.442416666666667H15.946083333333334C18.33275 2.57375 19.358 5.4199166666666665 18.241166666666665 7.813416666666666L16.784833333333335 10.908333333333333C15.653416666666667 13.295583333333335 12.806500000000002 14.321 10.41275 13.203416666666666H10.41275C9.248583333333334 12.654916666666667 8.354916666666668 11.659916666666666 7.934333333333334 10.443666666666667" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
diff --git a/apps/admin-x-design-system/src/assets/icons/import.svg b/apps/admin-x-design-system/src/assets/icons/import.svg
new file mode 100644
index 00000000000..fb62e9fd764
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/import.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-0.75 -0.75 24 24" height="24" width="24"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M18.09553125 20.3938125c0.674625 0 1.21921875 -0.54459375 1.21921875 -1.21921875V5.666521875c0 -0.325096875 -0.13012500000000002 -0.6420750000000001 -0.3658125 -0.8696531249999999l-2.43825 -2.34075c-0.227625 -0.227578125 -0.5364375 -0.349490625 -0.85340625 -0.349490625H4.40334375c-0.6745875 0 -1.21914375 0.544546875 -1.21914375 1.21914375V19.17459375c0 0.674625 0.5445562500000001 1.21921875 1.21914375 1.21921875h13.692187500000001Z" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m8.47595625 9.638625 2.7744187499999997 -2.774559375L14.025 9.638625" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m11.248125 6.864684375 0 8.770659375000001" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/info-fill.svg b/apps/admin-x-design-system/src/assets/icons/info-fill.svg
new file mode 100644
index 00000000000..9866e28014c
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/info-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24" id="Information-Circle--Streamline-Ultimate"><desc>Information Circle Streamline Icon: https://streamlinehq.com</desc><path d="M12 0a12 12 0 1 0 12 12A12 12 0 0 0 12 0Zm0.25 5a1.5 1.5 0 1 1 -1.5 1.5 1.5 1.5 0 0 1 1.5 -1.5Zm2.25 13.5h-4a1 1 0 0 1 0 -2h0.75a0.25 0.25 0 0 0 0.25 -0.25v-4.5a0.25 0.25 0 0 0 -0.25 -0.25h-0.75a1 1 0 0 1 0 -2h1a2 2 0 0 1 2 2v4.75a0.25 0.25 0 0 0 0.25 0.25h0.75a1 1 0 0 1 0 2Z" fill="currentcolor" stroke-width="1"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/layout-headline.svg b/apps/admin-x-design-system/src/assets/icons/layout-headline.svg
new file mode 100644
index 00000000000..7a6cfeed7e6
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/layout-headline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.75 -0.75 24 24" height="24" width="24"><defs></defs><title>layout-headline</title><path d="M2.109375 0.7003125h18.28125s1.40625 0 1.40625 1.40625v1.40625s0 1.40625 -1.40625 1.40625H2.109375s-1.40625 0 -1.40625 -1.40625v-1.40625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.109375 9.137812499999999h18.28125s1.40625 0 1.40625 1.40625v1.40625s0 1.40625 -1.40625 1.40625H2.109375s-1.40625 0 -1.40625 -1.40625v-1.40625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.109375 17.5753125h18.28125s1.40625 0 1.40625 1.40625v1.40625s0 1.40625 -1.40625 1.40625H2.109375s-1.40625 0 -1.40625 -1.40625v-1.40625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/layout-module-1.svg b/apps/admin-x-design-system/src/assets/icons/layout-module-1.svg
new file mode 100644
index 00000000000..88d8b62e056
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/layout-module-1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.75 -0.75 24 24" height="24" width="24"><defs></defs><title>layout-module-1</title><path d="M2.109375 0.7003125h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.109375 13.356562499999999h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M14.765625 0.7003125h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M14.765625 13.356562499999999h5.625s1.40625 0 1.40625 1.40625v5.625s0 1.40625 -1.40625 1.40625h-5.625s-1.40625 0 -1.40625 -1.40625v-5.625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/linkedin.svg b/apps/admin-x-design-system/src/assets/icons/linkedin.svg
new file mode 100644
index 00000000000..c20683fdcbc
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/linkedin.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="M5.315625 21.215625H0.759375V8.15625h4.55625Zm9.459375 -8.803125000000001a2.00625 2.00625 0 0 0 -2.00625 2.00625v6.796875H7.9781249999999995V8.15625h4.790625v1.490625a6.3374999999999995 6.3374999999999995 0 0 1 4.0125 -1.5c2.971875 0 5.034375 2.203125 5.034375 6.3843749999999995v6.684375H16.78125v-6.796875a2.00625 2.00625 0 0 0 -2.00625 -2.015625Zm-9.375 -8.774999999999999a2.34375 2.34375 0 1 1 -2.34375 -2.34375 2.34375 2.34375 0 0 1 2.325 2.34375Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/listview.svg b/apps/admin-x-design-system/src/assets/icons/listview.svg
new file mode 100644
index 00000000000..7a6cfeed7e6
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/listview.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.75 -0.75 24 24" height="24" width="24"><defs></defs><title>layout-headline</title><path d="M2.109375 0.7003125h18.28125s1.40625 0 1.40625 1.40625v1.40625s0 1.40625 -1.40625 1.40625H2.109375s-1.40625 0 -1.40625 -1.40625v-1.40625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.109375 9.137812499999999h18.28125s1.40625 0 1.40625 1.40625v1.40625s0 1.40625 -1.40625 1.40625H2.109375s-1.40625 0 -1.40625 -1.40625v-1.40625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.109375 17.5753125h18.28125s1.40625 0 1.40625 1.40625v1.40625s0 1.40625 -1.40625 1.40625H2.109375s-1.40625 0 -1.40625 -1.40625v-1.40625s0 -1.40625 1.40625 -1.40625" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/reload.svg b/apps/admin-x-design-system/src/assets/icons/reload.svg
new file mode 100644
index 00000000000..5afa3c7227f
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/reload.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" id="Button-Refresh-Arrows--Streamline-Ultimate.svg" height="24" width="24"><desc>Button Refresh Arrows Streamline Icon: https://streamlinehq.com</desc><path d="m5.25 14.248 0 4.5 -4.5 0" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m18.75 9.748 0 -4.5 4.5 0" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M19.032 5.245A9.752 9.752 0 0 1 8.246 21" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M4.967 18.751A9.753 9.753 0 0 1 15.754 3" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/share.svg b/apps/admin-x-design-system/src/assets/icons/share.svg
new file mode 100644
index 00000000000..6feac81448c
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Share-1--Streamline-Streamline--3.0.svg" height="24" width="24"><desc>Share 1 Streamline Icon: https://streamlinehq.com</desc><defs></defs><title>share-1</title><path d="M17.25 8.25h1.5a1.5 1.5 0 0 1 1.5 1.5v12a1.5 1.5 0 0 1 -1.5 1.5H5.25a1.5 1.5 0 0 1 -1.5 -1.5v-12a1.5 1.5 0 0 1 1.5 -1.5h1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m12 0.75 0 10.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M8.25 4.5 12 0.75l3.75 3.75" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/success-fill.svg b/apps/admin-x-design-system/src/assets/icons/success-fill.svg
new file mode 100644
index 00000000000..9028cd1028b
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/success-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24" id="Check-Circle-1--Streamline-Ultimate"><desc>Check Circle 1 Streamline Icon: https://streamlinehq.com</desc><path d="M12 0a12 12 0 1 0 12 12A12 12 0 0 0 12 0Zm6.93 8.2 -6.85 9.29a1 1 0 0 1 -1.43 0.19l-4.89 -3.91a1 1 0 0 1 -0.15 -1.41A1 1 0 0 1 7 12.21l4.08 3.26L17.32 7a1 1 0 0 1 1.39 -0.21 1 1 0 0 1 0.22 1.41Z" fill="currentcolor" stroke-width="1"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/tags-block.svg b/apps/admin-x-design-system/src/assets/icons/tags-block.svg
new file mode 100644
index 00000000000..febbc688e7d
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/tags-block.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-0.75 -0.75 24 24" height="24" width="24"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8.437481250000001 17.98875c-0.26370937499999997 0.263625 -0.621328125 0.41175 -0.99421875 0.41175 -0.37288125 0 -0.730509375 -0.148125 -0.99421875 -0.41175l-5.042812499999999 -5.041875c-0.13067812499999998 -0.13059375 -0.23433749999999998 -0.28565625 -0.3050625 -0.45628125 -0.070734375 -0.17071875 -0.10713750000000001 -0.35362499999999997 -0.10713750000000001 -0.53840625 0 -0.1846875 0.036403125 -0.3676875 0.10713750000000001 -0.5383125000000001 0.070725 -0.17071875 0.174384375 -0.32578124999999997 0.3050625 -0.45637500000000003L11.25 1.11376875c0.13059375 -0.13055624999999998 0.28575 -0.2341059375 0.45637500000000003 -0.304723125 0.17071875 -0.07061625 0.35362499999999997 -0.10692 0.5383125000000001 -0.106835625h5.041875c0.3729375 0 0.73059375 0.1481578125 0.9943124999999999 0.4118775 0.26371875 0.263728125 0.4119375 0.6214125 0.4119375 0.9943687499999999v5.042812499999999c-0.00009375 0.372703125 -0.148125 0.730125 -0.4115625 0.99375" stroke-width="1.5"></path><path stroke="currentColor" d="M15.1771875 4.56939375c-0.19415625 0 -0.3515625 -0.15739687500000002 -0.3515625 -0.3515625 0 -0.19415625 0.15740625 -0.3515625 0.3515625 -0.3515625" stroke-width="1.5"></path><path stroke="currentColor" d="M15.1771875 4.56939375c0.19415625 0 0.3515625 -0.15739687500000002 0.3515625 -0.3515625 0 -0.19415625 -0.15740625 -0.3515625 -0.3515625 -0.3515625" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M15.8803125 21.795937499999997c3.10659375 0 5.625 -2.51840625 5.625 -5.625s-2.51840625 -5.625 -5.625 -5.625 -5.625 2.51840625 -5.625 5.625 2.51840625 5.625 5.625 5.625Z" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m19.858124999999998 12.193125 -7.95375 7.9546874999999995" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/assets/icons/tags-check.svg b/apps/admin-x-design-system/src/assets/icons/tags-check.svg
new file mode 100644
index 00000000000..f82f8764682
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/tags-check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="-0.75 -0.75 24 24" height="24" width="24"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8.437481250000001 17.98875c-0.26370937499999997 0.263625 -0.621328125 0.41175 -0.99421875 0.41175 -0.37288125 0 -0.730509375 -0.148125 -0.99421875 -0.41175l-5.042812499999999 -5.041875c-0.13067812499999998 -0.13059375 -0.23433749999999998 -0.28565625 -0.3050625 -0.45628125 -0.070734375 -0.17071875 -0.10713750000000001 -0.35362499999999997 -0.10713750000000001 -0.53840625 0 -0.1846875 0.036403125 -0.3676875 0.10713750000000001 -0.5383125000000001 0.070725 -0.17071875 0.174384375 -0.32578124999999997 0.3050625 -0.45637500000000003L11.25 1.11376875c0.13059375 -0.13055624999999998 0.28575 -0.2341059375 0.45637500000000003 -0.304723125 0.17071875 -0.07061625 0.35362499999999997 -0.10692 0.5383125000000001 -0.106835625h5.041875c0.3729375 0 0.73059375 0.1481578125 0.9943124999999999 0.4118775 0.26371875 0.263728125 0.4119375 0.6214125 0.4119375 0.9943687499999999v5.042812499999999c-0.00009375 0.372703125 -0.148125 0.730125 -0.4115625 0.99375" stroke-width="1.5"></path><path stroke="currentColor" d="M15.1771875 4.56939375c-0.19415625 0 -0.3515625 -0.15739687500000002 -0.3515625 -0.3515625 0 -0.19415625 0.15740625 -0.3515625 0.3515625 -0.3515625" stroke-width="1.5"></path><path stroke="currentColor" d="M15.1771875 4.56939375c0.19415625 0 0.3515625 -0.15739687500000002 0.3515625 -0.3515625 0 -0.19415625 -0.15740625 -0.3515625 -0.3515625 -0.3515625" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="m18.38709375 14.53125 -2.7234374999999997 3.631875c-0.06046875 0.08053125 -0.13753125 0.14709375000000002 -0.22593749999999999 0.19528125000000002 -0.0885 0.0481875 -0.1861875 0.07678125 -0.28668750000000004 0.08390625 -0.10040625 0.007031249999999999 -0.20118750000000002 -0.0075 -0.29559375000000004 -0.04265625 -0.0943125 -0.035250000000000004 -0.18 -0.090375 -0.25115625 -0.16153125000000002l-1.40625 -1.40625" stroke-width="1.5"></path><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M15.8803125 21.795937499999997c3.10659375 0 5.625 -2.51840625 5.625 -5.625s-2.51840625 -5.625 -5.625 -5.625 -5.625 2.51840625 -5.625 5.625 2.51840625 5.625 5.625 5.625Z" stroke-width="1.5"></path></svg>
\ No newline at end of file
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-design-system/src/assets/icons/thumbs-down.svg b/apps/admin-x-design-system/src/assets/icons/thumbs-down.svg
new file mode 100644
index 00000000000..20450e318ea
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/thumbs-down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M22 14.429h-3.445a1.905 1.905 0 0 0-1.543.794l-4.617 7.095a1.622 1.622 0 0 1-2.783-.233 1.597 1.597 0 0 1-.103-1.1l.833-3.142a1.867 1.867 0 0 0-.993-2.164 1.911 1.911 0 0 0-.833-.193h-4.63A1.881 1.881 0 0 1 2.08 13.06v-.011l1.8-6.008v-.016c.733-2.36 1.992-3.97 4.47-3.97 5.933 0 5.594-.684 12.523 2.818.377.188.752.379 1.126.572V16.5"/>
+</svg>
\ No newline at end of file
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-design-system/src/assets/icons/user-fill.svg b/apps/admin-x-design-system/src/assets/icons/user-fill.svg
new file mode 100644
index 00000000000..7f9c2270b61
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/user-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Single-Neutral-Actions--Streamline-Ultimate.svg" height="24" width="24"><desc>Single Neutral Actions Streamline Icon: https://streamlinehq.com</desc><g><path d="M5.9611 6.2789C5.9611 10.9277 10.9935 13.8332 15.0195 11.5088C16.8879 10.43 18.0389 8.4364 18.0389 6.2789C18.0389 1.6302 13.0065 -1.2753 8.9805 1.0491C7.1121 2.1278 5.9611 4.1214 5.9611 6.2789" fill="currentColor" stroke-width="1"></path><path d="M12 13.5892C6.7337 13.589 2.4649 17.8581 2.4649 23.1243C2.4649 23.4754 2.7495 23.76 3.1005 23.76H20.8995C21.2505 23.76 21.5351 23.4754 21.5351 23.1243C21.5351 17.8581 17.2663 13.589 12 13.5892Z" fill="currentColor" stroke-width="1"></path></g></svg>
\ No newline at end of file
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-design-system/src/assets/icons/user.svg b/apps/admin-x-design-system/src/assets/icons/user.svg
new file mode 100644
index 00000000000..e954801d946
--- /dev/null
+++ b/apps/admin-x-design-system/src/assets/icons/user.svg
@@ -0,0 +1 @@
+<svg id="Single-Neutral--Streamline-Streamline--3.0" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24"><desc>Single Neutral Streamline Icon: https://streamlinehq.com</desc><defs></defs><title>single-neutral</title><path d="M6.75 6a5.25 5.25 0 1 0 10.5 0 5.25 5.25 0 1 0 -10.5 0" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M2.25 23.25a9.75 9.75 0 0 1 19.5 0" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
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 76%
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
index f2f14583e7d..060041cfaf0 100644
--- 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
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" aria-hidden="true"><g><path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"></path></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" aria-hidden="true"><g><path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z" fill="currentColor"></path></g></svg>
\ No newline at end of file
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-design-system/src/docs/Layout.mdx b/apps/admin-x-design-system/src/docs/Layout.mdx
new file mode 100644
index 00000000000..eb5d776f107
--- /dev/null
+++ b/apps/admin-x-design-system/src/docs/Layout.mdx
@@ -0,0 +1,31 @@
+import { Meta } from '@storybook/blocks';
+import SBPageViewContainer from './assets/page-viewcontainer.png';
+
+<Meta title="Foundations / Layout" />
+
+<div className="sb-doc">
+
+# Layout
+
+<p className='excerpt'>The goal of the layout system is to give a simple and flexible framework for pages in the Admin. It allows designs to be focused on primary functions yet stay consistent across the whole app.</p>
+
+### Structure
+
+Below you can see a the most common Admin screen structure: it consists of a [Page component](/docs/global-layout-page--docs) as the main container of a screen and a `ViewContainer` that sets the typical view boundaries and patterns for consistency.
+
+#### Page
+The purpose of this component is to set up the main container of a page. It defines/restricts scrolling and adds app/page level elements such as search, navigation or the main menu. And ofc. it also holds the contents of a screen.
+
+
+#### ViewContainer
+There's no restriction on what [component] should be used as the main contents of a page. However most pages would need similar constraints: setting a maximum width, a streamlined sticky header or the positioning of the primary action and so on. This is the main role of the [ViewContainer component](/docs/global-layout-view-container--docs).
+
+### Customisation
+
+It's not mandatory but it's advised to use this structure to maintain consistency as much as possible. The components have a bunch of documented parameters which allows customisation to be used in the current Admin and in future developments.
+
+</div>
+
+<div className="sb-wide">
+<img src={SBPageViewContainer} />
+</div>
\ No newline at end of file
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-design-system/src/docs/assets/page-viewcontainer.png b/apps/admin-x-design-system/src/docs/assets/page-viewcontainer.png
new file mode 100644
index 00000000000..903465bfe37
Binary files /dev/null and b/apps/admin-x-design-system/src/docs/assets/page-viewcontainer.png differ
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-design-system/src/global/Avatar.tsx b/apps/admin-x-design-system/src/global/Avatar.tsx
new file mode 100644
index 00000000000..88e75534585
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Avatar.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import {ReactComponent as UserIcon} from '../assets/icons/single-user-fill.svg';
+import * as AvatarPrimitive from '@radix-ui/react-avatar';
+
+type AvatarSize = 'sm' | 'md' | 'lg' | 'xl' | '2xl';
+
+export interface AvatarProps {
+    image?: string;
+    label?: string;
+
+    /**
+     * Accepts any valid Tailwindcolor e.g. `black`, `green`
+     */
+    labelColor?: string;
+
+    /**
+     * Accepts any valid CSS value e.g. #ffca03
+     */
+    bgColor?: string;
+    size?: AvatarSize;
+    className?: string;
+}
+
+const Avatar: React.FC<AvatarProps> = ({image, label, labelColor, bgColor, size, className}) => {
+    let avatarSize = '';
+    let fallbackPosition = ' -mb-2 ';
+
+    switch (size) {
+    case 'sm':
+        avatarSize = ' w-7 h-7 text-sm ';
+        break;
+    case 'lg':
+        avatarSize = ' w-12 h-12 text-xl ';
+        break;
+    case 'xl':
+        avatarSize = ' w-16 h-16 text-2xl ';
+        fallbackPosition = ' -mb-3 ';
+        break;
+    case '2xl':
+        avatarSize = ' w-20 h-20 text-2xl ';
+        fallbackPosition = ' -mb-3 ';
+        break;
+    default:
+        avatarSize = ' w-10 h-10 text-md ';
+        break;
+    }
+
+    return (
+        <AvatarPrimitive.Root className={`relative inline-flex select-none items-center justify-center overflow-hidden rounded-full align-middle ${avatarSize}`}>
+            {image ?
+                <AvatarPrimitive.Image className={`absolute z-20 h-full w-full object-cover ${className && className}`} src={image} /> :
+                <span className={`${labelColor && `text-${labelColor}`} relative z-10 inline-flex h-full w-full items-center justify-center p-2 font-semibold ${className && className}`} style={bgColor ? {backgroundColor: bgColor} : {}}>{label}</span>
+            }
+            <AvatarPrimitive.Fallback asChild>
+                <UserIcon className={`${fallbackPosition} absolute z-0 h-full w-full text-grey-300`} />
+            </AvatarPrimitive.Fallback>
+        </AvatarPrimitive.Root>
+    );
+};
+
+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 87%
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..a204043fad5 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Breadcrumbs.tsx
+++ b/apps/admin-x-design-system/src/global/Breadcrumbs.tsx
@@ -1,15 +1,16 @@
-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;
+    snapBackIcon?: boolean;
     onBack?: () => void;
     containerClassName?: string;
     itemClassName?: string;
@@ -20,6 +21,7 @@ interface BreadcrumbsProps {
 const Breadcrumbs: React.FC<BreadcrumbsProps> = ({
     items,
     backIcon = false,
+    snapBackIcon = true,
     onBack,
     containerClassName,
     itemClassName,
@@ -47,7 +49,7 @@ const Breadcrumbs: React.FC<BreadcrumbsProps> = ({
     return (
         <div className={containerClassName}>
             {backIcon &&
-            <Button className='mr-6' icon='arrow-left' iconColorClass='dark:text-white' size='sm' link onClick={onBack} />
+            <Button className={snapBackIcon ? 'mr-1' : 'mr-6'} icon='arrow-left' iconColorClass='dark:text-white' size='sm' link onClick={onBack} />
             }
             {items.map((item) => {
                 const bcItem = (i === allItems - 1 ?
@@ -71,4 +73,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 75%
rename from apps/admin-x-settings/src/admin-x-ds/global/Button.tsx
rename to apps/admin-x-design-system/src/global/Button.tsx
index dbf426f8381..a3cd14da598 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Button.tsx
+++ b/apps/admin-x-design-system/src/global/Button.tsx
@@ -1,9 +1,9 @@
-import Icon from './Icon';
+import Icon, {IconSize} from './Icon';
 import React, {HTMLProps} from 'react';
 import clsx from 'clsx';
 import {LoadingIndicator, LoadingIndicatorColor, LoadingIndicatorSize} from './LoadingIndicator';
 
-export type ButtonColor = 'clear' | 'grey' | 'black' | 'green' | 'red' | 'white' | 'outline';
+export type ButtonColor = 'clear' | 'light-grey' | 'grey' | 'black' | 'green' | 'red' | 'white' | 'outline';
 export type ButtonSize = 'sm' | 'md';
 
 export interface ButtonProps extends Omit<HTMLProps<HTMLButtonElement>, 'label' | 'size' | 'children'> {
@@ -11,6 +11,7 @@ export interface ButtonProps extends Omit<HTMLProps<HTMLButtonElement>, 'label'
     label?: React.ReactNode;
     hideLabel?: boolean;
     icon?: string;
+    iconSize?: IconSize;
     iconColorClass?: string;
     key?: string;
     color?: ButtonColor;
@@ -24,15 +25,19 @@ export interface ButtonProps extends Omit<HTMLProps<HTMLButtonElement>, 'label'
     loading?: boolean;
     loadingIndicatorSize?: LoadingIndicatorSize;
     loadingIndicatorColor?: LoadingIndicatorColor;
+    outlineOnMobile?: boolean;
     onClick?: (e?:React.MouseEvent<HTMLElement>) => void;
+    testId?: string;
 }
 
-const Button: React.FC<ButtonProps> = ({
+const Button: React.FC<ButtonProps> = React.forwardRef(({
+    testId,
     size = 'md',
     label = '',
     hideLabel = false,
     icon = '',
-    iconColorClass = 'text-black',
+    iconSize,
+    iconColorClass,
     color = 'clear',
     fullWidth,
     link,
@@ -43,9 +48,10 @@ const Button: React.FC<ButtonProps> = ({
     tag = 'button',
     loading = false,
     loadingIndicatorColor,
+    outlineOnMobile = false,
     onClick,
     ...props
-}) => {
+}, ref) => {
     if (!color) {
         color = 'clear';
     }
@@ -54,7 +60,8 @@ const Button: React.FC<ButtonProps> = ({
         className = clsx(
             'inline-flex items-center justify-center whitespace-nowrap rounded text-sm transition',
             ((link && color !== 'clear' && color !== 'black') || (!link && color !== 'clear')) ? 'font-bold' : 'font-semibold',
-            !link ? `${size === 'sm' ? ' h-7 px-3 ' : ' h-[34px] px-4 '}` : '',
+            !link ? `${size === 'sm' ? 'h-7' : 'h-[34px]'}` : '',
+            !link ? `${size === 'sm' || label && icon ? 'px-3' : 'px-4'}` : '',
             (link && linkWithPadding) && '-m-1 p-1',
             className
         );
@@ -66,6 +73,14 @@ const Button: React.FC<ButtonProps> = ({
                 className
             );
             loadingIndicatorColor = 'light';
+            iconColorClass = iconColorClass || 'text-white';
+            break;
+        case 'light-grey':
+            className = clsx(
+                link ? 'text-grey-800 hover:text-green-400 dark:text-white' : `bg-grey-200 text-black dark:bg-grey-900 dark:text-white ${!disabled && 'hover:!bg-grey-300 dark:hover:!bg-grey-800'}`,
+                className
+            );
+            loadingIndicatorColor = 'dark';
             break;
         case 'grey':
             className = clsx(
@@ -80,6 +95,7 @@ const Button: React.FC<ButtonProps> = ({
                 className
             );
             loadingIndicatorColor = 'light';
+            iconColorClass = iconColorClass || 'text-white';
             break;
         case 'red':
             className = clsx(
@@ -87,6 +103,7 @@ const Button: React.FC<ButtonProps> = ({
                 className
             );
             loadingIndicatorColor = 'light';
+            iconColorClass = iconColorClass || 'text-white';
             break;
         case 'white':
             className = clsx(
@@ -104,7 +121,8 @@ const Button: React.FC<ButtonProps> = ({
             break;
         default:
             className = clsx(
-                link ? ' text-black hover:text-grey-800 dark:text-white' : ` text-black dark:text-white dark:hover:bg-grey-900 ${!disabled && 'hover:bg-grey-200'}`,
+                link ? ' text-black hover:text-grey-800 dark:text-white' : `text-grey-900 dark:text-white dark:hover:bg-grey-900 ${!disabled && 'hover:bg-grey-200 hover:text-black'}`,
+                (outlineOnMobile && !link) && 'border border-grey-300 hover:border-transparent md:border-transparent',
                 className
             );
             loadingIndicatorColor = 'dark';
@@ -124,19 +142,25 @@ const Button: React.FC<ButtonProps> = ({
     labelClasses += (label && hideLabel) ? 'sr-only' : '';
     labelClasses += loading ? 'invisible' : '';
 
+    iconSize = iconSize || ((size === 'sm') || (label && icon) ? 'sm' : 'md');
+
     const buttonChildren = <>
-        {icon && <Icon className={iconClasses} colorClass={iconColorClass} name={icon} size={size === 'sm' ? 'sm' : 'md'} />}
+        {icon && <Icon className={iconClasses} colorClass={iconColorClass} name={icon} size={iconSize} />}
         <span className={labelClasses}>{label}</span>
         {loading && <div className='absolute flex'><LoadingIndicator color={loadingIndicatorColor} size={size}/><span className='sr-only'>Loading...</span></div>}
     </>;
 
     const buttonElement = React.createElement(tag, {className: className,
+        'data-testid': testId,
         disabled: disabled,
         type: 'button',
         onClick: onClick,
+        ref: ref,
         ...props}, buttonChildren);
 
     return buttonElement;
-};
+});
+
+Button.displayName = 'Button';
 
 export default Button;
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 78%
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
index f129e980774..850c8d7baba 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.stories.tsx
+++ b/apps/admin-x-design-system/src/global/ButtonGroup.stories.tsx
@@ -6,7 +6,8 @@ import {ButtonProps} from './Button';
 const ButtonGroupMeta = {
     title: 'Global / Button Group',
     component: ButtonGroup,
-    tags: ['autodocs']
+    tags: ['autodocs'],
+    decorators: [(_story: () => React.ReactNode) => (<div className='inline-block'>{_story()}</div>)]
 } satisfies Meta<typeof ButtonGroup>;
 
 export default ButtonGroupMeta;
@@ -32,6 +33,14 @@ export const Default: Story = {
     }
 };
 
+export const Small: Story = {
+    args: {
+        buttons: defaultButtons,
+        link: false,
+        size: 'sm'
+    }
+};
+
 const linkButtons: ButtonProps[] = [
     {
         label: 'Cancel',
diff --git a/apps/admin-x-design-system/src/global/ButtonGroup.tsx b/apps/admin-x-design-system/src/global/ButtonGroup.tsx
new file mode 100644
index 00000000000..26697d49776
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/ButtonGroup.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import Button, {ButtonSize} from './Button';
+
+import {ButtonProps} from './Button';
+import clsx from 'clsx';
+
+export interface ButtonGroupProps {
+    size?: ButtonSize;
+    buttons: Array<ButtonProps>;
+    link?: boolean;
+    linkWithPadding?: boolean;
+    clearBg?: boolean;
+    outlineOnMobile?: boolean;
+    className?: string;
+}
+
+const ButtonGroup: React.FC<ButtonGroupProps> = ({size = 'md', buttons, link, linkWithPadding, clearBg = true, outlineOnMobile, className}) => {
+    let groupColorClasses = clsx(
+        'flex items-center justify-start rounded',
+        link ? 'gap-4' : 'gap-2',
+        className
+    );
+
+    if (link && !clearBg) {
+        groupColorClasses = clsx(
+            'transition-all hover:bg-grey-200 dark:hover:bg-grey-900',
+            size === 'sm' ? 'h-7 px-3' : 'h-[34px] px-4',
+            outlineOnMobile && 'border border-grey-300 hover:border-transparent md:border-transparent',
+            groupColorClasses
+        );
+    }
+
+    return (
+        <div className={groupColorClasses}>
+            {buttons.map(({key, ...props}) => (
+                <Button key={key} link={link} linkWithPadding={linkWithPadding} size={size} {...props} />
+            ))}
+        </div>
+    );
+};
+
+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 89%
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..69603e2cd94 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 = '',
@@ -60,7 +62,7 @@ const Heading: React.FC<Heading1to5Props | Heading6Props | HeadingLabelProps> =
     if (!useLabelTag) {
         switch (level) {
         case 1:
-            styles += ' md:text-5xl leading-tighter';
+            styles += ' md:text-4xl leading-tighter';
             break;
         case 2:
             styles += ' md:text-3xl';
@@ -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-design-system/src/global/Icon.tsx b/apps/admin-x-design-system/src/global/Icon.tsx
new file mode 100644
index 00000000000..47fc5e7eaa0
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Icon.tsx
@@ -0,0 +1,82 @@
+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 = '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'custom' | number;
+
+export interface IconProps {
+    name: string;
+
+    /**
+     * Accepts either predefined sizes or number, in which case the size means the pixel width & height
+     */
+    size?: IconSize;
+
+    /**
+     * Accepts all colors available in the actual TailwindCSS theme, e.g. `black`, `green-100`
+     */
+    colorClass?: string;
+    styles?: string;
+    className?: string;
+}
+
+/**
+ * Icon guidelines:
+ * - all icons must be SVG's
+ * - all icons must have all it's children color value set `currentColor`
+ * - all strokes must be paths and _NOT_ outlined objects. Stroke width should be set to 1.5px
+ */
+const Icon: React.FC<IconProps> = ({name, size = 'md', colorClass = '', className = ''}) => {
+    const {ReactComponent: SvgComponent} = icons[`../assets/icons/${name}.svg`];
+
+    let classes = '';
+    let styles = {};
+
+    if (typeof size === 'number') {
+        styles = {
+            width: `${size}px`,
+            height: `${size}px`
+        };
+    }
+
+    if (!classes) {
+        switch (size) {
+        case 'custom':
+            break;
+        case '2xs':
+            classes = 'w-2 h-2';
+            break;
+        case 'xs':
+            classes = 'w-3 h-3';
+            break;
+        case 'sm':
+            classes = 'w-4 h-4';
+            break;
+        case 'lg':
+            classes = 'w-8 h-8';
+            break;
+        case 'xl':
+            classes = 'w-10 h-10';
+            break;
+
+        default:
+            classes = 'w-5 h-5';
+            break;
+        }
+    }
+
+    classes = clsx(
+        classes,
+        colorClass
+    );
+
+    if (SvgComponent) {
+        return (
+            <SvgComponent className={`pointer-events-none ${classes} ${className}`} style={styles} />
+        );
+    }
+    return null;
+};
+
+export default Icon;
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 95%
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..527ff2464d7 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
      */
@@ -39,7 +39,7 @@ const List: React.FC<ListProps> = ({
 }) => {
     const listClasses = clsx(
         (borderTop || pageTitle) && 'border-t border-grey-300',
-        pageTitle && 'mt-14',
+        pageTitle && 'mt-5',
         className
     );
 
@@ -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 95%
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
index d6c4a568ba7..77d5373f6f4 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Menu.stories.tsx
+++ b/apps/admin-x-design-system/src/global/Menu.stories.tsx
@@ -24,7 +24,7 @@ export const Default: Story = {
     args: {
         trigger: <Button color='black' label="Click"></Button>,
         items: items,
-        position: 'left'
+        position: 'start'
     },
     decorators: [
         ThisStory => (
@@ -37,7 +37,7 @@ export const Right: Story = {
     args: {
         trigger: <Button color='black' label="Click"></Button>,
         items: items,
-        position: 'right'
+        position: 'end'
     },
     decorators: [
         ThisStory => (
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 95%
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..c9a99e73721 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;
@@ -20,7 +20,7 @@ const Menu: React.FC<MenuProps> = ({
     trigger,
     triggerButtonProps,
     items,
-    position = 'left'
+    position = 'start'
 }) => {
     if (!trigger) {
         trigger = <Button icon='ellipsis' label='Menu' hideLabel {...triggerButtonProps} />;
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 96%
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
index a58a7fc18e0..99944139a74 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Pagination.stories.tsx
+++ b/apps/admin-x-design-system/src/global/Pagination.stories.tsx
@@ -3,7 +3,7 @@ import type {Meta, StoryObj} from '@storybook/react';
 import Pagination from './Pagination';
 
 const meta = {
-    title: 'Global / Pagination story',
+    title: 'Global / Pagination',
     component: Pagination,
     tags: ['autodocs']
 } satisfies Meta<typeof Pagination>;
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-design-system/src/global/Popover.stories.tsx b/apps/admin-x-design-system/src/global/Popover.stories.tsx
new file mode 100644
index 00000000000..6f50276fd20
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Popover.stories.tsx
@@ -0,0 +1,77 @@
+import type {Meta, StoryObj} from '@storybook/react';
+
+// import BoilerPlate from './Boilerplate';
+import Button from './Button';
+import Popover from './Popover';
+
+const meta = {
+    title: 'Global / Popover',
+    component: Popover,
+    tags: ['autodocs'],
+    argTypes: {
+        trigger: {
+            control: {
+                type: 'text'
+            }
+        }
+    }
+} satisfies Meta<typeof Popover>;
+
+export default meta;
+type Story = StoryObj<typeof Popover>;
+
+export const Default: Story = {
+    args: {
+        trigger: (
+            <Button color='grey' label='Open popover' />
+        ),
+        children: (
+            <div className='p-5 text-sm' style={{maxWidth: '320px'}}>
+                This is a popover. You can put anything in it. The styling of the content defines how it will look at the end.
+            </div>
+        )
+    }
+};
+
+export const CenterAlign: Story = {
+    args: {
+        position: 'center',
+        trigger: (
+            <Button color='grey' label='Open popover' />
+        ),
+        children: (
+            <div className='p-5 text-sm' style={{maxWidth: '320px'}}>
+                This is a popover. You can put anything in it. The styling of the content defines how it will look at the end.
+            </div>
+        )
+    }
+};
+
+export const RightAlign: Story = {
+    args: {
+        position: 'end',
+        trigger: (
+            <Button color='grey' label='Open popover' />
+        ),
+        children: (
+            <div className='p-5 text-sm' style={{maxWidth: '320px'}}>
+                This is a popover. You can put anything in it. The styling of the content defines how it will look at the end.
+            </div>
+        )
+    }
+};
+
+export const DismissOnClick: Story = {
+    args: {
+        position: 'start',
+        trigger: (
+            <Button color='grey' label='Open popover' />
+        ),
+        children: (
+            <div className='p-5 text-sm' style={{maxWidth: '320px'}}>
+                Click here to close the popover.
+            </div>
+        ),
+        closeOnItemClick: true
+    }
+};
diff --git a/apps/admin-x-design-system/src/global/Popover.tsx b/apps/admin-x-design-system/src/global/Popover.tsx
new file mode 100644
index 00000000000..719b2a50ef0
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Popover.tsx
@@ -0,0 +1,41 @@
+import React, {useState} from 'react';
+import * as PopoverPrimitive from '@radix-ui/react-popover';
+
+export type PopoverPosition = 'center' | 'end' | 'start' | undefined;
+
+export interface PopoverProps {
+    trigger: React.ReactNode;
+    children: React.ReactNode;
+    position?: PopoverPosition;
+    closeOnItemClick?: boolean;
+}
+
+const Popover: React.FC<PopoverProps> = ({
+    trigger,
+    children,
+    position = 'start',
+    closeOnItemClick
+}) => {
+    const [open, setOpen] = useState(false);
+
+    const handleContentClick = () => {
+        if (closeOnItemClick) {
+            setOpen(false);
+        }
+    };
+
+    return (
+        <PopoverPrimitive.Root open={open} onOpenChange={setOpen}>
+            <PopoverPrimitive.Anchor asChild>
+                <PopoverPrimitive.Trigger asChild>
+                    {trigger}
+                </PopoverPrimitive.Trigger>
+            </PopoverPrimitive.Anchor>
+            <PopoverPrimitive.Content align={position} className="z-50 mt-2 origin-top-right rounded bg-white shadow-md ring-1 ring-[rgba(0,0,0,0.01)] focus:outline-none dark:bg-grey-900 dark:text-white" data-testid='popover-content' side="bottom" onClick={handleContentClick}>
+                {children}
+            </PopoverPrimitive.Content>
+        </PopoverPrimitive.Root>
+    );
+};
+
+export default Popover;
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-design-system/src/global/Separator.tsx b/apps/admin-x-design-system/src/global/Separator.tsx
new file mode 100644
index 00000000000..1df6cd85ff1
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Separator.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import * as SeparatorPrimitive from '@radix-ui/react-separator';
+
+export interface SeparatorProps {
+    className?: string;
+}
+
+const Separator: React.FC<SeparatorProps> = ({className}) => {
+    if (!className) {
+        className = 'border-grey-200 dark:border-grey-800';
+    }
+    return (
+        <SeparatorPrimitive.Root asChild decorative>
+            <hr className={className} />
+        </SeparatorPrimitive.Root>
+    );
+};
+
+export default Separator;
diff --git a/apps/admin-x-design-system/src/global/SortMenu.stories.tsx b/apps/admin-x-design-system/src/global/SortMenu.stories.tsx
new file mode 100644
index 00000000000..296373b05c4
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/SortMenu.stories.tsx
@@ -0,0 +1,32 @@
+import type {Meta, StoryObj} from '@storybook/react';
+
+import SortMenu from './SortMenu';
+
+const meta = {
+    title: 'Global / SortMenu',
+    component: SortMenu,
+    tags: ['autodocs']
+} satisfies Meta<typeof SortMenu>;
+
+export default meta;
+type Story = StoryObj<typeof SortMenu>;
+
+const items = [
+    {id: 'date-added', label: 'Date added', selected: true},
+    {id: 'name', label: 'Name'},
+    {id: 'redemptions', label: 'Redemptions'}
+];
+
+export const Default: Story = {
+    args: {
+        items: items,
+        onSortChange: () => {},
+        onDirectionChange: () => {},
+        position: 'start'
+    },
+    decorators: [
+        ThisStory => (
+            <div style={{maxWidth: '100px', margin: '0 auto'}}><ThisStory /></div>
+        )
+    ]
+};
diff --git a/apps/admin-x-design-system/src/global/SortMenu.tsx b/apps/admin-x-design-system/src/global/SortMenu.tsx
new file mode 100644
index 00000000000..63b20f46cd4
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/SortMenu.tsx
@@ -0,0 +1,88 @@
+import React, {useState, useEffect} from 'react';
+import Button, {ButtonProps} from './Button';
+import Popover, {PopoverPosition} from './Popover';
+import {Icon} from '..';
+
+export type SortDirection = 'asc' | 'desc';
+
+export type SortItem = {
+    id: string,
+    label: string;
+    selected?: boolean;
+    direction?: SortDirection;
+}
+
+export interface SortMenuProps {
+    items: SortItem[];
+    direction: SortDirection;
+    onSortChange: (selectedOption: string) => void;
+    onDirectionChange: (selectedDirection: string) => void;
+    trigger?: React.ReactNode;
+    triggerButtonProps?: ButtonProps;
+    position?: PopoverPosition;
+}
+
+const SortMenu: React.FC<SortMenuProps> = ({
+    items,
+    direction,
+    onSortChange,
+    onDirectionChange,
+    trigger,
+    triggerButtonProps,
+    position = 'start'
+}) => {
+    const [localItems, setLocalItems] = useState<SortItem[]>(items);
+    const [localDirection, setLocalDirection] = useState<SortDirection>(direction || 'desc');
+
+    useEffect(() => {
+        setLocalItems(items);
+    }, [items]);
+
+    const handleSortChange = (selectedValue: string) => {
+        const updatedItems = localItems.map(item => ({
+            ...item,
+            selected: item.id === selectedValue ? true : false
+        }));
+        setLocalItems(updatedItems);
+
+        if (localItems.find(item => item.id === selectedValue)?.direction) {
+            setLocalDirection(localItems.find(item => item.id === selectedValue)?.direction || 'desc');
+            onDirectionChange(localDirection);
+        }
+
+        onSortChange(selectedValue);
+    };
+
+    const handleSortDirection = (e?: React.MouseEvent<HTMLElement, MouseEvent>) => {
+        e?.stopPropagation();
+        setLocalDirection(currentDirection => (currentDirection === 'desc' ? 'asc' : 'desc'));
+        onDirectionChange(localDirection);
+    };
+
+    if (!trigger) {
+        trigger = <Button className='flex-row-reverse' icon={`${localDirection === 'asc' ? 'arrow-up' : 'arrow-down'}`} iconColorClass='!w-3 !h-3 !mr-0 ml-1.5' label={`${localItems.find(item => item.selected)?.label}`} {...triggerButtonProps} />;
+    }
+
+    return (
+        <Popover position={position} trigger={trigger}>
+            <div className='flex flex-col'>
+                <div className='cursor-default select-none border-b border-b-grey-200 p-2 pl-3 text-sm font-semibold dark:border-b-grey-800'>Sort by</div>
+                <div className="flex min-w-[160px] flex-col justify-stretch py-1" role="none">
+                    {localItems.map(item => (
+                        <button key={item.id} className="group relative mx-1 flex grow cursor-pointer items-center rounded-[2.5px] px-8 py-1.5 pr-12 text-left text-sm hover:bg-grey-100 dark:hover:bg-grey-800" type="button" onClick={() => {
+                            handleSortChange(item.id);
+                        }}>
+                            {item.selected ? <Icon className='absolute left-2' name='check' size='xs' /> : null}
+                            {item.label}
+                            {item.selected ? <button className='absolute right-1 flex h-6 w-6 cursor-pointer items-center justify-center rounded-full hover:bg-grey-300 dark:hover:bg-grey-700' title={`${localDirection === 'asc' ? 'Ascending' : 'Descending'}`} type='button' onClick={handleSortDirection}>
+                                {localDirection === 'asc' ? <Icon name='arrow-up' size='xs' /> : <Icon name='arrow-down' size='xs' />}
+                            </button> : null}
+                        </button>
+                    ))}
+                </div>
+            </div>
+        </Popover>
+    );
+};
+
+export default SortMenu;
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-design-system/src/global/SortableList.tsx b/apps/admin-x-design-system/src/global/SortableList.tsx
new file mode 100644
index 00000000000..43247d0339d
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/SortableList.tsx
@@ -0,0 +1,177 @@
+import {DndContext, DragOverlay, DraggableAttributes, closestCenter} from '@dnd-kit/core';
+import {SortableContext, useSortable, verticalListSortingStrategy} from '@dnd-kit/sortable';
+import {CSS} from '@dnd-kit/utilities';
+import clsx from 'clsx';
+import React, {ElementType, HTMLProps, ReactNode, useState} from 'react';
+import Heading from './Heading';
+import Hint from './Hint';
+import Icon from './Icon';
+import Separator from './Separator';
+
+export interface SortableItemContainerProps {
+    id: string;
+    setRef?: (element: HTMLElement | null) => void;
+    isDragging: boolean;
+    dragHandleAttributes?: DraggableAttributes;
+    // TODO: figure out a stricter alternative for Function
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    dragHandleListeners?: Record<string, Function>;
+    dragHandleClass?: string;
+    style?: React.CSSProperties;
+    children: ReactNode;
+    separator?: boolean;
+}
+
+export type DragIndicatorProps = Pick<SortableItemContainerProps, 'isDragging' | 'dragHandleAttributes' | 'dragHandleListeners' | 'dragHandleClass'> & React.HTMLAttributes<HTMLButtonElement>
+
+export const DragIndicator: React.FC<DragIndicatorProps> = ({isDragging, dragHandleAttributes, dragHandleListeners, dragHandleClass, className, ...props}) => (
+    <button
+        className={clsx(
+            'opacity-50 group-hover:opacity-100',
+            isDragging ? 'cursor-grabbing' : 'cursor-grab',
+            dragHandleClass,
+            className
+        )}
+        type='button'
+        {...dragHandleAttributes}
+        {...dragHandleListeners}
+        {...props}
+    >
+        <Icon colorClass='text-grey-500' name='hamburger' size='sm' />
+    </button>
+);
+
+const DefaultContainer: React.FC<SortableItemContainerProps> = ({
+    setRef,
+    isDragging,
+    style,
+    separator,
+    children,
+    ...props
+}) => (
+    <div
+        ref={setRef}
+        className={clsx(
+            'group flex w-full items-center gap-3 bg-white py-1 dark:bg-black',
+            separator && 'border-b border-grey-200',
+            isDragging && 'opacity-75'
+        )}
+        style={style}
+    >
+        <DragIndicator className='h-7' isDragging={isDragging} {...props} />
+        {children}
+    </div>
+);
+
+const SortableItem: React.FC<{
+    id: string
+    children: ReactNode;
+    separator?: boolean;
+    dragHandleClass?: string;
+    container: (props: SortableItemContainerProps) => ReactNode;
+}> = ({id, children, separator, dragHandleClass, container}) => {
+    const {
+        attributes,
+        listeners,
+        setNodeRef,
+        transform,
+        transition
+    } = useSortable({id});
+
+    const style = {
+        transform: CSS.Transform.toString(transform),
+        transition
+    };
+
+    return container({
+        id,
+        setRef: setNodeRef,
+        isDragging: false,
+        separator: separator,
+        dragHandleClass: dragHandleClass,
+        dragHandleAttributes: attributes,
+        dragHandleListeners: listeners,
+        style,
+        children
+    });
+};
+
+export interface SortableListProps<Item extends {id: string}> extends HTMLProps<HTMLDivElement> {
+    title?: string;
+    titleSeparator?: boolean;
+    hint?: React.ReactNode;
+    items: Item[];
+    itemSeparator?: boolean;
+    dragHandleClass?: string;
+    onMove: (id: string, overId: string) => void;
+    renderItem: (item: Item) => ReactNode;
+    container?: (props: SortableItemContainerProps) => ReactNode;
+    wrapper?: ElementType;
+    dragOverlayWrapper?: keyof JSX.IntrinsicElements;
+}
+
+/**
+ * Note: For lists which don't have an ID, you can use `useSortableIndexedList` to give items a consistent index-based ID.
+ */
+const SortableList = <Item extends {id: string}>({
+    title,
+    titleSeparator,
+    hint,
+    items,
+    itemSeparator = true,
+    dragHandleClass,
+    onMove,
+    renderItem,
+    container = props => <DefaultContainer {...props} />,
+    wrapper: Wrapper = React.Fragment,
+    dragOverlayWrapper,
+    ...props
+}: SortableListProps<Item>) => {
+    const [draggingId, setDraggingId] = useState<string | null>(null);
+
+    if (!items.length) {
+        return <></>;
+    }
+
+    return (
+        <div {...props}>
+            {title && <Heading level={6} separator={titleSeparator} grey>{title}</Heading>}
+            <div className={`${title && titleSeparator ? '-mt-2' : ''}`}>
+                <DndContext
+                    collisionDetection={closestCenter}
+                    onDragEnd={(event) => {
+                        onMove(event.active.id as string, event.over?.id as string);
+                        setDraggingId(null);
+                    }}
+                    onDragStart={event => setDraggingId(event.active.id as string)}
+                >
+                    <Wrapper>
+                        <SortableContext
+                            items={items}
+                            strategy={verticalListSortingStrategy}
+                        >
+                            {items.map(item => (
+                                <SortableItem key={item.id} container={container} dragHandleClass={dragHandleClass} id={item.id} separator={itemSeparator}>{renderItem(item)}</SortableItem>
+                            ))}
+                        </SortableContext>
+                    </Wrapper>
+                    <DragOverlay wrapperElement={dragOverlayWrapper}>
+                        {draggingId ? container({
+                            id: draggingId,
+                            isDragging: true,
+                            children: renderItem(items.find(({id}) => id === draggingId)!)
+                        }) : null}
+                    </DragOverlay>
+                </DndContext>
+            </div>
+            {hint &&
+            <>
+                {!itemSeparator && <Separator />}
+                <Hint>{hint}</Hint>
+            </>
+            }
+        </div>
+    );
+};
+
+export default SortableList;
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 75%
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
index 62ab4926946..3315ed778f9 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/TabView.stories.tsx
+++ b/apps/admin-x-design-system/src/global/TabView.stories.tsx
@@ -29,6 +29,12 @@ const tabs = [
     {id: 'tab-6', title: 'Backstreet boys', contents: <div className='py-5'>Contents three</div>}
 ];
 
+const tabsWithIcons = [
+    {id: 'tab-1', title: 'Some items', icon: 'at-sign', contents: <div className='py-5'>Contents one</div>},
+    {id: 'tab-2', title: 'Lots of items', icon: 'hamburger', contents: <div className='py-5'>Contents two</div>},
+    {id: 'tab-3', title: 'No items', icon: 'laptop', contents: <div className='py-5'>Contents three</div>}
+];
+
 const tabsWithCounters = [
     {id: 'tab-1', title: 'Some items', counter: 4, contents: <div className='py-5'>Contents one</div>},
     {id: 'tab-2', title: 'Lots of items', counter: 12, contents: <div className='py-5'>Contents two</div>},
@@ -49,8 +55,21 @@ export const NoBorder: Story = {
     }
 };
 
+export const WithIcon: Story = {
+    args: {
+        tabs: tabsWithIcons
+    }
+};
+
 export const WithCounter: Story = {
     args: {
         tabs: tabsWithCounters
     }
 };
+
+export const WithTopRightContent: Story = {
+    args: {
+        tabs: tabs,
+        topRightContent: <p>Some content</p>
+    }
+};
diff --git a/apps/admin-x-design-system/src/global/TabView.tsx b/apps/admin-x-design-system/src/global/TabView.tsx
new file mode 100644
index 00000000000..2e8757b90db
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/TabView.tsx
@@ -0,0 +1,165 @@
+import * as TabsPrimitive from '@radix-ui/react-tabs';
+import clsx from 'clsx';
+import React from 'react';
+import Icon from './Icon';
+
+export type Tab<ID = string> = {
+    id: ID;
+    title: string;
+    icon?: string;
+    counter?: number | null;
+    tabWrapperClassName?: string;
+    containerClassName?: string;
+
+    /**
+     * Optional, so you can just use the tabs to other views
+    */
+    contents?: React.ReactNode;
+}
+
+export type TabWidth = 'narrow' | 'normal' | 'wide';
+
+export interface TabButtonProps<ID = string> {
+    id: ID,
+    title: string;
+    onClick?: (e:React.MouseEvent<HTMLButtonElement>) => void;
+    border?: boolean;
+    icon?: string;
+    counter?: number | null;
+}
+
+export const TabButton: React.FC<TabButtonProps> = ({
+    id,
+    title,
+    onClick,
+    border,
+    icon,
+    counter
+}) => {
+    return (
+        <TabsPrimitive.Trigger
+            className={clsx(
+                '-m-b-px cursor-pointer appearance-none whitespace-nowrap py-1 text-md font-medium text-grey-700 transition-all after:invisible after:block after:h-px after:overflow-hidden after:font-bold after:text-transparent after:content-[attr(title)] data-[state=active]:font-bold data-[state=active]:text-black dark:text-white [&>span]:data-[state=active]:text-black',
+                border && 'border-b-2 border-transparent hover:border-grey-500 data-[state=active]:border-black data-[state=active]:dark:border-white'
+            )}
+            id={id}
+            role='tab'
+            title={title}
+            value={id}
+            onClick={onClick}
+        >
+            {icon && <Icon className='mb-0.5 mr-1.5 inline' name={icon} size='sm' />}
+            {title}
+            {(typeof counter === 'number') && <span className='ml-1.5 rounded-full bg-grey-200 px-1.5 py-[2px] text-xs font-medium text-grey-800 dark:bg-grey-900 dark:text-grey-300'>{counter}</span>}
+        </TabsPrimitive.Trigger>
+    );
+};
+
+export interface TabListProps<ID = string> {
+    tabs: readonly Tab<ID>[];
+    width: TabWidth;
+    handleTabChange?: (e: React.MouseEvent<HTMLButtonElement>) => void;
+    border: boolean;
+    buttonBorder?: boolean;
+    selectedTab?: ID,
+    topRightContent?: React.ReactNode
+}
+
+export const TabList: React.FC<TabListProps> = ({
+    tabs,
+    width = 'normal',
+    handleTabChange,
+    border,
+    buttonBorder,
+    topRightContent
+}) => {
+    const containerClasses = clsx(
+        'no-scrollbar flex w-full overflow-x-auto',
+        width === 'narrow' && 'gap-3',
+        width === 'normal' && 'gap-5',
+        width === 'wide' && 'gap-7',
+        border && 'border-b border-grey-300 dark:border-grey-900'
+    );
+    return (
+        <TabsPrimitive.List>
+            <div className={containerClasses} role='tablist'>
+                {tabs.map(tab => (
+                    <div>
+                        <TabButton
+                            border={buttonBorder}
+                            counter={tab.counter}
+                            icon={tab.icon}
+                            id={tab.id}
+                            title={tab.title}
+                            onClick={handleTabChange}
+                        />
+                    </div>
+                ))}
+                {topRightContent !== null ?
+                    <div className='ml-auto'>{topRightContent}</div> :
+                    null
+                }
+            </div>
+        </TabsPrimitive.List>
+    );
+};
+
+export interface TabViewProps<ID = string> {
+    tabs: readonly Tab<ID>[];
+    onTabChange: (id: ID) => void;
+    selectedTab?: ID;
+    border?: boolean;
+    buttonBorder?: boolean;
+    width?: TabWidth;
+    containerClassName?: string;
+    topRightContent?: React.ReactNode;
+    testId?: string;
+}
+
+function TabView<ID extends string = string>({
+    testId,
+    tabs,
+    onTabChange,
+    selectedTab,
+    border = true,
+    buttonBorder = border,
+    width = 'normal',
+    containerClassName,
+    topRightContent
+}: TabViewProps<ID>) {
+    if (tabs.length !== 0 && selectedTab === undefined) {
+        selectedTab = tabs[0].id;
+    }
+
+    if (tabs.length === 0) {
+        return (<></>);
+    }
+
+    const handleTabChange = (e: React.MouseEvent<HTMLButtonElement>) => {
+        const newTab = e.currentTarget.id as ID;
+        onTabChange(newTab);
+    };
+
+    return (
+        <TabsPrimitive.Root className={containerClassName} data-testid={testId} value={selectedTab}>
+            <TabList
+                border={border}
+                buttonBorder={buttonBorder}
+                handleTabChange={handleTabChange}
+                selectedTab={selectedTab}
+                tabs={tabs}
+                topRightContent={topRightContent}
+                width={width}
+            />
+            {tabs.map((tab) => {
+                return (
+                    <TabsPrimitive.Content className={tab.tabWrapperClassName} value={tab.id}>
+                        <div className={tab.containerClassName}>{tab.contents}</div>
+                    </TabsPrimitive.Content>
+                );
+            })}
+        </TabsPrimitive.Root>
+    );
+};
+
+export default TabView;
diff --git a/apps/admin-x-design-system/src/global/Table.stories.tsx b/apps/admin-x-design-system/src/global/Table.stories.tsx
new file mode 100644
index 00000000000..bd294e5e6bc
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Table.stories.tsx
@@ -0,0 +1,246 @@
+import type {Meta, StoryObj} from '@storybook/react';
+import {ReactNode} from 'react';
+
+import {useSortableIndexedList} from '..';
+import SortableList, {DragIndicator, SortableItemContainerProps} from './SortableList';
+import Table from './Table';
+import TableCell from './TableCell';
+import TableHead from './TableHead';
+import TableRow from './TableRow';
+import * as TableRowStories from './TableRow.stories';
+
+const meta = {
+    title: 'Global / Table',
+    component: Table,
+    tags: ['autodocs']
+} satisfies Meta<typeof Table>;
+
+const {/*id,*/ ...tableRowProps} = TableRowStories.HiddenAction.args || {};
+
+const tableHeader = (
+    <>
+        <TableHead>Name</TableHead>
+        <TableHead>Email</TableHead>
+    </>
+);
+
+const tableRows = (
+    <>
+        <TableRow {...tableRowProps}>
+            <TableCell>Jamie Larson</TableCell>
+            <TableCell>jamie@example.com</TableCell>
+        </TableRow>
+        <TableRow {...tableRowProps}>
+            <TableCell>Jamie Larson</TableCell>
+            <TableCell>jamie@example.com</TableCell>
+        </TableRow>
+        <TableRow {...tableRowProps}>
+            <TableCell>Jamie Larson</TableCell>
+            <TableCell>jamie@example.com</TableCell>
+        </TableRow>
+        <TableRow {...tableRowProps}>
+            <TableCell>Jamie Larson</TableCell>
+            <TableCell>jamie@example.com</TableCell>
+        </TableRow>
+        <TableRow {...tableRowProps}>
+            <TableCell>Jamie Larson</TableCell>
+            <TableCell>jamie@example.com</TableCell>
+        </TableRow>
+    </>
+);
+
+export default meta;
+type Story = StoryObj<typeof Table>;
+
+export const Default: Story = {
+    args: {
+        children: tableRows
+    },
+    decorators: [(_story: () => ReactNode) => (<div style={{maxWidth: '600px'}}>{_story()}</div>)]
+};
+
+export const WithHeader: Story = {
+    args: {
+        header: tableHeader,
+        children: tableRows
+    }
+};
+
+export const WithPageTitle: Story = {
+    args: {
+        pageTitle: 'This is a page title',
+        children: tableRows
+    }
+};
+
+export const WithRowAction: Story = {
+    args: {
+        header: tableHeader,
+        children: tableRows
+    }
+};
+
+export const WithHint: Story = {
+    args: {
+        header: tableHeader,
+        children: tableRows,
+        hint: 'This is a hint',
+        hintSeparator: true
+    }
+};
+
+export const Loading: Story = {
+    args: {
+        header: tableHeader,
+        children: tableRows,
+        isLoading: true,
+        hint: 'This is a hint',
+        hintSeparator: true
+    }
+};
+
+// Components for Sortable example
+
+const SortableContainer: React.FC<Partial<SortableItemContainerProps>> = ({setRef, isDragging, style, children, ...props}) => {
+    const container = (
+        <TableRow ref={setRef} className={isDragging ? 'opacity-75' : ''} style={style} hideActions>
+            {(props.dragHandleAttributes || isDragging) && <TableCell className='w-10'>
+                <DragIndicator className='h-5' isDragging={isDragging || false} {...props} />
+            </TableCell>}
+            {children}
+        </TableRow>
+    );
+
+    if (isDragging) {
+        return <Table>{container}</Table>;
+    } else {
+        return container;
+    }
+};
+
+const SortableItem: React.FC<{id: string; item: string}> = ({id, item}) => {
+    return (
+        <>
+            <TableCell className='whitespace-nowrap'>{id}.</TableCell>
+            <TableCell className='w-full'>{item}</TableCell>
+        </>
+    );
+};
+
+const SortableTable = () => {
+    const list = useSortableIndexedList({
+        items: ['First', 'Second'],
+        setItems: () => {},
+        blank: '',
+        canAddNewItem: () => false
+    });
+
+    return <SortableList
+        container={props => <SortableContainer {...props} />}
+        items={list.items}
+        renderItem={item => <SortableItem {...item} />}
+        wrapper={Table}
+        onMove={list.moveItem}
+    />;
+};
+
+/**
+ * Example of combining Table and SortableList to create a sortable table.
+ * This is a little complex as each type of container/item needs to be overridden
+ * to end up with the correct table->tbody->tr->td structure.
+ */
+export const Sortable: Story = {
+    render: () => <SortableTable />
+};
+
+/**
+ * Sticky header
+ */
+
+// const complexTableHeader = (sticky: boolean) => (
+//     <>
+//         <TableHead sticky={sticky}>Member</TableHead>
+//         <TableHead sticky={sticky}>Status</TableHead>
+//         <TableHead sticky={sticky}>Open rate</TableHead>
+//         <TableHead sticky={sticky}>Location</TableHead>
+//         <TableHead sticky={sticky}>Created</TableHead>
+//         <TableHead sticky={sticky}>Signed up on post</TableHead>
+//         <TableHead sticky={sticky}>Newsletter</TableHead>
+//         <TableHead sticky={sticky}>Billing Period</TableHead>
+//         <TableHead sticky={sticky}>Email sent</TableHead>
+//     </>
+// );
+
+// const complexTableRows = (rows: number) => {
+//     const data = [];
+//     for (let i = 0; i < rows; i++) {
+//         data.push(
+//             <>
+//                 <TableRow>
+//                     <TableCell>
+//                         <div className='flex items-center gap-2'>
+//                             {i % 3 === 0 && <Avatar bgColor='green' label='JL' labelColor='white' />}
+//                             {i % 3 === 1 && <Avatar bgColor='orange' label='GS' labelColor='white' />}
+//                             {i % 3 === 2 && <Avatar bgColor='black' label='ZB' labelColor='white' />}
+//                             <div>
+//                                 {i % 3 === 0 && <div className='whitespace-nowrap'>Jamie Larson</div>}
+//                                 {i % 3 === 1 && <div className='whitespace-nowrap'>Giana Septimus</div>}
+//                                 {i % 3 === 2 && <div className='whitespace-nowrap'>Zaire Bator</div>}
+//                                 <div className='text-sm text-grey-700'>jamie@larson.com</div>
+//                             </div>
+//                         </div>
+//                     </TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>Free</TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>40%</TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>London, UK</TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>22 June 2023</TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>Hiking in the Nordic</TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>Subscribed</TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>Monthly</TableCell>
+//                     <TableCell className='whitespace-nowrap' valign='center'>1,303</TableCell>
+//                 </TableRow>
+//             </>
+//         );
+//     }
+//     return data;
+// };
+
+// export const HorizontalScroll: Story = {
+//     args: {
+//         header: complexTableHeader(false),
+//         children: complexTableRows(100),
+//         hint: 'Massive table',
+//         hintSeparator: true
+//     }
+// };
+
+// export const FillContainer: Story = {
+//     args: {
+//         fillContainer: true,
+//         header: complexTableHeader(true),
+//         children: complexTableRows(50),
+//         hint: 'Massive table',
+//         hintSeparator: true
+//     }
+// };
+
+// export const PageExample: Story = {
+//     decorators: [(_story: () => ReactNode) => (
+//         <div className='absolute inset-0 p-10'>
+//             <div className='flex h-full flex-col'>
+//                 <h1 className='mb-3'>Page title</h1>
+//                 <p className='max-w-2xl pb-6'>This example shows how you can create a page with arbitrary content on the top and a large table at the bottom that fills up the remaining space. The table has a sticky header row, a footer that is always visible and scrolling vertically and horizontally (resize the window to see the effect).</p>
+//                 <p className='max-w-2xl pb-6'>The size and positioning of the table is completely controlled by its <strong>container</strong>. The container must have `relative` position. Use a column flexbox as the main container of the page then set the table container to flex-auto to fill the available horizontal space.</p>
+//                 <div className='relative -mx-10 flex-auto'>{_story()}</div>
+//             </div>
+//         </div>
+//     )],
+//     args: {
+//         fillContainer: true,
+//         header: complexTableHeader(true),
+//         children: complexTableRows(50),
+//         hint: 'The footer of the table sticks to the bottom to stay visible',
+//         hintSeparator: true,
+//         paddingXClassName: 'px-10'
+//     }
+// };
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/global/Table.tsx b/apps/admin-x-design-system/src/global/Table.tsx
new file mode 100644
index 00000000000..f6c23cca317
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Table.tsx
@@ -0,0 +1,198 @@
+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 Separator from './Separator';
+import TableRow from './TableRow';
+
+export interface ShowMoreData {
+    hasMore: boolean;
+    loadMore: () => void;
+}
+
+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
+     */
+    header?: React.ReactNode;
+    pageTitle?: string;
+    children?: React.ReactNode;
+    borderTop?: boolean;
+    hint?: React.ReactNode;
+    hintSeparator?: boolean;
+    className?: string;
+    isLoading?: boolean;
+    pagination?: PaginationData;
+    showMore?: ShowMoreData;
+    fillContainer?: boolean;
+    horizontalScroll?: boolean;
+    paddingXClassName?: string;
+}
+
+const OptionalPagination = ({pagination}: {pagination?: PaginationData}) => {
+    if (!pagination) {
+        return null;
+    }
+
+    return <Pagination {...pagination}/>;
+};
+
+const OptionalShowMore = ({showMore}: {showMore?: ShowMoreData}) => {
+    if (!showMore) {
+        return null;
+    } else if (!showMore.hasMore) {
+        return <div></div>;
+    }
+
+    return (
+        <div className={`mt-1 flex items-center gap-2 text-sm font-bold text-green hover:text-green-400`}>
+            <button type='button' onClick={showMore.loadMore}>Show all</button>
+        </div>
+    );
+};
+
+const Table: React.FC<TableProps> = ({
+    header,
+    children,
+    borderTop,
+    hint,
+    hintSeparator,
+    pageTitle,
+    className,
+    pagination,
+    showMore,
+    isLoading,
+    fillContainer = false,
+    horizontalScroll = false,
+    paddingXClassName
+}) => {
+    const table = React.useRef<HTMLTableSectionElement>(null);
+    const maxTableHeight = React.useRef(0);
+    const [tableHeight, setTableHeight] = React.useState<number | undefined>(undefined);
+
+    const multiplePages = pagination && pagination.pages && pagination.pages > 1;
+
+    // Observe the height of the table content. This is used to:
+    // 1) avoid layout jumps when loading a new page of the table
+    // 2) keep the same table height between pages, cf. https://github.com/TryGhost/Product/issues/3881
+    React.useEffect(() => {
+        if (table.current) {
+            const resizeObserver = new ResizeObserver((entries) => {
+                const height = entries[0].target.clientHeight;
+                setTableHeight(height);
+
+                if (height > maxTableHeight.current) {
+                    maxTableHeight.current = height;
+                }
+            });
+
+            resizeObserver.observe(table.current);
+
+            return () => {
+                resizeObserver.disconnect();
+            };
+        }
+    }, [isLoading, pagination]);
+
+    const loadingStyle = React.useMemo(() => {
+        if (tableHeight === undefined) {
+            return {
+                height: 'auto'
+            };
+        }
+
+        return {
+            height: maxTableHeight.current
+        };
+    }, [tableHeight]);
+
+    const spaceHeightStyle = React.useMemo(() => {
+        if (tableHeight === undefined) {
+            return {
+                height: 0
+            };
+        }
+
+        return {
+            height: maxTableHeight.current - tableHeight
+        };
+    }, [tableHeight]);
+
+    const headerClasses = clsx(
+        'h-9 border-b border-grey-200 dark:border-grey-600'
+    );
+
+    /**
+     * To have full-bleed scroll try this:
+     * - unset width of table
+     * - set minWidth of table to 100%
+     * - set side padding of table to 40px
+     * - unset tableContainer width
+     * - set minWidth of tableContainer to 100%
+     * - unset mainContainer width
+     * - set minWidth of mainContainer to 100%
+     * - set side margins of outer container to -40px
+     * - set footer side paddings to 40px
+     */
+
+    const tableClasses = clsx(
+        'w-full',
+        fillContainer ? 'min-w-full' : 'w-full',
+        (borderTop || pageTitle) && 'border-t border-grey-300',
+        pageTitle ? 'mb-0 mt-14' : 'my-0',
+        className
+    );
+
+    const mainContainerClasses = clsx(
+        horizontalScroll ? 'overflow-x-auto' : '',
+        fillContainer ? 'absolute inset-0 min-w-full' : 'w-full'
+    );
+
+    const tableContainerClasses = clsx(
+        fillContainer ? 'max-h-[calc(100%-38px)] w-full overflow-y-auto' : 'w-full',
+        paddingXClassName
+    );
+
+    const footerClasses = clsx(
+        'sticky bottom-0 -mt-px bg-white pb-3 dark:bg-black',
+        paddingXClassName
+    );
+
+    return (
+        <>
+            <div className={mainContainerClasses}>
+                {pageTitle && <Heading>{pageTitle}</Heading>}
+
+                <div className={tableContainerClasses}>
+                    <table className={tableClasses}>
+                        {header && <thead className={headerClasses}>
+                            <TableRow bgOnHover={false} separator={false}>{header}</TableRow>
+                        </thead>}
+                        {!isLoading && <tbody ref={table}>
+                            {children}
+                        </tbody>}
+
+                        {multiplePages && <div style={spaceHeightStyle} />}
+                    </table>
+                </div>
+
+                {isLoading && <div className='p-5'><LoadingIndicator delay={200} size='lg' style={loadingStyle} /></div>}
+
+                {(hint || pagination || showMore) &&
+                    <footer className={footerClasses}>
+                        {(hintSeparator || pagination) && <Separator />}
+                        <div className="mt-1 flex flex-col-reverse items-start justify-between gap-1 pt-2 md:flex-row md:items-center md:gap-0 md:pt-0">
+                            <OptionalShowMore showMore={showMore} />
+                            <Hint>{hint ?? ' '}</Hint>
+                            <OptionalPagination pagination={pagination} />
+                        </div>
+                    </footer>}
+            </div>
+        </>
+    );
+};
+
+export default Table;
diff --git a/apps/admin-x-design-system/src/global/TableCell.tsx b/apps/admin-x-design-system/src/global/TableCell.tsx
new file mode 100644
index 00000000000..3bb08a5c834
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/TableCell.tsx
@@ -0,0 +1,36 @@
+import clsx from 'clsx';
+import React, {HTMLProps} from 'react';
+
+export interface TableCellProps extends HTMLProps<HTMLTableCellElement> {
+    padding?: boolean;
+    align?: 'left' | 'center' | 'right';
+    valign?: 'top' | 'center' | 'bottom';
+}
+
+const TableCell: React.FC<TableCellProps> = ({
+    className,
+    children,
+    padding = true,
+    align = 'left',
+    valign = 'top',
+    ...props
+}) => {
+    const tableCellClasses = clsx(
+        padding ? '!py-3 !pl-0 !pr-6' : '',
+        (align === 'center' && 'text-center'),
+        (align === 'right' && 'text-right'),
+        (valign === 'top' && 'align-top'),
+        (valign === 'center' && 'align-center'),
+        (valign === 'bottom' && 'align-bottom'),
+        props.onClick && 'hover:cursor-pointer',
+        className
+    );
+
+    return (
+        <td className={tableCellClasses} {...props}>
+            {children}
+        </td>
+    );
+};
+
+export default TableCell;
diff --git a/apps/admin-x-design-system/src/global/TableHead.tsx b/apps/admin-x-design-system/src/global/TableHead.tsx
new file mode 100644
index 00000000000..8ccdbbe35da
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/TableHead.tsx
@@ -0,0 +1,30 @@
+import clsx from 'clsx';
+import React, {HTMLProps} from 'react';
+import Heading from './Heading';
+
+export interface TableHeadProps extends HTMLProps<HTMLTableCellElement> {
+    sticky?: boolean;
+}
+
+const TableHead: React.FC<TableHeadProps> = ({
+    className,
+    children,
+    colSpan,
+    sticky = false,
+    ...props
+}) => {
+    const tableCellClasses = clsx(
+        '!py-2 !pl-0 !pr-6 text-left align-top',
+        sticky && 'sticky top-0 bg-white',
+        props.onClick && 'hover:cursor-pointer',
+        className
+    );
+
+    return (
+        <th className={tableCellClasses} colSpan={colSpan} {...props}>
+            <Heading className='whitespace-nowrap' level={6}>{children}</Heading>
+        </th>
+    );
+};
+
+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-design-system/src/global/TableRow.tsx b/apps/admin-x-design-system/src/global/TableRow.tsx
new file mode 100644
index 00000000000..7e40a3f5020
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/TableRow.tsx
@@ -0,0 +1,52 @@
+import clsx from 'clsx';
+import React, {forwardRef} from 'react';
+
+export const tableRowHoverBgClasses = 'hover:bg-gradient-to-r hover:from-white hover:to-grey-50 dark:hover:from-black dark:hover:to-grey-950';
+
+export interface TableRowProps {
+    id?: string;
+    action?: React.ReactNode;
+    hideActions?: boolean;
+    className?: string;
+    style?: React.CSSProperties;
+    testId?: string;
+
+    /**
+     * Hidden for the last item in the table
+     */
+    separator?: boolean;
+
+    bgOnHover?: boolean;
+    onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
+    children?: React.ReactNode;
+}
+
+const TableRow = forwardRef<HTMLTableRowElement, TableRowProps>(function TableRow({id, action, hideActions, className, style, testId, separator, bgOnHover = true, onClick, children}, ref) {
+    const handleClick = (e: React.MouseEvent<HTMLDivElement>) => {
+        onClick?.(e);
+    };
+
+    separator = (separator === undefined) ? true : separator;
+    const tableRowClasses = clsx(
+        'group/table-row',
+        bgOnHover && tableRowHoverBgClasses,
+        onClick && 'cursor-pointer',
+        separator ? 'border-b border-grey-100 last-of-type:border-b-transparent hover:border-grey-200 dark:border-grey-950 dark:hover:border-grey-900' : 'border-y border-none first-of-type:hover:border-t-transparent',
+        className
+    );
+
+    return (
+        <tr ref={ref} className={tableRowClasses} data-testid={testId} id={id} style={style} onClick={handleClick}>
+            {children}
+            {action &&
+                <td className={`w-[1%] whitespace-nowrap p-0 hover:cursor-pointer`}>
+                    <div className={`visible flex items-center justify-end py-3 pr-6 ${hideActions ? 'group-hover/table-row:visible md:invisible' : ''}`}>
+                        {action}
+                    </div>
+                </td>
+            }
+        </tr>
+    );
+});
+
+export default TableRow;
diff --git a/apps/admin-x-design-system/src/global/Toast.stories.tsx b/apps/admin-x-design-system/src/global/Toast.stories.tsx
new file mode 100644
index 00000000000..bdb5deb86ba
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Toast.stories.tsx
@@ -0,0 +1,136 @@
+import type {Meta, StoryObj} from '@storybook/react';
+import {ReactNode} from 'react';
+
+import Button from './Button';
+import {ShowToastProps, showToast} from './Toast';
+
+/**
+ * This component uses `react-hot-toast` which requires the `<Toaster />` component to be included in the app.
+ * The design system already does this so you don't have to — just call `showToast()` in any event and it'll work.
+ */
+const ToastContainer: React.FC<ShowToastProps> = ({...props}) => {
+    return (
+        <>
+            <Button color='black' label='Toast me!' onClick={() => {
+                showToast({...props});
+            }} />
+        </>
+    );
+};
+
+const meta = {
+    title: 'Global / Toast',
+    component: ToastContainer,
+    tags: ['autodocs'],
+    decorators: [(_story: () => ReactNode) => (
+        <>
+            {_story()}
+        </>
+    )]
+} satisfies Meta<typeof ToastContainer>;
+
+export default meta;
+type Story = StoryObj<typeof ToastContainer>;
+
+export const Default: Story = {
+    args: {
+        title: 'Toast title',
+        message: 'Hello notification in a toast'
+    }
+};
+
+export const TitleOnly: Story = {
+    args: {
+        title: 'Hello notification in a toast'
+    }
+};
+
+export const MinWidth: Story = {
+    args: {
+        title: 'Min toast'
+    }
+};
+
+export const TitleWithIcon: Story = {
+    args: {
+        title: 'Hello notification in a toast',
+        type: 'info',
+        options: {
+            duration: Infinity
+        }
+    }
+};
+
+export const MessageOnly: Story = {
+    args: {
+        message: 'Hey, this is a message in a toast. Almost like a message in a bottle.'
+    }
+};
+
+export const Info: Story = {
+    args: {
+        title: 'Toast title',
+        message: 'Hello success message in a toast',
+        type: 'info'
+    }
+};
+
+export const Success: Story = {
+    args: {
+        title: 'Toast title',
+        message: 'Hello success message in a toast',
+        type: 'success'
+    }
+};
+
+export const Error: Story = {
+    args: {
+        title: 'Toast title',
+        message: 'Hello error message in a toast',
+        type: 'error'
+    }
+};
+
+export const Infinite: Story = {
+    args: {
+        title: 'Toast title',
+        message: 'Hello error message in a toast',
+        type: 'error',
+        options: {
+            duration: Infinity
+        }
+    }
+};
+
+export const PageError: Story = {
+    args: {
+        title: 'Toast title',
+        message: 'This is a page error which should not be automatically dismissed.',
+        type: 'pageError'
+    }
+};
+
+export const Icon: Story = {
+    args: {
+        message: 'Custom icon in a toast',
+        icon: 'user-add'
+    }
+};
+
+export const Custom: Story = {
+    args: {
+        message: (
+            <div>
+                And here is one with a longer notification and a <a className='underline' href="https://ghost.org" rel="noreferrer" target="_blank">link</a>, custom <strong>formatting</strong>, icon and duration.
+            </div>
+        ),
+        icon: (
+            <>
+                👋
+            </>
+        ),
+        options: {
+            duration: 10000
+        }
+    }
+};
diff --git a/apps/admin-x-design-system/src/global/Toast.tsx b/apps/admin-x-design-system/src/global/Toast.tsx
new file mode 100644
index 00000000000..00703433a20
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Toast.tsx
@@ -0,0 +1,120 @@
+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' | 'info' | 'success' | 'error' | 'pageError';
+
+export interface ShowToastProps {
+    title?: React.ReactNode;
+    message?: React.ReactNode;
+    type?: ToastType;
+    icon?: React.ReactNode | string;
+    options?: ToastOptions
+}
+
+export interface ToastProps {
+    t: HotToast;
+
+    /**
+     * Can be a name of an icon from the icon library or a react component
+     */
+    children?: React.ReactNode;
+    props?: ShowToastProps;
+}
+
+/**
+ * This component uses `react-hot-toast` which requires the `<Toaster />` component to be included in the app.
+ * The design system already does this so you don't have to — just call `showToast()` in any event and it'll work.
+ */
+const Toast: React.FC<ToastProps> = ({
+    t,
+    children,
+    props
+}) => {
+    let iconColorClass = 'text-grey-500';
+
+    switch (props?.type) {
+    case 'info':
+        props.icon = props.icon || 'info-fill';
+        iconColorClass = 'text-grey-500';
+        break;
+    case 'success':
+        props.icon = props.icon || 'success-fill';
+        iconColorClass = 'text-green';
+        break;
+    case 'error':
+        props.icon = props.icon || 'error-fill';
+        iconColorClass = 'text-red';
+        break;
+    }
+
+    const classNames = clsx(
+        'relative z-[90] mb-[14px] ml-[6px] flex min-w-[272px] items-start justify-between gap-3 rounded-lg bg-white p-4 text-sm text-black shadow-md-heavy dark:bg-grey-925 dark:text-white',
+        props?.options?.position === 'top-center' ? 'max-w-[520px]' : 'max-w-[320px]',
+        t.visible ? (props?.options?.position === 'top-center' ? 'animate-toaster-top-in' : 'animate-toaster-in') : 'animate-toaster-out'
+    );
+
+    return (
+        <div className={classNames} data-testid={`toast-${props?.type}`}>
+            <div className='mr-7 flex items-start gap-[10px]'>
+                {props?.icon && (typeof props.icon === 'string' ?
+                    <div className='mt-px'><Icon className='grow' colorClass={iconColorClass} name={props.icon} size='sm' /></div> : props.icon)}
+                {children}
+            </div>
+            <button className='absolute right-5 top-5 -mr-1.5 -mt-1.5 cursor-pointer rounded-full p-2 text-grey-700 hover:text-black dark:hover:text-white' type='button' onClick={() => {
+                toast.dismiss(t.id);
+            }}>
+                <div>
+                    <Icon colorClass='stroke-2' name='close' size='2xs' />
+                </div>
+            </button>
+        </div>
+    );
+};
+
+export default Toast;
+
+export const showToast = ({
+    title,
+    message,
+    type = 'neutral',
+    icon = '',
+    options = {
+        position: 'bottom-left',
+        duration: 5000
+    }
+}: ShowToastProps): void => {
+    if (!options.position) {
+        options.position = 'bottom-left';
+    }
+
+    if (type === 'pageError') {
+        type = 'error';
+        options.position = 'top-center';
+        options.duration = Infinity;
+    }
+
+    toast.custom(t => (
+        <Toast props={{
+            type: type,
+            icon: icon,
+            options: options
+        }} t={t}>
+            <div>
+                {title && <span className='mt-px block text-md font-semibold leading-tighter tracking-[0.1px]'>{title}</span>}
+                {message &&
+                    <div className={`text-grey-900 dark:text-grey-300 ${title ? 'mt-1' : ''}`}>{message}</div>
+                }
+            </div>
+        </Toast>
+    ),
+    {
+        ...options
+    }
+    );
+};
+
+export const dismissAllToasts = (): void => {
+    toast.dismiss();
+};
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 86%
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
index 9711ea27ee5..91f7f43dc61 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/Tooltip.stories.tsx
+++ b/apps/admin-x-design-system/src/global/Tooltip.stories.tsx
@@ -6,7 +6,12 @@ import Tooltip from './Tooltip';
 const meta = {
     title: 'Global / Tooltip',
     component: Tooltip,
-    tags: ['autodocs']
+    tags: ['autodocs'],
+    decorators: [(_story: () => React.ReactNode) => (
+        <div className='p-10'>
+            {_story()}
+        </div>
+    )]
 } satisfies Meta<typeof Tooltip>;
 
 export default meta;
@@ -31,7 +36,7 @@ export const Left: Story = {
     args: {
         content: 'Hello tooltip on the left',
         children: <Button color='outline' label="Hover me" />,
-        origin: 'left'
+        origin: 'start'
     }
 };
 
@@ -47,7 +52,7 @@ export const Right: Story = {
     args: {
         content: 'Hello right tooltip',
         children: <Button color='outline' label="Hover me" />,
-        origin: 'right'
+        origin: 'end'
     }
 };
 
@@ -56,7 +61,7 @@ export const Long: Story = {
         content: `You're the best evil son an evil dad could ever ask for.`,
         children: <Button color='outline' label="Hover me" />,
         size: 'md',
-        origin: 'left'
+        origin: 'start'
     }
 };
 
@@ -66,4 +71,4 @@ export const OnText: Story = {
         children: 'Just hover me',
         origin: 'center'
     }
-};
\ No newline at end of file
+};
diff --git a/apps/admin-x-design-system/src/global/Tooltip.tsx b/apps/admin-x-design-system/src/global/Tooltip.tsx
new file mode 100644
index 00000000000..ec596da8ccf
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/Tooltip.tsx
@@ -0,0 +1,40 @@
+import * as TooltipPrimitive from '@radix-ui/react-tooltip';
+import clsx from 'clsx';
+import React from 'react';
+
+export interface TooltipProps {
+    content?: React.ReactNode;
+    size?: 'sm' | 'md';
+    children?: React.ReactNode;
+    containerClassName?: string;
+    tooltipClassName?: string;
+    origin?: 'start' | 'center' | 'end'
+}
+
+const Tooltip: React.FC<TooltipProps> = ({content, size = 'sm', children, containerClassName, tooltipClassName, origin = 'center'}) => {
+    containerClassName = clsx(
+        'will-change-[opacity]',
+        containerClassName
+    );
+
+    tooltipClassName = clsx(
+        'z-[9999] select-none rounded-sm bg-black px-2 py-0.5 leading-normal text-white will-change-[transform,opacity]',
+        size === 'sm' && 'text-xs',
+        size === 'md' && 'text-sm'
+    );
+
+    return (
+        <TooltipPrimitive.Provider delayDuration={0}>
+            <TooltipPrimitive.Root>
+                <TooltipPrimitive.Trigger className={containerClassName} onClick={event => event.preventDefault()}>
+                    {children}
+                </TooltipPrimitive.Trigger>
+                <TooltipPrimitive.Content align={origin} className={tooltipClassName} sideOffset={4} onPointerDownOutside={event => event.preventDefault()}>
+                    {content}
+                </TooltipPrimitive.Content>
+            </TooltipPrimitive.Root>
+        </TooltipPrimitive.Provider>
+    );
+};
+
+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-design-system/src/global/form/Checkbox.tsx b/apps/admin-x-design-system/src/global/form/Checkbox.tsx
new file mode 100644
index 00000000000..f620dc85208
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/form/Checkbox.tsx
@@ -0,0 +1,50 @@
+import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
+import Heading from '../Heading';
+import Hint from '../Hint';
+import React, {useId} from 'react';
+import Separator from '../Separator';
+
+export interface CheckboxProps {
+    title?: string;
+    label: string;
+    value: string;
+    onChange: (checked: boolean) => void;
+    disabled?: boolean;
+    error?: boolean;
+    hint?: React.ReactNode;
+    key?: string;
+    checked?: boolean;
+    separator?: boolean;
+}
+
+const Checkbox: React.FC<CheckboxProps> = ({title, label, value, onChange, disabled, error, hint, checked, separator}) => {
+    const id = useId();
+
+    const handleCheckedChange = (isChecked: boolean | 'indeterminate') => {
+        onChange(isChecked === true);
+    };
+
+    return (
+        <div>
+            <div className={`flex flex-col gap-1 ${separator && 'pb-2'}`}>
+                {title && <Heading grey={true} level={6}>{title}</Heading>}
+                <label className={`flex cursor-pointer items-start ${title && '-mb-1 mt-1'}`} htmlFor={id}>
+                    <CheckboxPrimitive.Root className="mt-0.5 flex h-4 w-4 cursor-pointer appearance-none items-center justify-center rounded-[3px] border border-solid border-grey-500 bg-white outline-none data-[state=checked]:border-black data-[state=indeterminate]:border-black data-[state=checked]:bg-black data-[state=indeterminate]:bg-black" defaultChecked={checked} disabled={disabled} id={id} value={value} onCheckedChange={handleCheckedChange}>
+                        <CheckboxPrimitive.Indicator>
+                            <svg fill="none" height="11" viewBox="0 0 10 11" width="10">
+                                <path d="M1 5.88889L4.6 9L9 1" stroke="white" strokeLinecap="round" strokeWidth="2"/>
+                            </svg>
+                        </CheckboxPrimitive.Indicator>
+                    </CheckboxPrimitive.Root>
+                    <div className={`ml-2 flex flex-col ${hint && 'mb-2'}`}>
+                        <span className={`inline-block text-[1.425rem] dark:text-white ${hint && '-mb-1'}`}>{label}</span>
+                        {hint && <Hint color={error ? 'red' : ''}>{hint}</Hint>}
+                    </div>
+                </label>
+            </div>
+            {(separator || error) && <Separator className={error ? 'border-red' : ''} />}
+        </div>
+    );
+};
+
+export default Checkbox;
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 75%
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..f429b62d9bb 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,12 @@
-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';
+import type {FetchKoenigLexical} from './HtmlEditor';
+
+export type {CodeEditorProps, FetchKoenigLexical};
 
 // 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 88%
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..fbcfdbe6c8a 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 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 CodeMirror, {ReactCodeMirrorProps, ReactCodeMirrorRef, BasicSetupOptions} from '@uiw/react-codemirror';
+import clsx from 'clsx';
+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;
@@ -27,7 +27,8 @@ const codeMirrorClasses = [
     '[&_.cm-gutters]:bg-grey-75 dark:[&_.cm-gutters]:bg-grey-950',
     '[&_.cm-gutters]:text-grey-600 dark:[&_.cm-gutters]:text-grey-500',
     '[&_.cm-gutters]:border-grey-500 dark:[&_.cm-gutters]:border-grey-800',
-    '[&_.cm-cursor]:border-grey-900 dark:[&_.cm-cursor]:border-grey-75'
+    '[&_.cm-cursor]:border-grey-900 dark:[&_.cm-cursor]:border-grey-75',
+    'dark:[&_.cm-tooltip-autocomplete.cm-tooltip_ul_li:not([aria-selected])]:bg-grey-975'
 ].join(' ');
 
 // Meant to be imported asynchronously to avoid including CodeMirror in the main bundle
@@ -49,6 +50,9 @@ const CodeEditorView = forwardRef<ReactCodeMirrorRef, CodeEditorProps>(function
     const sizeRef = useRef<HTMLDivElement>(null);
     const [width, setWidth] = useState(100);
     const [resolvedExtensions, setResolvedExtensions] = React.useState<Extension[] | null>(null);
+    const [basicSetup, setBasicSetup] = useState<BasicSetupOptions>({
+        crosshairCursor: false
+    });
     const {setFocusState} = useFocusContext();
 
     const handleFocus: FocusEventHandler<HTMLDivElement> = (e) => {
@@ -63,6 +67,7 @@ const CodeEditorView = forwardRef<ReactCodeMirrorRef, CodeEditorProps>(function
 
     useEffect(() => {
         Promise.all(extensions).then(setResolvedExtensions);
+        setBasicSetup(setup => ({setup, searchKeymap: false}));
     }, [extensions]);
 
     useEffect(() => {
@@ -75,7 +80,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',
@@ -90,6 +95,7 @@ const CodeEditorView = forwardRef<ReactCodeMirrorRef, CodeEditorProps>(function
         {resolvedExtensions && <div className={height === 'full' ? 'h-full' : ''} style={{width}}>
             <CodeMirror
                 ref={ref}
+                basicSetup={basicSetup}
                 className={styles}
                 extensions={resolvedExtensions}
                 height={height === 'full' ? '100%' : height}
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..a146ae0876d 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.round(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 88%
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..632cdd09900 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,19 @@
 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;
+    darkMode?: boolean;
 }
 
 declare global {
@@ -57,7 +61,9 @@ const KoenigWrapper: React.FC<HtmlEditorProps & { editor: EditorResource }> = ({
     onChange,
     onBlur,
     placeholder,
-    nodes
+    nodes,
+    emojiPicker = true,
+    darkMode = false
 }) => {
     const onError = useCallback((error: unknown) => {
         try {
@@ -124,21 +130,22 @@ const KoenigWrapper: React.FC<HtmlEditorProps & { editor: EditorResource }> = ({
 
     return (
         <koenig.KoenigComposer
+            darkMode={darkMode}
             nodes={koenig[nodes || 'DEFAULT_NODES']}
             onError={onError}
         >
             <koenig.KoenigComposableEditor
                 className='koenig-lexical koenig-lexical-editor-input'
-                darkMode={false}
                 isSnippetsEnabled={false}
                 markdownTransformers={transformers[nodes || 'DEFAULT_NODES']}
-                placeholderClassName='koenig-lexical-editor-input-placeholder'
+                placeholderClassName='koenig-lexical-editor-input-placeholder line-clamp-1'
                 placeholderText={placeholder}
                 singleParagraph={true}
                 onBlur={handleBlur}
                 onFocus={handleFocus}
             >
                 <koenig.HtmlOutputPlugin html={value} setHtml={handleSetHtml} />
+                {emojiPicker ? <koenig.EmojiPickerPlugin /> : null}
             </koenig.KoenigComposableEditor>
         </koenig.KoenigComposer>
     );
@@ -150,14 +157,14 @@ const HtmlEditor: React.FC<HtmlEditorProps & {
     className,
     ...props
 }) => {
-    const {fetchKoenigLexical} = useServices();
+    const {fetchKoenigLexical, darkMode} = useDesignSystem();
     const editorResource = useMemo(() => loadKoenig(fetchKoenigLexical), [fetchKoenigLexical]);
 
     return <div className={className || 'w-full'}>
         <div className="koenig-react-editor w-full [&_*]:!font-inherit [&_*]:!text-inherit">
             <ErrorBoundary name='editor'>
                 <Suspense fallback={<p className="koenig-react-editor-loading">Loading editor...</p>}>
-                    <KoenigWrapper {...props} editor={editorResource} />
+                    <KoenigWrapper {...props} darkMode={darkMode} editor={editorResource} />
                 </Suspense>
             </ErrorBoundary>
         </div>
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 86%
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
index 2e61dea8aa6..4aa36a7af2f 100644
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/HtmlField.tsx
+++ b/apps/admin-x-design-system/src/global/form/HtmlField.tsx
@@ -36,7 +36,7 @@ const HtmlField: React.FC<HtmlFieldProps> = ({
     const textFieldClasses = unstyled ? '' : clsx(
         'flex min-h-[32px] items-center rounded-md border border-transparent py-1.5 md:min-h-[36px]',
         clearBg ? 'bg-transparent' : 'bg-grey-150 px-3 dark:bg-grey-900',
-        error ? `border-red` : `dark:bg-dark-925 hover:bg-grey-100 focus:border-green focus:shadow-[0_0_0_1px_rgba(48,207,67,1)]`,
+        error ? `border-red` : `transition-all hover:bg-grey-100 has-[:focus]:border-green has-[:focus]:bg-white has-[:focus]:shadow-[0_0_0_1px_rgba(48,207,67,1)] dark:selection:bg-[rgba(88,101,116,0.99)] dark:hover:bg-grey-925 dark:has-[:focus]:bg-grey-950`,
         (title && !hideTitle && !clearBg) && `mt-2`,
         className
     );
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 98%
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..dd7540e69e2 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;
@@ -174,7 +174,7 @@ const ImageUpload: React.FC<ImageUploadProps> = ({
             <div className={`${buttonContainerClassName} ${unsplashEnabled ? 'relative' : ''}`}>
                 {
                     unsplashEnabled &&
-                        <button className={unsplashButtonClassName} type='button' onClick={openUnsplash}>
+                        <button className={unsplashButtonClassName} data-testid="toggle-unsplash-button" type='button' onClick={openUnsplash}>
                             {unsplashButtonContent}
                         </button>
                 }
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-design-system/src/global/form/Radio.tsx b/apps/admin-x-design-system/src/global/form/Radio.tsx
new file mode 100644
index 00000000000..390480a217f
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/form/Radio.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import Heading from '../Heading';
+import Hint from '../Hint';
+import Separator from '../Separator';
+import * as RadioPrimitive from '@radix-ui/react-radio-group';
+
+export interface RadioOption {
+    value: string;
+    label: string;
+    hint?: React.ReactNode;
+}
+
+export interface RadioProps {
+    id: string;
+    title?: string;
+    selectedOption?: string;
+    options: RadioOption[];
+    onSelect: (value: string) => void;
+    error?:boolean;
+    hint?: React.ReactNode;
+    separator?: boolean;
+}
+
+const Radio: React.FC<RadioProps> = ({id, title, options, onSelect, error, hint, selectedOption, separator}) => {
+    return (
+        <RadioPrimitive.Root defaultValue={selectedOption} name={id} onValueChange={onSelect}>
+            <div className={`flex flex-col gap-2 ${separator && 'pb-2'}`}>
+                {title && <Heading level={6}>{title}</Heading>}
+                {options.map(option => (
+                    <label key={option.value} className={`flex cursor-pointer items-start ${title && '-mb-1 mt-1'}`} htmlFor={option.value}>
+                        <RadioPrimitive.Item className="relative float-left mt-[3px] h-4 w-4 min-w-[16px] appearance-none rounded-full border-2 border-solid border-grey-300 hover:cursor-pointer focus:shadow-none focus:outline-none focus:ring-0 data-[state=checked]:border-green data-[state=checked]:focus:border-green dark:border-grey-800 dark:text-white dark:data-[state=checked]:border-green dark:data-[state=checked]:focus:border-green" id={option.value} value={option.value}>
+                            <RadioPrimitive.Indicator className="flex h-full w-full items-center justify-center after:block after:h-[6px] after:w-[6px] after:rounded-full after:border-green after:bg-green after:content-[''] dark:after:border-green dark:after:bg-green" />
+                        </RadioPrimitive.Item>
+                        <div className={`ml-2 flex flex-col ${option.hint && 'mb-2'}`}>
+                            <span className={`inline-block text-md dark:text-white ${option.hint && '-mb-1'}`}>{option.label}</span>
+                            {option.hint && <Hint>{option.hint}</Hint>}
+                        </div>
+                    </label>
+                ))}
+                {hint && <Hint color={error ? 'red' : ''}>{hint}</Hint>}
+            </div>
+            {(separator || error) && <Separator className={error ? 'border-red' : ''} />}
+        </RadioPrimitive.Root>
+    );
+};
+
+export default Radio;
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 79%
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..2fec4859986 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, useEffect} 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;
@@ -69,7 +69,7 @@ export type SelectProps = Props<SelectOption, false> & SelectOptionProps & {
 
 const DropdownIndicator: React.FC<DropdownIndicatorProps<SelectOption, false> & {clearBg: boolean}> = ({clearBg, ...props}) => (
     <components.DropdownIndicator {...props}>
-        <div className={`absolute top-[11px] block h-2 w-2 rotate-45 border-[1px] border-l-0 border-t-0 border-grey-900 content-[''] dark:border-grey-400 ${clearBg ? 'right-2' : 'right-[14px]'} `}></div>
+        <div className={`absolute top-[13px] block h-2 w-2 rotate-45 border-[1px] border-l-0 border-t-0 border-grey-900 content-[''] dark:border-grey-400 ${clearBg ? 'right-2' : 'right-[14px]'} `}></div>
     </components.DropdownIndicator>
 );
 
@@ -118,12 +118,35 @@ const Select: React.FC<SelectProps> = ({
         setFocusState(false);
     };
 
+    useEffect(() => {
+        const handleEscapeKey = (event: KeyboardEvent) => {
+            if (event.key === 'Escape') {
+                // Fix for Safari - if an element in the modal is focused, closing it will jump to
+                // the bottom of the page because Safari tries to focus the "next" element in the DOM
+                if (document.activeElement && document.activeElement instanceof HTMLElement) {
+                    document.activeElement.blur();
+                }
+                setFocusState(false);
+
+                // Prevent the event from bubbling up to the window level
+                event.stopPropagation();
+            }
+        };
+
+        document.addEventListener('keydown', handleEscapeKey);
+
+        // Clean up the event listener when the modal is closed
+        return () => {
+            document.removeEventListener('keydown', handleEscapeKey);
+        };
+    }, [setFocusState]);
+
     let containerClasses = '';
     if (!unstyled) {
         containerClasses = clsx(
             'dark:text-white',
             fullWidth && 'w-full',
-            disabled && 'opacity-40'
+            disabled && 'cursor-not-allowed opacity-40'
         );
     }
     containerClasses = clsx(
@@ -134,22 +157,23 @@ const Select: React.FC<SelectProps> = ({
     const customClasses = {
         control: clsx(
             controlClasses?.control,
-            'h-9 min-h-[36px] w-full cursor-pointer appearance-none rounded-md border outline-none dark:text-white',
+            'h-9 min-h-[36px] w-full appearance-none rounded-lg border outline-none dark:text-white md:h-[38px] md:min-h-[38px]',
             size === 'xs' ? 'py-0 pr-2 text-xs' : 'py-1 pr-4',
             clearBg ? '' : 'bg-grey-150 px-3 dark:bg-grey-900',
             error ? 'border-red' : `border-transparent ${!clearBg && 'hover:bg-grey-100 dark:hover:bg-grey-925'}`,
+            !disabled && 'cursor-pointer',
             (title && !clearBg) && 'mt-1.5'
         ),
         valueContainer: clsx('mr-1.5 gap-1', controlClasses?.valueContainer),
         placeHolder: clsx('text-grey-700 dark:text-grey-800', controlClasses?.placeHolder),
         menu: clsx(
-            'z-[300] rounded-b bg-white shadow dark:border dark:border-grey-900 dark:bg-black',
+            'z-[300] mt-0.5 overflow-hidden rounded-lg bg-white shadow-lg dark:border dark:border-grey-900 dark:bg-black',
             size === 'xs' && 'text-xs',
             controlClasses?.menu
         ),
-        option: clsx('px-3 py-[6px] hover:cursor-pointer hover:bg-grey-100 dark:text-white dark:hover:bg-grey-900', controlClasses?.option),
+        option: clsx('px-3 py-[7px] hover:cursor-pointer hover:bg-grey-100 dark:text-white dark:hover:bg-grey-900', controlClasses?.option),
         noOptionsMessage: clsx('nowrap p-3 text-grey-600', controlClasses?.noOptionsMessage),
-        groupHeading: clsx('px-3 py-[6px] text-2xs font-semibold uppercase tracking-wide text-grey-700', controlClasses?.groupHeading),
+        groupHeading: clsx('px-3 py-[7px] text-2xs font-semibold uppercase tracking-wide text-grey-700', controlClasses?.groupHeading),
         clearIndicator: clsx('', controlClasses?.clearIndicator)
     };
 
@@ -178,6 +202,7 @@ const Select: React.FC<SelectProps> = ({
         options,
         placeholder: prompt ? prompt : '',
         value: selectedOption,
+        isDisabled: disabled,
         unstyled: true,
         onChange: onSelect,
         onFocus: handleFocus,
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 88%
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
index b0b912b1314..611bfa14dd3 100644
--- 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
@@ -80,15 +80,6 @@ export const ResizeDisabled: Story = {
     }
 };
 
-export const MaxLength: Story = {
-    args: {
-        title: 'Description',
-        placeholder: 'Try to enter more than 80 characters, I dare you...',
-        value: 'This is a nice text area that only accepts up to 80 characters. Try to add more:',
-        maxLength: 80
-    }
-};
-
 export const Error: Story = {
     args: {
         title: 'Description',
diff --git a/apps/admin-x-design-system/src/global/form/TextArea.tsx b/apps/admin-x-design-system/src/global/form/TextArea.tsx
new file mode 100644
index 00000000000..2f2ad595e32
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/form/TextArea.tsx
@@ -0,0 +1,110 @@
+import React, {FocusEventHandler, HTMLProps, useId} from 'react';
+
+import clsx from 'clsx';
+import {useFocusContext} from '../../providers/DesignSystemProvider';
+import Heading from '../Heading';
+import Hint from '../Hint';
+import * as FormPrimitive from '@radix-ui/react-form';
+
+type ResizeOptions = 'both' | 'vertical' | 'horizontal' | 'none';
+type FontStyles = 'sans' | 'mono';
+
+export interface TextAreaProps extends HTMLProps<HTMLTextAreaElement> {
+    inputRef?: React.RefObject<HTMLTextAreaElement>;
+    title?: string;
+    value?: string;
+    rows?: number;
+    maxLength?: number;
+    resize?: ResizeOptions;
+    error?: boolean;
+    placeholder?: string;
+    hint?: React.ReactNode;
+    fontStyle?: FontStyles;
+    className?: string;
+    onChange?: (event: React.ChangeEvent<HTMLTextAreaElement>) => void;
+}
+
+const TextArea: React.FC<TextAreaProps> = ({
+    inputRef,
+    title,
+    value,
+    rows = 3,
+    maxLength,
+    resize = 'none',
+    error,
+    placeholder,
+    hint,
+    fontStyle = 'sans',
+    className,
+    onChange,
+    onFocus,
+    onBlur,
+    ...props
+}) => {
+    const id = useId();
+    const {setFocusState} = useFocusContext();
+
+    const handleFocus: FocusEventHandler<HTMLTextAreaElement> = (e) => {
+        setFocusState(true);
+        onFocus?.(e);
+    };
+
+    const handleBlur: FocusEventHandler<HTMLTextAreaElement> = (e) => {
+        setFocusState(false);
+        onBlur?.(e);
+    };
+
+    let styles = clsx(
+        'order-2 rounded-lg border bg-grey-150 px-3 py-2 transition-all dark:bg-grey-900 dark:text-white',
+        error ? 'border-red bg-white' : 'border-transparent placeholder:text-grey-500 hover:bg-grey-100 focus:border-green focus:bg-white focus:shadow-[0_0_0_2px_rgba(48,207,67,0.25)] dark:placeholder:text-grey-800 dark:hover:bg-grey-925 dark:focus:bg-grey-950',
+        title && 'mt-1.5',
+        fontStyle === 'mono' && 'font-mono text-sm',
+        className
+    );
+
+    switch (resize) {
+    case 'both':
+        styles += ' resize ';
+        break;
+    case 'vertical':
+        styles += ' resize-y ';
+        break;
+    case 'horizontal':
+        styles += ' resize-x ';
+        break;
+    case 'none':
+        styles += ' resize-none ';
+        break;
+    default:
+        styles += ' resize ';
+        break;
+    }
+
+    return (
+        <FormPrimitive.Root asChild>
+            <div className='flex flex-col'>
+                <FormPrimitive.Field name={id} asChild>
+                    <FormPrimitive.Control asChild>
+                        <textarea
+                            ref={inputRef}
+                            className={styles}
+                            id={id}
+                            maxLength={maxLength}
+                            placeholder={placeholder}
+                            rows={rows}
+                            value={value}
+                            onBlur={handleBlur}
+                            onChange={onChange}
+                            onFocus={handleFocus}
+                            {...props}>
+                        </textarea>
+                    </FormPrimitive.Control>
+                </FormPrimitive.Field>
+                {title && <Heading className={'order-1'} htmlFor={id} useLabelTag={true}>{title}</Heading>}
+                {hint && <Hint className='order-3' color={error ? 'red' : ''}>{hint}</Hint>}
+            </div>
+        </FormPrimitive.Root>
+    );
+};
+
+export default TextArea;
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 98%
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
index 64d7d406b54..47f10bd6e3b 100644
--- 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
@@ -11,7 +11,7 @@ const meta = {
     component: TextField,
     tags: ['autodocs'],
     decorators: [(_story: () => ReactNode) => (
-        <div style={{maxWidth: '400px'}}>
+        <div style={{maxWidth: '400px', padding: '20px'}}>
             {_story()}
         </div>
     )],
diff --git a/apps/admin-x-design-system/src/global/form/TextField.tsx b/apps/admin-x-design-system/src/global/form/TextField.tsx
new file mode 100644
index 00000000000..86b39631c95
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/form/TextField.tsx
@@ -0,0 +1,149 @@
+import Heading from '../Heading';
+import Hint from '../Hint';
+import React, {FocusEventHandler, useId} from 'react';
+import clsx from 'clsx';
+import {useFocusContext} from '../../providers/DesignSystemProvider';
+import * as FormPrimitive from '@radix-ui/react-form';
+
+export type TextFieldProps = React.InputHTMLAttributes<HTMLInputElement> & {
+    inputRef?: React.RefObject<HTMLInputElement>;
+    title?: string;
+    titleColor?: 'auto' | 'black' | 'grey';
+    hideTitle?: boolean;
+    type?: React.InputHTMLAttributes<HTMLInputElement>['type'];
+    value?: string;
+    error?: boolean;
+    placeholder?: string;
+    rightPlaceholder?: React.ReactNode;
+    hint?: React.ReactNode;
+    clearBg?: boolean;
+    onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+    onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
+    className?: string;
+    maxLength?: number;
+    containerClassName?: string;
+    hintClassName?: string;
+    unstyled?: boolean;
+    disabled?: boolean;
+    border?: boolean;
+    autoFocus?: boolean;
+}
+
+const TextField: React.FC<TextFieldProps> = ({
+    type = 'text',
+    inputRef,
+    title,
+    hideTitle,
+    value,
+    error,
+    placeholder,
+    rightPlaceholder,
+    hint,
+    onChange,
+    onFocus,
+    onBlur,
+    clearBg = false,
+    className = '',
+    maxLength,
+    containerClassName = '',
+    hintClassName = '',
+    unstyled = false,
+    disabled,
+    ...props
+}) => {
+    const id = useId();
+    const {setFocusState} = useFocusContext();
+
+    const handleFocus: FocusEventHandler<HTMLInputElement> = (e) => {
+        onFocus?.(e);
+        setFocusState(true);
+    };
+
+    const handleBlur: FocusEventHandler<HTMLInputElement> = (e) => {
+        onBlur?.(e);
+        setFocusState(false);
+    };
+
+    const fieldContainerClasses = clsx(
+        'relative order-2 flex w-full items-center',
+        (title && !hideTitle) && `mt-1.5`
+    );
+
+    const bgClasses = !unstyled && clsx(
+        'absolute inset-0 rounded-lg border text-grey-300 transition-colors peer-hover:bg-grey-100 peer-focus:border-green peer-focus:bg-white peer-focus:shadow-[0_0_0_2px_rgba(48,207,67,.25)] dark:peer-hover:bg-grey-925 dark:peer-focus:bg-grey-950',
+        error ? `border-red bg-white dark:bg-grey-925` : 'border-transparent bg-grey-150 dark:bg-grey-900',
+        disabled && 'bg-grey-50 peer-hover:bg-grey-50 dark:bg-grey-950 dark:peer-hover:bg-grey-950'
+    );
+
+    const textFieldClasses = !unstyled && clsx(
+        'peer z-[1] order-2 h-9 w-full bg-transparent px-3 py-1.5 text-sm placeholder:text-grey-500 dark:placeholder:text-grey-700 md:h-[38px] md:py-2 md:text-md',
+        disabled ? 'cursor-not-allowed text-grey-600 opacity-60 dark:text-grey-800' : 'dark:text-white',
+        rightPlaceholder ? 'w-0 grow rounded-l-lg' : 'rounded-lg',
+        className
+    );
+
+    const rightPlaceholderClasses = !unstyled && clsx(
+        'z-[1] order-3 rounded-r-lg',
+        (rightPlaceholder ?
+            ((typeof (rightPlaceholder) === 'string') ? 'flex h-8 items-center py-1 pr-3 text-right text-sm text-grey-500 md:h-9 md:text-base' : 'h-9 pr-1')
+            : 'pr-2')
+    );
+
+    let field = <></>;
+
+    const inputField = <input
+        ref={inputRef}
+        className={textFieldClasses || className}
+        disabled={disabled}
+        id={id}
+        maxLength={maxLength}
+        placeholder={placeholder}
+        type={type}
+        value={value}
+        onBlur={handleBlur}
+        onChange={onChange}
+        onFocus={handleFocus}
+        {...props} />;
+
+    field = (
+        <FormPrimitive.Field name={id} asChild>
+            <div className={fieldContainerClasses}>
+                <FormPrimitive.Control asChild>
+                    {inputField}
+                </FormPrimitive.Control>
+                {!unstyled && !clearBg && <div className={bgClasses ? bgClasses : ''}></div>}
+                {rightPlaceholder && <span className={rightPlaceholderClasses || ''}>{rightPlaceholder}</span>}
+            </div>
+        </FormPrimitive.Field>
+    );
+
+    hintClassName = clsx(
+        'order-3',
+        hintClassName
+    );
+
+    containerClassName = clsx(
+        'flex flex-col',
+        containerClassName
+    );
+
+    if (title || hint) {
+        return (
+            <FormPrimitive.Root asChild>
+                <div className={containerClassName}>
+                    {field}
+                    {title && <Heading className={hideTitle ? 'sr-only' : 'order-1'} htmlFor={id} useLabelTag={true}>{title}</Heading>}
+                    {hint && <Hint className={hintClassName} color={error ? 'red' : 'default'}>{hint}</Hint>}
+                </div>
+            </FormPrimitive.Root>
+        );
+    } else {
+        return (
+            <FormPrimitive.Root asChild>
+                {field}
+            </FormPrimitive.Root>
+        );
+    }
+};
+
+export default TextField;
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-design-system/src/global/form/Toggle.tsx b/apps/admin-x-design-system/src/global/form/Toggle.tsx
new file mode 100644
index 00000000000..cd0eadfc98a
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/form/Toggle.tsx
@@ -0,0 +1,131 @@
+import clsx from 'clsx';
+import React, {useId} from 'react';
+import {Heading6StylesGrey} from '../Heading';
+import Separator from '../Separator';
+import * as TogglePrimitive from '@radix-ui/react-switch';
+
+type ToggleSizes = 'sm' | 'md' | 'lg';
+export type ToggleDirections = 'ltr' | 'rtl';
+
+export interface ToggleProps {
+    checked?: boolean;
+    disabled?: boolean;
+    name?: string;
+    error?: boolean;
+    size?: ToggleSizes;
+    label?: React.ReactNode;
+    labelStyle?: 'heading' | 'value';
+    labelClasses?: string;
+    toggleBg?: 'green' | 'black' | 'stripetest';
+    separator?: boolean;
+    direction?: ToggleDirections;
+    hint?: React.ReactNode;
+    onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+}
+
+const Toggle: React.FC<ToggleProps> = ({
+    size,
+    direction,
+    label,
+    labelStyle = 'value',
+    labelClasses,
+    toggleBg = 'black',
+    hint,
+    separator,
+    error,
+    checked,
+    disabled,
+    name,
+    onChange
+}) => {
+    const id = useId();
+
+    let sizeStyles = '';
+    let thumbSizeStyles = '';
+    let labelStyles = '';
+    switch (size) {
+    case 'sm':
+        sizeStyles = ' h-3 w-5';
+        thumbSizeStyles = ' h-2 w-2 data-[state=checked]:translate-x-[10px]';
+        labelStyles = 'mt-[-5.5px]';
+        break;
+
+    case 'lg':
+        sizeStyles = ' h-5 w-8';
+        thumbSizeStyles = ' h-4 w-4 data-[state=checked]:translate-x-[14px]';
+        labelStyles = 'mt-[-1px]';
+        break;
+
+    default:
+        sizeStyles = ' min-w-[28px] h-4 w-7';
+        thumbSizeStyles = ' h-3 w-3 data-[state=checked]:translate-x-[14px]';
+        labelStyles = 'mt-[-3px]';
+        break;
+    }
+
+    labelStyles = clsx(
+        labelClasses,
+        labelStyles
+    );
+
+    if (labelStyle === 'heading') {
+        direction = 'rtl';
+    }
+
+    let toggleBgClass;
+    switch (toggleBg) {
+    case 'stripetest':
+        toggleBgClass = 'data-[state=checked]:bg-[#EC6803] dark:data-[state=checked]:bg-[#EC6803]';
+        break;
+
+    case 'green':
+        toggleBgClass = 'data-[state=checked]:bg-green';
+        break;
+
+    default:
+        toggleBgClass = 'data-[state=checked]:bg-black dark:data-[state=checked]:bg-green';
+        break;
+    }
+
+    const handleCheckedChange = (isChecked: boolean) => {
+        if (onChange) {
+            const event = {
+                target: {checked: isChecked}
+            } as React.ChangeEvent<HTMLInputElement>;
+            onChange(event);
+        }
+    };
+
+    return (
+        <div>
+            <div className={`group flex items-start gap-2 dark:text-white ${direction === 'rtl' && 'justify-between'} ${separator && 'pb-2'}`}>
+                <TogglePrimitive.Root className={clsx(
+                    toggleBgClass,
+                    'appearance-none rounded-full bg-grey-300 transition duration-100 dark:bg-grey-800',
+                    'enabled:hover:cursor-pointer disabled:opacity-40 enabled:group-hover:opacity-80',
+                    sizeStyles,
+                    direction === 'rtl' && ' order-2'
+                )} defaultChecked={checked} disabled={disabled} id={id} name={name} onCheckedChange={handleCheckedChange}>
+                    <TogglePrimitive.Thumb className={clsx(
+                        thumbSizeStyles,
+                        'block translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform'
+                    )} />
+                </TogglePrimitive.Root>
+                {label &&
+                    <label className={`flex grow flex-col hover:cursor-pointer ${direction === 'rtl' && 'order-1'} ${labelStyles}`} htmlFor={id}>
+                        {
+                            labelStyle === 'heading' ?
+                                <span className={`${Heading6StylesGrey} mt-1`}>{label}</span>
+                                :
+                                <span>{label}</span>
+                        }
+                        {hint && <span className={`text-xs ${error ? 'text-red' : 'text-grey-700 dark:text-grey-600'}`}>{hint}</span>}
+                    </label>
+                }
+            </div>
+            {(separator || error) && <Separator className={error ? 'border-red' : ''} />}
+        </div>
+    );
+};
+
+export default Toggle;
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 94%
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..93985811f55 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 isEmail from 'validator/es/lib/isEmail';
 import {useFocusContext} from '../../providers/DesignSystemProvider';
+import TextField, {TextFieldProps} from './TextField';
 
 export const formatUrl = (value: string, baseUrl?: string, nullable?: boolean) => {
     if (nullable && !value) {
@@ -18,7 +18,7 @@ export const formatUrl = (value: string, baseUrl?: string, nullable?: boolean) =
     }
 
     // if we have an email address, add the mailto:
-    if (validator.isEmail(url)) {
+    if (isEmail(url)) {
         return {save: `mailto:${url}`, display: `mailto:${url}`};
     }
 
@@ -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-design-system/src/global/layout/AppMenu.tsx b/apps/admin-x-design-system/src/global/layout/AppMenu.tsx
new file mode 100644
index 00000000000..01864596aab
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/layout/AppMenu.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import Button from '../Button';
+
+const PageMenu: React.FC = () => {
+    return (
+        <Button icon='hamburger' iconColorClass='text-black dark:text-white' size='sm' link onClick={() => {
+            alert('Clicked on hamburger');
+        }} />
+    );
+};
+
+export default PageMenu;
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/global/layout/GlobalActions.tsx b/apps/admin-x-design-system/src/global/layout/GlobalActions.tsx
new file mode 100644
index 00000000000..42f4343d4d5
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/layout/GlobalActions.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import Button from '../Button';
+
+const GlobalActions: React.FC = () => {
+    return (
+        <Button icon='magnifying-glass' iconColorClass='dark:text-white text-black' size='sm' link onClick={() => {}} />
+    );
+};
+
+export default GlobalActions;
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/global/layout/Page.stories.tsx b/apps/admin-x-design-system/src/global/layout/Page.stories.tsx
new file mode 100644
index 00000000000..bee5e7fae0d
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/layout/Page.stories.tsx
@@ -0,0 +1,489 @@
+import type {Meta, StoryObj} from '@storybook/react';
+import {useArgs} from '@storybook/preview-api';
+
+import Page, {CustomGlobalAction} from './Page';
+import {Tab} from '../TabView';
+import ViewContainer from './ViewContainer';
+
+import {testColumns, testRows} from '../table/DynamicTable.stories';
+import {exampleActions as exampleActionButtons} from './ViewContainer.stories';
+import DynamicTable from '../table/DynamicTable';
+import Hint from '../Hint';
+import Heading from '../Heading';
+import {tableRowHoverBgClasses} from '../TableRow';
+import Breadcrumbs from '../Breadcrumbs';
+import Avatar from '../Avatar';
+import Button from '../Button';
+import {Toggle} from '../..';
+
+const meta = {
+    title: 'Global / Layout / Page',
+    component: Page,
+    tags: ['autodocs'],
+    parameters: {
+        layout: 'fullscreen'
+    },
+    render: function Component(args) {
+        const [, updateArgs] = useArgs();
+
+        return <Page {...args}
+            onTabChange={(tab) => {
+                updateArgs({selectedTab: tab});
+                args.onTabChange?.(tab);
+            }}
+        />;
+    }
+} satisfies Meta<typeof Page>;
+
+export default meta;
+type Story = StoryObj<typeof Page>;
+
+const dummyContent = <div className='w-full bg-grey-100 p-5 text-center'>Placeholder content</div>;
+
+const customGlobalActions: CustomGlobalAction[] = [
+    {
+        iconName: 'heart',
+        onClick: () => {
+            alert('Clicked on custom action');
+        }
+    }
+];
+
+const pageTabs: Tab[] = [
+    {
+        id: 'active',
+        title: 'Active'
+    },
+    {
+        id: 'archive',
+        title: 'Archive'
+    }
+];
+
+export const Default: Story = {
+    args: {
+        pageTabs: pageTabs,
+        children: dummyContent
+    }
+};
+
+export const LimitToolbarWidth: Story = {
+    args: {
+        pageTabs: pageTabs,
+        children: dummyContent,
+        fullBleedToolbar: false
+    }
+};
+
+export const WithHamburger: Story = {
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        children: dummyContent
+    }
+};
+
+export const WithGlobalActions: Story = {
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: dummyContent
+    }
+};
+
+export const CustomGlobalActions: Story = {
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: dummyContent,
+        customGlobalActions: customGlobalActions
+    }
+};
+
+const currentAdminExample = <ViewContainer
+    title='Members'
+    type='page'
+>
+    <DynamicTable
+        columns={testColumns}
+        pageHasSidebar={false}
+        rows={testRows(100)}
+    />
+</ViewContainer>;
+
+export const ExampleCurrentAdminList: Story = {
+    name: 'Example: List in Current Admin',
+    args: {
+        children: currentAdminExample
+    }
+};
+
+const simpleList = <ViewContainer
+    firstOnPage={false}
+    title='Members'
+    type='page'
+>
+    <DynamicTable
+        columns={testColumns}
+        footer={<Hint>Just a regular table footer</Hint>}
+        pageHasSidebar={false}
+        rows={testRows(100)}
+    />
+</ViewContainer>;
+
+export const ExampleSimpleList: Story = {
+    name: 'Example: Simple List',
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: simpleList
+    }
+};
+
+const stickyList = <ViewContainer
+    firstOnPage={false}
+    title='Members'
+    type='page'
+>
+    <DynamicTable
+        columns={testColumns}
+        footer={<Hint>Sticky footer</Hint>}
+        pageHasSidebar={false}
+        rows={testRows(40)}
+        stickyFooter
+        stickyHeader
+    />
+</ViewContainer>;
+
+export const ExampleStickyList: Story = {
+    name: 'Example: Sticky Header/Footer List',
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: stickyList
+    }
+};
+
+const examplePrimaryAction = <ViewContainer
+    firstOnPage={false}
+    primaryAction={{
+        title: 'Add member',
+        color: 'black',
+        onClick: () => {
+            alert('Clicked primary action');
+        }
+    }}
+    title='Members'
+    type='page'
+>
+    <DynamicTable
+        columns={testColumns}
+        footer={<Hint>Sticky footer</Hint>}
+        pageHasSidebar={false}
+        rows={testRows(40)}
+        stickyFooter
+        stickyHeader
+    />
+</ViewContainer>;
+
+export const ExamplePrimaryAction: Story = {
+    name: 'Example: Primary Action',
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: examplePrimaryAction
+    }
+};
+
+const exampleActionsContent = <ViewContainer
+    actions={exampleActionButtons}
+    firstOnPage={false}
+    primaryAction={{
+        title: 'Add member',
+        icon: 'add',
+        color: 'black',
+        onClick: () => {
+            alert('Clicked primary action');
+        }
+    }}
+    title='Members'
+    type='page'
+>
+    <DynamicTable
+        columns={testColumns}
+        footer={<Hint>Sticky footer</Hint>}
+        pageHasSidebar={false}
+        rows={testRows(40)}
+        stickyFooter
+        stickyHeader
+    />
+</ViewContainer>;
+
+export const ExampleActions: Story = {
+    name: 'Example: Custom Actions',
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: exampleActionsContent
+    }
+};
+
+const mockIdeaCards = () => {
+    const cards = [];
+
+    for (let i = 0; i < 11; i++) {
+        cards.push(
+            <div className='min-h-[30vh] rounded-sm bg-grey-100 p-7 transition-all hover:bg-grey-200'>
+                <Heading level={5}>
+                    {i % 3 === 0 && 'Sunset drinks cruise eat sleep repeat'}
+                    {i % 3 === 1 && 'Elegance Rolls Royce on my private jet'}
+                    {i % 3 === 2 && 'Down to the wire Bathurst 5000 Le Tour'}
+                </Heading>
+                <div className='mt-4'>
+                    {i % 3 === 0 && 'Numea captain’s table crystal waters paradise island the scenic route great adventure. Pirate speak the road less travelled seas the day '}
+                    {i % 3 === 1 && 'Another day in paradise cruise life adventure bound gap year cruise time languid afternoons let the sea set you free'}
+                    {i % 3 === 2 && <span className='text-grey-500'>No body text</span>}
+                </div>
+            </div>
+        );
+    }
+    return cards;
+};
+
+const exampleCardViewContent = (
+    <ViewContainer
+        actions={exampleActionButtons}
+        firstOnPage={false}
+        primaryAction={{
+            title: 'New idea',
+            icon: 'add'
+        }}
+        title='Ideas'
+        type='page'
+    >
+        <div className='grid grid-cols-2 gap-7 py-7 tablet:grid-cols-4'>
+            {mockIdeaCards()}
+        </div>
+    </ViewContainer>
+);
+
+export const ExampleCardView: Story = {
+    name: 'Example: Card View',
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: exampleCardViewContent
+    }
+};
+
+const mockPosts = () => {
+    const posts = [];
+
+    for (let i = 0; i < 11; i++) {
+        posts.push(
+            <div className={`group grid grid-cols-[96px_auto_120px_120px_60px] items-center gap-7 border-b border-grey-200 py-5 ${tableRowHoverBgClasses}`}>
+                <div className='flex h-24 w-24 items-center justify-center rounded-sm bg-grey-100'>
+
+                </div>
+                <div className='overflow-hidden'>
+                    <div className='flex flex-col'>
+                        <Heading className='truncate' level={5}>
+                            {i % 3 === 0 && 'Sunset drinks cruise eat sleep repeat'}
+                            {i % 3 === 1 && 'Elegance Rolls Royce on my private jet'}
+                            {i % 3 === 2 && 'Down to the wire Bathurst 5000 Le Tour'}
+                        </Heading>
+                        <div className='truncate'>
+                            {i % 3 === 0 && 'Numea captain’s table crystal waters paradise island the scenic route great adventure. Pirate speak the road less travelled seas the day '}
+                            {i % 3 === 1 && 'Another day in paradise cruise life adventure bound gap year cruise time languid afternoons let the sea set you free'}
+                            {i % 3 === 2 && 'Grand Prix gamble responsibly intensity is not a perfume The Datsun 180B Aerial ping pong knock for six watch with the boys total hospital pass.'}
+                        </div>
+                    </div>
+                </div>
+                <div className='flex flex-col'>
+                    <strong>15%</strong>
+                    viewed
+                </div>
+                <div className='flex flex-col'>
+                    <strong>55%</strong>
+                    opened
+                </div>
+                <div className='flex justify-end pr-7'>
+                    <Button className='group-hover:bg-grey-200' icon='ellipsis' />
+                </div>
+            </div>
+        );
+    }
+    return posts;
+};
+
+const examplePostsContent = (
+    <ViewContainer
+        actions={exampleActionButtons}
+        firstOnPage={false}
+        primaryAction={{
+            title: 'New post',
+            icon: 'add'
+        }}
+        title='Posts'
+        type='page'
+    >
+        <div className='mb-10'>
+            {<>{mockPosts()}</>}
+        </div>
+    </ViewContainer>
+);
+
+export const ExampleAlternativeList: Story = {
+    name: 'Example: Alternative List',
+    args: {
+        pageTabs: pageTabs,
+        showAppMenu: true,
+        showGlobalActions: true,
+        children: examplePostsContent
+    }
+};
+
+export const ExampleDetailScreen: Story = {
+    name: 'Example: Detail Page',
+    args: {
+        showAppMenu: true,
+        breadCrumbs: <Breadcrumbs
+            items={[
+                {
+                    label: 'Members',
+                    onClick: () => {
+                        alert('Clicked back');
+                    }
+                },
+                {
+                    label: 'Emerson Vaccaro'
+                }
+            ]}
+            backIcon
+        />,
+        showGlobalActions: true,
+        children: <>
+            <ViewContainer
+                firstOnPage={false}
+                headerContent={
+                    <div>
+                        <Avatar bgColor='#A5D5F7' label='EV' labelColor='white' size='xl' />
+                        <Heading className='mt-2' level={1}>Emerson Vaccaro</Heading>
+                        <div className=''>Colombus, OH</div>
+                    </div>
+                }
+                primaryAction={
+                    {
+                        icon: 'ellipsis',
+                        color: 'outline'
+                    }
+                }
+                type='page'
+            >
+                <div className='grid grid-cols-3 border-b border-grey-200 pb-5 tablet:grid-cols-4'>
+                    <div className='col-span-3 -ml-5 mb-5 hidden h-full gap-4 px-5 tablet:col-span-1 tablet:mb-0 tablet:!flex tablet:flex-col tablet:gap-0'>
+                        <span>Last seen on <strong>22 June 2023</strong></span>
+                        <span className='tablet:mt-2'>Created on <strong>27 Jan 2021</strong></span>
+                    </div>
+                    <div className='flex h-full flex-col tablet:px-5'>
+                        <Heading level={6}>Emails received</Heading>
+                        <span className='mt-1 text-4xl font-bold leading-none'>181</span>
+                    </div>
+                    <div className='flex h-full flex-col tablet:px-5'>
+                        <Heading level={6}>Emails opened</Heading>
+                        <span className='mt-1 text-4xl font-bold leading-none'>104</span>
+                    </div>
+                    <div className='-mr-5 flex h-full flex-col tablet:px-5'>
+                        <Heading level={6}>Average open rate</Heading>
+                        <span className='mt-1 text-4xl font-bold leading-none'>57%</span>
+                    </div>
+                </div>
+                <div className='grid grid-cols-2 items-baseline border-b border-grey-200 py-5 tablet:grid-cols-4'>
+                    <div className='-ml-5 flex h-full flex-col gap-6 border-r border-grey-200 px-5'>
+                        <div className='flex justify-between'>
+                            <Heading level={5}>Member data</Heading>
+                            <Button color='green' label='Edit' link />
+                        </div>
+                        <div>
+                            <Heading level={6}>Name</Heading>
+                            <div>Emerson Vaccaro</div>
+                        </div>
+                        <div>
+                            <Heading level={6}>Email</Heading>
+                            <div>emerson@vaccaro.com</div>
+                        </div>
+                        <div>
+                            <Heading level={6}>Labels</Heading>
+                            <div className='mt-2 flex gap-1'>
+                                <div className='inline-block rounded-sm bg-grey-200 px-1.5 text-xs font-medium'>VIP</div>
+                                <div className='inline-block rounded-sm bg-grey-200 px-1.5 text-xs font-medium'>Inner Circle</div>
+                            </div>
+                        </div>
+                        <div>
+                            <Heading level={6}>Notes</Heading>
+                            <div className='text-grey-500'>No notes.</div>
+                        </div>
+                    </div>
+                    <div className='flex h-full flex-col gap-6 border-grey-200 px-5 tablet:border-r'>
+                        <Heading level={5}>Newsletters</Heading>
+                        <div className='flex flex-col gap-3'>
+                            <div className='flex items-center gap-2'>
+                                <Toggle />
+                                <span>Daily news</span>
+                            </div>
+                            <div className='flex items-center gap-2'>
+                                <Toggle />
+                                <span>Weekly roundup</span>
+                            </div>
+                            <div className='flex items-center gap-2'>
+                                <Toggle checked />
+                                <span>The Inner Circle</span>
+                            </div>
+                            <div className='mt-5 rounded border border-red p-4 text-sm text-red'>
+                                This member cannot receive emails due to permanent failure (bounce).
+                            </div>
+                        </div>
+                    </div>
+                    <div className='-ml-5 flex h-full flex-col gap-6 border-r border-grey-200 px-5 pt-10 tablet:ml-0 tablet:pt-0'>
+                        <Heading level={5}>Subscriptions</Heading>
+                        <div className='flex items-center gap-3'>
+                            <div className='flex h-16 w-16 flex-col items-center justify-center rounded-md bg-grey-200'>
+                                <Heading level={5}>$5</Heading>
+                                <span className='text-xs text-grey-700'>Yearly</span>
+                            </div>
+                            <div className='flex flex-col'>
+                                <span className='font-semibold'>Gold</span>
+                                <span className='text-sm text-grey-500'>Renews 21 Jan 2024</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div className='-mr-5 flex h-full flex-col gap-6 px-5 pt-10 tablet:pt-0'>
+                        <div className='flex justify-between'>
+                            <Heading level={5}>Activity</Heading>
+                            <Button color='green' label='View all' link />
+                        </div>
+                        <div className='flex flex-col text-sm'>
+                            <span className='font-semibold'>Logged in</span>
+                            <span className='text-sm text-grey-500'>13 days ago</span>
+                        </div>
+                        <div className='flex flex-col text-sm'>
+                            <span className='font-semibold'>Subscribed to Daily News</span>
+                            <span className='text-sm text-grey-500'>17 days ago</span>
+                        </div>
+                        <div className='flex flex-col text-sm'>
+                            <span className='font-semibold'>Logged in</span>
+                            <span className='text-sm text-grey-500'>21 days ago</span>
+                        </div>
+                    </div>
+                </div>
+            </ViewContainer>
+        </>
+    }
+};
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/global/layout/Page.tsx b/apps/admin-x-design-system/src/global/layout/Page.tsx
new file mode 100644
index 00000000000..72e657906d8
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/layout/Page.tsx
@@ -0,0 +1,162 @@
+import React from 'react';
+import {TabList} from '../TabView';
+import clsx from 'clsx';
+import AppMenu from './AppMenu';
+import GlobalActions from './GlobalActions';
+import Button from '../Button';
+import {BreadcrumbsProps} from '../Breadcrumbs';
+import PageHeader from './PageHeader';
+
+export interface PageTab {
+    id: string;
+    title: string;
+}
+
+export interface CustomGlobalAction {
+    iconName: string;
+    onClick?: () => void;
+}
+
+interface PageProps {
+    mainContainerClassName?: string;
+    mainClassName?: string;
+    fullBleedPage?: boolean;
+
+    /**
+     * The pageToolbar is a WIP part of this component, it's unused ATM in Ghost Admin.
+     */
+    pageToolbarClassName?: string;
+    fullBleedToolbar?: boolean;
+
+    /**
+     * TK. Part of the Page Toolbar
+     */
+    showAppMenu?: boolean;
+
+    /**
+     * Show
+     */
+    showGlobalActions?: boolean;
+
+    /**
+     * TK. Part of the Page Toolbar
+     */
+    customGlobalActions?: CustomGlobalAction[];
+    breadCrumbs?: React.ReactElement<BreadcrumbsProps>;
+
+    /**
+     * TK. Part of the Page Toolbar
+     */
+    pageTabs?: PageTab[],
+
+    /**
+     * TK. Part of the Page Toolbar
+     */
+    selectedTab?: string;
+
+    /**
+     * TK. Part of the Page Toolbar
+     */
+    onTabChange?: (id: string) => void;
+
+    children?: React.ReactNode;
+}
+
+/**
+ * The page component is the main container in Ghost Admin. It consists of a
+ * page level toolbar (`pageToolbar` — unused ATM, it's for page level views and
+ * navigation in the future), and the main content area.
+ *
+ * ### Examples
+ * You can find several examples in the sidebar. If you're building a page for the
+ * current Admin you can use the ["List in Current Admin"](/story/global-layout-page--example-current-admin-list)
+ * example as a starting point. The rest of the examples are showing a potential direction for a
+ * future structure.
+ */
+const Page: React.FC<PageProps> = ({
+    fullBleedPage = true,
+    mainContainerClassName,
+    mainClassName,
+    pageToolbarClassName,
+    fullBleedToolbar = true,
+    showAppMenu = false,
+    showGlobalActions = false,
+    customGlobalActions,
+    breadCrumbs,
+    pageTabs,
+    selectedTab,
+    onTabChange,
+    children
+}) => {
+    const handleTabChange = (e: React.MouseEvent<HTMLButtonElement>) => {
+        const newTab = e.currentTarget.id as string;
+        onTabChange!(newTab);
+    };
+
+    if (pageTabs?.length && !selectedTab) {
+        selectedTab = pageTabs[0].id;
+    }
+
+    const left: React.ReactNode = (
+        (showAppMenu || breadCrumbs || pageTabs?.length) && <div className='flex items-center gap-10'>
+            {showAppMenu && (
+                <AppMenu />
+            )}
+            {breadCrumbs}
+            {pageTabs?.length && (
+                <TabList
+                    border={false}
+                    buttonBorder={false}
+                    handleTabChange={handleTabChange}
+                    selectedTab={selectedTab}
+                    tabs={pageTabs!}
+                    width='normal'
+                />
+            )}
+        </div>);
+
+    mainClassName = clsx(
+        'flex w-full flex-auto flex-col',
+        mainClassName
+    );
+
+    const globalActions = (
+        (customGlobalActions?.length || showGlobalActions) &&
+        <div className='sticky flex items-center gap-7'>
+            {(customGlobalActions?.map((action) => {
+                return (
+                    <Button icon={action.iconName} iconColorClass='text-black dark:text-white' size='sm' link onClick={action.onClick} />
+                );
+            }))}
+            {showGlobalActions && <GlobalActions />}
+        </div>);
+
+    mainContainerClassName = clsx(
+        'flex h-[100vh] w-full flex-col overflow-y-auto overflow-x-hidden',
+        !fullBleedPage && 'mx-auto max-w-7xl',
+        mainContainerClassName
+    );
+
+    pageToolbarClassName = clsx(
+        'sticky top-0 z-50 flex h-22 min-h-[92px] w-full items-center justify-between gap-5 bg-white p-8 dark:bg-black',
+        !fullBleedToolbar && 'mx-auto max-w-7xl',
+        pageToolbarClassName
+    );
+
+    return (
+        <div className={mainContainerClassName}>
+            {(left || globalActions) &&
+                <PageHeader
+                    containerClassName={pageToolbarClassName}
+                    left={left}
+                    right={globalActions}
+                />
+            }
+            <main className={mainClassName}>
+                {children}
+            </main>
+        </div>
+    );
+};
+
+export default Page;
\ No newline at end of file
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 89%
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..8ccbd7745c5 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.
@@ -28,7 +28,7 @@ const PageHeader: React.FC<PageHeaderProps> = ({
     children
 }) => {
     const containerClasses = clsx(
-        'z-50 h-[74px] p-5 px-7',
+        'z-50 h-22 min-h-[92px] p-8 px-6 tablet:px-12',
         !children && 'flex items-center justify-between gap-3',
         sticky && 'sticky top-0',
         containerClassName
@@ -39,7 +39,7 @@ const PageHeader: React.FC<PageHeaderProps> = ({
             const leftClasses = clsx(
                 'flex flex-auto items-center',
                 (right && center) && 'basis-1/3',
-                ((right && !center) || (!right && center)) && 'basis-1/2'
+                ((!right && center)) && 'basis-1/2'
             );
             left = <div className={leftClasses}>{left}</div>;
         }
@@ -55,7 +55,7 @@ const PageHeader: React.FC<PageHeaderProps> = ({
             const rightClasses = clsx(
                 'flex flex-auto items-center justify-end',
                 (left && center) && 'basis-1/3',
-                ((left && !center) || (!left && center)) && 'basis-1/2'
+                ((!left && center)) && 'basis-1/2'
             );
             right = <div className={rightClasses}>{right}</div>;
         }
@@ -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-design-system/src/global/layout/ViewContainer.stories.tsx b/apps/admin-x-design-system/src/global/layout/ViewContainer.stories.tsx
new file mode 100644
index 00000000000..2a002916eb7
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/layout/ViewContainer.stories.tsx
@@ -0,0 +1,200 @@
+import {useArgs} from '@storybook/preview-api';
+import type {Meta, StoryObj} from '@storybook/react';
+
+import ViewContainer, {PrimaryActionProps, ViewTab} from './ViewContainer';
+import Button from '../Button';
+import ButtonGroup from '../ButtonGroup';
+
+const meta = {
+    title: 'Global / Layout / View Container',
+    component: ViewContainer,
+    parameters: {
+        layout: 'fullscreen'
+    },
+    render: function Component(args) {
+        const [, updateArgs] = useArgs();
+
+        return <ViewContainer {...args}
+            onTabChange={(tab) => {
+                updateArgs({selectedTab: tab});
+                args.onTabChange?.(tab);
+            }}
+        />;
+    },
+    argTypes: {
+        children: {
+            control: {
+                type: 'text'
+            }
+        }
+    },
+    tags: ['autodocs'],
+    excludeStories: ['exampleActions']
+} satisfies Meta<typeof ViewContainer>;
+
+export default meta;
+type Story = StoryObj<typeof ViewContainer>;
+
+export const exampleActions = [
+    <Button label='Filter' outlineOnMobile onClick={() => {
+        alert('Clicked filter');
+    }} />,
+    <Button label='Sort' outlineOnMobile onClick={() => {
+        alert('Clicked sort');
+    }} />,
+    <Button icon='magnifying-glass' iconSize='sm' outlineOnMobile onClick={() => {
+        alert('Clicked search');
+    }} />,
+    <ButtonGroup buttons={[
+        {
+            icon: 'listview',
+            size: 'sm',
+            iconColorClass: 'text-black',
+            onClick: () => {
+                alert('Clicked list view');
+            }
+        },
+        {
+            icon: 'cardview',
+            size: 'sm',
+            iconColorClass: 'text-grey-500',
+            onClick: () => {
+                alert('Clicked card view');
+            }
+        }
+    ]} clearBg={false} link outlineOnMobile />
+];
+
+const primaryAction: PrimaryActionProps = {
+    title: 'Add item',
+    color: 'black',
+    onClick: () => {
+        alert('Clicked primary action');
+    }
+};
+
+const tabs: ViewTab[] = [
+    {
+        id: 'steph',
+        title: 'Steph Curry',
+        contents: 'The tabs component lets you add various datasets. It uses the <code>`TabList`</code> component to stay consistent with the simple TabView.'
+    },
+    {
+        id: 'klay',
+        title: 'Klay Thompson',
+        contents: 'Splash brother #11.'
+    }
+];
+
+export const Default: Story = {
+    args: {
+        type: 'page',
+        toolbarBorder: false,
+        children: 'The view container component is the main container of pages and/or sections on a page. Select one of the stories on the right to browse use cases.'
+    }
+};
+
+export const PageType: Story = {
+    name: 'Type: Page',
+    args: {
+        type: 'page',
+        title: 'Page title',
+        children: 'In its simplest form you can use this component as the main container of pages.'
+    }
+};
+
+export const SectionType: Story = {
+    name: 'Type: Section',
+    args: {
+        type: 'section',
+        title: 'Section title',
+        children: 'This example shows how to use it for sections on a page.'
+    }
+};
+
+export const PrimaryActionOnPage: Story = {
+    args: {
+        type: 'page',
+        title: 'Page title',
+        primaryAction: primaryAction,
+        children: 'View contents'
+    }
+};
+
+export const ActionsOnPage: Story = {
+    args: {
+        type: 'page',
+        title: 'Page title',
+        actions: exampleActions,
+        primaryAction: primaryAction
+    }
+};
+
+export const PrimaryActionOnSection: Story = {
+    args: {
+        type: 'section',
+        title: 'Section title',
+        primaryAction: primaryAction
+    }
+};
+
+export const MultipleTabs: Story = {
+    args: {
+        type: 'section',
+        title: 'Section title',
+        tabs: tabs
+    }
+};
+
+export const TabsWithPrimaryAction: Story = {
+    args: {
+        type: 'section',
+        title: 'Section title',
+        tabs: tabs,
+        primaryAction: primaryAction
+    }
+};
+
+const sectionActions = [
+    <Button label='Filter' size='sm' onClick={() => {
+        alert('Clicked filter');
+    }} />,
+    <ButtonGroup buttons={[
+        {
+            icon: 'listview',
+            size: 'sm',
+            iconColorClass: 'text-black',
+            onClick: () => {
+                alert('Clicked list view');
+            }
+        },
+        {
+            icon: 'cardview',
+            size: 'sm',
+            iconColorClass: 'text-grey-500',
+            onClick: () => {
+                alert('Clicked card view');
+            }
+        }
+    ]} clearBg={false} size='sm' link />
+];
+
+export const TabsWithActions: Story = {
+    args: {
+        type: 'section',
+        title: 'Section title',
+        tabs: tabs,
+        primaryAction: primaryAction,
+        actions: sectionActions
+    }
+};
+
+export const HiddenActions: Story = {
+    args: {
+        type: 'section',
+        title: 'Hover to show actions',
+        tabs: tabs,
+        actions: sectionActions,
+        actionsHidden: true
+    }
+};
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/global/layout/ViewContainer.tsx b/apps/admin-x-design-system/src/global/layout/ViewContainer.tsx
new file mode 100644
index 00000000000..d7034b6a770
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/layout/ViewContainer.tsx
@@ -0,0 +1,262 @@
+import React from 'react';
+import {Tab, TabList} from '../TabView';
+import Heading from '../Heading';
+import clsx from 'clsx';
+import Button, {ButtonColor, ButtonProps} from '../Button';
+import {ButtonGroupProps} from '../ButtonGroup';
+import DynamicTable, {DynamicTableProps} from '../table/DynamicTable';
+
+export interface View {
+    id: string;
+    buttonClasses?: string;
+    buttonChildren: React.ReactNode;
+    contents: React.ReactNode;
+}
+
+export interface ViewTab extends Tab {
+    views?: View[];
+}
+
+export interface PrimaryActionProps {
+    title?: string;
+    icon?: string;
+    color?: ButtonColor;
+    className?: string;
+    onClick?: () => void;
+}
+
+interface ViewContainerProps {
+    /**
+     * Use `page` if the `ViewContainer` is your main component on the page. Use
+     * `section` for individual sections on the page (e.g. blocks on a dashboard).
+     */
+    type: 'page' | 'section';
+
+    /**
+     * The title of the ViewContainer. `page` type containers will use a large
+     * size that matches the rest of the page titles in the Admin.
+     */
+    title?: string;
+
+    /**
+     * Use this if there's no toolbar on the page and you use the `ViewContainer`
+     * as the main container on a page. Technically it sticks the header to
+     * the top of the page with the actions aligned properly to match other
+     * pages in the Admin.
+     */
+    firstOnPage?:boolean;
+
+    /**
+     * Use this for custom content in the header.
+     */
+    headerContent?: React.ReactNode;
+
+    /**
+     * Sticks the header so it's always visible. The `top` value depends on the
+     * value of `firstOnPage`:
+     *
+     * ```
+     * firstOnPage = true    -> top: 0px;
+     * firstOnPage = false   -> top: 3vmin;
+     * ```
+     */
+    stickyHeader?: boolean;
+
+    /**
+     * Use this to break down the view to multiple tabs.
+     */
+    tabs?: ViewTab[];
+    selectedTab?: string;
+    selectedView?: string;
+    onTabChange?: (id: string) => void;
+    mainContainerClassName?: string;
+    toolbarWrapperClassName?: string;
+    toolbarContainerClassName?: string;
+    toolbarLeftClassName?: string;
+    toolbarBorder?: boolean;
+
+    /**
+     * The primary action appears in the view container's top right usually as a solid
+     * button.
+     */
+    primaryAction?: PrimaryActionProps;
+
+    /**
+     * Adds more actions by the primary action, primarily buttons and button groups.
+     */
+    actions?: (React.ReactElement<ButtonProps> | React.ReactElement<ButtonGroupProps> | React.ReactNode)[];
+    actionsClassName?: string;
+    actionsHidden?: boolean;
+    contentWrapperClassName?: string;
+
+    /**
+     * Sets the width of the view container full bleed
+     */
+    contentFullBleed?: boolean;
+    children?: React.ReactNode;
+}
+
+/**
+ * The `ViewContainer` component is a generic container for either the complete
+ * contents of a page (`type = 'page'`) or for individual sections on a
+ * page, like blocks on a dashboard (`type = 'section'`). It has a bunch of
+ * parameters to customise its look & feel.
+ */
+const ViewContainer: React.FC<ViewContainerProps> = ({
+    type,
+    title,
+    firstOnPage = true,
+    headerContent,
+    stickyHeader = true,
+    tabs,
+    selectedTab,
+    onTabChange,
+    mainContainerClassName,
+    toolbarWrapperClassName,
+    toolbarContainerClassName,
+    toolbarLeftClassName,
+    primaryAction,
+    actions,
+    actionsClassName,
+    actionsHidden,
+    toolbarBorder = true,
+    contentWrapperClassName,
+    contentFullBleed = false,
+    children
+}) => {
+    let toolbar = <></>;
+    let mainContent:React.ReactNode = <></>;
+
+    const handleTabChange = (e: React.MouseEvent<HTMLButtonElement>) => {
+        const newTab = e.currentTarget.id as string;
+        onTabChange!(newTab);
+    };
+
+    let isSingleDynamicTable;
+    let singleDynamicTableIsSticky = false;
+
+    if (tabs?.length && !children) {
+        if (!selectedTab) {
+            selectedTab = tabs[0].id;
+        }
+
+        mainContent = <>
+            {tabs.map((tab) => {
+                return (
+                    <>
+                        {tab.contents &&
+                            <div key={tab.id} className={`${selectedTab === tab.id ? 'block' : 'hidden'}`} role='tabpanel'>
+                                <div>{tab.contents}</div>
+                            </div>
+                        }
+                    </>
+                );
+            })}
+        </>;
+    } else if (React.isValidElement(children) && children.type === DynamicTable) {
+        isSingleDynamicTable = true;
+        const dynTable = (children as React.ReactElement<DynamicTableProps>);
+        if (dynTable.props.stickyHeader || dynTable.props.stickyFooter) {
+            singleDynamicTableIsSticky = true;
+            children = isSingleDynamicTable
+                ? React.cloneElement(dynTable, {
+                    ...(dynTable.props as DynamicTableProps),
+                    singlePageTable: true
+                })
+                : children;
+        }
+        mainContent = children;
+    } else {
+        mainContent = children;
+    }
+
+    toolbarWrapperClassName = clsx(
+        'z-50',
+        type === 'page' && 'mx-auto w-full max-w-7xl bg-white px-[4vw] dark:bg-black tablet:px-12',
+        (type === 'page' && stickyHeader) && (firstOnPage ? 'sticky top-0 pt-8' : 'sticky top-22 pt-[3vmin]'),
+        toolbarContainerClassName
+    );
+
+    toolbarContainerClassName = clsx(
+        'flex justify-between gap-5',
+        (type === 'page' && actions?.length) ? (tabs?.length ? 'flex-col md:flex-row md:items-start' : 'flex-col md:flex-row md:items-end') : 'items-end',
+        (firstOnPage && type === 'page' && !tabs?.length) ? 'pb-3 tablet:pb-8' : (tabs?.length ? '' : 'pb-2'),
+        toolbarBorder && 'border-b border-grey-200 dark:border-grey-900',
+        toolbarContainerClassName
+    );
+
+    toolbarLeftClassName = clsx(
+        'flex flex-col',
+        toolbarLeftClassName
+    );
+
+    actionsClassName = clsx(
+        'flex items-center justify-between gap-3 transition-all tablet:justify-start tablet:gap-5',
+        actionsHidden && 'opacity-0 group-hover/view-container:opacity-100',
+        tabs?.length ? 'pb-1' : (type === 'page' ? 'pb-1' : ''),
+        actionsClassName
+    );
+
+    const primaryActionContents = <>
+        {(primaryAction?.title || primaryAction?.icon) && (
+            <Button className={primaryAction.className} color={primaryAction.color || 'black'} icon={primaryAction.icon} label={primaryAction.title} size={type === 'page' ? 'md' : 'sm'} onClick={primaryAction.onClick} />
+        )}
+    </>;
+
+    const headingClassName = clsx(
+        tabs?.length && 'pb-3',
+        type === 'page' && '-mt-2'
+    );
+
+    toolbar = (
+        <div className={toolbarWrapperClassName}>
+            <div className={toolbarContainerClassName}>
+                <div className={toolbarLeftClassName}>
+                    {headerContent}
+                    {title && <Heading className={headingClassName} level={type === 'page' ? 1 : 4}>{title}</Heading>}
+                    {tabs?.length && (
+                        <TabList
+                            border={false}
+                            buttonBorder={true}
+                            handleTabChange={handleTabChange}
+                            selectedTab={selectedTab}
+                            tabs={tabs!}
+                            width='normal'
+                        />
+                    )}
+                </div>
+                <div className={actionsClassName}>
+                    {actions}
+                    {primaryActionContents}
+                </div>
+            </div>
+        </div>
+    );
+
+    mainContainerClassName = clsx(
+        'group/view-container flex flex-auto flex-col',
+        mainContainerClassName
+    );
+
+    if (singleDynamicTableIsSticky) {
+        contentFullBleed = true;
+    }
+
+    contentWrapperClassName = clsx(
+        'relative mx-auto w-full flex-auto',
+        (!contentFullBleed && type === 'page') && 'max-w-7xl px-[4vw] tablet:px-12',
+        contentWrapperClassName,
+        (!title && !actions) && 'pt-[3vmin]'
+    );
+
+    return (
+        <section className={mainContainerClassName}>
+            {(title || actions || headerContent || tabs) && toolbar}
+            <div className={contentWrapperClassName}>
+                {mainContent}
+            </div>
+        </section>
+    );
+};
+
+export default ViewContainer;
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/global/modal/ConfirmationModal.stories.tsx b/apps/admin-x-design-system/src/global/modal/ConfirmationModal.stories.tsx
new file mode 100644
index 00000000000..0bddd41df45
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/modal/ConfirmationModal.stories.tsx
@@ -0,0 +1,45 @@
+import type {Meta, StoryContext, StoryObj} from '@storybook/react';
+import {ReactNode} from 'react';
+
+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',
+    component: ConfirmationModal,
+    tags: ['autodocs'],
+    decorators: [(_story: () => ReactNode, context: StoryContext) => (
+        <NiceModal.Provider>
+            <ConfirmationModalContainer {...context.args} />
+        </NiceModal.Provider>
+    )]
+} satisfies Meta<typeof ConfirmationModal>;
+
+export default meta;
+type Story = StoryObj<typeof ConfirmationModal>;
+
+export const Default: Story = {
+    args: {
+        title: 'Are you sure?',
+        prompt: 'Watch out, you\'re doing something super-super dangerous. Don\'t press the red button (you know you will).'
+    }
+};
+
+export const CustomButtons: Story = {
+    args: {
+        ...Default.args,
+        title: 'You want to delete?',
+        cancelLabel: 'Meh',
+        okLabel: 'Alrite',
+        okColor: 'red'
+    }
+};
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 81%
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..ddf397d0f23 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',
@@ -146,6 +203,32 @@ export const CustomButtons: Story = {
     }
 };
 
+export const RightDrawer: Story = {
+    args: {
+        size: 'bleed',
+        align: 'right',
+        animate: false,
+        width: 600,
+        footer: <></>,
+        children: <>
+            <p>This is a drawer style on the right</p>
+        </>
+    }
+};
+
+export const LeftDrawer: Story = {
+    args: {
+        size: 'bleed',
+        align: 'left',
+        animate: false,
+        width: 600,
+        footer: <></>,
+        children: <>
+            <p>This is a drawer style on the right</p>
+        </>
+    }
+};
+
 const longContent = (
     <>
         <p className='mb-6'>Esse ex officia ipsum et magna reprehenderit ullamco dolore cillum cupidatat ullamco culpa. In et irure irure est id cillum officia pariatur et proident. Nulla nulla dolore qui excepteur magna eu adipisicing mollit. Eiusmod eu irure cupidatat consequat consectetur irure.</p>
@@ -212,4 +295,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 84%
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..12372d4c7bc 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,9 @@ 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;
+    align?: 'center' | 'left' | 'right';
 
     testId?: string;
     title?: string;
@@ -26,6 +28,7 @@ export interface ModalProps {
     cancelLabel?: string;
     leftButtonProps?: ButtonProps;
     buttonsDisabled?: boolean;
+    okDisabled?: boolean;
     footer?: boolean | React.ReactNode;
     header?: boolean;
     padding?: boolean;
@@ -50,7 +53,9 @@ export const topLevelBackdropClasses = 'bg-[rgba(98,109,121,0.2)] backdrop-blur-
 
 const Modal: React.FC<ModalProps> = ({
     size = 'md',
-    maxHeight,
+    align = 'center',
+    width,
+    height,
     testId,
     title,
     okLabel = 'OK',
@@ -60,6 +65,7 @@ const Modal: React.FC<ModalProps> = ({
     header,
     leftButtonProps,
     buttonsDisabled,
+    okDisabled,
     padding = true,
     onOk,
     okColor = 'black',
@@ -105,6 +111,9 @@ const Modal: React.FC<ModalProps> = ({
                         });
                     }
                 });
+
+                // Prevent the event from bubbling up to the window level
+                event.stopPropagation();
             }
         };
 
@@ -143,9 +152,9 @@ const Modal: React.FC<ModalProps> = ({
         }
     });
 
-    let buttons: ButtonProps[] = [];
+    const buttons: ButtonProps[] = [];
 
-    let footerClasses, contentClasses;
+    let contentClasses;
 
     const removeModal = () => {
         confirmIfDirty(dirty, () => {
@@ -174,23 +183,27 @@ const Modal: React.FC<ModalProps> = ({
                 color: okColor,
                 className: 'min-w-[80px]',
                 onClick: onOk,
-                disabled: buttonsDisabled,
+                disabled: buttonsDisabled || okDisabled,
                 loading: okLoading
             });
         }
     }
 
     let modalClasses = clsx(
-        'relative z-50 mx-auto flex max-h-[100%] w-full flex-col justify-between overflow-x-hidden bg-white dark:bg-black',
+        'relative z-50 flex max-h-[100%] w-full flex-col justify-between overflow-x-hidden bg-white dark:bg-black',
+        align === 'center' && 'mx-auto',
+        align === 'left' && 'mr-auto',
+        align === 'right' && 'ml-auto',
         size !== 'bleed' && 'rounded',
         formSheet ? 'shadow-md' : 'shadow-xl',
-        (animate && !formSheet && !animationFinished) && 'animate-modal-in',
+        (animate && !formSheet && !animationFinished && align === 'center') && 'animate-modal-in',
+        (animate && !formSheet && !animationFinished && align === 'right') && 'animate-modal-in-from-right',
         (formSheet && !animationFinished) && 'animate-modal-in-reverse',
         scrolling ? 'overflow-y-auto' : 'overflow-y-hidden'
     );
 
     let backdropClasses = clsx(
-        'fixed inset-0 z-40 h-[100vh] w-[100vw]'
+        'fixed inset-0 z-[1000] h-[100vh] w-[100vw]'
     );
 
     let paddingClasses = '';
@@ -201,7 +214,7 @@ const Modal: React.FC<ModalProps> = ({
     if (stickyHeader) {
         headerClasses = clsx(
             headerClasses,
-            'sticky top-0 z-[200] -mb-4 bg-white !pb-4 dark:bg-black'
+            'sticky top-0 z-[300] -mb-4 bg-white !pb-4 dark:bg-black'
         );
     }
 
@@ -247,7 +260,7 @@ const Modal: React.FC<ModalProps> = ({
             backdropClasses,
             'p-4 md:p-[4vmin]'
         );
-        paddingClasses = 'p-8';
+        paddingClasses = 'p-7';
         headerClasses = clsx(
             headerClasses,
             '-inset-x-8'
@@ -336,14 +349,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 +365,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;
@@ -402,7 +427,7 @@ const Modal: React.FC<ModalProps> = ({
                     (<header className={headerClasses}>
                         {title && <Heading level={3}>{title}</Heading>}
                         <div className={`${topRightContent !== 'close' && 'md:!invisible md:!hidden'} ${hideXOnMobile && 'hidden'} absolute right-6 top-6`}>
-                            <Button className='-m-2 cursor-pointer p-2 opacity-50 hover:opacity-100' icon='close' iconColorClass='text-black dark:text-white' size='sm' unstyled onClick={removeModal} />
+                            <Button className='-m-2 cursor-pointer p-2 opacity-50 hover:opacity-100' icon='close' iconColorClass='text-black dark:text-white' size='sm' testId='close-modal' unstyled onClick={removeModal} />
                         </div>
                     </header>)
                     :
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 80%
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..6f2c41718af 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',
@@ -88,3 +96,11 @@ export const FullBleed: Story = {
         size: 'bleed'
     }
 };
+
+export const BreadcrumbsToolbar: Story = {
+    args: {
+        ...Default.args,
+        previewToolbarTabs: undefined,
+        previewToolbarBreadcrumbs: [{label: 'Previous', onClick: () => {}}, {label: 'Current'}]
+    }
+};
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 84%
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..7b70798cb6b 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,26 @@
+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 Breadcrumbs, {BreadcrumbItem} from '../Breadcrumbs';
 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
@@ -31,6 +34,7 @@ export interface PreviewModalProps {
     deviceSelector?: boolean;
     siteLink?: string;
     previewToolbarURLs?: SelectOption[];
+    previewToolbarBreadcrumbs?: BreadcrumbItem[];
     previewBgColor?: 'grey' | 'white' | 'greygradient';
     selectedURL?: string;
     previewToolbarTabs?: Tab[];
@@ -40,6 +44,7 @@ export interface PreviewModalProps {
     sidebarPadding?: boolean;
     sidebarContentClasses?: string;
     enableCMDS?: boolean;
+    backDropClick?: boolean;
 
     onCancel?: () => void;
     onOk?: () => void;
@@ -47,6 +52,7 @@ export interface PreviewModalProps {
     onSelectURL?: (url: string) => void;
     onSelectDesktopView?: () => void;
     onSelectMobileView?: () => void;
+    onBreadcrumbsBack?: () => void;
 }
 
 export const PreviewModalContent: React.FC<PreviewModalProps> = ({
@@ -54,6 +60,8 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
     title,
     titleHeadingLevel = 4,
     size = 'full',
+    width,
+    height,
     sidebar = '',
     preview,
     dirty = false,
@@ -69,19 +77,22 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
     previewBgColor = 'grey',
     selectedURL,
     previewToolbarTabs,
+    previewToolbarBreadcrumbs,
     buttonsDisabled,
     sidebarButtons,
     sidebarHeader,
     sidebarPadding = true,
     sidebarContentClasses,
     enableCMDS = true,
+    backDropClick,
 
     onCancel,
     onOk,
     afterClose,
     onSelectURL,
     onSelectDesktopView,
-    onSelectMobileView
+    onSelectMobileView,
+    onBreadcrumbsBack
 }) => {
     const modal = useModal();
     const {setGlobalDirtyState} = useGlobalDirtyState();
@@ -141,6 +152,16 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
                 width='wide'
                 onTabChange={onSelectURL!}
             />;
+        } else if (previewToolbarBreadcrumbs) {
+            toolbarLeft = <Breadcrumbs
+                activeItemClassName='hidden md:!block md:!visible'
+                containerClassName='whitespace-nowrap'
+                itemClassName='hidden md:!block md:!visible'
+                items={previewToolbarBreadcrumbs}
+                separatorClassName='hidden md:!block md:!visible'
+                backIcon
+                onBack={onBreadcrumbsBack}
+            />;
         }
 
         const selectedIconColorClass = 'text-black dark:text-green';
@@ -184,7 +205,7 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
         }
 
         const containerClasses = clsx(
-            'min-w-100 absolute inset-y-0 left-0 right-[400px] flex grow flex-col overflow-y-auto',
+            'min-w-100 absolute inset-y-0 left-0 right-[400px] flex w-full grow flex-col overflow-y-auto',
             previewBgClass
         );
 
@@ -215,7 +236,7 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
         );
     }
 
-    let buttons: ButtonProps[] = [];
+    const buttons: ButtonProps[] = [];
 
     if (!sidebarButtons) {
         buttons.push({
@@ -243,21 +264,25 @@ export const PreviewModalContent: React.FC<PreviewModalProps> = ({
         <Modal
             afterClose={afterClose}
             animate={false}
+            backDropClick={backDropClick}
+            dirty={dirty}
             footer={false}
+            height={height}
             padding={false}
             size={size}
             testId={testId}
             title=''
+            width={width}
             hideXOnMobile
         >
             <div className='flex h-full grow'>
-                <div className={`hidden grow flex-col md:!visible md:!flex ${previewBgColor === 'grey' ? 'bg-grey-50' : 'bg-white'}`}>
+                <div className={`relative hidden grow flex-col [@media(min-width:801px)]:!visible [@media(min-width:801px)]:!flex ${previewBgColor === 'grey' ? 'bg-grey-50' : 'bg-white dark:bg-black'}`}>
                     {preview}
                 </div>
                 {sidebar &&
-                    <div className='relative flex h-full w-full flex-col border-l border-grey-100 dark:border-grey-900 md:w-auto md:basis-[400px]'>
+                    <div className='relative flex h-full w-full flex-col border-l border-grey-100 dark:border-grey-900 [@media(min-width:801px)]:w-auto [@media(min-width:801px)]:basis-[400px]'>
                         {sidebarHeader ? sidebarHeader : (
-                            <div className='flex max-h-[74px] items-center justify-between gap-3 px-7 py-5'>
+                            <div className='flex max-h-[82px] items-center justify-between gap-3 px-7 py-6'>
                                 <Heading level={titleHeadingLevel}>{title}</Heading>
                                 {sidebarButtons ? sidebarButtons : <ButtonGroup buttons={buttons} /> }
                             </div>
diff --git a/apps/admin-x-design-system/src/global/table/DynamicTable.stories.tsx b/apps/admin-x-design-system/src/global/table/DynamicTable.stories.tsx
new file mode 100644
index 00000000000..fc816dad325
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/table/DynamicTable.stories.tsx
@@ -0,0 +1,212 @@
+import type {Meta, StoryObj} from '@storybook/react';
+
+import DynamicTable, {DynamicTableColumn, DynamicTableRow} from './DynamicTable';
+import Avatar from '../Avatar';
+import Hint from '../Hint';
+import Pagination from '../Pagination';
+import Button from '../Button';
+
+const meta = {
+    title: 'Global / Table / Dynamic Table',
+    component: DynamicTable,
+    tags: ['autodocs'],
+    excludeStories: ['testColumns', 'testRows']
+} satisfies Meta<typeof DynamicTable>;
+
+export default meta;
+type Story = StoryObj<typeof DynamicTable>;
+
+export const testColumns: DynamicTableColumn[] = [
+    {
+        title: 'Member'
+    },
+    {
+        title: 'Status'
+    },
+    {
+        title: 'Open rate'
+    },
+    {
+        title: 'Location',
+        noWrap: true
+    },
+    {
+        title: 'Created',
+        noWrap: true
+    },
+    {
+        title: 'Signed up on post',
+        noWrap: true,
+        maxWidth: '150px'
+    },
+    {
+        title: 'Newsletter'
+    },
+    {
+        title: 'Billing period'
+    },
+    {
+        title: 'Email sent'
+    },
+    {
+        title: '',
+        hidden: true,
+        disableRowClick: true
+    }
+];
+
+export const testRows = (noOfRows: number) => {
+    const data: DynamicTableRow[] = [];
+    for (let i = 0; i < noOfRows; i++) {
+        data.push(
+            {
+                onClick: () => {
+                    alert('Clicked on row: ' + i);
+                },
+                cells: [
+                    (<div className='flex items-center gap-2'>
+                        {i % 3 === 0 && <Avatar bgColor='green' label='JL' labelColor='white' />}
+                        {i % 3 === 1 && <Avatar bgColor='orange' label='GS' labelColor='white' />}
+                        {i % 3 === 2 && <Avatar bgColor='black' label='ZB' labelColor='white' />}
+                        <div>
+                            {i % 3 === 0 && <div className='whitespace-nowrap'>Jamie Larson</div>}
+                            {i % 3 === 1 && <div className='whitespace-nowrap'>Giana Septimus</div>}
+                            {i % 3 === 2 && <div className='whitespace-nowrap'>Zaire Bator</div>}
+                            <div className='text-sm text-grey-700'>jamie@larson.com</div>
+                        </div>
+                    </div>),
+                    'Free',
+                    '40%',
+                    'London, UK',
+                    '22 June 2023',
+                    'Lorem ipsum dolor sit amet, consectetur adipiscing elit',
+                    'Subscribed',
+                    'Monthly',
+                    '1,303',
+                    <Button color='green' label='Edit' link onClick={() => {
+                        alert('Clicked Edit in row:' + i);
+                    }} />
+                ]
+            }
+        );
+    }
+    return data;
+};
+
+/**
+ * In its simplest form this component lets you create a table with passing a
+ * `columns` and `rows` parameter. You can customise each column's width, whether
+ * it should wrap etc.
+ */
+export const Default: Story = {
+    args: {
+        columns: testColumns,
+        rows: testRows(10)
+    }
+};
+
+export const HiddenHeader: Story = {
+    args: {
+        columns: testColumns,
+        rows: testRows(10),
+        hideHeader: true
+    }
+};
+
+export const NoBorder: Story = {
+    args: {
+        columns: testColumns,
+        rows: testRows(10),
+        border: false
+    }
+};
+
+/**
+ * By default it's just a simple table but you can set its header or footer to
+ * be sticky. In this case the container is `absolute` positioned with `inset-0`
+ * so the size and layout of the table is completely controlled by its container.
+ */
+export const StickyHeader: Story = {
+    args: {
+        stickyHeader: true,
+        columns: testColumns,
+        rows: testRows(40)
+    }
+};
+
+export const StickyFooter: Story = {
+    args: {
+        stickyFooter: true,
+        footer: <Hint>Here we go</Hint>,
+        columns: testColumns,
+        rows: testRows(40)
+    }
+};
+
+export const AllSticky: Story = {
+    // render: () => (
+    //     <DynamicTable columns={columns} footer={<Hint>Table footer</Hint>} rows={rows(40)} stickyFooter stickyHeader />
+    // )
+    args: {
+        stickyHeader: true,
+        stickyFooter: true,
+        footer: <Hint>Here we go</Hint>,
+        columns: testColumns,
+        rows: testRows(40)
+    }
+};
+
+export const HalfPageExample: Story = {
+    decorators: [(_story: () => React.ReactNode) => (
+        <div className='absolute inset-0 p-10'>
+            <div className='flex h-full'>
+                <div className='w-1/2'>
+                    <h1 className='mb-3'>Half page example</h1>
+                    <p className='max-w-2xl pb-6'>This example shows how the table can positioned on the page by its container. You can enable this mode by setting `absolute=true` or by enabling `stickyHeader` or `stickyFooter` (in these cases the component switches to `display: absolute`).</p>
+                    <p className='max-w-2xl pb-6'>If you use the table like this, make sure to set the container to `display:relative`.</p>
+                </div>
+                <div className='relative h-1/2 flex-auto' id='componentContainer'>{_story()}</div>
+            </div>
+        </div>
+    )],
+    args: {
+        stickyHeader: true,
+        stickyFooter: true,
+        columns: testColumns,
+        rows: testRows(40),
+        footer: <Hint>This is a table footer</Hint>
+    }
+};
+
+export const FullPageExample: Story = {
+    decorators: [(_story: () => React.ReactNode) => (
+        <div className='absolute inset-0 p-10'>
+            <div className='flex h-full flex-col'>
+                <h1 className='mb-3'>Page title</h1>
+                <p className='max-w-2xl pb-6'>This example shows how you can create a page with arbitrary content on the top and a large table at the bottom that fills up the remaining space. The table has a sticky header row, a footer that is always visible and scrolling vertically and horizontally (resize the window to see the effect).</p>
+                <p className='max-w-2xl pb-6'>The size and positioning of the table is completely controlled by its <strong>container</strong>. The container must have `relative` position. Use a column flexbox as the main container of the page then set the table container to flex-auto to fill the available horizontal space.</p>
+                <div className='relative -mx-10 flex-auto'>{_story()}</div>
+            </div>
+        </div>
+    )],
+    args: {
+        stickyHeader: true,
+        stickyFooter: true,
+        columns: testColumns,
+        rows: testRows(40),
+        tableContainerClassName: 'px-10',
+        footerClassName: 'mx-10',
+        footer: <Hint>This is a table footer</Hint>
+    }
+};
+
+export const PaginationExample: Story = {
+    args: {
+        columns: testColumns,
+        rows: testRows(10),
+        footer: <div className='flex justify-between'>
+            <Hint>Table footer comes here</Hint>
+            <Pagination limit={5} nextPage={() => {}} page={1} pages={5} prevPage={() => {}} setPage={() => {}} total={15} />
+        </div>
+    }
+};
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/global/table/DynamicTable.tsx b/apps/admin-x-design-system/src/global/table/DynamicTable.tsx
new file mode 100644
index 00000000000..cf2b965f3ff
--- /dev/null
+++ b/apps/admin-x-design-system/src/global/table/DynamicTable.tsx
@@ -0,0 +1,233 @@
+import React from 'react';
+import {Heading} from '../..';
+import clsx from 'clsx';
+import {tableRowHoverBgClasses} from '../TableRow';
+
+export type DynamicTableColumn = {
+    title: string;
+    minWidth?: string;
+    maxWidth?: string;
+    noWrap?: boolean;
+    align?: 'left' | 'center' | 'right';
+    valign?: 'top' | 'middle' | 'bottom';
+    hidden?: boolean;
+    disableRowClick?: boolean;
+}
+
+export type DynamicTableRow = {
+    cells: React.ReactNode[];
+    onClick?: () => void;
+}
+
+export interface DynamicTableProps {
+    columns: DynamicTableColumn[];
+    rows: DynamicTableRow[];
+    horizontalScrolling?: boolean;
+    absolute?: boolean;
+    stickyHeader?: boolean;
+    hideHeader?: boolean;
+    headerBorder?: boolean;
+
+    /**
+     * Set this parameter if the table is the main content in a viewcontainer or on a page
+     */
+    singlePageTable?: boolean;
+    pageHasSidebar?: boolean;
+
+    border?: boolean;
+    footerBorder?:boolean;
+    footer?: React.ReactNode;
+    stickyFooter?: boolean;
+    containerClassName?: string;
+    tableContainerClassName?: string;
+    tableClassName?: string;
+    thClassName?: string;
+    tdClassName?: string;
+    cellClassName?: string;
+    trClassName?: string;
+    footerClassName?: string;
+}
+
+const DynamicTable: React.FC<DynamicTableProps> = ({
+    columns,
+    rows,
+    horizontalScrolling = false,
+    absolute = false,
+    stickyHeader = false,
+    hideHeader = false,
+    headerBorder = true,
+    border = true,
+    footer,
+    footerBorder = true,
+    stickyFooter = false,
+    singlePageTable = false,
+    pageHasSidebar = true,
+    containerClassName,
+    tableContainerClassName,
+    tableClassName,
+    thClassName,
+    tdClassName,
+    cellClassName,
+    trClassName,
+    footerClassName
+}) => {
+    let headerColID = 0;
+    let rowID = 0;
+
+    containerClassName = clsx(
+        'flex max-h-full w-full flex-col',
+        (stickyHeader || stickyFooter || absolute) ? 'absolute inset-0' : 'relative',
+        containerClassName
+    );
+
+    tableContainerClassName = clsx(
+        'flex-auto overflow-x-auto',
+        !horizontalScrolling && 'w-full max-w-full',
+        (singlePageTable && (stickyHeader || stickyFooter || absolute)) && `px-[4vw] tablet:px-12 ${pageHasSidebar ? 'min-[1640px]:px-[calc((100%-1320px)/2+48px)]' : 'xl:px-[calc((100%-1320px)/2+48px)]'}`,
+        tableContainerClassName
+    );
+
+    tableClassName = clsx(
+        'h-full max-h-full min-w-full flex-auto table-fixed',
+        tableClassName
+    );
+
+    thClassName = clsx(
+        'last-child:pr-5 bg-white py-3 text-left dark:bg-black [&:not(:first-child)]:pl-5',
+        thClassName
+    );
+
+    tdClassName = clsx(
+        'w-full border-b group-hover:border-grey-200 dark:group-hover:border-grey-900',
+        border ? 'border-grey-200 dark:border-grey-900' : 'border-transparent',
+        tdClassName
+    );
+
+    cellClassName = clsx(
+        'flex h-full py-4',
+        cellClassName
+    );
+
+    trClassName = clsx(
+        'group',
+        tableRowHoverBgClasses,
+        trClassName
+    );
+
+    footerClassName = clsx(
+        'bg-white dark:bg-black',
+        (singlePageTable && stickyFooter) && `mx-[4vw] tablet:mx-12 ${pageHasSidebar ? 'min-[1640px]:mx-[calc((100%-1320px)/2+48px)]' : 'xl:mx-[calc((100%-1320px)/2+48px)]'}`,
+        footer && 'py-4',
+        stickyFooter && 'sticky inset-x-0 bottom-0',
+        footerBorder && 'border-t border-grey-200 dark:border-grey-900',
+        footerClassName
+    );
+
+    const footerContents = <footer className={footerClassName}>{footer}</footer>;
+
+    return (
+    // Outer container for testing. Should not be part of the table component
+    // <div className='h-[40vh]'>
+
+        <div className={containerClassName}>
+            <div className={tableContainerClassName}>
+                <table className={tableClassName}>
+                    {!hideHeader &&
+                    <thead className={stickyHeader ? 'sticky top-0' : ''}>
+                        <tr>
+                            {columns.map((column) => {
+                                headerColID = headerColID + 1;
+                                const thMaxWidth: string = column.maxWidth || 'auto';
+                                const thMinWidth: string = column.minWidth || 'auto';
+                                const thStyles = {
+                                    maxWidth: thMaxWidth,
+                                    minWidth: thMinWidth,
+                                    width: thMaxWidth
+                                };
+                                return (
+                                    <th key={'head-' + headerColID} className={thClassName} style={thStyles}>
+                                        <Heading className='truncate' level={6}>{column.title}</Heading>
+                                    </th>);
+                            })}
+                        </tr>
+                        {headerBorder && (
+                            <tr>
+                                <th className='h-px bg-grey-200 p-0 dark:bg-grey-900' colSpan={columns.length}></th>
+                            </tr>
+                        )}
+                    </thead>
+                    }
+                    <tbody>
+                        {rows.map((row) => {
+                            let colID = 0;
+                            rowID = rowID + 1;
+                            return <tr key={'row-' + rowID} className={trClassName}>
+                                {row.cells.map((cell) => {
+                                    const currentColumn: DynamicTableColumn = columns[colID] || {title: ''};
+
+                                    let customTdClasses = tdClassName;
+                                    customTdClasses = clsx(
+                                        customTdClasses,
+                                        // currentColumn.noWrap ? 'truncate' : '',
+                                        currentColumn.align === 'center' && 'text-center',
+                                        currentColumn.align === 'right' && 'text-right'
+                                    );
+
+                                    if (rowID === rows.length && footerBorder) {
+                                        customTdClasses = clsx(
+                                            customTdClasses,
+                                            'border-none'
+                                        );
+                                    }
+
+                                    const tdMaxWidth: string = (currentColumn !== undefined && currentColumn.maxWidth) || 'auto';
+                                    const tdMinWidth: string = (currentColumn !== undefined && currentColumn.minWidth) || 'auto';
+                                    const tdStyles = {
+                                        maxWidth: tdMaxWidth,
+                                        minWidth: tdMinWidth,
+                                        width: tdMaxWidth
+                                    };
+                                    let customCellClasses = cellClassName;
+                                    customCellClasses = clsx(
+                                        customCellClasses,
+                                        colID !== 0 && 'pl-5',
+                                        (colID === columns.length - 1) && 'pr-5',
+                                        currentColumn.noWrap ? 'truncate' : '',
+                                        currentColumn.valign === 'middle' || !currentColumn.valign && 'items-center',
+                                        currentColumn.valign === 'top' && 'items-start',
+                                        currentColumn.valign === 'bottom' && 'items-end'
+                                    );
+                                    if (row.onClick && !currentColumn.disableRowClick) {
+                                        customCellClasses = clsx(
+                                            customCellClasses,
+                                            'cursor-pointer'
+                                        );
+                                    }
+                                    if (currentColumn.hidden) {
+                                        customCellClasses = clsx(
+                                            customCellClasses,
+                                            'opacity-0 group-hover:opacity-100'
+                                        );
+                                    }
+                                    const data = (
+                                        <td key={colID} className={customTdClasses} style={tdStyles}>
+                                            <div className={customCellClasses} onClick={(row.onClick && !currentColumn.disableRowClick) ? row.onClick : (() => {})}>{cell}</div>
+                                        </td>
+                                    );
+                                    colID = colID + 1;
+                                    return data;
+                                })}
+                            </tr>;
+                        })}
+                    </tbody>
+                </table>
+                {!stickyFooter && footerContents}
+            </div>
+            {stickyFooter && footerContents}
+        </div>
+
+    // </div>
+    );
+};
+
+export default DynamicTable;
\ No newline at end of file
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-design-system/src/hooks/usePagination.tsx b/apps/admin-x-design-system/src/hooks/usePagination.tsx
new file mode 100644
index 00000000000..2f83d7a997a
--- /dev/null
+++ b/apps/admin-x-design-system/src/hooks/usePagination.tsx
@@ -0,0 +1,50 @@
+import {useEffect, useState} from 'react';
+
+export interface PaginationMeta {
+    limit: number | 'all';
+    pages: number;
+    total: number;
+    next: number | null;
+    prev: number | null;
+}
+
+export interface PaginationData {
+    page: number;
+    pages: number | null;
+    total: number | null;
+    limit: number;
+    setPage: (page: number) => void;
+    nextPage: () => void;
+    prevPage: () => void;
+}
+
+export const usePage = () => {
+    const [page, setPage] = useState(1);
+    return {page, setPage};
+};
+
+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<PaginationMeta | undefined>(meta);
+
+    useEffect(() => {
+        if (meta) {
+            setPrevMeta(meta);
+
+            if (meta.pages > 0 && meta.pages < page) {
+                // We probably deleted an item when on the last page: go one page back automatically
+                setPage(meta.pages);
+            }
+        }
+    }, [meta, setPage, page]);
+
+    return {
+        page,
+        setPage,
+        pages: prevMeta?.pages ?? null,
+        limit: prevMeta?.limit && prevMeta.limit !== 'all' ? 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-settings/src/hooks/useSortableIndexedList.tsx b/apps/admin-x-design-system/src/hooks/useSortableIndexedList.tsx
similarity index 95%
rename from apps/admin-x-settings/src/hooks/useSortableIndexedList.tsx
rename to apps/admin-x-design-system/src/hooks/useSortableIndexedList.tsx
index a547b7facc3..1b1da423d76 100644
--- a/apps/admin-x-settings/src/hooks/useSortableIndexedList.tsx
+++ b/apps/admin-x-design-system/src/hooks/useSortableIndexedList.tsx
@@ -1,5 +1,6 @@
 import {arrayMove} from '@dnd-kit/sortable';
 import {useEffect, useState} from 'react';
+import * as _ from 'lodash-es';
 
 export type SortableIndexedList<Item> = {
     items: Array<{ item: Item; id: string }>;
@@ -32,7 +33,7 @@ const useSortableIndexedList = <Item extends unknown>({items, setItems, blank, c
             allItems.push(newItem);
         }
 
-        if (JSON.stringify(allItems) !== JSON.stringify(items)) {
+        if (!_.isEqual(JSON.parse(JSON.stringify(allItems)), JSON.parse(JSON.stringify(items)))) {
             setItems(allItems);
         }
     }, [editableItems, newItem, items, setItems, canAddNewItem]);
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..c2298cb1a28
--- /dev/null
+++ b/apps/admin-x-design-system/src/index.ts
@@ -0,0 +1,172 @@
+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, FetchKoenigLexical} 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 {DragIndicator, default as SortableList} from './global/SortableList';
+export type {DragIndicatorProps, SortableItemContainerProps, SortableListProps} from './global/SortableList';
+export {default as SortMenu} from './global/SortMenu';
+export type {SortMenuProps} from './global/SortMenu';
+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 Page} from './global/layout/Page';
+export type {PageTab} from './global/layout/Page';
+export type {CustomGlobalAction} from './global/layout/Page';
+export {default as ViewContainer} from './global/layout/ViewContainer';
+export type {View} from './global/layout/ViewContainer';
+export type {ViewTab} from './global/layout/ViewContainer';
+export type {PrimaryActionProps} from './global/layout/ViewContainer';
+export {default as DynamicTable} from './global/table/DynamicTable';
+export type {DynamicTableProps} from './global/table/DynamicTable';
+export type {DynamicTableColumn} from './global/table/DynamicTable';
+export type {DynamicTableRow} from './global/table/DynamicTable';
+
+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 {default as useSortableIndexedList} from './hooks/useSortableIndexedList';
+
+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';
\ No newline at end of file
diff --git a/apps/admin-x-design-system/src/providers/DesignSystemProvider.tsx b/apps/admin-x-design-system/src/providers/DesignSystemProvider.tsx
new file mode 100644
index 00000000000..a79413283c5
--- /dev/null
+++ b/apps/admin-x-design-system/src/providers/DesignSystemProvider.tsx
@@ -0,0 +1,57 @@
+// 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;
+    darkMode: boolean;
+}
+
+const DesignSystemContext = createContext<DesignSystemContextType>({
+    isAnyTextFieldFocused: false,
+    setFocusState: () => {},
+    fetchKoenigLexical: async () => {},
+    darkMode: false
+});
+
+export const useDesignSystem = () => useContext(DesignSystemContext);
+
+export const useFocusContext = () => {
+    const context = useDesignSystem();
+    if (!context) {
+        throw new Error('useFocusContext must be used within a FocusProvider');
+    }
+    return context;
+};
+
+interface DesignSystemProviderProps {
+    fetchKoenigLexical: FetchKoenigLexical;
+    darkMode: boolean;
+    children: React.ReactNode;
+}
+
+const DesignSystemProvider: React.FC<DesignSystemProviderProps> = ({fetchKoenigLexical, darkMode, children}) => {
+    const [isAnyTextFieldFocused, setIsAnyTextFieldFocused] = useState(false);
+
+    const setFocusState = (value: boolean) => {
+        setIsAnyTextFieldFocused(value);
+    };
+
+    return (
+        <DesignSystemContext.Provider value={{isAnyTextFieldFocused, setFocusState, fetchKoenigLexical, darkMode}}>
+            <GlobalDirtyStateProvider>
+                <Toaster />
+                <NiceModal.Provider>
+                    {children}
+                </NiceModal.Provider>
+            </GlobalDirtyStateProvider>
+        </DesignSystemContext.Provider>
+    );
+};
+
+export default DesignSystemProvider;
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-design-system/src/settings/SettingGroup.tsx b/apps/admin-x-design-system/src/settings/SettingGroup.tsx
new file mode 100644
index 00000000000..2a620534fc2
--- /dev/null
+++ b/apps/admin-x-design-system/src/settings/SettingGroup.tsx
@@ -0,0 +1,188 @@
+import clsx from 'clsx';
+import React, {forwardRef, useEffect} from 'react';
+import {ButtonProps} from '../global/Button';
+import ButtonGroup from '../global/ButtonGroup';
+import SettingGroupHeader from './SettingGroupHeader';
+
+export interface SettingGroupProps {
+    navid?:string;
+    testId?: string;
+    title?: string;
+    description?: React.ReactNode;
+    isVisible?: boolean;
+    isEditing?: boolean;
+    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
+     */
+    highlightOnModalClose?: boolean;
+
+    /**
+     * Remove borders and paddings
+     */
+    border?: boolean;
+    styles?: string;
+
+    /**
+     * Default buttons only appear if onStateChange is implemented
+     */
+    onEditingChange?: (isEditing: boolean) => void
+    onSave?: () => void
+    onCancel?: () => void
+    enableCMDS?: boolean
+}
+
+const SettingGroup = forwardRef<HTMLDivElement, SettingGroupProps>(function SettingGroup({
+    navid,
+    testId,
+    title,
+    description,
+    isVisible = true,
+    isEditing,
+    saveState,
+    customHeader,
+    customButtons,
+    beta = false,
+    children,
+    hideEditButton,
+    alwaysShowSaveButton = true,
+    border = true,
+    highlight = false,
+    highlightOnModalClose = true,
+    styles,
+    onEditingChange,
+    onSave,
+    onCancel,
+    enableCMDS = true
+}, ref) {
+    const handleEdit = () => {
+        onEditingChange?.(true);
+    };
+
+    const handleCancel = () => {
+        onCancel?.();
+        onEditingChange?.(false);
+    };
+
+    const handleSave = () => {
+        onSave?.();
+    };
+
+    styles += ' border-grey-250 dark:border-grey-925';
+
+    // The links visible before editing
+    const viewButtons: ButtonProps[] = [];
+
+    if (!hideEditButton) {
+        let label = 'Edit';
+        if (saveState === 'saved') {
+            label = 'Saved';
+        }
+        viewButtons.push(
+            {
+                label,
+                key: 'edit',
+                color: 'clear',
+                onClick: handleEdit
+            }
+        );
+    } else if (saveState === 'saved') {
+        viewButtons.push(
+            {
+                label: 'Saved',
+                key: 'edit',
+                color: 'green',
+                onClick: handleEdit
+            }
+        );
+    }
+
+    // The buttons that show when you are editing
+    const editButtons: ButtonProps[] = [
+        {
+            label: 'Cancel',
+            key: 'cancel',
+            onClick: handleCancel
+        }
+    ];
+
+    if (saveState === 'unsaved' || alwaysShowSaveButton) {
+        let label = 'Save';
+        if (saveState === 'saving') {
+            label = 'Saving...';
+        }
+        editButtons.push(
+            {
+                label: label,
+                key: 'save',
+                color: saveState === 'unsaved' ? 'green' : 'light-grey',
+                disabled: saveState !== 'unsaved',
+                onClick: handleSave
+            }
+        );
+    }
+
+    useEffect(() => {
+        const handleCMDS = (e: KeyboardEvent) => {
+            if ((e.metaKey || e.ctrlKey) && e.key === 's') {
+                e.preventDefault();
+                handleSave();
+            }
+        };
+        if (enableCMDS) {
+            window.addEventListener('keydown', handleCMDS);
+            return () => {
+                window.removeEventListener('keydown', handleCMDS);
+            };
+        }
+    });
+
+    const containerClasses = clsx(
+        'relative flex-col gap-6 rounded-xl transition-all hover:border-grey-200',
+        border && 'border p-5 hover:shadow-sm md:p-7',
+        isVisible ? 'flex' : 'hidden',
+        (highlight && highlightOnModalClose) && 'border-grey-200 shadow-sm',
+        !isEditing ? 'is-not-editing group/setting-group' : 'border-grey-200 shadow-sm',
+        styles
+    );
+
+    if (!isEditing) {
+        return (
+            <div className={containerClasses} data-testid={testId}>
+                <div ref={ref} className='absolute' id={navid && navid}></div>
+                {customHeader ? customHeader :
+                    <SettingGroupHeader beta={beta} description={description} title={title!}>
+                        {customButtons ? customButtons :
+                            (onEditingChange && <ButtonGroup buttons={isEditing ? editButtons : viewButtons} className={isEditing ? 'mt-[-5px]  ' : '-mr-1 mt-[-5px]'} size='sm' />)
+                        }
+                    </SettingGroupHeader>
+                }
+                {children}
+            </div>
+        );
+    } else {
+        return (
+            <div className={containerClasses} data-testid={testId}>
+                <div ref={ref} className='absolute' id={navid && navid}></div>
+                {customHeader ? customHeader :
+                    <SettingGroupHeader beta={beta} description={description} title={title!}>
+                        {customButtons ? customButtons :
+                            (onEditingChange && <ButtonGroup buttons={isEditing ? editButtons : viewButtons} className={isEditing ? 'mt-[-5px]  ' : '-mr-1 mt-[-5px]'} size='sm' />)
+                        }
+                    </SettingGroupHeader>
+                }
+                {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-design-system/src/settings/SettingGroupContent.tsx b/apps/admin-x-design-system/src/settings/SettingGroupContent.tsx
new file mode 100644
index 00000000000..f2efcf61e76
--- /dev/null
+++ b/apps/admin-x-design-system/src/settings/SettingGroupContent.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import SettingValue, {SettingValueProps} from './SettingValue';
+
+export interface SettingGroupContentProps {
+    columns?: 1 | 2;
+
+    /**
+     * Use this array to display setting values with standard formatting in the content area of a setting group
+     */
+    values?: Array<SettingValueProps>;
+    children?: React.ReactNode;
+    className?: string;
+}
+
+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';
+    }
+
+    styles += ` ${className}`;
+
+    return (
+        <div className={styles}>
+            {values && values.map(({key, ...props}) => (
+                <SettingValue key={key} {...props} />
+            ))}
+            {children}
+        </div>
+    );
+};
+
+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-design-system/src/settings/SettingGroupHeader.tsx b/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx
new file mode 100644
index 00000000000..89278245438
--- /dev/null
+++ b/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import Heading from '../global/Heading';
+
+export interface SettingGroupHeaderProps {
+    title?: React.ReactNode;
+    description?: React.ReactNode;
+    beta?: boolean;
+    children?: React.ReactNode;
+}
+
+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}>{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-md group-[.is-not-editing]/setting-group:!visible group-[.is-not-editing]/setting-group:!block md:!visible md:!block">{description}</p>}
+                </div>
+            }
+            <div>
+                {children}
+            </div>
+        </div>
+    );
+};
+
+export default SettingGroupHeader;
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-design-system/src/settings/SettingNavItem.tsx b/apps/admin-x-design-system/src/settings/SettingNavItem.tsx
new file mode 100644
index 00000000000..292ce2db6d2
--- /dev/null
+++ b/apps/admin-x-design-system/src/settings/SettingNavItem.tsx
@@ -0,0 +1,37 @@
+import clsx from 'clsx';
+import React, {forwardRef} from 'react';
+import Icon from '../global/Icon';
+
+export interface SettingNavItemProps extends Omit<React.HTMLProps<HTMLLIElement>, 'ref' | 'title' | 'onClick'> {
+    title: React.ReactNode;
+    navid?: string;
+    icon?: string;
+    isCurrent?: boolean;
+    isVisible?: boolean;
+    onClick?: (e: React.MouseEvent<HTMLAnchorElement>) => void;
+}
+
+const SettingNavItem = forwardRef<HTMLLIElement, SettingNavItemProps>(function SettingNavItem({
+    title,
+    navid = '',
+    icon,
+    isCurrent = false,
+    isVisible = true,
+    onClick = () => {},
+    ...props
+}, ref) {
+    const classNames = clsx(
+        'w-100 mt-1 flex h-[38px] cursor-pointer items-center rounded-lg px-3 py-2 text-left text-[14px] font-medium transition-all hover:bg-grey-200 focus:bg-grey-100 dark:text-grey-600 dark:hover:bg-grey-950 dark:focus:bg-grey-925',
+        isCurrent ? 'bg-grey-250 text-black dark:bg-grey-925 dark:text-white' : 'text-grey-800',
+        !isVisible && 'hidden'
+    );
+
+    return (
+        <li ref={ref} {...props}><a className={classNames} id={navid} onClick={onClick}>
+            {icon && <Icon className='mr-[7px] h-[18px] w-[18px]' name={icon} size='custom' />}
+            {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-design-system/src/settings/SettingNavSection.tsx b/apps/admin-x-design-system/src/settings/SettingNavSection.tsx
new file mode 100644
index 00000000000..a52668e396a
--- /dev/null
+++ b/apps/admin-x-design-system/src/settings/SettingNavSection.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import {Separator} from '..';
+
+export interface SettingNavSectionProps {
+    title?: string;
+    isVisible?: boolean;
+    children?: React.ReactNode;
+}
+
+const SettingNavSection: React.FC<SettingNavSectionProps> = ({title, isVisible, children}) => {
+    if (!isVisible) {
+        return null;
+    }
+
+    return (
+        <>
+            {title && <h2 className='mb-4 ml-2 text-base font-semibold tracking-normal text-black dark:text-grey-400'>{title}</h2>}
+            {children &&
+            <>
+                <ul className="-mt-1 mb-7">
+                    {children}
+                </ul>
+                <Separator className='mx-2 mb-7 border-grey-300 dark:border-grey-950' />
+            </>
+            }
+        </>
+    );
+};
+
+export default SettingNavSection;
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-design-system/src/settings/SettingSection.tsx b/apps/admin-x-design-system/src/settings/SettingSection.tsx
new file mode 100644
index 00000000000..ead97be404b
--- /dev/null
+++ b/apps/admin-x-design-system/src/settings/SettingSection.tsx
@@ -0,0 +1,29 @@
+import clsx from 'clsx';
+import React from 'react';
+import SettingSectionHeader from './SettingSectionHeader';
+
+export interface SettingSectionProps {
+    title?: string;
+    isVisible?: boolean;
+    children?: React.ReactNode;
+}
+
+const SettingSection: React.FC<SettingSectionProps> = ({title, isVisible = true, children}) => {
+    const containerClassNames = clsx(
+        'mb-[10vh]',
+        isVisible ? '' : 'hidden'
+    );
+
+    return (
+        <div className={containerClassNames}>
+            {title && <SettingSectionHeader title={title} />}
+            {children &&
+                <div className="mb-10 flex flex-col gap-12">
+                    {children}
+                </div>
+            }
+        </div>
+    );
+};
+
+export default SettingSection;
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-design-system/src/settings/SettingSectionHeader.tsx b/apps/admin-x-design-system/src/settings/SettingSectionHeader.tsx
new file mode 100644
index 00000000000..0925260cf1d
--- /dev/null
+++ b/apps/admin-x-design-system/src/settings/SettingSectionHeader.tsx
@@ -0,0 +1,20 @@
+import clsx from 'clsx';
+import React from 'react';
+
+export interface SettingSectionHeaderProps {
+    title: string;
+    sticky?: boolean;
+}
+
+const SettingSectionHeader: React.FC<SettingSectionHeaderProps> = ({title, sticky = false}) => {
+    const classNames = clsx(
+        'z-20 mb-px pb-10 text-3xl 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]')
+    );
+
+    return (
+        <h2 className={classNames}>{title}</h2>
+    );
+};
+
+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 92%
rename from apps/admin-x-settings/src/admin-x-ds/settings/SettingValue.tsx
rename to apps/admin-x-design-system/src/settings/SettingValue.tsx
index bf57bdff3d1..9349cf2e802 100644
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingValue.tsx
+++ b/apps/admin-x-design-system/src/settings/SettingValue.tsx
@@ -8,6 +8,7 @@ export interface SettingValueProps {
     value: ReactNode;
     hint?: ReactNode;
     hideEmptyValue?: boolean;
+    'data-testid'?: string;
 }
 
 const SettingValue: React.FC<SettingValueProps> = ({heading, value, hint, hideEmptyValue, ...props}) => {
@@ -24,4 +25,4 @@ const SettingValue: React.FC<SettingValueProps> = ({heading, value, hint, hideEm
     );
 };
 
-export default SettingValue;
\ No newline at end of file
+export default SettingValue;
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-design-system/src/utils/modals.tsx b/apps/admin-x-design-system/src/utils/modals.tsx
new file mode 100644
index 00000000000..8a37e8522ce
--- /dev/null
+++ b/apps/admin-x-design-system/src/utils/modals.tsx
@@ -0,0 +1,26 @@
+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) {
+        action();
+    } else {
+        NiceModal.show(ConfirmationModal, {
+            title: 'Are you sure you want to leave this page?',
+            prompt: (
+                <>
+                    <p>{`Hey there! It looks like you didn't save the changes you made.`}</p>
+                    <p>Save before you go!</p>
+                </>
+            ),
+            okLabel: 'Leave',
+            cancelLabel: 'Stay',
+            okColor: 'red',
+            onOk: (confirmationModal) => {
+                action();
+                confirmationModal?.remove();
+            },
+            ...options
+        });
+    }
+}
diff --git a/apps/admin-x-design-system/styles.css b/apps/admin-x-design-system/styles.css
new file mode 100644
index 00000000000..5ba0b87bf7a
--- /dev/null
+++ b/apps/admin-x-design-system/styles.css
@@ -0,0 +1,100 @@
+@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: 800px) {
+    .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..712560fc06a
--- /dev/null
+++ b/apps/admin-x-design-system/tailwind.config.cjs
@@ -0,0 +1,306 @@
+// 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: '1320px',
+            tablet: '860px'
+        },
+        colors: {
+            transparent: 'transparent',
+            current: 'currentColor',
+            accent: 'var(--accent-color, #ff0095)',
+            white: '#FFF',
+            black: '#15171A',
+            grey: {
+                DEFAULT: '#ABB4BE',
+                50: '#FAFAFB',
+                75: '#F9FAFB',
+                100: '#F4F5F6',
+                150: '#F1F3F4',
+                200: '#EBEEF0',
+                250: '#E5E9ED',
+                300: '#DDE1E5',
+                400: '#CED4D9',
+                500: '#AEB7C1',
+                600: '#95A1AD',
+                700: '#7C8B9A',
+                800: '#626D79',
+                900: '#394047',
+                925: '#2E3338',
+                950: '#222427',
+                975: '#191B1E'
+            },
+            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)',
+            xs: '0 0 1px rgba(0,0,0,0.04), 0 1px 3px rgba(0,0,0,0.03), 0 8px 10px -12px rgba(0,0,0,.1)',
+            sm: '0 0 1px rgba(0,0,0,.12), 0 1px 6px rgba(0,0,0,0.03), 0 8px 10px -8px rgba(0,0,0,.1)',
+            md: '0 0 1px rgba(0,0,0,0.12), 0 1px 6px rgba(0,0,0,0.03), 0 8px 10px -8px rgba(0,0,0,0.05), 0px 24px 37px -21px rgba(0, 0, 0, 0.05)',
+            'md-heavy': '0 0 1px rgba(0,0,0,0.22), 0 1px 6px rgba(0,0,0,0.15), 0 8px 10px -8px rgba(0,0,0,0.16), 0px 24px 37px -21px rgba(0, 0, 0, 0.46)',
+            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%': {
+                        transform: 'translateY(100%)'
+                    },
+                    '26.52%': {
+                        transform: 'translateY(-3.90px)'
+                    },
+                    '63.26%': {
+                        transform: 'translateY(1.2px)'
+                    },
+                    '100.00%': {
+                        transform: 'translateY(0px)'
+                    }
+                },
+                toasterTopIn: {
+                    '0.00%': {
+                        transform: 'translateY(-82px)'
+                    },
+                    '26.52%': {
+                        transform: 'translateY(5.90px)'
+                    },
+                    '63.26%': {
+                        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)'
+                    }
+                },
+                modalInFromRight: {
+                    '0%': {
+                        transform: 'translateX(32px)',
+                        opacity: '0'
+                    },
+                    '100%': {
+                        transform: 'translateX(0px)',
+                        opacity: '1'
+                    }
+                },
+                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-from-right': 'modalInFromRight 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',
+                22: '9.2rem',
+                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': '132rem',
+                '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.4rem',
+                xs: '1.2rem',
+                sm: '1.3rem',
+                md: '1.4rem',
+                lg: '1.65rem',
+                xl: '2rem',
+                '2xl': '2.4rem',
+                '3xl': '3.2rem',
+                '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/unit/hello.test.js b/apps/admin-x-design-system/test/unit/hello.test.js
new file mode 100644
index 00000000000..926450737b8
--- /dev/null
+++ b/apps/admin-x-design-system/test/unit/hello.test.js
@@ -0,0 +1,8 @@
+import assert from 'assert/strict';
+
+describe('Hello world', function () {
+    it('Runs a test', function () {
+        // TODO: Write me!
+        assert.equal(1, 1);
+    });
+});
diff --git a/apps/admin-x-design-system/test/unit/hooks/usePagination.test.ts b/apps/admin-x-design-system/test/unit/hooks/usePagination.test.ts
new file mode 100644
index 00000000000..85ed5af4a79
--- /dev/null
+++ b/apps/admin-x-design-system/test/unit/hooks/usePagination.test.ts
@@ -0,0 +1,116 @@
+import {expect} from 'chai';
+import {renderHook, act} from '@testing-library/react-hooks';
+import {usePagination, PaginationMeta, PaginationData} from '../../../src/hooks/usePagination';
+
+describe('usePagination', function () {
+    const initialMeta: PaginationMeta = {
+        limit: 10,
+        pages: 5,
+        total: 50,
+        next: null,
+        prev: null
+    };
+
+    it('should initialize with the given meta and page', function () {
+        const {result} = renderHook(() => usePagination({
+            meta: initialMeta,
+            limit: 10,
+            page: 1,
+            setPage: () => {}
+        })
+        );
+
+        const expectedData: PaginationData = {
+            page: 1,
+            pages: initialMeta.pages,
+            total: initialMeta.total,
+            limit: initialMeta.limit,
+            setPage: result.current.setPage,
+            nextPage: result.current.nextPage,
+            prevPage: result.current.prevPage
+        };
+
+        expect(result.current).to.deep.equal(expectedData);
+    });
+
+    it('should update page correctly when nextPage and prevPage are called', function () {
+        let currentPage = 1;
+        const setPage = (newPage: number) => {
+            currentPage = newPage;
+        };
+
+        const {result} = renderHook(() => usePagination({
+            meta: initialMeta,
+            limit: 10,
+            page: currentPage,
+            setPage
+        })
+        );
+
+        act(() => {
+            result.current.nextPage();
+        });
+
+        expect(currentPage).to.equal(2);
+
+        act(() => {
+            result.current.prevPage();
+        });
+
+        expect(currentPage).to.equal(1);
+    });
+
+    it('should update page correctly when setPage is called', function () {
+        let currentPage = 3;
+        const setPage = (newPage: number) => {
+            currentPage = newPage;
+        };
+
+        const {result} = renderHook(() => usePagination({
+            meta: initialMeta,
+            limit: 10,
+            page: currentPage,
+            setPage
+        })
+        );
+
+        const newPage = 5;
+
+        act(() => {
+            result.current.setPage(newPage);
+        });
+
+        expect(currentPage).to.equal(newPage);
+    });
+
+    it('should handle edge cases where meta.pages < page when setting meta', function () {
+        let currentPage = 5;
+        const setPage = (newPage: number) => {
+            currentPage = newPage;
+        };
+
+        const {rerender} = renderHook(
+            ({meta}) => usePagination({
+                meta,
+                limit: 10,
+                page: currentPage,
+                setPage
+            }),
+            {initialProps: {meta: initialMeta}}
+        );
+
+        const updatedMeta: PaginationMeta = {
+            limit: 10,
+            pages: 4,
+            total: 40,
+            next: null,
+            prev: null
+        };
+
+        act(() => {
+            rerender({meta: updatedMeta});
+        });
+
+        expect(currentPage).to.equal(4);
+    });
+});
diff --git a/apps/admin-x-design-system/test/unit/hooks/useSortableIndexedList.test.ts b/apps/admin-x-design-system/test/unit/hooks/useSortableIndexedList.test.ts
new file mode 100644
index 00000000000..9a8f444915a
--- /dev/null
+++ b/apps/admin-x-design-system/test/unit/hooks/useSortableIndexedList.test.ts
@@ -0,0 +1,150 @@
+import {expect} from 'chai';
+import {renderHook, act} from '@testing-library/react-hooks';
+import useSortableIndexedList from '../../../src/hooks/useSortableIndexedList';
+import sinon from 'sinon';
+
+describe('useSortableIndexedList', function () {
+    // Mock initial items and blank item
+    const initialItems = [{name: 'Item 1'}, {name: 'Item 2'}];
+    const blankItem = {name: ''};
+
+    // Mock canAddNewItem function
+    const canAddNewItem = (item: { name: string }) => !!item.name;
+
+    it('should initialize with the given items', function () {
+        const setItems = sinon.spy();
+
+        const {result} = renderHook(() => useSortableIndexedList({
+            items: initialItems,
+            setItems,
+            blank: blankItem,
+            canAddNewItem
+        })
+        );
+
+        // Assert initial items setup correctly
+        expect(result.current.items).to.deep.equal(initialItems.map((item, index) => ({item, id: index.toString()})));
+    });
+
+    it('should add a new item', function () {
+        let items = initialItems;
+        const setItems = (newItems: any[]) => {
+            items = newItems;
+        };
+
+        const {result} = renderHook(() => useSortableIndexedList({
+            items,
+            setItems,
+            blank: blankItem,
+            canAddNewItem
+        })
+        );
+
+        act(() => {
+            result.current.setNewItem({name: 'New Item'});
+            result.current.addItem();
+        });
+
+        // Assert items updated correctly after adding new item
+        expect(items).to.deep.equal([...initialItems, {name: 'New Item'}]);
+    });
+
+    it('should update an item', function () {
+        let items = initialItems;
+        const setItems = (newItems: any[]) => {
+            items = newItems;
+        };
+
+        const {result} = renderHook(() => useSortableIndexedList({
+            items,
+            setItems,
+            blank: blankItem,
+            canAddNewItem
+        })
+        );
+
+        act(() => {
+            result.current.updateItem('0', {name: 'Updated Item 1'});
+        });
+
+        // Assert item updated correctly
+        expect(items[0]).to.deep.equal({name: 'Updated Item 1'});
+    });
+
+    it('should remove an item', function () {
+        let items = initialItems;
+        const setItems = (newItems: any[]) => {
+            items = newItems;
+        };
+
+        const {result} = renderHook(() => useSortableIndexedList({
+            items,
+            setItems,
+            blank: blankItem,
+            canAddNewItem
+        })
+        );
+
+        act(() => {
+            result.current.removeItem('0');
+        });
+
+        // Assert item removed correctly
+        expect(items).to.deep.equal([initialItems[1]]);
+    });
+
+    it('should move an item', function () {
+        let items = initialItems;
+        const setItems = (newItems: any[]) => {
+            items = newItems;
+        };
+
+        const {result} = renderHook(() => useSortableIndexedList({
+            items,
+            setItems,
+            blank: blankItem,
+            canAddNewItem
+        })
+        );
+
+        act(() => {
+            result.current.moveItem('0', '1');
+        });
+
+        // Assert item moved correctly
+        expect(items).to.deep.equal([initialItems[1], initialItems[0]]);
+    });
+
+    it('should not setItems for deeply equal items regardless of property order', function () {
+        const setItems = sinon.spy();
+        const initialItem = [{name: 'Item 1', url: 'http://example.com'}];
+        const blankItem1 = {name: '', url: ''};
+
+        const {rerender} = renderHook(
+            // eslint-disable-next-line
+            ({items, setItems}) => useSortableIndexedList({ 
+                items,
+                setItems,
+                blank: blankItem1,
+                canAddNewItem
+            }),
+            {
+                initialProps: {
+                    items: initialItem,
+                    setItems
+                }
+            }
+        );
+
+        expect(setItems.callCount).to.equal(0);
+
+        // Re-render with items in different order but same content
+        rerender({
+            items: [{url: 'http://example.com', name: 'Item 1'}],
+            setItems
+        });
+
+        // Expect no additional calls because the items are deeply equal
+        expect(setItems.callCount).to.equal(0);
+    });
+});
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-settings/tsconfig.node.json b/apps/admin-x-design-system/tsconfig.node.json
similarity index 100%
rename from apps/admin-x-settings/tsconfig.node.json
rename to apps/admin-x-design-system/tsconfig.node.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..118183752ef
--- /dev/null
+++ b/apps/admin-x-design-system/vite.config.ts
@@ -0,0 +1,67 @@
+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({
+        logLevel: process.env.CI ? 'info' : 'warn',
+        plugins: [
+            svgr(),
+            react()
+        ],
+        define: {
+            'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+            'process.env.VITEST_SEGFAULT_RETRY': 3
+        },
+        preview: {
+            port: 4174
+        },
+        build: {
+            reportCompressedSize: false,
+            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-framework/.eslintrc.cjs b/apps/admin-x-framework/.eslintrc.cjs
new file mode 100644
index 00000000000..27d400ede58
--- /dev/null
+++ b/apps/admin-x-framework/.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-framework/.gitignore b/apps/admin-x-framework/.gitignore
new file mode 100644
index 00000000000..7998256b87f
--- /dev/null
+++ b/apps/admin-x-framework/.gitignore
@@ -0,0 +1,2 @@
+dist
+types
diff --git a/apps/admin-x-framework/package.json b/apps/admin-x-framework/package.json
new file mode 100644
index 00000000000..51367b44d29
--- /dev/null
+++ b/apps/admin-x-framework/package.json
@@ -0,0 +1,117 @@
+{
+  "name": "@tryghost/admin-x-framework",
+  "type": "module",
+  "version": "0.0.0",
+  "repository": "https://github.com/TryGhost/Ghost/tree/main/apps/admin-x-framework",
+  "author": "Ghost Foundation",
+  "private": true,
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "types": "./types/index.d.ts"
+    },
+    "./errors": {
+      "import": "./dist/errors.js",
+      "require": "./dist/errors.cjs",
+      "types": "./types/errors.d.ts"
+    },
+    "./helpers": {
+      "import": "./dist/helpers.js",
+      "require": "./dist/helpers.cjs",
+      "types": "./types/helpers.d.ts"
+    },
+    "./hooks": {
+      "import": "./dist/hooks.js",
+      "require": "./dist/hooks.cjs",
+      "types": "./types/hooks.d.ts"
+    },
+    "./routing": {
+      "import": "./dist/routing.js",
+      "require": "./dist/routing.cjs",
+      "types": "./types/routing.d.ts"
+    },
+    "./api/*": {
+      "import": "./dist/api/*.js",
+      "require": "./dist/api/*.cjs",
+      "types": "./types/api/*.d.ts"
+    },
+    "./vite": {
+      "import": "./dist/vite.js",
+      "require": "./dist/vite.cjs",
+      "types": "./types/vite.d.ts"
+    },
+    "./playwright": {
+      "import": "./dist/playwright.js",
+      "require": "./dist/playwright.cjs",
+      "types": "./types/playwright.d.ts"
+    },
+    "./test/*": {
+      "import": "./dist/test/*.js",
+      "require": "./dist/test/*.cjs",
+      "types": "./types/test/*.d.ts"
+    }
+  },
+  "sideEffects": false,
+  "scripts": {
+    "build": "tsc -p tsconfig.declaration.json && vite build",
+    "prepare": "yarn build",
+    "test": "yarn test:types && yarn test:unit",
+    "test:types": "tsc --noEmit",
+    "test:unit": "vitest run --coverage",
+    "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"
+  },
+  "files": [
+    "es",
+    "types"
+  ],
+  "devDependencies": {
+    "@testing-library/react": "14.3.1",
+    "@types/mocha": "10.0.1",
+    "c8": "8.0.1",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-plugin-react-refresh": "0.4.3",
+    "jsdom": "24.1.3",
+    "mocha": "10.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "sinon": "17.0.0",
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5"
+  },
+  "dependencies": {
+    "@sentry/react": "7.119.0",
+    "@tanstack/react-query": "4.36.1",
+    "@tryghost/admin-x-design-system": "0.0.0",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "@vitejs/plugin-react": "4.2.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "vite": "4.5.3",
+    "vite-plugin-css-injected-by-js": "^3.3.0",
+    "vite-plugin-svgr": "3.3.0",
+    "vitest": "0.34.3"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "nx": {
+    "targets": {
+      "dev": {
+        "dependsOn": [
+          "^build"
+        ]
+      },
+      "test:unit": {
+        "dependsOn": [
+          "test:unit",
+          "^build"
+        ]
+      }
+    }
+  }
+}
diff --git a/apps/admin-x-settings/src/api/actions.ts b/apps/admin-x-framework/src/api/actions.ts
similarity index 91%
rename from apps/admin-x-settings/src/api/actions.ts
rename to apps/admin-x-framework/src/api/actions.ts
index ed656a48fa4..43a00db4a59 100644
--- a/apps/admin-x-settings/src/api/actions.ts
+++ b/apps/admin-x-framework/src/api/actions.ts
@@ -1,7 +1,7 @@
-import {ExternalLink, InternalLink} from '../components/providers/RoutingProvider';
 import {InfiniteData} from '@tanstack/react-query';
-import {JSONObject} from './config';
+import {ExternalLink, InternalLink} from '../providers/RoutingProvider';
 import {Meta, createInfiniteQuery} from '../utils/api/hooks';
+import {JSONObject} from './config';
 
 // Types
 
@@ -18,12 +18,12 @@ export type Action = {
         id: string;
         name: string;
         slug: string;
-        image: string;
+        image: string|null;
     },
     resource?: {
         id: string;
         slug: string;
-        name: string;
+        name?: string;
         title?: string;
     }
 
@@ -32,9 +32,13 @@ export type Action = {
 };
 
 export interface ActionsResponseType {
-    actions: Action[];
+    actions: Array<Omit<Action, 'context'> & {context: string}>;
     meta: Meta;
+}
 
+export interface ActionsList {
+    actions: Action[];
+    meta: Meta;
     isEnd: boolean;
 }
 
@@ -42,7 +46,7 @@ export interface ActionsResponseType {
 
 const dataType = 'ActionsResponseType';
 
-export const useBrowseActions = createInfiniteQuery<ActionsResponseType>({
+export const useBrowseActions = createInfiniteQuery<ActionsList>({
     dataType,
     path: '/actions/',
     returnData: (originalData) => {
@@ -74,7 +78,7 @@ export const useBrowseActions = createInfiniteQuery<ActionsResponseType>({
             }
         });
 
-        const meta = pages.at(-1)!.meta;
+        const meta = pages[pages.length - 1].meta;
 
         return {
             actions: actions.reverse(),
@@ -128,7 +132,7 @@ export const getLinkTarget = (action: Action): InternalLink | ExternalLink | und
 
             return {
                 isExternal: true,
-                route: 'editor.edit',
+                route: `editor/${resourceType}/${action.resource.id}`,
                 models: [resourceType, action.resource.id]
             };
         case 'integration':
@@ -141,10 +145,10 @@ export const getLinkTarget = (action: Action): InternalLink | ExternalLink | und
             if (!action.resource || !action.resource.id) {
                 return;
             }
-
+            // replace with Settings route once Offers X GA is released
             return {
                 isExternal: true,
-                route: 'offer',
+                route: `offers/${action.resource.id}`,
                 models: [action.resource.id]
             };
         case 'tag':
diff --git a/apps/admin-x-framework/src/api/activitypub.ts b/apps/admin-x-framework/src/api/activitypub.ts
new file mode 100644
index 00000000000..97201808e0f
--- /dev/null
+++ b/apps/admin-x-framework/src/api/activitypub.ts
@@ -0,0 +1,122 @@
+import {createMutation, createQueryWithId} from '../utils/api/hooks';
+
+export type FollowItem = {
+    id: string;
+    preferredUsername: string,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [x: string]: any
+};
+
+export type ObjectProperties = {
+    '@context': string | (string | object)[];
+    type: 'Article' | 'Link' | 'Note';
+    name: string;
+    content: string;
+    url?: string | undefined;
+    attributedTo?: object | string | object[] | undefined;
+    image?: string;
+    published?: string;
+    preview?: {type: string, content: string};
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [x: string]: any;
+}
+
+export type ActorProperties = {
+    '@context': string | (string | object)[];
+    attachment: object[];
+    discoverable: boolean;
+    featured: string;
+    followers: string;
+    following: string;
+    id: string | null;
+    image: string;
+    inbox: string;
+    manuallyApprovesFollowers: boolean;
+    name: string;
+    outbox: string;
+    preferredUsername: string;
+    publicKey: {
+        id: string;
+        owner: string;
+        publicKeyPem: string;
+    };
+    published: string;
+    summary: string;
+    type: 'Person';
+    url: string;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [x: string]: any;
+}
+
+export type Activity = {
+    '@context': string;
+    id: string;
+    type: string;
+    actor: ActorProperties;
+    object: ObjectProperties;
+    to: string;
+}
+
+export type InboxResponseData = {
+    '@context': string;
+    id: string;
+    summary: string;
+    type: 'OrderedCollection';
+    totalItems: number;
+    items: Activity[];
+}
+
+export type FollowingResponseData = {
+    '@context': string;
+    id: string;
+    summary: string;
+    type: string;
+    totalItems: number;
+    items: FollowItem[];
+}
+
+type FollowRequestProps = {
+    username: string
+}
+
+export const useFollow = createMutation<object, FollowRequestProps>({
+    method: 'POST',
+    useActivityPub: true,
+    path: data => `/actions/follow/${data.username}`
+});
+
+export const useUnfollow = createMutation<object, FollowRequestProps>({
+    method: 'POST',
+    useActivityPub: true,
+    path: data => `/actions/unfollow/${data.username}`
+});
+
+// This is a frontend root, not using the Ghost admin API
+export const useBrowseInboxForUser = createQueryWithId<InboxResponseData>({
+    dataType: 'InboxResponseData',
+    useActivityPub: true,
+    headers: {
+        Accept: 'application/activity+json'
+    },
+    path: id => `/inbox/${id}`
+});
+
+// This is a frontend root, not using the Ghost admin API
+export const useBrowseFollowingForUser = createQueryWithId<FollowingResponseData>({
+    dataType: 'FollowingResponseData',
+    useActivityPub: true,
+    headers: {
+        Accept: 'application/activity+json'
+    },
+    path: id => `/following/${id}`
+});
+
+// This is a frontend root, not using the Ghost admin API
+export const useBrowseFollowersForUser = createQueryWithId<FollowingResponseData>({
+    dataType: 'FollowingResponseData',
+    useActivityPub: true,
+    headers: {
+        Accept: 'application/activity+json'
+    },
+    path: id => `/followers/${id}`
+});
diff --git a/apps/admin-x-settings/src/api/apiKeys.ts b/apps/admin-x-framework/src/api/apiKeys.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/apiKeys.ts
rename to apps/admin-x-framework/src/api/apiKeys.ts
index a70ad74c622..a66ec2aedc6 100644
--- a/apps/admin-x-settings/src/api/apiKeys.ts
+++ b/apps/admin-x-framework/src/api/apiKeys.ts
@@ -1,5 +1,5 @@
-import {IntegrationsResponseType, integrationsDataType} from './integrations';
 import {createMutation} from '../utils/api/hooks';
+import {IntegrationsResponseType, integrationsDataType} from './integrations';
 
 // Types
 
diff --git a/apps/admin-x-settings/src/api/config.ts b/apps/admin-x-framework/src/api/config.ts
similarity index 75%
rename from apps/admin-x-settings/src/api/config.ts
rename to apps/admin-x-framework/src/api/config.ts
index e399a905cd3..2136e69de43 100644
--- a/apps/admin-x-settings/src/api/config.ts
+++ b/apps/admin-x-framework/src/api/config.ts
@@ -17,7 +17,7 @@ export type Config = {
     }
     enableDeveloperExperiments: boolean;
     database: string;
-    blogUrl: string;
+    blogUrl?: string;
     labs: Record<string, boolean>;
     stripeDirect: boolean;
     mail: string;
@@ -48,7 +48,11 @@ export type Config = {
         pintura?: {
             js?: string
             css?: string
-        }
+        },
+        managedEmail?: {
+            enabled?: boolean
+            sendingDomain?: string
+        },
     }
 
     // Config is relatively fluid, so we only type used properties above and still support arbitrary property access when needed
@@ -67,3 +71,18 @@ export const useBrowseConfig = createQuery<ConfigResponseType>({
     dataType,
     path: '/config/'
 });
+
+// Helpers
+
+export const isManagedEmail = (config: Config) => {
+    return !!config?.hostSettings?.managedEmail?.enabled;
+};
+
+export const hasSendingDomain = (config: Config) => {
+    const sendingDomain = config?.hostSettings?.managedEmail?.sendingDomain;
+    return typeof sendingDomain === 'string' && sendingDomain.length > 0;
+};
+
+export const sendingDomain = (config: Config) => {
+    return config?.hostSettings?.managedEmail?.sendingDomain;
+};
diff --git a/apps/admin-x-framework/src/api/currentUser.ts b/apps/admin-x-framework/src/api/currentUser.ts
new file mode 100644
index 00000000000..a2093dea4fa
--- /dev/null
+++ b/apps/admin-x-framework/src/api/currentUser.ts
@@ -0,0 +1,32 @@
+import {useQuery} from '@tanstack/react-query';
+import {useEffect, useMemo} from 'react';
+import useHandleError from '../hooks/useHandleError';
+import {apiUrl, useFetchApi} from '../utils/api/fetchApi';
+import {User} from './users';
+
+export const usersDataType = 'UsersResponseType';
+
+// Special case where we can't use createQuery because this is used by usePermissions, which is then used by createQuery
+export const useCurrentUser = () => {
+    const url = apiUrl('/users/me/', {include: 'roles'});
+    const fetchApi = useFetchApi();
+    const handleError = useHandleError();
+
+    const result = useQuery({
+        queryKey: [usersDataType, url],
+        queryFn: () => fetchApi(url)
+    });
+
+    const data = useMemo<User | null>(() => result.data?.users?.[0], [result.data]);
+
+    useEffect(() => {
+        if (result.error) {
+            handleError(result.error);
+        }
+    }, [handleError, result.error]);
+
+    return {
+        ...result,
+        data
+    };
+};
diff --git a/apps/admin-x-settings/src/api/customThemeSettings.ts b/apps/admin-x-framework/src/api/customThemeSettings.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/customThemeSettings.ts
rename to apps/admin-x-framework/src/api/customThemeSettings.ts
index 2c59fab67e3..3a1871e3572 100644
--- a/apps/admin-x-settings/src/api/customThemeSettings.ts
+++ b/apps/admin-x-framework/src/api/customThemeSettings.ts
@@ -1,5 +1,5 @@
-import {Setting} from './settings';
 import {createMutation, createQuery} from '../utils/api/hooks';
+import {Setting} from './settings';
 
 type CustomThemeSettingData =
     { type: 'text', value: string | null, default: string | null } |
diff --git a/apps/admin-x-settings/src/api/db.ts b/apps/admin-x-framework/src/api/db.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/db.ts
rename to apps/admin-x-framework/src/api/db.ts
diff --git a/apps/admin-x-settings/src/api/emailVerification.ts b/apps/admin-x-framework/src/api/emailVerification.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/emailVerification.ts
rename to apps/admin-x-framework/src/api/emailVerification.ts
diff --git a/apps/admin-x-settings/src/api/files.ts b/apps/admin-x-framework/src/api/files.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/files.ts
rename to apps/admin-x-framework/src/api/files.ts
diff --git a/apps/admin-x-settings/src/api/images.ts b/apps/admin-x-framework/src/api/images.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/images.ts
rename to apps/admin-x-framework/src/api/images.ts
diff --git a/apps/admin-x-settings/src/api/integrations.ts b/apps/admin-x-framework/src/api/integrations.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/integrations.ts
rename to apps/admin-x-framework/src/api/integrations.ts
index 68fda881efc..e991db9802b 100644
--- a/apps/admin-x-settings/src/api/integrations.ts
+++ b/apps/admin-x-framework/src/api/integrations.ts
@@ -1,5 +1,5 @@
-import {APIKey} from './apiKeys';
 import {Meta, createMutation, createQuery} from '../utils/api/hooks';
+import {APIKey} from './apiKeys';
 import {Webhook} from './webhooks';
 
 // Types
diff --git a/apps/admin-x-settings/src/api/invites.ts b/apps/admin-x-framework/src/api/invites.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/invites.ts
rename to apps/admin-x-framework/src/api/invites.ts
diff --git a/apps/admin-x-settings/src/api/labels.ts b/apps/admin-x-framework/src/api/labels.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/labels.ts
rename to apps/admin-x-framework/src/api/labels.ts
diff --git a/apps/admin-x-settings/src/api/members.ts b/apps/admin-x-framework/src/api/members.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/members.ts
rename to apps/admin-x-framework/src/api/members.ts
diff --git a/apps/admin-x-settings/src/api/newsletters.ts b/apps/admin-x-framework/src/api/newsletters.ts
similarity index 92%
rename from apps/admin-x-settings/src/api/newsletters.ts
rename to apps/admin-x-framework/src/api/newsletters.ts
index b59fed8f105..b74f8cbbbba 100644
--- a/apps/admin-x-settings/src/api/newsletters.ts
+++ b/apps/admin-x-framework/src/api/newsletters.ts
@@ -21,6 +21,7 @@ export type Newsletter = {
     show_header_title: boolean;
     title_font_category: string;
     title_alignment: string;
+    show_excerpt: boolean;
     show_feature_image: boolean;
     body_font_category: string;
     footer_content: string | null;
@@ -47,6 +48,7 @@ export interface NewslettersResponseType {
 }
 
 const dataType = 'NewslettersResponseType';
+export const newslettersDataType = dataType;
 
 export const useBrowseNewsletters = createInfiniteQuery<NewslettersResponseType & {isEnd: boolean}>({
     dataType,
@@ -59,7 +61,7 @@ export const useBrowseNewsletters = createInfiniteQuery<NewslettersResponseType
     returnData: (originalData) => {
         const {pages} = originalData as InfiniteData<NewslettersResponseType>;
         const newsletters = pages.flatMap(page => page.newsletters);
-        const meta = pages.at(-1)!.meta;
+        const meta = pages[pages.length - 1].meta;
 
         return {
             newsletters: newsletters,
@@ -86,6 +88,10 @@ export interface NewslettersEditResponseType extends NewslettersResponseType {
     meta?: Meta & {sent_email_verification: string[]}
 }
 
+export interface NewslettersVerifyResponseType extends NewslettersResponseType {
+    meta?: Meta & {email_verified: string}
+}
+
 export const useEditNewsletter = createMutation<NewslettersEditResponseType, Newsletter>({
     method: 'PUT',
     path: newsletter => `/newsletters/${newsletter.id}/`,
@@ -98,7 +104,7 @@ export const useEditNewsletter = createMutation<NewslettersEditResponseType, New
     }
 });
 
-export const useVerifyNewsletterEmail = createMutation<NewslettersResponseType, {token: string}>({
+export const useVerifyNewsletterEmail = createMutation<NewslettersVerifyResponseType, {token: string}>({
     method: 'PUT',
     path: () => '/newsletters/verifications/',
     body: ({token}) => ({token}),
diff --git a/apps/admin-x-framework/src/api/offers.ts b/apps/admin-x-framework/src/api/offers.ts
new file mode 100644
index 00000000000..4001bb9cc12
--- /dev/null
+++ b/apps/admin-x-framework/src/api/offers.ts
@@ -0,0 +1,76 @@
+import {Meta, createMutation, createQuery, createQueryWithId} from '../utils/api/hooks';
+import {updateQueryCache, insertToQueryCache} from '../utils/api/updateQueries';
+
+export type Offer = {
+    id: string;
+    name: string;
+    code: string;
+    display_title: string;
+    display_description: string;
+    type: string;
+    cadence: string;
+    amount: number;
+    duration: string;
+    duration_in_months: number | null;
+    currency_restriction: boolean;
+    currency: string | null;
+    status: string;
+    redemption_count: number;
+    tier: {
+        id: string;
+        name?: string;
+    },
+    created_at?: string;
+    last_redeemed? : string;
+}
+
+export type PartialNewOffer = Omit<Offer, 'redemption_count'>;
+export type NewOffer = Partial<Pick<PartialNewOffer, 'id'>> & Omit<PartialNewOffer, 'id'>;
+
+export interface OffersResponseType {
+    meta?: Meta
+    offers?: Offer[]
+}
+
+export interface OfferEditResponseType extends OffersResponseType {
+    meta?: Meta
+}
+
+export interface OfferAddResponseType {
+    meta?: Meta,
+    offers: NewOffer[]
+}
+
+const dataType = 'OffersResponseType';
+
+export const useBrowseOffers = createQuery<OffersResponseType>({
+    dataType,
+    path: '/offers/'
+});
+
+export const useBrowseOffersById = createQueryWithId<OffersResponseType>({
+    dataType,
+    path: id => `/offers/${id}/`
+});
+
+export const useEditOffer = createMutation<OfferEditResponseType, Offer>({
+    method: 'PUT',
+    path: offer => `/offers/${offer.id}/`,
+    body: offer => ({offers: [offer]}),
+    updateQueries: {
+        dataType,
+        emberUpdateType: 'createOrUpdate',
+        update: updateQueryCache('offers')
+    }
+});
+
+export const useAddOffer = createMutation<OfferAddResponseType, NewOffer>({
+    method: 'POST',
+    path: () => '/offers/',
+    body: offer => ({offers: [offer]}),
+    updateQueries: {
+        dataType,
+        emberUpdateType: 'createOrUpdate',
+        update: insertToQueryCache('offers')
+    }
+});
diff --git a/apps/admin-x-settings/src/api/posts.ts b/apps/admin-x-framework/src/api/posts.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/posts.ts
rename to apps/admin-x-framework/src/api/posts.ts
diff --git a/apps/admin-x-settings/src/api/recommendations.ts b/apps/admin-x-framework/src/api/recommendations.ts
similarity index 79%
rename from apps/admin-x-settings/src/api/recommendations.ts
rename to apps/admin-x-framework/src/api/recommendations.ts
index adcb49b5794..e203a864f99 100644
--- a/apps/admin-x-settings/src/api/recommendations.ts
+++ b/apps/admin-x-framework/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/api/redirects.ts b/apps/admin-x-framework/src/api/redirects.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/redirects.ts
rename to apps/admin-x-framework/src/api/redirects.ts
diff --git a/apps/admin-x-settings/src/api/referrers.ts b/apps/admin-x-framework/src/api/referrers.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/referrers.ts
rename to apps/admin-x-framework/src/api/referrers.ts
diff --git a/apps/admin-x-settings/src/api/roles.ts b/apps/admin-x-framework/src/api/roles.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/roles.ts
rename to apps/admin-x-framework/src/api/roles.ts
diff --git a/apps/admin-x-settings/src/api/routes.ts b/apps/admin-x-framework/src/api/routes.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/routes.ts
rename to apps/admin-x-framework/src/api/routes.ts
diff --git a/apps/admin-x-settings/src/api/settings.ts b/apps/admin-x-framework/src/api/settings.ts
similarity index 91%
rename from apps/admin-x-settings/src/api/settings.ts
rename to apps/admin-x-framework/src/api/settings.ts
index c9614d89d30..afd6457d704 100644
--- a/apps/admin-x-settings/src/api/settings.ts
+++ b/apps/admin-x-framework/src/api/settings.ts
@@ -1,5 +1,5 @@
-import {Config} from './config';
 import {Meta, createMutation, createQuery} from '../utils/api/hooks';
+import {Config} from './config';
 
 // Types
 
@@ -10,7 +10,12 @@ export type Setting = {
     value: SettingValue;
 }
 
-export type SettingsResponseMeta = Meta & { sent_email_verification?: boolean }
+export type SettingsResponseMeta = Meta & {
+    filters?: {
+        group?: string;
+    };
+    sent_email_verification?: boolean;
+}
 
 export interface SettingsResponseType {
     meta?: SettingsResponseMeta;
@@ -49,6 +54,11 @@ export const useDeleteStripeSettings = createMutation<unknown, null>({
     invalidateQueries: {dataType}
 });
 
+export const useTestSlack = createMutation<unknown, null>({
+    method: 'POST',
+    path: () => '/slack/test/'
+});
+
 // Helpers
 
 export function humanizeSettingKey(key: string) {
diff --git a/apps/admin-x-framework/src/api/site.ts b/apps/admin-x-framework/src/api/site.ts
new file mode 100644
index 00000000000..f51d44890a0
--- /dev/null
+++ b/apps/admin-x-framework/src/api/site.ts
@@ -0,0 +1,54 @@
+import {createQuery} from '../utils/api/hooks';
+import {Config, hasSendingDomain, isManagedEmail, sendingDomain} from './config';
+
+// Types
+
+export type SiteData = {
+    title: string;
+    description: string;
+    logo: string;
+    icon: string;
+    accent_color: string;
+    url: string;
+    locale: string;
+    version: string;
+};
+
+export interface SiteResponseType {
+    site: SiteData;
+}
+
+// Requests
+
+const dataType = 'SiteResponseType';
+
+export const useBrowseSite = createQuery<SiteResponseType>({
+    dataType,
+    path: '/site/'
+});
+
+// Helpers
+
+export function getHomepageUrl(siteData: SiteData): string {
+    const url = new URL(siteData.url);
+    const subdir = url.pathname.endsWith('/') ? url.pathname : `${url.pathname}/`;
+
+    return `${url.origin}${subdir}`;
+}
+
+export function getEmailDomain(siteData: SiteData, config: Config): string {
+    if (isManagedEmail(config) && hasSendingDomain(config)) {
+        return sendingDomain(config) || '';
+    }
+
+    const domain = new URL(siteData.url).hostname || '';
+    if (domain.startsWith('www.')) {
+        return domain.replace(/^(www)\.(?=[^/]*\..{2,5})/, '');
+    }
+    return domain;
+}
+
+export function fullEmailAddress(value: 'noreply' | string, siteData: SiteData, config: Config) {
+    const emailDomain = getEmailDomain(siteData, config);
+    return value === 'noreply' ? `noreply@${emailDomain}` : value;
+}
diff --git a/apps/admin-x-settings/src/api/staffToken.ts b/apps/admin-x-framework/src/api/staffToken.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/staffToken.ts
rename to apps/admin-x-framework/src/api/staffToken.ts
diff --git a/apps/admin-x-settings/src/api/themes.ts b/apps/admin-x-framework/src/api/themes.ts
similarity index 93%
rename from apps/admin-x-settings/src/api/themes.ts
rename to apps/admin-x-framework/src/api/themes.ts
index e3157397512..debf83d785a 100644
--- a/apps/admin-x-settings/src/api/themes.ts
+++ b/apps/admin-x-framework/src/api/themes.ts
@@ -1,4 +1,3 @@
-import {OfficialTheme} from '../components/providers/ServiceProvider';
 import {createMutation, createQuery} from '../utils/api/hooks';
 import {customThemeSettingsDataType} from './customThemeSettings';
 
@@ -133,15 +132,15 @@ export function isActiveTheme(theme: Theme): boolean {
     return theme.active;
 }
 
-export function isDefaultTheme(theme: Theme | OfficialTheme): boolean {
+export function isDefaultTheme(theme: {name: string}): boolean {
     return theme.name.toLowerCase() === 'source';
 }
 
-export function isLegacyTheme(theme: Theme | OfficialTheme): boolean {
+export function isLegacyTheme(theme: {name: string}): boolean {
     return theme.name.toLowerCase() === 'casper';
 }
 
-export function isDefaultOrLegacyTheme(theme: Theme | OfficialTheme): boolean {
+export function isDefaultOrLegacyTheme(theme: {name: string}): boolean {
     return isDefaultTheme(theme) || isLegacyTheme(theme);
 }
 
diff --git a/apps/admin-x-settings/src/api/tiers.ts b/apps/admin-x-framework/src/api/tiers.ts
similarity index 97%
rename from apps/admin-x-settings/src/api/tiers.ts
rename to apps/admin-x-framework/src/api/tiers.ts
index 6ac9b67566c..1813846cafc 100644
--- a/apps/admin-x-settings/src/api/tiers.ts
+++ b/apps/admin-x-framework/src/api/tiers.ts
@@ -41,7 +41,7 @@ export const useBrowseTiers = createInfiniteQuery<TiersResponseType & {isEnd: bo
     returnData: (originalData) => {
         const {pages} = originalData as InfiniteData<TiersResponseType>;
         const tiers = pages.flatMap(page => page.tiers);
-        const meta = pages.at(-1)!.meta;
+        const meta = pages[pages.length - 1].meta;
 
         return {
             tiers,
diff --git a/apps/admin-x-settings/src/api/users.ts b/apps/admin-x-framework/src/api/users.ts
similarity index 90%
rename from apps/admin-x-settings/src/api/users.ts
rename to apps/admin-x-framework/src/api/users.ts
index 7015e546bbe..4eda024595e 100644
--- a/apps/admin-x-settings/src/api/users.ts
+++ b/apps/admin-x-framework/src/api/users.ts
@@ -1,7 +1,8 @@
 import {InfiniteData} from '@tanstack/react-query';
-import {Meta, createInfiniteQuery, createMutation, createQuery} from '../utils/api/hooks';
-import {UserRole} from './roles';
+import {Meta, createInfiniteQuery, createMutation} from '../utils/api/hooks';
 import {deleteFromQueryCache, updateQueryCache} from '../utils/api/updateQueries';
+import {usersDataType} from './currentUser';
+import {UserRole} from './roles';
 
 // Types
 
@@ -10,11 +11,11 @@ export type User = {
     name: string;
     slug: string;
     email: string;
-    profile_image: string;
+    profile_image: string|null;
     cover_image: string|null;
     bio: string|null;
-    website: string;
-    location: string;
+    website: string|null;
+    location: string|null;
     facebook: string|null;
     twitter: string|null;
     accessibility: string|null;
@@ -32,6 +33,7 @@ export type User = {
     mention_notifications: boolean;
     recommendation_notifications: boolean;
     milestone_notifications: boolean;
+    donation_notifications: boolean;
     roles: UserRole[];
     url: string;
 }
@@ -62,7 +64,7 @@ export interface DeleteUserResponse {
 
 // Requests
 
-const dataType = 'UsersResponseType';
+const dataType = usersDataType;
 
 export const useBrowseUsers = createInfiniteQuery<UsersResponseType & {isEnd: boolean}>({
     dataType,
@@ -75,7 +77,7 @@ export const useBrowseUsers = createInfiniteQuery<UsersResponseType & {isEnd: bo
     returnData: (originalData) => {
         const {pages} = originalData as InfiniteData<UsersResponseType>;
         const users = pages.flatMap(page => page.users);
-        const meta = pages.at(-1)!.meta;
+        const meta = pages[pages.length - 1].meta;
 
         return {
             users: users,
@@ -85,13 +87,6 @@ export const useBrowseUsers = createInfiniteQuery<UsersResponseType & {isEnd: bo
     }
 });
 
-export const useCurrentUser = createQuery<User>({
-    dataType,
-    path: '/users/me/',
-    defaultSearchParams: {include: 'roles'},
-    returnData: originalData => (originalData as UsersResponseType).users?.[0]
-});
-
 export const useEditUser = createMutation<UsersResponseType, User>({
     method: 'PUT',
     path: user => `/users/${user.id}/`,
diff --git a/apps/admin-x-settings/src/api/webhooks.ts b/apps/admin-x-framework/src/api/webhooks.ts
similarity index 100%
rename from apps/admin-x-settings/src/api/webhooks.ts
rename to apps/admin-x-framework/src/api/webhooks.ts
index e48752d1181..da7ff9f9280 100644
--- a/apps/admin-x-settings/src/api/webhooks.ts
+++ b/apps/admin-x-framework/src/api/webhooks.ts
@@ -1,5 +1,5 @@
-import {IntegrationsResponseType, integrationsDataType} from './integrations';
 import {Meta, createMutation} from '../utils/api/hooks';
+import {IntegrationsResponseType, integrationsDataType} from './integrations';
 
 // Types
 
diff --git a/apps/admin-x-framework/src/errors.ts b/apps/admin-x-framework/src/errors.ts
new file mode 100644
index 00000000000..1398926415d
--- /dev/null
+++ b/apps/admin-x-framework/src/errors.ts
@@ -0,0 +1,2 @@
+export * from './utils/errors';
+
diff --git a/apps/admin-x-framework/src/helpers.ts b/apps/admin-x-framework/src/helpers.ts
new file mode 100644
index 00000000000..dea77bdd0c1
--- /dev/null
+++ b/apps/admin-x-framework/src/helpers.ts
@@ -0,0 +1,2 @@
+export * from './utils/helpers';
+
diff --git a/apps/admin-x-framework/src/hooks.ts b/apps/admin-x-framework/src/hooks.ts
new file mode 100644
index 00000000000..76d347ef49e
--- /dev/null
+++ b/apps/admin-x-framework/src/hooks.ts
@@ -0,0 +1,6 @@
+export {default as useFilterableApi} from './hooks/useFilterableApi';
+export {default as useForm} from './hooks/useForm';
+export type {Dirtyable, ErrorMessages, FormHook, OkProps, SaveHandler, SaveState} from './hooks/useForm';
+export {default as useHandleError} from './hooks/useHandleError';
+export {usePermission} from './hooks/usePermissions';
+
diff --git a/apps/admin-x-framework/src/hooks/useFilterableApi.ts b/apps/admin-x-framework/src/hooks/useFilterableApi.ts
new file mode 100644
index 00000000000..61b568916a7
--- /dev/null
+++ b/apps/admin-x-framework/src/hooks/useFilterableApi.ts
@@ -0,0 +1,68 @@
+import {useRef} from 'react';
+import {apiUrl, useFetchApi} from '../utils/api/fetchApi';
+import {Meta} from '../utils/api/hooks';
+
+const escapeNqlString = (value: string) => {
+    return '\'' + value.replace(/'/g, '\\\'') + '\'';
+};
+
+const useFilterableApi = <
+    Data extends {id: string} & {[k in FilterKey]: string} & {[k: string]: unknown},
+    ResponseKey extends string = string,
+    FilterKey extends string = string
+>({path, filterKey, responseKey, limit = 20}: {
+    path: string
+    filterKey: FilterKey
+    responseKey: ResponseKey
+    limit?: number
+}) => {
+    const fetchApi = useFetchApi();
+
+    const result = useRef<{
+        data?: Data[];
+        allLoaded?: boolean;
+        lastInput?: string;
+    }>({});
+
+    const loadData = async (input: string) => {
+        if ((result.current.allLoaded || result.current.lastInput === input) && result.current.data) {
+            return result.current.data.filter(item => item[filterKey]?.toLowerCase().includes(input.toLowerCase()));
+        }
+
+        const response = await fetchApi<{meta?: Meta} & {[k in ResponseKey]: Data[]}>(apiUrl(path, {
+            filter: input ? `${filterKey}:~${escapeNqlString(input)}` : '',
+            limit: limit.toString()
+        }));
+
+        result.current.data = response[responseKey];
+        result.current.allLoaded = !input && !response.meta?.pagination.next;
+        result.current.lastInput = input;
+
+        return response[responseKey];
+    };
+
+    const loadInitialValues = async (values: string[], key: string) => {
+        await loadData('');
+
+        const data = [...(result.current.data || [])];
+        const missingValues = values.filter(value => !result.current.data?.find(item => item[key] === value));
+
+        if (missingValues.length) {
+            const additionalData = await fetchApi<{meta?: Meta} & {[k in ResponseKey]: Data[]}>(apiUrl(path, {
+                filter: `${key}:[${missingValues.join(',')}]`,
+                limit: 'all'
+            }));
+
+            data.push(...additionalData[responseKey]);
+        }
+
+        return values.map(value => data.find(item => item[key] === value)!);
+    };
+
+    return {
+        loadData,
+        loadInitialValues
+    };
+};
+
+export default useFilterableApi;
diff --git a/apps/admin-x-framework/src/hooks/useForm.ts b/apps/admin-x-framework/src/hooks/useForm.ts
new file mode 100644
index 00000000000..b68646ff987
--- /dev/null
+++ b/apps/admin-x-framework/src/hooks/useForm.ts
@@ -0,0 +1,169 @@
+import {ButtonColor} from '@tryghost/admin-x-design-system';
+import {useCallback, useEffect, useState} from 'react';
+
+export type Dirtyable<Data> = Data & {
+    dirty?: boolean;
+}
+
+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: SaveHandler;
+    /**
+     * Update the form state and mark the form as dirty. Should be used in input events
+     */
+    updateForm: (updater: (state: State) => State) => void;
+    /**
+     * Update the form state without marking the form as dirty. Should be used for updating initial state after API responses
+     */
+    setFormState: (updater: (state: State) => State) => void;
+    reset: () => void;
+
+    validate: () => boolean;
+    clearError: (field: string) => void;
+    isValid: boolean;
+    errors: ErrorMessages;
+    setErrors: (errors: ErrorMessages) => void;
+
+    okProps: OkProps;
+}
+
+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 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));
+            }, savedDelay);
+        }
+    }, [saveState, savedDelay]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    const isValid = (errs: ErrorMessages) => Object.values(errs).filter(Boolean).length === 0;
+
+    const validate = useCallback(
+        () => {
+            if (!onValidate) {
+                return true;
+            }
+
+            const newErrors = onValidate(formState);
+            setErrors(newErrors);
+            return isValid(newErrors);
+        },
+        [formState, onValidate]
+    );
+
+    // function to save the changed settings via API
+    const handleSave = useCallback<SaveHandler>(async (options = {}) => {
+        if (!validate()) {
+            setSaveState('error');
+            return false;
+        }
+
+        if (saveState !== 'unsaved' && !options.force && !options.fakeWhenUnchanged) {
+            return true;
+        }
+
+        const timeBefore = Date.now();
+
+        setSaveState('saving');
+        try {
+            if (saveState === 'unsaved' || options.force) {
+                await onSave(formState);
+            }
+
+            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');
+    }, []);
+
+    let okColor: ButtonColor = 'black';
+    if (saveState === 'saved') {
+        okColor = 'green';
+    } else if (saveState === 'error') {
+        okColor = 'red';
+    }
+
+    let okLabel = '';
+    if (saveState === 'saved') {
+        okLabel = 'Saved';
+    } else if (saveState === 'saving') {
+        okLabel = 'Saving...';
+    } else if (saveState === 'error') {
+        okLabel = 'Retry';
+    }
+
+    const okProps: OkProps = {
+        disabled: saveState === 'saving',
+        color: okColor,
+        label: okLabel || undefined
+    };
+
+    return {
+        formState,
+        saveState,
+        handleSave,
+        updateForm,
+        setFormState,
+        reset() {
+            setFormState(initialState);
+            setSaveState('');
+        },
+        validate,
+        isValid: isValid(errors),
+        clearError: (field: string) => {
+            setErrors(state => ({...state, [field]: ''}));
+        },
+        errors,
+        setErrors,
+        okProps
+    };
+};
+
+export default useForm;
diff --git a/apps/admin-x-framework/src/hooks/useHandleError.ts b/apps/admin-x-framework/src/hooks/useHandleError.ts
new file mode 100644
index 00000000000..740ecaf1a3c
--- /dev/null
+++ b/apps/admin-x-framework/src/hooks/useHandleError.ts
@@ -0,0 +1,67 @@
+import * as Sentry from '@sentry/react';
+import {showToast} from '@tryghost/admin-x-design-system';
+import {useCallback} from 'react';
+import toast from 'react-hot-toast';
+import {useFramework} from '../providers/FrameworkProvider';
+import {APIError, ValidationError} from '../utils/errors';
+
+/**
+ * Generic error handling for API calls. This is enabled by default for queries (can be disabled by
+ * setting defaultErrorHandler:false when using the query) but should be called when mutations throw
+ * errors in order to handle anything unexpected.
+ */
+const useHandleError = () => {
+    const {sentryDSN} = useFramework();
+
+    /**
+     * @param error Thrown error.
+     * @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.
+     *
+     */
+    const handleError = useCallback((error: unknown, {withToast = true}: {withToast?: boolean} = {}) => {
+        // eslint-disable-next-line no-console
+        console.error(error);
+
+        if (sentryDSN) {
+            Sentry.withScope((scope) => {
+                if (error instanceof APIError && error.response) {
+                    scope.setTag('api_url', error.response.url);
+                    scope.setTag('api_response_status', error.response.status);
+                }
+                Sentry.captureException(error);
+            });
+        }
+
+        if (!withToast) {
+            return;
+        }
+
+        toast.remove();
+
+        if (error instanceof APIError && error.response?.status === 418) {
+            // We use this status in tests to indicate the API request was not mocked -
+            // don't show a toast because it may block clicking things in the test
+        } else if (error instanceof ValidationError && error.data?.errors[0]) {
+            showToast({
+                message: error.data.errors[0].context || error.data.errors[0].message,
+                type: 'error'
+            });
+        } else if (error instanceof APIError) {
+            showToast({
+                message: error.message,
+                type: 'error'
+            });
+        } else {
+            showToast({
+                message: 'Something went wrong, please try again.',
+                type: 'error'
+            });
+        }
+    }, [sentryDSN]);
+
+    return handleError;
+};
+
+export default useHandleError;
diff --git a/apps/admin-x-framework/src/hooks/usePermissions.ts b/apps/admin-x-framework/src/hooks/usePermissions.ts
new file mode 100644
index 00000000000..e1e68ae6a00
--- /dev/null
+++ b/apps/admin-x-framework/src/hooks/usePermissions.ts
@@ -0,0 +1,11 @@
+import {useCurrentUser} from '../api/currentUser';
+import {UserRoleType} from '../api/roles';
+
+export const usePermission = (userRoles:string[]) => {
+    const {data: currentUser} = useCurrentUser();
+    const currentUserRoles = currentUser?.roles.map(role => role.name);
+    if (!currentUserRoles) {
+        return false;
+    }
+    return userRoles.some((role => currentUserRoles.includes(role as UserRoleType)));
+};
diff --git a/apps/admin-x-framework/src/index.ts b/apps/admin-x-framework/src/index.ts
new file mode 100644
index 00000000000..f8766594214
--- /dev/null
+++ b/apps/admin-x-framework/src/index.ts
@@ -0,0 +1,6 @@
+export {FrameworkProvider, useFramework} from './providers/FrameworkProvider';
+export type {FrameworkContextType, FrameworkProviderProps, TopLevelFrameworkProps} from './providers/FrameworkProvider';
+
+export {useQueryClient} from '@tanstack/react-query';
+export type {InfiniteData} from '@tanstack/react-query';
+
diff --git a/apps/admin-x-framework/src/playwright.ts b/apps/admin-x-framework/src/playwright.ts
new file mode 100644
index 00000000000..e72c05e580d
--- /dev/null
+++ b/apps/admin-x-framework/src/playwright.ts
@@ -0,0 +1,62 @@
+import {defineConfig, devices, PlaywrightTestConfig} from '@playwright/test';
+
+export const E2E_PORT = 5173;
+
+export function adminXPlaywrightConfig(overrides: Partial<PlaywrightTestConfig> = {}) {
+    /**
+     * See https://playwright.dev/docs/test-configuration.
+     */
+    return defineConfig({
+        testDir: './test/acceptance',
+        /* Run tests in files in parallel */
+        fullyParallel: true,
+        /* Fail the build on CI if you accidentally left test.only in the source code. */
+        forbidOnly: !!process.env.CI,
+        /* Retry on CI only */
+        retries: process.env.CI ? 2 : 0,
+        /* Hardcode to use all cores in CI */
+        workers: process.env.CI ? '100%' : (process.env.PLAYWRIGHT_SLOWMO ? 1 : undefined),
+        /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+        reporter: 'html',
+        /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+        use: {
+            baseURL: `http://localhost:${E2E_PORT}`,
+            /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+            trace: 'on-first-retry',
+            launchOptions: {
+                slowMo: parseInt(process.env.PLAYWRIGHT_SLOWMO ?? '') || 0,
+                // force GPU hardware acceleration
+                // (even in headless mode)
+                args: ['--use-gl=egl']
+            }
+        },
+
+        /* Configure projects for major browsers */
+        projects: [
+            {
+                name: 'chromium',
+                use: {...devices['Desktop Chrome']}
+            },
+
+            ...(process.env.ALL_BROWSERS ? [{
+                name: 'firefox',
+                use: {...devices['Desktop Firefox']}
+            },
+
+            {
+                name: 'webkit',
+                use: {...devices['Desktop Safari']}
+            }] : [])
+        ],
+
+        /* Run local dev server before starting the tests */
+        webServer: {
+            command: `yarn dev:start`,
+            url: `http://localhost:${E2E_PORT}`,
+            reuseExistingServer: !process.env.CI,
+            timeout: 10000
+        },
+
+        ...overrides
+    });
+}
diff --git a/apps/admin-x-framework/src/providers/FrameworkProvider.tsx b/apps/admin-x-framework/src/providers/FrameworkProvider.tsx
new file mode 100644
index 00000000000..4a26aef9327
--- /dev/null
+++ b/apps/admin-x-framework/src/providers/FrameworkProvider.tsx
@@ -0,0 +1,57 @@
+import {ErrorBoundary as SentryErrorBoundary} from '@sentry/react';
+import {QueryClientProvider} from '@tanstack/react-query';
+import {ReactNode, createContext, useContext} from 'react';
+import queryClient from '../utils/queryClient';
+import {ExternalLink} from './RoutingProvider';
+
+export interface FrameworkProviderProps {
+    ghostVersion: string;
+    externalNavigate: (link: ExternalLink) => void;
+    unsplashConfig: {
+        Authorization: string;
+        'Accept-Version': string;
+        'Content-Type': string;
+        'App-Pragma': string;
+        'X-Unsplash-Cache': boolean;
+    };
+    sentryDSN: string | null;
+    onUpdate: (dataType: string, response: unknown) => void;
+    onInvalidate: (dataType: string) => void;
+    onDelete: (dataType: string, id: string) => void;
+
+    children: ReactNode;
+}
+
+export type TopLevelFrameworkProps = Omit<FrameworkProviderProps, 'children'>;
+
+export type FrameworkContextType = Omit<FrameworkProviderProps, 'children'>;
+
+const FrameworkContext = createContext<FrameworkContextType>({
+    ghostVersion: '',
+    externalNavigate: () => {},
+    unsplashConfig: {
+        Authorization: '',
+        'Accept-Version': '',
+        'Content-Type': '',
+        'App-Pragma': '',
+        'X-Unsplash-Cache': true
+    },
+    sentryDSN: null,
+    onUpdate: () => {},
+    onInvalidate: () => {},
+    onDelete: () => {}
+});
+
+export function FrameworkProvider({children, ...props}: FrameworkProviderProps) {
+    return (
+        <SentryErrorBoundary>
+            <QueryClientProvider client={queryClient}>
+                <FrameworkContext.Provider value={props}>
+                    {children}
+                </FrameworkContext.Provider>
+            </QueryClientProvider>
+        </SentryErrorBoundary>
+    );
+}
+
+export const useFramework = () => useContext(FrameworkContext);
diff --git a/apps/admin-x-framework/src/providers/RoutingProvider.tsx b/apps/admin-x-framework/src/providers/RoutingProvider.tsx
new file mode 100644
index 00000000000..f14c3a80728
--- /dev/null
+++ b/apps/admin-x-framework/src/providers/RoutingProvider.tsx
@@ -0,0 +1,194 @@
+import NiceModal, {NiceModalHocProps} from '@ebay/nice-modal-react';
+import React, {createContext, useCallback, useContext, useEffect, useState} from 'react';
+import {useFramework} from './FrameworkProvider';
+
+export type RouteParams = Record<string, string>
+
+export type ExternalLink = {
+    isExternal: true;
+    route: string;
+    models?: string[] | null
+};
+
+export type InternalLink = {
+    isExternal?: false;
+    route: string;
+}
+
+export type RoutingModalProps = {
+    pathName: string;
+    params?: Record<string, string>,
+    searchParams?: URLSearchParams
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type ModalsModule = {default: {[key: string]: ModalComponent<any>}}
+
+export type ModalComponent<Props = object> = React.FC<NiceModalHocProps & RoutingModalProps & Props>;
+
+export type RoutingContextData = {
+    route: string;
+    updateRoute: (to: string | InternalLink | ExternalLink) => void;
+    loadingModal: boolean;
+    eventTarget: EventTarget;
+};
+
+export const RouteContext = createContext<RoutingContextData>({
+    route: '',
+    updateRoute: () => {},
+    loadingModal: false,
+    eventTarget: new EventTarget()
+});
+
+function getHashPath(basePath: string, urlPath: string | undefined) {
+    if (!urlPath) {
+        return null;
+    }
+    const regex = new RegExp(`/${basePath}/(.*)`);
+    const match = urlPath?.match(regex);
+    if (match) {
+        const afterSettingsX = match[1];
+        return afterSettingsX;
+    }
+    return null;
+}
+
+const handleNavigation = (basePath: string, currentRoute: string | undefined, loadModals?: () => Promise<ModalsModule>, modalPaths?: Record<string, string>) => {
+    // Get the hash from the URL
+    let hash = window.location.hash;
+    hash = hash.substring(1);
+
+    // Create a URL to easily extract the path without query parameters
+    const domain = `${window.location.protocol}//${window.location.hostname}`;
+    const url = new URL(hash, domain);
+
+    const pathName = getHashPath(basePath, url.pathname);
+    const searchParams = url.searchParams;
+
+    if (pathName && modalPaths && loadModals) {
+        const [, currentModalName] = Object.entries(modalPaths).find(([modalPath]) => matchRoute(currentRoute || '', modalPath)) || [];
+        const [path, modalName] = Object.entries(modalPaths).find(([modalPath]) => matchRoute(pathName, modalPath)) || [];
+
+        return {
+            pathName,
+            changingModal: modalName && modalName !== currentModalName,
+            modal: (path && modalName) ? // we should consider adding '&& modalName !== currentModalName' here, but this breaks tests
+                loadModals().then(({default: modals}) => {
+                    NiceModal.show(modals[modalName] as ModalComponent, {pathName, params: matchRoute(pathName, path), searchParams});
+                }) :
+                undefined
+        };
+    }
+    return {pathName: ''};
+};
+
+const matchRoute = (pathname: string, routeDefinition: string) => {
+    const regex = new RegExp('^' + routeDefinition.replace(/:(\w+)/g, '(?<$1>[^/]+)') + '/?$');
+    const match = pathname.match(regex);
+    if (match) {
+        return match.groups || {};
+    }
+};
+
+export interface RoutingProviderProps {
+    basePath: string;
+    modals?: {paths: Record<string, string>, load: () => Promise<ModalsModule>}
+    children: React.ReactNode;
+}
+
+export const RoutingProvider: React.FC<RoutingProviderProps> = ({basePath, modals, children}) => {
+    const {externalNavigate} = useFramework();
+    const [route, setRoute] = useState<string | undefined>(undefined);
+    const [loadingModal, setLoadingModal] = useState(false);
+    const [eventTarget] = useState(new EventTarget());
+
+    const updateRoute = useCallback((to: string | InternalLink | ExternalLink) => {
+        const options = typeof to === 'string' ? {route: to} : to;
+
+        if (options.isExternal) {
+            externalNavigate(options);
+            return;
+        }
+
+        const newPath = options.route.replace(/^\//, '');
+
+        if (newPath === route) {
+            // No change
+        } else if (newPath) {
+            window.location.hash = `/${basePath}/${newPath}`;
+        } else {
+            window.location.hash = `/${basePath}`;
+        }
+
+        eventTarget.dispatchEvent(new CustomEvent('routeChange', {detail: {newPath, oldPath: route}}));
+    }, [basePath, eventTarget, externalNavigate, route]);
+
+    useEffect(() => {
+        // Preload all the modals after initial render to avoid a delay when opening them
+        setTimeout(() => {
+            modals?.load();
+        }, 1000);
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+    useEffect(() => {
+        const handleHashChange = () => {
+            setRoute((currentRoute) => {
+                const {pathName, modal, changingModal} = handleNavigation(basePath, currentRoute, modals?.load, modals?.paths);
+
+                if (modal && changingModal) {
+                    setLoadingModal(true);
+                    modal.then(() => setLoadingModal(false));
+                }
+
+                return pathName;
+            });
+        };
+
+        handleHashChange();
+
+        window.addEventListener('hashchange', handleHashChange);
+
+        return () => {
+            window.removeEventListener('hashchange', handleHashChange);
+        };
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+    if (route === undefined) {
+        return null;
+    }
+
+    return (
+        <RouteContext.Provider
+            value={{
+                route,
+                updateRoute,
+                loadingModal,
+                eventTarget
+            }}
+        >
+            {children}
+        </RouteContext.Provider>
+    );
+};
+
+export function useRouting() {
+    return useContext(RouteContext);
+}
+
+export function useRouteChangeCallback(callback: (newPath: string, oldPath: string) => void, deps: React.DependencyList) {
+    const {eventTarget} = useRouting();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const stableCallback = useCallback(callback, deps);
+
+    useEffect(() => {
+        const listener: EventListener = (e) => {
+            const event = e as CustomEvent<{newPath: string, oldPath: string}>;
+            stableCallback(event.detail.newPath, event.detail.oldPath);
+        };
+
+        eventTarget.addEventListener('routeChange', listener);
+
+        return () => eventTarget.removeEventListener('routeChange', listener);
+    }, [eventTarget, stableCallback]);
+}
diff --git a/apps/admin-x-framework/src/routing.ts b/apps/admin-x-framework/src/routing.ts
new file mode 100644
index 00000000000..426eb4b8a76
--- /dev/null
+++ b/apps/admin-x-framework/src/routing.ts
@@ -0,0 +1,3 @@
+export {RoutingProvider, useRouteChangeCallback, useRouting} from './providers/RoutingProvider';
+export type {ExternalLink, InternalLink, ModalComponent, RoutingModalProps} from './providers/RoutingProvider';
+
diff --git a/apps/admin-x-framework/src/test/acceptance.ts b/apps/admin-x-framework/src/test/acceptance.ts
new file mode 100644
index 00000000000..4bf8a38ee92
--- /dev/null
+++ b/apps/admin-x-framework/src/test/acceptance.ts
@@ -0,0 +1,271 @@
+import {Locator, Page, expect} from '@playwright/test';
+
+import actionsFixture from './responses/actions.json';
+import configFixture from './responses/config.json';
+import customThemeSettingsFixture from './responses/custom_theme_settings.json';
+import incomingRecommendationsFixture from './responses/incoming_recommendations.json';
+import invitesFixture from './responses/invites.json';
+import labelsFixture from './responses/labels.json';
+import meFixture from './responses/me.json';
+import newslettersFixture from './responses/newsletters.json';
+import offersFixture from './responses/offers.json';
+import recommendationsFixture from './responses/recommendations.json';
+import rolesFixture from './responses/roles.json';
+import settingsFixture from './responses/settings.json';
+import siteFixture from './responses/site.json';
+import themesFixture from './responses/themes.json';
+import tiersFixture from './responses/tiers.json';
+import usersFixture from './responses/users.json';
+import activitypubInboxFixture from './responses/activitypub/inbox.json';
+import activitypubFollowingFixture from './responses/activitypub/following.json';
+
+import {ActionsResponseType} from '../api/actions';
+import {ConfigResponseType} from '../api/config';
+import {CustomThemeSettingsResponseType} from '../api/customThemeSettings';
+import {InvitesResponseType} from '../api/invites';
+import {LabelsResponseType} from '../api/labels';
+import {NewslettersResponseType} from '../api/newsletters';
+import {OffersResponseType} from '../api/offers';
+import {IncomingRecommendationResponseType, RecommendationResponseType} from '../api/recommendations';
+import {RolesResponseType} from '../api/roles';
+import {SettingsResponseType} from '../api/settings';
+import {ThemesResponseType} from '../api/themes';
+import {TiersResponseType} from '../api/tiers';
+import {UsersResponseType} from '../api/users';
+import {ExternalLink} from '../routing';
+
+interface MockRequestConfig {
+    method: string;
+    path: string | RegExp;
+    response: unknown;
+    responseStatus?: number;
+    responseHeaders?: {[key: string]: string};
+}
+
+interface RequestRecord {
+    url?: string
+    body?: object | null
+    headers?: {[key: string]: string}
+}
+
+export const responseFixtures = {
+    settings: settingsFixture as SettingsResponseType,
+    recommendations: recommendationsFixture as RecommendationResponseType,
+    incomingRecommendations: incomingRecommendationsFixture as IncomingRecommendationResponseType,
+    config: configFixture as ConfigResponseType,
+    users: usersFixture as UsersResponseType,
+    me: meFixture as UsersResponseType,
+    roles: rolesFixture as RolesResponseType,
+    site: siteFixture,
+    invites: invitesFixture as InvitesResponseType,
+    customThemeSettings: customThemeSettingsFixture as CustomThemeSettingsResponseType,
+    tiers: tiersFixture as TiersResponseType,
+    labels: labelsFixture as LabelsResponseType,
+    offers: offersFixture as OffersResponseType,
+    themes: themesFixture as ThemesResponseType,
+    newsletters: newslettersFixture as NewslettersResponseType,
+    actions: actionsFixture as ActionsResponseType,
+    latestPost: {posts: [{id: '1', url: `${siteFixture.site.url}/test-post/`}]},
+    activitypubInbox: activitypubInboxFixture,
+    activitypubFollowing: activitypubFollowingFixture
+};
+
+const defaultLabFlags = {
+    audienceFeedback: false,
+    collections: false,
+    themeErrorsNotification: false,
+    outboundLinkTagging: false,
+    announcementBar: false,
+    members: false
+};
+
+// Inject defaultLabFlags into responseFixtures.settings and config
+let labsSetting = responseFixtures.settings.settings.find(s => s.key === 'labs');
+let configSettings = responseFixtures.config.config;
+
+if (configSettings) {
+    configSettings.labs = defaultLabFlags;
+}
+
+if (!labsSetting) {
+    // If 'labs' key doesn't exist, create it
+    responseFixtures.settings.settings.push({
+        key: 'labs',
+        value: JSON.stringify(defaultLabFlags)
+    });
+} else {
+    // If 'labs' key exists, update its value
+    labsSetting.value = JSON.stringify(defaultLabFlags);
+}
+
+interface LabsSettings {
+    [key: string]: boolean;
+}
+
+export function toggleLabsFlag(flag: string, value: boolean) {
+    // Update responseFixtures.settings
+    labsSetting = responseFixtures.settings.settings.find(s => s.key === 'labs');
+
+    if (!labsSetting) {
+        throw new Error('Labs settings not found');
+    }
+
+    if (typeof labsSetting.value !== 'string') {
+        throw new Error('Labs settings value is not a string');
+    }
+
+    let labs: LabsSettings;
+    try {
+        labs = JSON.parse(labsSetting.value);
+    } catch (e) {
+        throw new Error('Failed to parse labs settings');
+    }
+
+    labs[flag] = value;
+    labsSetting.value = JSON.stringify(labs);
+
+    // Update responseFixtures.config
+    configSettings = responseFixtures.config.config;
+
+    if (configSettings && configSettings.labs) {
+        configSettings.labs[flag] = value;
+    } else {
+        throw new Error('Config settings or labs settings in config not found');
+    }
+}
+
+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},
+    browseRoles: {method: 'GET', path: '/roles/?limit=all', response: responseFixtures.roles},
+    browseNewslettersLimit: {method: 'GET', path: '/newsletters/?filter=status%3Aactive&limit=1', response: responseFixtures.newsletters}
+};
+
+export async function mockApi<Requests extends Record<string, MockRequestConfig>>({page, requests, options = {}}: {page: Page, requests: Requests, options?: {useActivityPub?: boolean}}) {
+    const lastApiRequests: {[key in keyof Requests]?: RequestRecord} = {};
+
+    const namedRequests = Object.entries(requests).reduce(
+        (array, [key, value]) => array.concat({name: key, ...value}),
+        [] as Array<MockRequestConfig & {name: keyof Requests}>
+    );
+
+    const routeRegex = options?.useActivityPub ? /\/activitypub\// : /\/ghost\/api\/admin\//;
+    const routeReplaceRegex = options.useActivityPub ? /^.*\/activitypub/ : /^.*\/ghost\/api\/admin/;
+
+    await page.route(routeRegex, async (route) => {
+        const apiPath = route.request().url().replace(routeReplaceRegex, '');
+
+        const matchingMock = namedRequests.find((request) => {
+            if (request.method !== route.request().method()) {
+                return false;
+            }
+
+            if (typeof request.path === 'string') {
+                return request.path === apiPath;
+            }
+
+            return request.path.test(apiPath);
+        });
+
+        if (!matchingMock) {
+            return route.fulfill({
+                status: 418,
+                body: [
+                    'No matching mock found. If this request is needed for the test, add it to your mockApi call',
+                    '',
+                    'Currently mocked:',
+                    ...namedRequests.map(({method, path}) => `${method} ${path}`)
+                ].join('\n')
+            });
+        }
+
+        const requestBody = JSON.parse(route.request().postData() || 'null');
+
+        lastApiRequests[matchingMock.name] = {
+            body: requestBody,
+            url: route.request().url(),
+            headers: route.request().headers()
+        };
+
+        await route.fulfill({
+            status: matchingMock.responseStatus || 200,
+            body: typeof matchingMock.response === 'string' ? matchingMock.response : JSON.stringify(matchingMock.response),
+            headers: matchingMock.responseHeaders || {}
+        });
+    });
+
+    return {lastApiRequests};
+}
+
+export function updatedSettingsResponse(newSettings: Array<{ key: string, value: string | boolean | null }>) {
+    return {
+        ...responseFixtures.settings,
+        settings: responseFixtures.settings.settings.map((setting) => {
+            const newSetting = newSettings.find(({key}) => key === setting.key);
+
+            return {key: setting.key, value: newSetting?.value || setting.value};
+        })
+    };
+}
+
+export function meWithRole(name: string) {
+    const role = responseFixtures.roles.roles.find(r => r.name === name);
+
+    return {
+        ...responseFixtures.me,
+        users: [{
+            ...responseFixtures.me.users[0],
+            roles: [role]
+        }]
+    };
+};
+
+export async function mockSitePreview({page, url, response}: {page: Page, url: string, response: string}) {
+    const lastRequest: {previewHeader?: string} = {};
+
+    await page.route(url, async (route) => {
+        if (route.request().method() !== 'POST') {
+            return route.continue();
+        }
+
+        if (!route.request().headers()['x-ghost-preview']) {
+            return route.continue();
+        }
+
+        lastRequest.previewHeader = route.request().headers()['x-ghost-preview'];
+
+        await route.fulfill({
+            status: 200,
+            body: response
+        });
+    });
+
+    return lastRequest;
+}
+
+export async function chooseOptionInSelect(select: Locator, optionText: string | RegExp) {
+    await select.click();
+    await select.page().locator('[data-testid="select-option"]', {hasText: optionText}).click();
+}
+
+export async function testUrlValidation(input: Locator, textToEnter: string, expectedResult: string, expectedError?: string) {
+    await input.fill(textToEnter);
+    await input.blur();
+
+    expect(input).toHaveValue(expectedResult);
+
+    if (expectedError) {
+        await expect(input.locator('xpath=../..')).toContainText(expectedError);
+    }
+};
+
+export async function expectExternalNavigate(page: Page, link: Partial<ExternalLink>) {
+    await page.waitForURL(`/external/${encodeURIComponent(JSON.stringify({isExternal: true, ...link}))}`);
+};
diff --git a/apps/admin-x-framework/src/test/render.tsx b/apps/admin-x-framework/src/test/render.tsx
new file mode 100644
index 00000000000..4e12470f821
--- /dev/null
+++ b/apps/admin-x-framework/src/test/render.tsx
@@ -0,0 +1,62 @@
+import {DesignSystemAppProps} from '@tryghost/admin-x-design-system';
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import {TopLevelFrameworkProps} from '../providers/FrameworkProvider';
+
+export default function renderStandaloneApp<Props extends object>(
+    App: React.ComponentType<Props & {
+        framework: TopLevelFrameworkProps;
+        designSystem: DesignSystemAppProps;
+    }>,
+    props: Props
+) {
+    const style = document.createElement('style');
+    style.appendChild(document.createTextNode(`
+        :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;
+        }
+    `));
+    document.head.appendChild(style);
+
+    ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
+        <React.StrictMode>
+            <App
+                designSystem={{darkMode: false, fetchKoenigLexical: async () => {}}}
+                framework={{
+                    externalNavigate: (link) => {
+                        // Use the expectExternalNavigate helper to test this dummy external linking
+                        window.location.href = `/external/${encodeURIComponent(JSON.stringify(link))}`;
+                    },
+                    ghostVersion: '5.x',
+                    sentryDSN: null,
+                    unsplashConfig: {
+                        Authorization: '',
+                        'Accept-Version': '',
+                        'Content-Type': '',
+                        'App-Pragma': '',
+                        'X-Unsplash-Cache': false
+                    },
+                    onDelete: () => {},
+                    onInvalidate: () => {},
+                    onUpdate: () => {}
+                }}
+                {...props}
+            />
+        </React.StrictMode>
+    );
+}
diff --git a/apps/admin-x-settings/test/utils/responses/actions.json b/apps/admin-x-framework/src/test/responses/actions.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/actions.json
rename to apps/admin-x-framework/src/test/responses/actions.json
diff --git a/apps/admin-x-framework/src/test/responses/activitypub/following.json b/apps/admin-x-framework/src/test/responses/activitypub/following.json
new file mode 100644
index 00000000000..f374bedb4e3
--- /dev/null
+++ b/apps/admin-x-framework/src/test/responses/activitypub/following.json
@@ -0,0 +1,13 @@
+{
+    "@context": "https://www.w3.org/ns/activitystreams",
+    "id": "https://0a2e-129-222-88-174.ngrok-free.app/activitypub/following/deadbeefdeadbeefdeadbeef",
+    "summary": "Following collection for index",
+    "type": "Collection",
+    "totalItems": 1,
+    "items": [
+      {
+        "id": "https://main.ghost.org/activitypub/actor/deadbeefdeadbeefdeadbeef",
+        "username": "@index@main.ghost.org"
+      }
+    ]
+  }
diff --git a/apps/admin-x-framework/src/test/responses/activitypub/inbox.json b/apps/admin-x-framework/src/test/responses/activitypub/inbox.json
new file mode 100644
index 00000000000..550fda9489f
--- /dev/null
+++ b/apps/admin-x-framework/src/test/responses/activitypub/inbox.json
@@ -0,0 +1,155 @@
+{
+    "@context": "https://www.w3.org/ns/activitystreams",
+    "id": "https://example.com/activitypub/inbox/index",
+    "summary": "Inbox for index",
+    "type": "OrderedCollection",
+    "totalItems": 2,
+    "orderedItems": [
+        {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://main.ghost.org/activitypub/activity/664cf007fd27b20001a76d72",
+            "type": "Accept",
+            "actor": {
+                "@context": [
+                    "https://www.w3.org/ns/activitystreams",
+                    "https://w3id.org/security/v1",
+                    {
+                        "featured": {
+                            "@id": "http://joinmastodon.org/ns#featured",
+                            "@type": "@id"
+                        }
+                    },
+                    {
+                        "discoverable": {
+                            "@id": "http://joinmastodon.org/ns#discoverable",
+                            "@type": "@id"
+                        }
+                    },
+                    {
+                        "manuallyApprovesFollowers": {
+                            "@id": "http://joinmastodon.org/ns#manuallyApprovesFollowers",
+                            "@type": "@id"
+                        }
+                    },
+                    {
+                        "schema": "http://schema.org#",
+                        "PropertyValue": "schema:PropertyValue",
+                        "value": "schema:value"
+                    }
+                ],
+                "type": "Person",
+                "id": "https://main.ghost.org/activitypub/actor/index",
+                "name": "The Main",
+                "preferredUsername": "index",
+                "summary": "The bio for the actor",
+                "url": "https://main.ghost.org/activitypub/actor/index",
+                "icon": "",
+                "image": "",
+                "published": "1970-01-01T00:00:00Z",
+                "manuallyApprovesFollowers": false,
+                "discoverable": true,
+                "attachment": [
+                    {
+                        "type": "PropertyValue",
+                        "name": "Website",
+                        "value": "<a href='https://main.ghost.org/activitypub/'>main.ghost.org</a>"
+                    }
+                ],
+                "following": "https://main.ghost.org/activitypub/following/index",
+                "followers": "https://main.ghost.org/activitypub/followers/index",
+                "inbox": "https://main.ghost.org/activitypub/inbox/index",
+                "outbox": "https://main.ghost.org/activitypub/outbox/index",
+                "featured": "https://main.ghost.org/activitypub/featured/index",
+                "publicKey": {
+                    "id": "https://main.ghost.org/activitypub/actor/index#main-key",
+                    "owner": "https://main.ghost.org/activitypub/actor/index",
+                    "publicKeyPem": "-----BEGIN RSA PUBLIC KEY-----\nMIGJAoGBANRpUrwk7x7bJDddHmrYSWVw9enVPMFm5qAW7fTgoZ7x2PoJUIqy/bkqpXZ0SmZs\nsLO3UZm+yN/DqxioD8BnhhD0N8Ydv6+UniT7hE2tHvsMxQIq2jet1auSBZNFmUIWodsBxI/R\ntm+KwFBFk+P+MvVsGZ2K3Rkd4K0dv0/45dtXAgMBAAE=\n-----END RSA PUBLIC KEY-----\n"
+                }
+            },
+            "object": {
+                "id": "https://0a2e-129-222-88-174.ngrok-free.app/activitypub/activity/664cf0074daa2f8183ba6ea6",
+                "type": "Follow"
+            },
+            "to": "https://0a2e-129-222-88-174.ngrok-free.app/activitypub/actor/index"
+        },
+        {
+            "type": "Create",
+            "actor": {
+                "@context": [
+                    "https://www.w3.org/ns/activitystreams",
+                    "https://w3id.org/security/v1",
+                    {
+                        "featured": {
+                            "@id": "http://joinmastodon.org/ns#featured",
+                            "@type": "@id"
+                        }
+                    },
+                    {
+                        "discoverable": {
+                            "@id": "http://joinmastodon.org/ns#discoverable",
+                            "@type": "@id"
+                        }
+                    },
+                    {
+                        "manuallyApprovesFollowers": {
+                            "@id": "http://joinmastodon.org/ns#manuallyApprovesFollowers",
+                            "@type": "@id"
+                        }
+                    },
+                    {
+                        "schema": "http://schema.org#",
+                        "PropertyValue": "schema:PropertyValue",
+                        "value": "schema:value"
+                    }
+                ],
+                "type": "Person",
+                "id": "https://main.ghost.org/activitypub/actor/index",
+                "name": "The Main",
+                "preferredUsername": "index",
+                "summary": "The bio for the actor",
+                "url": "https://main.ghost.org/activitypub/actor/index",
+                "icon": "",
+                "image": "",
+                "published": "1970-01-01T00:00:00Z",
+                "manuallyApprovesFollowers": false,
+                "discoverable": true,
+                "attachment": [
+                    {
+                        "type": "PropertyValue",
+                        "name": "Website",
+                        "value": "<a href='https://main.ghost.org/activitypub/'>main.ghost.org</a>"
+                    }
+                ],
+                "following": "https://main.ghost.org/activitypub/following/index",
+                "followers": "https://main.ghost.org/activitypub/followers/index",
+                "inbox": "https://main.ghost.org/activitypub/inbox/index",
+                "outbox": "https://main.ghost.org/activitypub/outbox/index",
+                "featured": "https://main.ghost.org/activitypub/featured/index",
+                "publicKey": {
+                    "id": "https://main.ghost.org/activitypub/actor/index#main-key",
+                    "owner": "https://main.ghost.org/activitypub/actor/index",
+                    "publicKeyPem": "-----BEGIN RSA PUBLIC KEY-----\nMIGJAoGBANRpUrwk7x7bJDddHmrYSWVw9enVPMFm5qAW7fTgoZ7x2PoJUIqy/bkqpXZ0SmZs\nsLO3UZm+yN/DqxioD8BnhhD0N8Ydv6+UniT7hE2tHvsMxQIq2jet1auSBZNFmUIWodsBxI/R\ntm+KwFBFk+P+MvVsGZ2K3Rkd4K0dv0/45dtXAgMBAAE=\n-----END RSA PUBLIC KEY-----\n"
+                }
+            },
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "type": "Article",
+                "id": "https://main.ghost.org/activitypub/article/my-article/",
+                "name": "Testing ActivityPub",
+                "content": "<p> Super long test </p>",
+                "url": "https://main.ghost.org/my-article/",
+                "image": "https://main.ghost.org/content/images/2021/08/ghost-logo.png",
+                "published": "2024-05-09T00:00:00Z",
+                "attributedTo": {
+                    "type": "Person",
+                    "name": "The Main"
+                },
+                "preview": {
+                    "type": "Link",
+                    "href": "https://main.ghost.org/my-article/",
+                    "name": "Testing ActivityPub"
+                }
+            }
+        }
+    ]
+}
diff --git a/apps/admin-x-settings/test/utils/responses/config.json b/apps/admin-x-framework/src/test/responses/config.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/config.json
rename to apps/admin-x-framework/src/test/responses/config.json
diff --git a/apps/admin-x-settings/test/utils/responses/custom_theme_settings.json b/apps/admin-x-framework/src/test/responses/custom_theme_settings.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/custom_theme_settings.json
rename to apps/admin-x-framework/src/test/responses/custom_theme_settings.json
diff --git a/apps/admin-x-settings/test/utils/responses/incoming_recommendations.json b/apps/admin-x-framework/src/test/responses/incoming_recommendations.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/incoming_recommendations.json
rename to apps/admin-x-framework/src/test/responses/incoming_recommendations.json
diff --git a/apps/admin-x-settings/test/utils/responses/invites.json b/apps/admin-x-framework/src/test/responses/invites.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/invites.json
rename to apps/admin-x-framework/src/test/responses/invites.json
diff --git a/apps/admin-x-settings/test/utils/responses/labels.json b/apps/admin-x-framework/src/test/responses/labels.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/labels.json
rename to apps/admin-x-framework/src/test/responses/labels.json
diff --git a/apps/admin-x-settings/test/utils/responses/me.json b/apps/admin-x-framework/src/test/responses/me.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/me.json
rename to apps/admin-x-framework/src/test/responses/me.json
diff --git a/apps/admin-x-settings/test/utils/responses/newsletters.json b/apps/admin-x-framework/src/test/responses/newsletters.json
similarity index 98%
rename from apps/admin-x-settings/test/utils/responses/newsletters.json
rename to apps/admin-x-framework/src/test/responses/newsletters.json
index 96a971542e5..7c94e4ccea8 100644
--- a/apps/admin-x-settings/test/utils/responses/newsletters.json
+++ b/apps/admin-x-framework/src/test/responses/newsletters.json
@@ -19,6 +19,7 @@
             "show_header_title": true,
             "title_font_category": "serif",
             "title_alignment": "center",
+            "show_excerpt": true,
             "show_feature_image": true,
             "body_font_category": "serif",
             "footer_content": "",
diff --git a/apps/admin-x-framework/src/test/responses/offers.json b/apps/admin-x-framework/src/test/responses/offers.json
new file mode 100644
index 00000000000..b6194c9f435
--- /dev/null
+++ b/apps/admin-x-framework/src/test/responses/offers.json
@@ -0,0 +1,64 @@
+{
+    "offers": [
+        {
+            "id": "6487ea6464fca78ec2fff5fe",
+            "name": "First offer",
+            "code": "first-offer",
+            "display_title": "First offer",
+            "display_description": "",
+            "type": "percent",
+            "cadence": "month",
+            "amount": 10,
+            "duration": "once",
+            "duration_in_months": null,
+            "currency_restriction": false,
+            "currency": null,
+            "status": "active",
+            "redemption_count": 0,
+            "tier": {
+                "id": "645453f4d254799990dd0e22",
+                "name": "Supporter"
+            }
+        },
+        {
+            "id": "6487f0c364fca78ec2fff600",
+            "name": "Second offer",
+            "code": "second-offer",
+            "display_title": "Second offer",
+            "display_description": "",
+            "type": "percent",
+            "cadence": "month",
+            "amount": 12,
+            "duration": "repeating",
+            "duration_in_months": 3,
+            "currency_restriction": false,
+            "currency": null,
+            "status": "active",
+            "redemption_count": 0,
+            "tier": {
+                "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/admin-x-settings/test/utils/responses/recommendations.json b/apps/admin-x-framework/src/test/responses/recommendations.json
similarity index 94%
rename from apps/admin-x-settings/test/utils/responses/recommendations.json
rename to apps/admin-x-framework/src/test/responses/recommendations.json
index 5069ce43638..d579660198f 100644
--- a/apps/admin-x-settings/test/utils/responses/recommendations.json
+++ b/apps/admin-x-framework/src/test/responses/recommendations.json
@@ -8,7 +8,7 @@
             "featured_image": "https://recommendation1.com/image.jpg",
             "favicon": "https://recommendation1.com/favicon.ico",
             "url": "https://recommendation1.com/",
-            "one_click_subscribe": "true",
+            "one_click_subscribe": true,
             "created_at": "2023-10-28T20:00:00.000Z",
             "updated_at": "2023-10-30T20:00:00.000Z",
             "count": {
@@ -24,7 +24,7 @@
             "featured_image": "https://recommendation2.com/image.jpg",
             "favicon": "https://recommendation2.com/favicon.ico",
             "url": "https://recommendation2.com/",
-            "one_click_subscribe": "false",
+            "one_click_subscribe": false,
             "created_at": "2023-10-28T20:00:00.000Z",
             "updated_at": "2023-10-30T20:00:00.000Z",
             "count": {
diff --git a/apps/admin-x-settings/test/utils/responses/roles.json b/apps/admin-x-framework/src/test/responses/roles.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/roles.json
rename to apps/admin-x-framework/src/test/responses/roles.json
diff --git a/apps/admin-x-settings/test/utils/responses/settings.json b/apps/admin-x-framework/src/test/responses/settings.json
similarity index 95%
rename from apps/admin-x-settings/test/utils/responses/settings.json
rename to apps/admin-x-framework/src/test/responses/settings.json
index 27514a352f3..758c3dc546c 100644
--- a/apps/admin-x-settings/test/utils/responses/settings.json
+++ b/apps/admin-x-framework/src/test/responses/settings.json
@@ -176,6 +176,10 @@
             "key": "portal_plans",
             "value": "[\"monthly\",\"yearly\",\"free\"]"
         },
+        {
+            "key": "portal_default_plan",
+            "value": "yearly"
+        },
         {
             "key": "portal_products",
             "value": "[]"
@@ -315,6 +319,14 @@
         {
             "key": "firstpromoter_account",
             "value": null
+        },
+        {
+            "key": "default_email_address",
+            "value": "default@example.com"
+        },
+        {
+            "key": "support_email_address",
+            "value": "support@example.com"
         }
     ],
     "meta": {
diff --git a/apps/admin-x-settings/test/utils/responses/site.json b/apps/admin-x-framework/src/test/responses/site.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/site.json
rename to apps/admin-x-framework/src/test/responses/site.json
diff --git a/apps/admin-x-settings/test/utils/responses/themes.json b/apps/admin-x-framework/src/test/responses/themes.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/themes.json
rename to apps/admin-x-framework/src/test/responses/themes.json
diff --git a/apps/admin-x-settings/test/utils/responses/tiers.json b/apps/admin-x-framework/src/test/responses/tiers.json
similarity index 100%
rename from apps/admin-x-settings/test/utils/responses/tiers.json
rename to apps/admin-x-framework/src/test/responses/tiers.json
diff --git a/apps/admin-x-settings/test/utils/responses/users.json b/apps/admin-x-framework/src/test/responses/users.json
similarity index 97%
rename from apps/admin-x-settings/test/utils/responses/users.json
rename to apps/admin-x-framework/src/test/responses/users.json
index f1616a59857..4a87e358644 100644
--- a/apps/admin-x-settings/test/utils/responses/users.json
+++ b/apps/admin-x-framework/src/test/responses/users.json
@@ -25,6 +25,7 @@
             "mention_notifications": true,
             "recommendation_notifications": true,
             "milestone_notifications": true,
+            "donation_notifications": true,
             "created_at": "2023-06-26T00:21:57.000Z",
             "updated_at": "2023-06-26T00:21:58.000Z",
             "roles": [
@@ -63,6 +64,7 @@
             "mention_notifications": true,
             "recommendation_notifications": true,
             "milestone_notifications": true,
+            "donation_notifications": true,
             "created_at": "2023-06-26T00:21:22.000Z",
             "updated_at": "2023-06-26T00:21:22.000Z",
             "roles": [
@@ -101,6 +103,7 @@
             "mention_notifications": true,
             "recommendation_notifications": true,
             "milestone_notifications": true,
+            "donation_notifications": true,
             "created_at": "2023-06-26T00:20:56.000Z",
             "updated_at": "2023-06-26T00:20:57.000Z",
             "roles": [
@@ -139,6 +142,7 @@
             "mention_notifications": true,
             "recommendation_notifications": true,
             "milestone_notifications": true,
+            "donation_notifications": true,
             "created_at": "2023-05-05T00:55:15.000Z",
             "updated_at": "2023-06-25T23:34:33.000Z",
             "roles": [
@@ -177,6 +181,7 @@
             "mention_notifications": true,
             "recommendation_notifications": true,
             "milestone_notifications": true,
+            "donation_notifications": true,
             "created_at": "2023-06-22T05:39:57.000Z",
             "updated_at": "2023-06-22T05:39:58.000Z",
             "roles": [
diff --git a/apps/admin-x-framework/src/utils/api/fetchApi.ts b/apps/admin-x-framework/src/utils/api/fetchApi.ts
new file mode 100644
index 00000000000..352fd2f3db2
--- /dev/null
+++ b/apps/admin-x-framework/src/utils/api/fetchApi.ts
@@ -0,0 +1,121 @@
+import * as Sentry from '@sentry/react';
+import {useFramework} from '../../providers/FrameworkProvider';
+import {APIError, MaintenanceError, ServerUnreachableError, TimeoutError} from '../errors';
+import {getGhostPaths} from '../helpers';
+import handleResponse from './handleResponse';
+
+export interface RequestOptions {
+    method?: string;
+    body?: string | FormData;
+    headers?: {
+        'Content-Type'?: string;
+    };
+    credentials?: 'include' | 'omit' | 'same-origin';
+    timeout?: number;
+    retry?: boolean;
+}
+
+export const useFetchApi = () => {
+    const {ghostVersion, sentryDSN} = useFramework();
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return async <ResponseData = any>(endpoint: string | URL, {headers = {}, retry, ...options}: RequestOptions = {}): Promise<ResponseData> => {
+        // By default, we set the Content-Type header to application/json
+        const defaultHeaders: Record<string, string> = {
+            'app-pragma': 'no-cache',
+            'x-ghost-version': ghostVersion
+        };
+        if (typeof options.body === 'string') {
+            defaultHeaders['content-type'] = 'application/json';
+        }
+
+        const controller = new AbortController();
+        const {timeout} = options;
+
+        if (timeout) {
+            setTimeout(() => controller.abort(), timeout);
+        }
+
+        // attempt retries for 15 seconds in two situations:
+        // 1. Server Unreachable error from the browser (code 0 or TypeError), typically from short internet blips
+        // 2. Maintenance error from Ghost, upgrade in progress so API is temporarily unavailable
+        let attempts = 0;
+        const shouldRetry = retry !== false;
+        let retryingMs = 0;
+        const startTime = Date.now();
+        const maxRetryingMs = 15_000;
+        const retryPeriods = [500, 1000];
+        const retryableErrors = [ServerUnreachableError, MaintenanceError, TypeError];
+
+        const getErrorData = (error?: APIError, response?: Response) => {
+            const data: Record<string, unknown> = {
+                errorName: error?.name,
+                attempts,
+                totalSeconds: retryingMs / 1000,
+                endpoint: endpoint.toString()
+            };
+            if (endpoint.toString().includes('/ghost/api/')) {
+                data.server = response?.headers.get('server');
+            }
+            return data;
+        };
+
+        while (attempts === 0 || shouldRetry) {
+            try {
+                const response = await fetch(endpoint, {
+                    headers: {
+                        ...defaultHeaders,
+                        ...headers
+                    },
+                    method: 'GET',
+                    mode: 'cors',
+                    credentials: 'include',
+                    signal: controller.signal,
+                    ...options
+                });
+
+                return handleResponse(response) as ResponseData;
+            } catch (error) {
+                retryingMs = Date.now() - startTime;
+
+                if (shouldRetry && (import.meta.env.MODE !== 'development' && retryableErrors.some(errorClass => error instanceof errorClass) && retryingMs <= maxRetryingMs)) {
+                    await new Promise((resolve) => {
+                        setTimeout(resolve, retryPeriods[attempts] || retryPeriods[retryPeriods.length - 1]);
+                    });
+                    attempts += 1;
+                    continue;
+                }
+
+                if (attempts !== 0 && sentryDSN) {
+                    Sentry.captureMessage('Request failed after multiple attempts', {extra: getErrorData()});
+                }
+
+                if (error && typeof error === 'object' && 'name' in error && error.name === 'AbortError') {
+                    throw new TimeoutError();
+                }
+
+                let newError = error;
+
+                if (!(error instanceof APIError)) {
+                    newError = new ServerUnreachableError({cause: error});
+                }
+
+                throw newError;
+            };
+        }
+
+        // Used for type checking
+        // this can't happen, but TS isn't smart enough to undeerstand that the loop will never exit without an error or return
+        // because of shouldRetry + attemps usage combination
+        return undefined as never;
+    };
+};
+
+const {apiRoot, activityPubRoot} = getGhostPaths();
+
+export const apiUrl = (path: string, searchParams: Record<string, string> = {}, useActivityPub: boolean = false) => {
+    const root = useActivityPub ? activityPubRoot : apiRoot;
+    const url = new URL(`${root}${path}`, window.location.origin);
+    url.search = new URLSearchParams(searchParams).toString();
+    return url.toString();
+};
diff --git a/apps/admin-x-settings/src/utils/api/handleResponse.ts b/apps/admin-x-framework/src/utils/api/handleResponse.ts
similarity index 100%
rename from apps/admin-x-settings/src/utils/api/handleResponse.ts
rename to apps/admin-x-framework/src/utils/api/handleResponse.ts
diff --git a/apps/admin-x-framework/src/utils/api/hooks.ts b/apps/admin-x-framework/src/utils/api/hooks.ts
new file mode 100644
index 00000000000..d2818cdb9cd
--- /dev/null
+++ b/apps/admin-x-framework/src/utils/api/hooks.ts
@@ -0,0 +1,210 @@
+import {UseInfiniteQueryOptions, UseQueryOptions, UseQueryResult, useInfiniteQuery, useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
+import {usePagination} from '@tryghost/admin-x-design-system';
+import {useCallback, useEffect, useMemo, useState} from 'react';
+import useHandleError from '../../hooks/useHandleError';
+import {usePermission} from '../../hooks/usePermissions';
+import {useFramework} from '../../providers/FrameworkProvider';
+import {RequestOptions, apiUrl, useFetchApi} from './fetchApi';
+
+export interface Meta {
+    pagination: {
+        page: number;
+        limit: number | 'all';
+        pages: number;
+        total: number;
+        next: number | null;
+        prev: number | null;
+    }
+}
+
+interface QueryOptions<ResponseData> {
+    dataType: string
+    path: string
+    headers?: Record<string, string>;
+    defaultSearchParams?: Record<string, string>;
+    permissions?: string[];
+    returnData?: (originalData: unknown) => ResponseData;
+    useActivityPub?: boolean;
+}
+
+type QueryHookOptions<ResponseData> = UseQueryOptions<ResponseData> & {
+    searchParams?: Record<string, string>;
+    defaultErrorHandler?: boolean;
+};
+
+export const createQuery = <ResponseData>(options: QueryOptions<ResponseData>) => ({searchParams, ...query}: QueryHookOptions<ResponseData> = {}): Omit<UseQueryResult<ResponseData>, 'data'> & {data: ResponseData | undefined} => {
+    const url = apiUrl(options.path, searchParams || options.defaultSearchParams, options?.useActivityPub);
+    const fetchApi = useFetchApi();
+    const handleError = useHandleError();
+
+    const result = useQuery<ResponseData>({
+        enabled: options.permissions ? usePermission(options.permissions) : true,
+        queryKey: [options.dataType, url],
+        queryFn: () => fetchApi(url, {...options}),
+        ...query
+    });
+
+    const data = useMemo(() => (
+        (result.data && options.returnData) ? options.returnData(result.data) : result.data)
+    , [result.data]);
+
+    useEffect(() => {
+        if (result.error && query.defaultErrorHandler !== false) {
+            handleError(result.error);
+        }
+    }, [handleError, result.error, query.defaultErrorHandler]);
+
+    return {
+        ...result,
+        data
+    };
+};
+
+export const createPaginatedQuery = <ResponseData extends {meta?: Meta}>(options: QueryOptions<ResponseData>) => ({searchParams, ...query}: QueryHookOptions<ResponseData> = {}) => {
+    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 || {};
+    paginatedSearchParams.page = page.toString();
+
+    const url = apiUrl(options.path, paginatedSearchParams, options?.useActivityPub);
+    const fetchApi = useFetchApi();
+    const handleError = useHandleError();
+
+    const result = useQuery<ResponseData>({
+        queryKey: [options.dataType, url],
+        queryFn: () => fetchApi(url),
+        ...query
+    });
+
+    const data = useMemo(() => (
+        (result.data && options.returnData) ? options.returnData(result.data) : result.data)
+    , [result]);
+
+    const pagination = usePagination({
+        page,
+        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?.pagination
+    });
+
+    useEffect(() => {
+        if (result.error && query.defaultErrorHandler !== false) {
+            handleError(result.error);
+        }
+    }, [handleError, result.error, query.defaultErrorHandler]);
+
+    return {
+        ...result,
+        data,
+        pagination
+    };
+};
+
+type InfiniteQueryOptions<ResponseData> = Omit<QueryOptions<ResponseData>, 'returnData'> & {
+    returnData: NonNullable<QueryOptions<ResponseData>['returnData']>
+    defaultNextPageParams?: (data: ResponseData, params: Record<string, string>) => Record<string, string>;
+}
+
+type InfiniteQueryHookOptions<ResponseData> = UseInfiniteQueryOptions<ResponseData> & {
+    searchParams?: Record<string, string>;
+    defaultErrorHandler?: boolean;
+    getNextPageParams?: (data: ResponseData, params: Record<string, string>) => Record<string, string> | undefined;
+};
+
+export const createInfiniteQuery = <ResponseData>(options: InfiniteQueryOptions<ResponseData>) => ({searchParams, getNextPageParams, ...query}: InfiniteQueryHookOptions<ResponseData> = {}) => {
+    const fetchApi = useFetchApi();
+    const handleError = useHandleError();
+
+    const nextPageParams = getNextPageParams || options.defaultNextPageParams || (() => ({}));
+
+    const result = useInfiniteQuery<ResponseData>({
+        queryKey: [options.dataType, apiUrl(options.path, searchParams || options.defaultSearchParams, options?.useActivityPub)],
+        queryFn: ({pageParam}) => fetchApi(apiUrl(options.path, pageParam || searchParams || options.defaultSearchParams, options?.useActivityPub)),
+        getNextPageParam: data => nextPageParams(data, searchParams || options.defaultSearchParams || {}),
+        ...query
+    });
+
+    const data = useMemo(() => result.data && options.returnData(result.data), [result.data]);
+
+    useEffect(() => {
+        if (result.error && query.defaultErrorHandler !== false) {
+            handleError(result.error);
+        }
+    }, [handleError, result.error, query.defaultErrorHandler]);
+
+    return {
+        ...result,
+        data
+    };
+};
+
+export const createQueryWithId = <ResponseData>(options: Omit<QueryOptions<ResponseData>, 'path'> & {path: (id: string) => string}) => (id: string, {searchParams, ...query}: QueryHookOptions<ResponseData> = {}) => {
+    const queryHook = createQuery<ResponseData>({...options, path: options.path(id)});
+    return queryHook({searchParams: searchParams || options.defaultSearchParams, ...query});
+};
+
+interface MutationOptions<ResponseData, Payload> extends Omit<QueryOptions<ResponseData>, 'dataType' | 'path'>, Omit<RequestOptions, 'body'> {
+    path: (payload: Payload) => string;
+    headers?: Record<string, string>;
+    body?: (payload: Payload) => FormData | object;
+    searchParams?: (payload: Payload) => { [key: string]: string; };
+    invalidateQueries?: { dataType: string; };
+    updateQueries?: { dataType: string; emberUpdateType: 'createOrUpdate' | 'delete' | 'skip'; update: (newData: ResponseData, currentData: unknown, payload: Payload) => unknown };
+}
+
+const mutate = <ResponseData, Payload>({fetchApi, path, payload, searchParams, options}: {
+    fetchApi: ReturnType<typeof useFetchApi>;
+    path: string;
+    payload?: Payload;
+    searchParams?: Record<string, string>;
+    options: Omit<MutationOptions<ResponseData, Payload>, 'path'>
+}) => {
+    const {defaultSearchParams, body, ...requestOptions} = options;
+    const url = apiUrl(path, searchParams || defaultSearchParams, options?.useActivityPub);
+    const generatedBody = payload && body?.(payload);
+
+    let requestBody: string | FormData | undefined = undefined;
+    if (generatedBody instanceof FormData) {
+        requestBody = generatedBody;
+    } else if (generatedBody) {
+        requestBody = JSON.stringify(generatedBody);
+    }
+
+    return fetchApi<ResponseData>(url, {
+        body: requestBody,
+        ...requestOptions
+    });
+};
+
+export const createMutation = <ResponseData, Payload>({path, searchParams, defaultSearchParams, updateQueries, invalidateQueries, ...mutateOptions}: MutationOptions<ResponseData, Payload>) => () => {
+    const fetchApi = useFetchApi();
+    const queryClient = useQueryClient();
+    const {onUpdate, onInvalidate, onDelete} = useFramework();
+
+    const afterMutate = useCallback((newData: ResponseData, payload: Payload) => {
+        if (invalidateQueries) {
+            queryClient.invalidateQueries([invalidateQueries.dataType]);
+            onInvalidate(invalidateQueries.dataType);
+        }
+
+        if (updateQueries) {
+            queryClient.setQueriesData([updateQueries.dataType], (data: unknown) => updateQueries!.update(newData, data, payload));
+            if (updateQueries.emberUpdateType === 'createOrUpdate') {
+                onUpdate(updateQueries.dataType, newData);
+            } else if (updateQueries.emberUpdateType === 'delete') {
+                if (typeof payload !== 'string') {
+                    throw new Error('Expected delete mutation to have a string (ID) payload. Either change the payload or update the createMutation hook');
+                }
+
+                onDelete(updateQueries.dataType, payload);
+            }
+        }
+    }, [onInvalidate, onUpdate, onDelete, queryClient]);
+
+    return useMutation<ResponseData, unknown, Payload>({
+        mutationFn: payload => mutate({fetchApi, path: path(payload), payload, searchParams: searchParams?.(payload) || defaultSearchParams, options: mutateOptions}),
+        onSuccess: afterMutate
+    });
+};
diff --git a/apps/admin-x-settings/src/utils/api/updateQueries.ts b/apps/admin-x-framework/src/utils/api/updateQueries.ts
similarity index 98%
rename from apps/admin-x-settings/src/utils/api/updateQueries.ts
rename to apps/admin-x-framework/src/utils/api/updateQueries.ts
index bc2890c7235..a797d2fd83b 100644
--- a/apps/admin-x-settings/src/utils/api/updateQueries.ts
+++ b/apps/admin-x-framework/src/utils/api/updateQueries.ts
@@ -10,7 +10,7 @@ export const insertToQueryCache = <ResponseData>(field: string, recordsToInsert?
 
         if (typeof currentData === 'object' && 'pages' in currentData) {
             const {pages} = currentData as InfiniteData<ResponseData>;
-            const lastPage = pages.at(-1)!;
+            const lastPage = pages[pages.length - 1];
             return {
                 ...currentData,
                 pages: pages.slice(0, -1).concat({
diff --git a/apps/admin-x-framework/src/utils/errors.ts b/apps/admin-x-framework/src/utils/errors.ts
new file mode 100644
index 00000000000..b8156d65d0a
--- /dev/null
+++ b/apps/admin-x-framework/src/utils/errors.ts
@@ -0,0 +1,111 @@
+// API errors
+
+export interface ErrorResponse {
+    errors: Array<{
+        code: string
+        context: string | null
+        details: string | null
+        ghostErrorCode: string | null
+        help: string
+        id: string
+        message: string
+        property: string | null
+        type: string
+    }>
+}
+
+export class APIError extends Error {
+    constructor(
+        public readonly response?: Response,
+        public readonly data?: unknown,
+        message?: string,
+        errorOptions?: ErrorOptions
+    ) {
+        if (!message && response && response.url.includes('/ghost/api/admin/')) {
+            message = `Something went wrong while loading ${response.url.replace(/.+\/ghost\/api\/admin\//, '').replace(/\W.*/, '').replace('_', ' ')}, please try again.`;
+        }
+
+        super(message || 'Something went wrong, please try again.', errorOptions);
+    }
+}
+
+export class JSONError extends APIError {
+    constructor(
+        response: Response,
+        public readonly data?: ErrorResponse,
+        message?: string,
+        errorOptions?: ErrorOptions
+    ) {
+        super(response, data, message, errorOptions);
+    }
+}
+
+export class VersionMismatchError extends JSONError {
+    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
+        super(response, data, 'API server is running a newer version of Ghost, please upgrade.', errorOptions);
+    }
+}
+
+export class ServerUnreachableError extends APIError {
+    constructor(errorOptions?: ErrorOptions) {
+        super(undefined, undefined, 'Something went wrong, please try again.', errorOptions);
+    }
+}
+
+export class TimeoutError extends APIError {
+    constructor(errorOptions?: ErrorOptions) {
+        super(undefined, undefined, 'Request timed out, please try again.', errorOptions);
+    }
+}
+
+export class RequestEntityTooLargeError extends APIError {
+    constructor(response: Response, data: unknown, errorOptions?: ErrorOptions) {
+        super(response, data, 'Request is larger than the maximum file size the server allows', errorOptions);
+    }
+}
+
+export class UnsupportedMediaTypeError extends APIError {
+    constructor(response: Response, data: unknown, errorOptions?: ErrorOptions) {
+        super(response, data, 'Request contains an unknown or unsupported file type.', errorOptions);
+    }
+}
+
+export class MaintenanceError extends APIError {
+    constructor(response: Response, data: unknown, errorOptions?: ErrorOptions) {
+        super(response, data, 'Ghost is currently undergoing maintenance, please wait a moment then retry.', errorOptions);
+    }
+}
+
+export class ThemeValidationError extends JSONError {
+    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
+        super(response, data, 'Theme is not compatible or contains errors.', errorOptions);
+    }
+}
+
+export class HostLimitError extends JSONError {
+    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
+        super(response, data, 'A hosting plan limit was reached or exceeded.', errorOptions);
+    }
+}
+
+export class EmailError extends JSONError {
+    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
+        super(response, data, 'Please verify your email settings', errorOptions);
+    }
+}
+
+export class ValidationError extends JSONError {
+    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
+        super(response, data, data.errors[0].message, errorOptions);
+    }
+}
+
+export const errorsWithMessage = [ValidationError, ThemeValidationError, HostLimitError, EmailError];
+
+// Frontend errors
+
+export class AlreadyExistsError extends Error {
+    constructor(message?: string) {
+        super(message);
+    }
+}
diff --git a/apps/admin-x-framework/src/utils/helpers.ts b/apps/admin-x-framework/src/utils/helpers.ts
new file mode 100644
index 00000000000..1207ff12c61
--- /dev/null
+++ b/apps/admin-x-framework/src/utils/helpers.ts
@@ -0,0 +1,34 @@
+export interface IGhostPaths {
+    subdir: string;
+    adminRoot: string;
+    assetRoot: string;
+    apiRoot: string;
+    activityPubRoot: string;
+}
+
+export function getGhostPaths(): IGhostPaths {
+    const path = window.location.pathname;
+    const subdir = path.substr(0, path.search('/ghost/'));
+    const adminRoot = `${subdir}/ghost/`;
+    const assetRoot = `${subdir}/ghost/assets/`;
+    const apiRoot = `${subdir}/ghost/api/admin`;
+    const activityPubRoot = `${subdir}/.ghost/activitypub`;
+    return {subdir, adminRoot, assetRoot, apiRoot, activityPubRoot};
+}
+
+export function downloadFile(url: string) {
+    let iframe = document.getElementById('iframeDownload');
+
+    if (!iframe) {
+        iframe = document.createElement('iframe');
+        iframe.id = 'iframeDownload';
+        iframe.style.display = 'none';
+        document.body.append(iframe);
+    }
+
+    iframe.setAttribute('src', url);
+}
+
+export function downloadFromEndpoint(path: string) {
+    downloadFile(`${getGhostPaths().apiRoot}${path}`);
+}
diff --git a/apps/admin-x-framework/src/utils/queryClient.ts b/apps/admin-x-framework/src/utils/queryClient.ts
new file mode 100644
index 00000000000..26a9cfe719c
--- /dev/null
+++ b/apps/admin-x-framework/src/utils/queryClient.ts
@@ -0,0 +1,26 @@
+import {QueryClient} from '@tanstack/react-query';
+
+declare global {
+    interface Window {
+        adminXQueryClient?: QueryClient;
+    }
+}
+
+const queryClient = window.adminXQueryClient || new QueryClient({
+    defaultOptions: {
+        queries: {
+            refetchOnWindowFocus: false,
+            staleTime: 5 * (60 * 1000), // 5 mins
+            cacheTime: 10 * (60 * 1000), // 10 mins
+            // We have custom retry logic for specific errors in fetchApi()
+            retry: false,
+            networkMode: 'always'
+        }
+    }
+});
+
+if (!window.adminXQueryClient) {
+    window.adminXQueryClient = queryClient;
+}
+
+export default queryClient;
diff --git a/apps/admin-x-framework/src/vite.ts b/apps/admin-x-framework/src/vite.ts
new file mode 100644
index 00000000000..b5af10ccf3a
--- /dev/null
+++ b/apps/admin-x-framework/src/vite.ts
@@ -0,0 +1,87 @@
+import react from '@vitejs/plugin-react';
+import {PluginOption, UserConfig, mergeConfig} from 'vite';
+import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
+import svgr from 'vite-plugin-svgr';
+import {defineConfig} from 'vitest/config';
+
+const externalPlugin = ({externals}: { externals: Record<string, string> }): PluginOption => {
+    return {
+        name: 'external-globals',
+        apply: 'build',
+        enforce: 'pre',
+        resolveId(id) {
+            if (Object.keys(externals).includes(id)) {
+                // Naming convention for IDs that will be resolved by a plugin
+                return `\0${id}`;
+            }
+        },
+        async load(id) {
+            const [originalId, externalName] = Object.entries(externals).find(([key]) => id === `\0${key}`) || [];
+
+            if (originalId) {
+                const module = await import(originalId);
+
+                return Object.keys(module).map(key => (key === 'default' ? `export default ${externalName};` : `export const ${key} = ${externalName}.${key};`)).join('\n');
+            }
+        }
+    };
+};
+
+// https://vitejs.dev/config/
+export default function adminXViteConfig({packageName, entry, overrides}: {packageName: string; entry: string; overrides?: UserConfig}) {
+    const outputFileName = packageName[0] === '@' ? packageName.slice(packageName.indexOf('/') + 1) : packageName;
+
+    const defaultConfig = defineConfig({
+        logLevel: process.env.CI ? 'info' : 'warn',
+        plugins: [
+            svgr(),
+            react(),
+            externalPlugin({
+                externals: {
+                    react: 'React',
+                    'react-dom': 'ReactDOM'
+                }
+            }),
+            cssInjectedByJsPlugin()
+        ],
+        define: {
+            'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+            'process.env.VITEST_SEGFAULT_RETRY': 3
+        },
+        preview: {
+            port: 4174
+        },
+        build: {
+            reportCompressedSize: false,
+            minify: true,
+            sourcemap: true,
+            lib: {
+                formats: ['es'],
+                entry,
+                name: packageName,
+                fileName(format) {
+                    if (format === 'umd') {
+                        return `${outputFileName}.umd.js`;
+                    }
+
+                    return `${outputFileName}.js`;
+                }
+            },
+            commonjsOptions: {
+                include: [/packages/, /node_modules/]
+            }
+        },
+        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
+            })
+        }
+    });
+
+    return mergeConfig(defaultConfig, overrides || {});
+};
diff --git a/apps/admin-x-framework/test/.eslintrc.cjs b/apps/admin-x-framework/test/.eslintrc.cjs
new file mode 100644
index 00000000000..42f8e77355a
--- /dev/null
+++ b/apps/admin-x-framework/test/.eslintrc.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/ts-test'
+    ]
+};
diff --git a/apps/admin-x-framework/test/unit/hooks/useForm.test.ts b/apps/admin-x-framework/test/unit/hooks/useForm.test.ts
new file mode 100644
index 00000000000..8c4548b74f3
--- /dev/null
+++ b/apps/admin-x-framework/test/unit/hooks/useForm.test.ts
@@ -0,0 +1,75 @@
+import {act, renderHook} from '@testing-library/react';
+import * as assert from 'assert/strict';
+import useForm from '../../../src/hooks/useForm';
+
+describe('useForm', function () {
+    describe('formState', function () {
+        it('returns the initial form state', function () {
+            const {result} = renderHook(() => useForm({
+                initialState: {a: 1},
+                onSave: () => {}
+            }));
+
+            assert.deepEqual(result.current.formState, {a: 1});
+        });
+    });
+
+    describe('updateForm', function () {
+        it('updates the form state', function () {
+            const {result} = renderHook(() => useForm({
+                initialState: {a: 1},
+                onSave: () => {}
+            }));
+
+            act(() => result.current.updateForm(state => ({...state, b: 2})));
+
+            assert.deepEqual(result.current.formState, {a: 1, b: 2});
+        });
+
+        it('sets the saveState to unsaved', function () {
+            const {result} = renderHook(() => useForm({
+                initialState: {a: 1},
+                onSave: () => {}
+            }));
+
+            act(() => result.current.updateForm(state => ({...state, a: 2})));
+
+            assert.deepEqual(result.current.saveState, 'unsaved');
+        });
+    });
+
+    describe('handleSave', function () {
+        it('does nothing when the state has not changed', async function () {
+            let onSaveCalled = false;
+
+            const {result} = renderHook(() => useForm({
+                initialState: {a: 1},
+                onSave: () => {
+                    onSaveCalled = true;
+                }
+            }));
+
+            assert.equal(await act(() => result.current.handleSave()), true);
+
+            assert.equal(result.current.saveState, '');
+            assert.equal(onSaveCalled, false);
+        });
+
+        it('calls the onSave callback when the state has changed', async function () {
+            let onSaveCalled = false;
+
+            const {result} = renderHook(() => useForm({
+                initialState: {a: 1},
+                onSave: () => {
+                    onSaveCalled = true;
+                }
+            }));
+
+            act(() => result.current.updateForm(state => ({...state, a: 2})));
+            assert.equal(await act(() => result.current.handleSave()), true);
+
+            assert.equal(result.current.saveState, 'saved');
+            assert.equal(onSaveCalled, true);
+        });
+    });
+});
diff --git a/apps/admin-x-framework/test/unit/utils/api/fetchApi.test.tsx b/apps/admin-x-framework/test/unit/utils/api/fetchApi.test.tsx
new file mode 100644
index 00000000000..ae25f61053b
--- /dev/null
+++ b/apps/admin-x-framework/test/unit/utils/api/fetchApi.test.tsx
@@ -0,0 +1,57 @@
+import {renderHook} from '@testing-library/react';
+import React, {ReactNode} from 'react';
+import {FrameworkProvider} from '../../../../src/providers/FrameworkProvider';
+import {useFetchApi} from '../../../../src/utils/api/fetchApi';
+import {withMockFetch} from '../../../utils/mockFetch';
+
+const wrapper: React.FC<{ children: ReactNode }> = ({children}) => (
+    <FrameworkProvider
+        externalNavigate={() => {}}
+        ghostVersion='5.x'
+        sentryDSN=''
+        unsplashConfig={{
+            Authorization: '',
+            'Accept-Version': '',
+            'Content-Type': '',
+            'App-Pragma': '',
+            'X-Unsplash-Cache': true
+        }}
+        onDelete={() => {}}
+        onInvalidate={() => {}}
+        onUpdate={() => {}}
+    >
+        {children}
+    </FrameworkProvider>
+);
+
+describe('useFetchApi', function () {
+    it('makes an API request', async function () {
+        await withMockFetch({
+            json: {test: 1}
+        }, async (mock) => {
+            const {result} = renderHook(() => useFetchApi(), {wrapper});
+
+            const data = await result.current<{test: number}>('http://localhost:3000/ghost/api/admin/test/', {
+                method: 'POST',
+                body: 'test',
+                retry: false
+            });
+
+            expect(data).toEqual({test: 1});
+
+            expect(mock.calls.length).toBe(1);
+            expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/', {
+                body: 'test',
+                credentials: 'include',
+                headers: {
+                    'app-pragma': 'no-cache',
+                    'x-ghost-version': '5.x',
+                    'content-type': 'application/json'
+                },
+                method: 'POST',
+                mode: 'cors',
+                signal: expect.any(AbortSignal)
+            }]);
+        });
+    });
+});
diff --git a/apps/admin-x-framework/test/unit/utils/api/hooks.test.tsx b/apps/admin-x-framework/test/unit/utils/api/hooks.test.tsx
new file mode 100644
index 00000000000..2099441d963
--- /dev/null
+++ b/apps/admin-x-framework/test/unit/utils/api/hooks.test.tsx
@@ -0,0 +1,493 @@
+import {InfiniteData, QueryClient, QueryClientProvider} from '@tanstack/react-query';
+import {act, renderHook, waitFor} from '@testing-library/react';
+import React, {ReactNode} from 'react';
+import {FrameworkProvider} from '../../../../src/providers/FrameworkProvider';
+import {createInfiniteQuery, createMutation, createPaginatedQuery, createQuery, createQueryWithId} from '../../../../src/utils/api/hooks';
+import {withMockFetch} from '../../../utils/mockFetch';
+
+const queryClient = new QueryClient({
+    defaultOptions: {
+        queries: {
+            retry: false
+        }
+    }
+});
+
+const wrapper: React.FC<{ children: ReactNode }> = ({children}) => (
+    <FrameworkProvider
+        externalNavigate={() => {}}
+        ghostVersion='5.x'
+        sentryDSN=''
+        unsplashConfig={{
+            Authorization: '',
+            'Accept-Version': '',
+            'Content-Type': '',
+            'App-Pragma': '',
+            'X-Unsplash-Cache': true
+        }}
+        onDelete={() => {}}
+        onInvalidate={() => {}}
+        onUpdate={() => {}}
+    >
+        {/* Being nested, this overrides the default QueryClientProvider from the framework */}
+        <QueryClientProvider client={queryClient}>
+            {children}
+        </QueryClientProvider>
+    </FrameworkProvider>
+);
+
+describe('API hooks', function () {
+    describe('createQuery', function () {
+        afterEach(function () {
+            queryClient.clear();
+        });
+
+        it('makes an API request', async function () {
+            await withMockFetch({
+                json: {test: 1}
+            }, async (mock) => {
+                const useTestQuery = createQuery({
+                    dataType: 'test',
+                    path: '/test/'
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.data).toEqual({test: 1});
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/', {
+                    credentials: 'include',
+                    dataType: 'test',
+                    headers: {
+                        'app-pragma': 'no-cache',
+                        'x-ghost-version': '5.x'
+                    },
+                    method: 'GET',
+                    mode: 'cors',
+                    path: '/test/',
+                    signal: expect.any(AbortSignal)
+                }]);
+            });
+        });
+
+        it('can add custom headers', async function () {
+            await withMockFetch({
+                json: {test: 1}
+            }, async (mock) => {
+                const useTestQuery = createQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    headers: {'Content-Type': 'ALOHA'}
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.data).toEqual({test: 1});
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/', {
+                    credentials: 'include',
+                    dataType: 'test',
+                    headers: {
+                        'Content-Type': 'ALOHA',
+                        'app-pragma': 'no-cache',
+                        'x-ghost-version': '5.x'
+                    },
+                    method: 'GET',
+                    mode: 'cors',
+                    path: '/test/',
+                    signal: expect.any(AbortSignal)
+                }]);
+            });
+        });
+
+        it('sends default query params', async function () {
+            await withMockFetch({}, async (mock) => {
+                const useTestQuery = createQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    defaultSearchParams: {a: '?'}
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?a=%3F');
+            });
+        });
+
+        it('can override default query params', async function () {
+            await withMockFetch({}, async (mock) => {
+                const useTestQuery = createQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    defaultSearchParams: {a: '?'}
+                });
+
+                const {result} = renderHook(() => useTestQuery({searchParams: {b: '1'}}), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?b=1');
+            });
+        });
+
+        it('can transform return data', async function () {
+            await withMockFetch({json: {test: 1}}, async () => {
+                const useTestQuery = createQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    returnData: data => (data as {test: number}).test + 1
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.data).toEqual(2);
+            });
+        });
+    });
+
+    describe('createPaginatedQuery', function () {
+        afterEach(function () {
+            queryClient.clear();
+        });
+
+        it('makes a paginated API request', async function () {
+            await withMockFetch({
+                json: {test: 1}
+            }, async (mock) => {
+                const useTestQuery = createPaginatedQuery({
+                    dataType: 'test',
+                    path: '/test/'
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.data).toEqual({test: 1});
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/?page=1', {
+                    credentials: 'include',
+                    headers: {
+                        'app-pragma': 'no-cache',
+                        'x-ghost-version': '5.x'
+                    },
+                    method: 'GET',
+                    mode: 'cors',
+                    signal: expect.any(AbortSignal)
+                }]);
+            });
+        });
+
+        it('sends default query params', async function () {
+            await withMockFetch({}, async (mock) => {
+                const useTestQuery = createPaginatedQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    defaultSearchParams: {a: '?'}
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?a=%3F&page=1');
+            });
+        });
+
+        it('can override default query params', async function () {
+            await withMockFetch({}, async (mock) => {
+                const useTestQuery = createPaginatedQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    defaultSearchParams: {a: '?'}
+                });
+
+                const {result} = renderHook(() => useTestQuery({searchParams: {b: '1'}}), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?b=1&page=1');
+            });
+        });
+
+        it('can transform return data', async function () {
+            await withMockFetch({json: {test: 1}}, async () => {
+                const useTestQuery = createPaginatedQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    returnData: data => ({test: (data as {test: number}).test + 1, meta: undefined})
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.data).toEqual({test: 2});
+            });
+        });
+
+        it('exposes pagination metadata', async function () {
+            await withMockFetch({json: {meta: {pagination: {pages: 2, total: 100}}}}, async () => {
+                const useTestQuery = createPaginatedQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    defaultSearchParams: {limit: '15'}
+                });
+
+                const {result} = renderHook(() => useTestQuery({}), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.pagination.limit).toEqual(15);
+                expect(result.current.pagination.page).toEqual(1);
+                expect(result.current.pagination.pages).toEqual(2);
+                expect(result.current.pagination.total).toEqual(100);
+            });
+        });
+
+        it('supports navigating pages', async function () {
+            await withMockFetch({json: {meta: {pagination: {pages: 2}}}}, async (mock) => {
+                const useTestQuery = createPaginatedQuery({
+                    dataType: 'test',
+                    path: '/test/'
+                });
+
+                const {result} = renderHook(() => useTestQuery({}), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?page=1');
+
+                act(() => result.current.pagination.nextPage());
+
+                await waitFor(() => expect(mock.calls.length).toBe(2));
+
+                expect(mock.calls[1][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?page=2');
+
+                act(() => result.current.pagination.prevPage());
+
+                await waitFor(() => expect(mock.calls.length).toBe(3));
+
+                expect(mock.calls[2][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?page=1');
+
+                act(() => result.current.pagination.setPage(5));
+
+                await waitFor(() => expect(mock.calls.length).toBe(4));
+
+                expect(mock.calls[3][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?page=5');
+            });
+        });
+    });
+
+    describe('createInfiniteQuery', function () {
+        afterEach(function () {
+            queryClient.clear();
+        });
+
+        it('makes a paginated API request', async function () {
+            await withMockFetch({
+                json: {test: 1, pagination: {next: 2}}
+            }, async (mock) => {
+                const useTestQuery = createInfiniteQuery({
+                    dataType: 'test',
+                    path: '/test/',
+                    defaultNextPageParams: (lastPage, otherParams) => ({
+                        ...otherParams,
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        page: ((lastPage as any).pagination.next || 1).toString()
+                    }),
+                    returnData: (originalData) => {
+                        const {pages} = originalData as InfiniteData<{test: number}>;
+                        return pages.map(page => page.test);
+                    }
+                });
+
+                const {result} = renderHook(() => useTestQuery(), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.data).toEqual([1]);
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/', {
+                    credentials: 'include',
+                    headers: {
+                        'app-pragma': 'no-cache',
+                        'x-ghost-version': '5.x'
+                    },
+                    method: 'GET',
+                    mode: 'cors',
+                    signal: expect.any(AbortSignal)
+                }]);
+
+                await act(() => result.current.fetchNextPage());
+
+                await waitFor(() => expect(mock.calls.length).toBe(2));
+                expect(mock.calls[1][0]).toEqual('http://localhost:3000/ghost/api/admin/test/?page=2');
+
+                await waitFor(() => expect(result.current.data).toEqual([1, 1]));
+            });
+        });
+    });
+
+    describe('createQueryWithId', function () {
+        afterEach(function () {
+            queryClient.clear();
+        });
+
+        it('fills in the ID in the request', async function () {
+            await withMockFetch({
+                json: {test: 1}
+            }, async (mock) => {
+                const useTestQuery = createQueryWithId({
+                    dataType: 'test',
+                    path: id => `/test/${id}/`
+                });
+
+                const {result} = renderHook(() => useTestQuery('1'), {wrapper});
+
+                await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+                expect(result.current.data).toEqual({test: 1});
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0][0]).toEqual('http://localhost:3000/ghost/api/admin/test/1/');
+            });
+        });
+    });
+
+    describe('createMutation', function () {
+        afterEach(function () {
+            queryClient.clear();
+        });
+
+        it('makes a request', async function () {
+            await withMockFetch({
+                json: {test: 1}
+            }, async (mock) => {
+                const useTestMutation = createMutation({
+                    path: () => '/test/',
+                    method: 'PUT'
+                });
+
+                const {result} = renderHook(() => useTestMutation(), {wrapper});
+
+                expect(await result.current.mutateAsync({})).toEqual({test: 1});
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/', {
+                    credentials: 'include',
+                    headers: {
+                        'app-pragma': 'no-cache',
+                        'x-ghost-version': '5.x'
+                    },
+                    method: 'PUT',
+                    mode: 'cors',
+                    body: undefined,
+                    signal: expect.any(AbortSignal)
+                }]);
+            });
+        });
+
+        it('computes path, body, searchParams', async function () {
+            await withMockFetch({
+                json: {test: 1}
+            }, async (mock) => {
+                const useTestMutation = createMutation({
+                    path: payload => `/test/${payload}/`,
+                    searchParams: payload => ({a: `${payload}`}),
+                    body: payload => ({b: `${payload}`}),
+                    method: 'POST'
+                });
+
+                const {result} = renderHook(() => useTestMutation(), {wrapper});
+
+                expect(await result.current.mutateAsync('hello')).toEqual({test: 1});
+
+                expect(mock.calls.length).toBe(1);
+                expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/hello/?a=hello', {
+                    credentials: 'include',
+                    headers: {
+                        'app-pragma': 'no-cache',
+                        'content-type': 'application/json',
+                        'x-ghost-version': '5.x'
+                    },
+                    method: 'POST',
+                    mode: 'cors',
+                    body: '{"b":"hello"}',
+                    signal: expect.any(AbortSignal)
+                }]);
+            });
+        });
+
+        it('can invalidate queries in the cache', async function () {
+            await withMockFetch({
+                json: {test: 1}
+            }, async (mock) => {
+                queryClient.setQueryData(['MyDataType', '1'], {test: 1});
+                queryClient.setQueryData(['MyDataType', '2'], {test: 2});
+
+                const useTestMutation = createMutation({
+                    path: () => '/test/',
+                    method: 'PUT',
+                    invalidateQueries: {dataType: 'MyDataType'}
+                });
+
+                const {result} = renderHook(() => useTestMutation(), {wrapper});
+
+                await result.current.mutateAsync({});
+
+                expect(mock.calls.length).toBe(1);
+
+                expect(queryClient.getQueryState(['MyDataType', '1'])?.isInvalidated).toBe(true);
+                expect(queryClient.getQueryState(['MyDataType', '2'])?.isInvalidated).toBe(true);
+            });
+        });
+
+        it('can update queries in the cache', async function () {
+            await withMockFetch({
+                json: {test: 10}
+            }, async (mock) => {
+                queryClient.setQueryData(['MyDataType', '1'], {test: 1});
+                queryClient.setQueryData(['MyDataType', '2'], {test: 2});
+
+                const useTestMutation = createMutation({
+                    path: () => '/test/',
+                    method: 'PUT',
+                    updateQueries: {
+                        emberUpdateType: 'skip',
+                        dataType: 'MyDataType',
+                        update: (newData, currentData) => {
+                            return {test: (newData as {test: number}).test + (currentData as {test: number}).test};
+                        }
+                    }
+                });
+
+                const {result} = renderHook(() => useTestMutation(), {wrapper});
+
+                await result.current.mutateAsync({});
+
+                expect(mock.calls.length).toBe(1);
+
+                expect(queryClient.getQueryData(['MyDataType', '1'])).toEqual({test: 11});
+                expect(queryClient.getQueryData(['MyDataType', '2'])).toEqual({test: 12});
+            });
+        });
+    });
+});
diff --git a/apps/admin-x-framework/test/unit/utils/api/updateQueries.test.ts b/apps/admin-x-framework/test/unit/utils/api/updateQueries.test.ts
new file mode 100644
index 00000000000..a9fef45699c
--- /dev/null
+++ b/apps/admin-x-framework/test/unit/utils/api/updateQueries.test.ts
@@ -0,0 +1,97 @@
+import {deleteFromQueryCache, insertToQueryCache, updateQueryCache} from '../../../../src/utils/api/updateQueries';
+
+describe('cache update functions', function () {
+    describe('insertToQueryCache', function () {
+        it('appends records from the new data', function () {
+            const newData = {
+                posts: [{id: '2'}]
+            };
+
+            const currentData = {
+                posts: [{id: '1'}]
+            };
+
+            const result = insertToQueryCache('posts')(newData, currentData);
+
+            expect(result).toEqual({
+                posts: [{id: '1'}, {id: '2'}]
+            });
+        });
+
+        it('appends to the last page for paginated queries', function () {
+            const newData = {
+                posts: [{id: '3'}]
+            };
+
+            const currentData = {
+                pages: [{posts: [{id: '1'}]}, {posts: [{id: '2'}]}]
+            };
+
+            const result = insertToQueryCache('posts')(newData, currentData);
+
+            expect(result).toEqual({
+                pages: [{posts: [{id: '1'}]}, {posts: [{id: '2'}, {id: '3'}]}]
+            });
+        });
+    });
+
+    describe('updateQueryCache', function () {
+        it('updates based on the ID', function () {
+            const newData = {
+                posts: [{id: '2', title: 'New Title'}]
+            };
+
+            const currentData = {
+                posts: [{id: '1'}, {id: '2', title: 'Old Title'}]
+            };
+
+            const result = updateQueryCache('posts')(newData, currentData);
+
+            expect(result).toEqual({
+                posts: [{id: '1'}, {id: '2', title: 'New Title'}]
+            });
+        });
+
+        it('updates nested records in paginated queries', function () {
+            const newData = {
+                posts: [{id: '2', title: 'New Title'}]
+            };
+
+            const currentData = {
+                pages: [{posts: [{id: '1'}]}, {posts: [{id: '2', title: 'Old Title'}]}]
+            };
+
+            const result = updateQueryCache('posts')(newData, currentData);
+
+            expect(result).toEqual({
+                pages: [{posts: [{id: '1'}]}, {posts: [{id: '2', title: 'New Title'}]}]
+            });
+        });
+    });
+
+    describe('deleteFromQueryCache', function () {
+        it('deletes based on the ID', function () {
+            const currentData = {
+                posts: [{id: '1'}, {id: '2'}]
+            };
+
+            const result = deleteFromQueryCache('posts')(null, currentData, '2');
+
+            expect(result).toEqual({
+                posts: [{id: '1'}]
+            });
+        });
+
+        it('deletes nested records in paginated queries', function () {
+            const currentData = {
+                pages: [{posts: [{id: '1'}]}, {posts: [{id: '2'}]}]
+            };
+
+            const result = deleteFromQueryCache('posts')(null, currentData, '2');
+
+            expect(result).toEqual({
+                pages: [{posts: [{id: '1'}]}, {posts: []}]
+            });
+        });
+    });
+});
diff --git a/apps/admin-x-framework/test/utils/mockFetch.ts b/apps/admin-x-framework/test/utils/mockFetch.ts
new file mode 100644
index 00000000000..55fade407d8
--- /dev/null
+++ b/apps/admin-x-framework/test/utils/mockFetch.ts
@@ -0,0 +1,23 @@
+import {MockContext, vi} from 'vitest';
+
+const originalFetch = global.fetch;
+
+type FetchArgs = Parameters<typeof global.fetch>;
+
+export const withMockFetch = async (
+    {json = {}, headers = {}, status = 200, ok = true}: {json?: unknown; headers?: Record<string, string>; status?: number; ok?: boolean},
+    callback: (mock: MockContext<FetchArgs, Promise<Response>>) => void | Promise<void>
+) => {
+    const mockFetch = vi.fn<FetchArgs, Promise<Response>>(() => Promise.resolve({
+        json: () => Promise.resolve(json),
+        headers: new Headers(headers),
+        status,
+        ok
+    } as Response));
+
+    global.fetch = mockFetch as any; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+    await callback(mockFetch.mock);
+
+    global.fetch = originalFetch;
+};
diff --git a/apps/admin-x-framework/tsconfig.declaration.json b/apps/admin-x-framework/tsconfig.declaration.json
new file mode 100644
index 00000000000..294527b1a6f
--- /dev/null
+++ b/apps/admin-x-framework/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-framework/tsconfig.json b/apps/admin-x-framework/tsconfig.json
new file mode 100644
index 00000000000..ee1c2d7d2d1
--- /dev/null
+++ b/apps/admin-x-framework/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-framework/tsconfig.node.json b/apps/admin-x-framework/tsconfig.node.json
new file mode 100644
index 00000000000..364bc0ea553
--- /dev/null
+++ b/apps/admin-x-framework/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-framework/vite.config.ts b/apps/admin-x-framework/vite.config.ts
new file mode 100644
index 00000000000..ea71b260ad1
--- /dev/null
+++ b/apps/admin-x-framework/vite.config.ts
@@ -0,0 +1,61 @@
+import react from '@vitejs/plugin-react';
+import glob from 'glob';
+import {resolve} from 'path';
+import {defineConfig} from 'vitest/config';
+
+// https://vitejs.dev/config/
+export default (function viteConfig() {
+    return defineConfig({
+        logLevel: process.env.CI ? 'info' : 'warn',
+        plugins: [
+            react()
+        ],
+        preview: {
+            port: 4174
+        },
+        build: {
+            reportCompressedSize: false,
+            minify: false,
+            sourcemap: true,
+            outDir: 'dist',
+            lib: {
+                formats: ['es', 'cjs'],
+                entry: glob.sync(resolve(__dirname, 'src/**/*.{ts,tsx}')).reduce((entries, path) => {
+                    if (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/.storybook/main.tsx b/apps/admin-x-settings/.storybook/main.tsx
deleted file mode 100644
index c80dfe7b948..00000000000
--- a/apps/admin-x-settings/.storybook/main.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import {resolve} from "path";
-import type { StorybookConfig } from "@storybook/react-vite";
-const config: StorybookConfig = {
-	stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
-	addons: [
-		"@storybook/addon-links",
-		"@storybook/addon-essentials",
-		"@storybook/addon-interactions",
-		{
-			name: '@storybook/addon-styling',
-		},
-	],
-	framework: {
-		name: "@storybook/react-vite",
-		options: {},
-	},
-	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')
-		}
-		return config;
-	},
-};
-export default config;
diff --git a/apps/admin-x-settings/.storybook/preview.tsx b/apps/admin-x-settings/.storybook/preview.tsx
deleted file mode 100644
index 268a8befcda..00000000000
--- a/apps/admin-x-settings/.storybook/preview.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-
-import '../src/styles/demo.css';
-import type { Preview } from "@storybook/react";
-import '../src/admin-x-ds/providers/DesignSystemProvider';
-import DesignSystemProvider from '../src/admin-x-ds/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: {
-		actions: { argTypesRegex: "^on[A-Z].*" },
-		controls: {
-			matchers: {
-				color: /(background|color)$/i,
-				date: /Date$/,
-			},
-		},
-		options: {
-			storySort: {
-				mathod: 'alphabetical',
-				order: ['Welcome', 'Foundations', ['Style Guide', 'Colors', 'Icons', 'ErrorHandling'], 'Global', ['Form', 'Chrome', 'Modal', 'Layout', 'List', 'Table', '*'], 'Settings', ['Setting Section', 'Setting Group', '*'], 'Experimental'],
-			},
-		},
-		docs: {
-			theme: adminxTheme,
-		},
-	},
-	decorators: [
-		(Story, context) => {
-			let {scheme} = context.globals;
-
-			return (
-			<div className={`admin-x-settings ${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>
-					<Story />
-				</DesignSystemProvider>
-			</div>);
-	},
-	],
-	globalTypes: {
-		scheme: {
-			name: "Scheme",
-			description: "Select light or dark mode",
-			defaultValue: "light",
-			toolbar: {
-				icon: "mirror",
-				items: ["light", "dark"],
-				dynamicTitle: true
-			}
-		}
-	}
-};
-
-export default preview;
diff --git a/apps/admin-x-settings/package.json b/apps/admin-x-settings/package.json
index 6e47942169a..9e0956699d2 100644
--- a/apps/admin-x-settings/package.json
+++ b/apps/admin-x-settings/package.json
@@ -30,65 +30,54 @@
     "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/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",
-    "react": "18.2.0",
-    "react-colorful": "^5.1.2",
-    "react-dom": "18.2.0",
+    "@codemirror/lang-html": "6.4.9",
+    "@tryghost/color-utils": "0.2.2",
+    "@tryghost/kg-unsplash-selector": "0.2.4",
+    "@tryghost/limit-service": "1.2.14",
+    "@tryghost/nql": "0.12.4",
+    "@tryghost/timezone-data": "0.4.3",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "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",
+    "@testing-library/react": "14.3.1",
+    "@tryghost/admin-x-design-system": "0.0.0",
+    "@tryghost/admin-x-framework": "0.0.0",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "@types/validator": "13.12.0",
+    "@vitejs/plugin-react": "4.2.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": "4.5.3",
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vite-plugin-svgr": "3.3.0",
     "vitest": "0.34.3"
+  },
+  "nx": {
+    "targets": {
+      "dev": {
+        "dependsOn": [
+          "^build"
+        ]
+      },
+      "test:acceptance": {
+        "dependsOn": [
+          "test:acceptance",
+          "^build"
+        ]
+      }
+    }
   }
 }
diff --git a/apps/admin-x-settings/playwright.config.mjs b/apps/admin-x-settings/playwright.config.mjs
new file mode 100644
index 00000000000..8fa59553e54
--- /dev/null
+++ b/apps/admin-x-settings/playwright.config.mjs
@@ -0,0 +1,3 @@
+import {adminXPlaywrightConfig} from '@tryghost/admin-x-framework/playwright';
+
+export default adminXPlaywrightConfig();
diff --git a/apps/admin-x-settings/playwright.config.ts b/apps/admin-x-settings/playwright.config.ts
deleted file mode 100644
index 510f2ac1b57..00000000000
--- a/apps/admin-x-settings/playwright.config.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {defineConfig, devices} from '@playwright/test';
-
-export const E2E_PORT = 5173;
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-    testDir: './test/acceptance',
-    /* Run tests in files in parallel */
-    fullyParallel: true,
-    /* Fail the build on CI if you accidentally left test.only in the source code. */
-    forbidOnly: !!process.env.CI,
-    /* Retry on CI only */
-    retries: process.env.CI ? 2 : 0,
-    /* Hardcode to use all cores in CI */
-    workers: process.env.CI ? '100%' : (process.env.PLAYWRIGHT_SLOWMO ? 1 : undefined),
-    /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: 'html',
-    /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-    use: {
-        baseURL: `http://localhost:${E2E_PORT}`,
-        /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: 'on-first-retry',
-        launchOptions: {
-            slowMo: parseInt(process.env.PLAYWRIGHT_SLOWMO ?? '') || 0,
-            // force GPU hardware acceleration
-            // (even in headless mode)
-            args: ['--use-gl=egl']
-        }
-    },
-
-    /* Configure projects for major browsers */
-    projects: [
-        {
-            name: 'chromium',
-            use: {...devices['Desktop Chrome']}
-        },
-
-        ...(process.env.ALL_BROWSERS ? [{
-            name: 'firefox',
-            use: {...devices['Desktop Firefox']}
-        },
-
-        {
-            name: 'webkit',
-            use: {...devices['Desktop Safari']}
-        }] : [])
-    ],
-
-    /* Run local dev server before starting the tests */
-    webServer: {
-        command: `yarn dev:start`,
-        url: `http://localhost:${E2E_PORT}`,
-        reuseExistingServer: !process.env.CI,
-        timeout: 10000
-    }
-});
diff --git a/apps/admin-x-settings/postcss.config.cjs b/apps/admin-x-settings/postcss.config.cjs
index ab7c4939b1d..8799f4acf82 100644
--- a/apps/admin-x-settings/postcss.config.cjs
+++ b/apps/admin-x-settings/postcss.config.cjs
@@ -1,8 +1 @@
-module.exports = {
-    plugins: {
-        'postcss-import': {},
-        'tailwindcss/nesting': {},
-        tailwindcss: {},
-        autoprefixer: {}
-    }
-};
+module.exports = require('@tryghost/admin-x-design-system/postcss.config.cjs');
diff --git a/apps/admin-x-settings/src/App.tsx b/apps/admin-x-settings/src/App.tsx
index 39b4ea0073b..26292ceeb72 100644
--- a/apps/admin-x-settings/src/App.tsx
+++ b/apps/admin-x-settings/src/App.tsx
@@ -1,80 +1,37 @@
-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 {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 SettingsAppProvider, {OfficialTheme, UpgradeStatusType} from './components/providers/SettingsAppProvider';
+import SettingsRouter, {loadModals, modalPaths} from './components/providers/SettingsRouter';
+import {DesignSystemApp, DesignSystemAppProps} from '@tryghost/admin-x-design-system';
+import {FrameworkProvider, TopLevelFrameworkProps} from '@tryghost/admin-x-framework';
+import {RoutingProvider} from '@tryghost/admin-x-framework/routing';
 import {ZapierTemplate} from './components/settings/advanced/integrations/ZapierModal';
 
 interface AppProps {
-    ghostVersion: string;
+    framework: TopLevelFrameworkProps;
+    designSystem: DesignSystemAppProps;
     officialThemes: OfficialTheme[];
     zapierTemplates: ZapierTemplate[];
-    externalNavigate: (link: ExternalLink) => void;
-    darkMode?: boolean;
-    unsplashConfig: DefaultHeaderTypes
-    sentryDSN: string | null;
-    fetchKoenigLexical: FetchKoenigLexical;
-    onUpdate: (dataType: string, response: unknown) => void;
-    onInvalidate: (dataType: string) => void;
-    onDelete: (dataType: string, id: string) => void;
     upgradeStatus?: UpgradeStatusType;
 }
 
-const queryClient = new QueryClient({
-    defaultOptions: {
-        queries: {
-            refetchOnWindowFocus: false,
-            staleTime: 5 * (60 * 1000), // 5 mins
-            cacheTime: 10 * (60 * 1000), // 10 mins
-            // We have custom retry logic for specific errors in fetchApi()
-            retry: false
-        }
-    }
-});
-
-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]'
-    );
-
+function App({framework, designSystem, officialThemes, zapierTemplates, upgradeStatus}: AppProps) {
     return (
-        <SentryErrorBoundary>
-            <QueryClientProvider client={queryClient}>
-                <ServicesProvider fetchKoenigLexical={fetchKoenigLexical} ghostVersion={ghostVersion} officialThemes={officialThemes} sentryDSN={sentryDSN} unsplashConfig={unsplashConfig} upgradeStatus={upgradeStatus} zapierTemplates={zapierTemplates} onDelete={onDelete} onInvalidate={onInvalidate} onUpdate={onUpdate}>
-                    <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>
-                            </RoutingProvider>
-                        </ScrollSectionProvider>
-                    </GlobalDataProvider>
-                </ServicesProvider>
-            </QueryClientProvider>
-        </SentryErrorBoundary>
+        <FrameworkProvider {...framework}>
+            <SettingsAppProvider officialThemes={officialThemes} upgradeStatus={upgradeStatus} zapierTemplates={zapierTemplates}>
+                {/* NOTE: we need to have an extra NiceModal.Provider here because the one inside DesignSystemApp
+                    is loaded too late for possible modals in RoutingProvider, and it's quite hard to change it at
+                    this point */}
+                <NiceModal.Provider>
+                    <RoutingProvider basePath='settings' modals={{paths: modalPaths, load: loadModals}}>
+                        <DesignSystemApp className='admin-x-settings' {...designSystem}>
+                            <SettingsRouter />
+                            <MainContent />
+                        </DesignSystemApp>
+                    </RoutingProvider>
+                </NiceModal.Provider>
+            </SettingsAppProvider>
+        </FrameworkProvider>
     );
 }
 
diff --git a/apps/admin-x-settings/src/MainContent.tsx b/apps/admin-x-settings/src/MainContent.tsx
index 8bcc9a3a3f3..31898d9b565 100644
--- a/apps/admin-x-settings/src/MainContent.tsx
+++ b/apps/admin-x-settings/src/MainContent.tsx
@@ -1,22 +1,20 @@
 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, confirmIfDirty, topLevelBackdropClasses, useGlobalDirtyState} from '@tryghost/admin-x-design-system';
 import {ReactNode, useEffect} from 'react';
-import {canAccessSettings, isEditorUser} from './api/users';
+import {canAccessSettings, isEditorUser} from '@tryghost/admin-x-framework/api/users';
 import {toast} from 'react-hot-toast';
-import {topLevelBackdropClasses} from './admin-x-ds/global/modal/Modal';
 import {useGlobalData} from './components/providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const Page: React.FC<{children: ReactNode}> = ({children}) => {
     return <>
-        <div className='sticky top-0 z-30 px-[5vmin] py-4 tablet:fixed tablet:px-6'>
+        <div className='fixed right-0 top-2 z-50 flex justify-end p-8 dark:bg-grey-975 tablet:fixed tablet:top-0 tablet:bg-transparent tablet:px-8 dark:tablet:bg-transparent' id="done-button-container">
             <ExitSettingsButton />
         </div>
-
-        <div className="mx-auto flex max-w-[1080px] flex-col px-[5vmin] pb-[12vmin] tablet:flex-row tablet:items-start tablet:gap-x-10 tablet:py-[8vmin]" id="admin-x-settings-content">
+        <div className="w-full dark:bg-grey-975 tablet:fixed tablet:left-0 tablet:top-0 tablet:flex tablet:h-full" id="admin-x-settings-content">
             {children}
         </div>
     </>;
@@ -25,6 +23,25 @@ const Page: React.FC<{children: ReactNode}> = ({children}) => {
 const MainContent: React.FC = () => {
     const {currentUser} = useGlobalData();
     const {route, updateRoute, loadingModal} = useRouting();
+    const {isDirty} = useGlobalDirtyState();
+
+    const navigateAway = () => {
+        window.location.hash = '/dashboard';
+    };
+
+    useEffect(() => {
+        const handleKeyDown = (event: KeyboardEvent) => {
+            if (event.key === 'Escape') {
+                confirmIfDirty(isDirty, navigateAway);
+            }
+        };
+
+        window.addEventListener('keydown', handleKeyDown);
+
+        return () => {
+            window.removeEventListener('keydown', handleKeyDown);
+        };
+    }, []);
 
     useEffect(() => {
         // resets any toasts that may have been left open on initial load
@@ -44,8 +61,8 @@ const MainContent: React.FC = () => {
     if (isEditorUser(currentUser)) {
         return (
             <Page>
-                <div className='w-full'>
-                    <Heading className='mb-10'>Settings</Heading>
+                <div className='mx-auto w-full max-w-5xl overflow-y-auto px-[5vmin] tablet:mt-16 xl:mt-10' id="admin-x-settings-scroller">
+                    <Heading className='mb-[5vmin]'>Settings</Heading>
                     <Users highlight={false} keywords={[]} />
                 </div>
             </Page>
@@ -55,14 +72,12 @@ const MainContent: React.FC = () => {
     return (
         <Page>
             {loadingModal && <div className={`fixed inset-0 z-40 h-[calc(100vh-55px)] w-[100vw] tablet:h-[100vh] ${topLevelBackdropClasses}`} />}
-
-            {/* Sidebar */}
-            <div className="sticky -top-px z-20 mt-[-55px] min-w-[260px] grow-0 bg-white pt-[52px] dark:bg-black tablet:fixed tablet:top-[8vmin] tablet:mt-0 tablet:basis-[260px] tablet:pt-0">
-                <div className="relative w-full bg-white dark:bg-black">
+            <div className="no-scrollbar fixed inset-x-0 top-0 z-[35] flex-1 basis-[320px] bg-white p-8 dark:bg-grey-975 tablet:relative tablet:inset-x-auto tablet:top-auto tablet:h-full tablet:overflow-y-scroll tablet:bg-grey-50 tablet:py-0 dark:tablet:bg-black" id="admin-x-settings-sidebar-scroller">
+                <div className="relative w-full">
                     <Sidebar />
                 </div>
             </div>
-            <div className="relative flex-auto pt-[10vmin] tablet:ml-[330px] tablet:pt-0">
+            <div className="relative h-full flex-1 overflow-y-scroll bg-white pt-11 dark:bg-black tablet:basis-[800px]" id="admin-x-settings-scroller">
                 <Settings />
             </div>
         </Page>
diff --git a/apps/admin-x-settings/src/admin-x-ds/assets/icons/thumbs-down.svg b/apps/admin-x-settings/src/admin-x-ds/assets/icons/thumbs-down.svg
deleted file mode 100644
index 9edad7f3329..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/assets/icons/thumbs-down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2 14.429h3.444a1.906 1.906 0 0 1 1.543.794l4.617 7.095a1.622 1.622 0 0 0 1.992.537 1.597 1.597 0 0 0 .894-1.87l-.833-3.142a1.867 1.867 0 0 1 .993-2.164 1.91 1.91 0 0 1 .833-.193h4.63a1.882 1.882 0 0 0 1.806-2.426v-.011l-1.8-6.008v-.016c-.733-2.36-1.992-3.97-4.469-3.97-5.934 0-5.595-.684-12.524 2.818-.377.188-.752.379-1.126.572V16.5"/>
-</svg>
\ No newline at end of file
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/Avatar.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Avatar.tsx
deleted file mode 100644
index 6d0a30befa9..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Avatar.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import {ReactComponent as UserIcon} from '../assets/icons/single-user-fill.svg';
-
-type AvatarSize = 'sm' | 'md' | 'lg' | 'xl';
-
-interface AvatarProps {
-    image?: string;
-    label?: string;
-
-    /**
-     * Accepts any valid Tailwindcolor e.g. `black`, `green`
-     */
-    labelColor?: string;
-
-    /**
-     * Accepts any valid CSS value e.g. #ffca03
-     */
-    bgColor?: string;
-    size?: AvatarSize;
-    className?: string;
-}
-
-const Avatar: React.FC<AvatarProps> = ({image, label, labelColor, bgColor, size, className}) => {
-    let avatarSize = '';
-    let fallbackPosition = ' -mb-2 ';
-
-    switch (size) {
-    case 'sm':
-        avatarSize = ' w-7 h-7 text-sm ';
-        break;
-    case 'lg':
-        avatarSize = ' w-12 h-12 text-xl ';
-        break;
-    case 'xl':
-        avatarSize = ' w-16 h-16 text-2xl ';
-        fallbackPosition = ' -mb-3 ';
-        break;
-    default:
-        avatarSize = ' w-10 h-10 text-md ';
-        break;
-    }
-
-    if (image) {
-        return (
-            <img alt="" className={`inline-flex shrink-0 items-center justify-center rounded-full object-cover font-semibold ${avatarSize} ${className && className}`} src={image}/>
-        );
-    } else if (label) {
-        return (
-            <div className={`${labelColor && `text-${labelColor}`} inline-flex items-center justify-center rounded-full p-2 font-semibold ${avatarSize} ${className && className}`} style={bgColor ? {backgroundColor: bgColor} : {}}>{label}</div>
-        );
-    } else {
-        return (
-            <div className={`inline-flex items-center justify-center overflow-hidden rounded-full bg-grey-100 p-1 font-semibold ${avatarSize} ${className && className}`}>
-                <UserIcon className={`${fallbackPosition} h-full w-full  text-grey-300`} />
-            </div>
-        );
-    }
-};
-
-export default Avatar;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.tsx b/apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.tsx
deleted file mode 100644
index 1c8e54cd5d8..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/ButtonGroup.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import Button from './Button';
-import React from 'react';
-
-import {ButtonProps} from './Button';
-
-interface ButtonGroupProps {
-    buttons: Array<ButtonProps>;
-    link?: boolean;
-    linkWithPadding?: boolean;
-    className?: string;
-}
-
-const ButtonGroup: React.FC<ButtonGroupProps> = ({buttons, link, linkWithPadding, className}) => {
-    return (
-        <div className={`flex items-center ${link ? 'gap-5' : 'gap-3'} ${className}`}>
-            {buttons.map(({key, ...props}) => (
-                <Button key={key} link={link} linkWithPadding={linkWithPadding} {...props} />
-            ))}
-        </div>
-    );
-};
-
-export default ButtonGroup;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Icon.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Icon.tsx
deleted file mode 100644
index 4a082527f9c..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Icon.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import clsx from 'clsx';
-
-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;
-
-interface IconProps {
-    name: string;
-
-    /**
-     * Accepts either predefined sizes or number, in which case the size means the pixel width & height
-     */
-    size?: IconSize;
-
-    /**
-     * Accepts all colors available in the actual TailwindCSS theme, e.g. `black`, `green-100`
-     */
-    colorClass?: string;
-    styles?: string;
-    className?: string;
-}
-
-/**
- * Icon guidelines:
- * - all icons must be SVG's
- * - all icons must have all it's children color value set `currentColor`
- * - all strokes must be paths and _NOT_ outlined objects. Stroke width should be set to 1.5px
- */
-const Icon: React.FC<IconProps> = ({name, size = 'md', colorClass = '', className = ''}) => {
-    const {ReactComponent: SvgComponent} = icons[`../assets/icons/${name}.svg`];
-
-    let styles = '';
-
-    if (!styles) {
-        switch (size) {
-        case 'xs':
-            styles = 'w-3 h-3';
-            break;
-        case 'sm':
-            styles = 'w-4 h-4';
-            break;
-        case 'lg':
-            styles = 'w-8 h-8';
-            break;
-        case 'xl':
-            styles = 'w-10 h-10';
-            break;
-
-        default:
-            styles = 'w-5 h-5';
-            break;
-        }
-    }
-
-    styles = clsx(
-        styles,
-        colorClass
-    );
-
-    if (SvgComponent) {
-        return (
-            <SvgComponent className={`${styles} ${className}`} />
-        );
-    }
-    return null;
-};
-
-export default Icon;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Popover.stories.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Popover.stories.tsx
deleted file mode 100644
index d6245ef9f0e..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Popover.stories.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import type {Meta, StoryObj} from '@storybook/react';
-
-// import BoilerPlate from './Boilerplate';
-import Button from './Button';
-import Popover from './Popover';
-
-const meta = {
-    title: 'Global / Popover',
-    component: Popover,
-    tags: ['autodocs'],
-    argTypes: {
-        trigger: {
-            control: {
-                type: 'text'
-            }
-        }
-    }
-} satisfies Meta<typeof Popover>;
-
-export default meta;
-type Story = StoryObj<typeof Popover>;
-
-export const Default: Story = {
-    args: {
-        trigger: (
-            <Button color='grey' label='Open popover' />
-        ),
-        children: (
-            <div className='p-5 text-sm' style={{maxWidth: '320px'}}>
-                This is a popover. You can put anything in it. The styling of the content defines how it will look at the end.
-            </div>
-        )
-    }
-};
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Popover.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Popover.tsx
deleted file mode 100644
index f84cb6dca13..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Popover.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, {useRef, useState} from 'react';
-import clsx from 'clsx';
-import {createPortal} from 'react-dom';
-
-export type PopoverPosition = 'left' | 'right';
-
-interface PopoverProps {
-    trigger: React.ReactNode;
-    children: React.ReactNode;
-    position?: PopoverPosition;
-    closeOnItemClick?: boolean;
-}
-
-const getOffsetPosition = (element: HTMLDivElement | null) => {
-    // innerZoomElementWrapper fixes weird behaviour in Storybook - the preview container
-    // uses transform which changes how position:fixed works and means getBoundingClientRect
-    // won't return the right position
-    return element?.closest('.innerZoomElementWrapper')?.getBoundingClientRect() || {x: 0, y: 0};
-};
-
-const Popover: React.FC<PopoverProps> = ({
-    trigger,
-    children,
-    position = 'left',
-    closeOnItemClick
-}) => {
-    const [open, setOpen] = useState(false);
-    const [positionX, setPositionX] = useState(0);
-    const [positionY, setPositionY] = useState(0);
-    const triggerRef = useRef<HTMLDivElement | null>(null);
-
-    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 finalX = (position === 'left') ? x : window.innerWidth - (x + width);
-            setOpen(true);
-            setPositionX(finalX);
-            setPositionY(y + height);
-        } else {
-            setOpen(false);
-        }
-    };
-
-    const style: React.CSSProperties = {
-        top: `${positionY}px`
-    };
-
-    if (position === 'left') {
-        style.left = `${positionX}px`;
-    } else {
-        style.right = `${positionX}px`;
-    }
-
-    const handleBackdropClick = (e: React.MouseEvent<HTMLDivElement>) => {
-        if (e.target === e.currentTarget) {
-            setOpen(false);
-        }
-    };
-
-    const handleContentClick = () => {
-        if (closeOnItemClick) {
-            setOpen(false);
-        }
-    };
-
-    let className = '';
-
-    className = clsx(
-        'fixed z-50 mt-2 origin-top-right rounded bg-white shadow-md ring-1 ring-[rgba(0,0,0,0.01)] focus:outline-none dark:bg-grey-900 dark:text-white',
-        className
-    );
-
-    const backdropClasses = clsx(
-        'fixed inset-0 z-40',
-        open ? 'block' : 'hidden'
-    );
-
-    return (
-        <>
-            <div ref={triggerRef} onClick={handleTriggerClick}>
-                {trigger}
-            </div>
-            {open && createPortal(<div className='fixed z-[9999] inline-block' onClick={handleContentClick}>
-                <div className={backdropClasses} data-testid="popover-overlay" onClick={handleBackdropClick}></div>
-                <div className={className} data-testid='popover-content' style={style}>
-                    {children}
-                </div>
-            </div>, triggerRef.current?.closest('.admin-x-settings') || document.body)}
-        </>
-    );
-};
-
-export default Popover;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Separator.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Separator.tsx
deleted file mode 100644
index 5df81e57e1e..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Separator.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-interface SeparatorProps {
-    className?: string;
-}
-
-const Separator: React.FC<SeparatorProps> = ({className}) => {
-    if (!className) {
-        className = 'border-grey-200 dark:border-grey-800';
-    }
-    return <hr className={className} />;
-};
-
-export default Separator;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/SortableList.tsx b/apps/admin-x-settings/src/admin-x-ds/global/SortableList.tsx
deleted file mode 100644
index a4a2b26eeda..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/SortableList.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import Heading from './Heading';
-import Hint from './Hint';
-import Icon from './Icon';
-import React, {HTMLProps, ReactNode, useState} from 'react';
-import Separator from './Separator';
-import clsx from 'clsx';
-import {CSS} from '@dnd-kit/utilities';
-import {DndContext, DragOverlay, DraggableAttributes, closestCenter} from '@dnd-kit/core';
-import {SortableContext, useSortable, verticalListSortingStrategy} from '@dnd-kit/sortable';
-
-export interface SortableItemContainerProps {
-    setRef?: (element: HTMLElement | null) => void;
-    isDragging: boolean;
-    dragHandleAttributes?: DraggableAttributes;
-    // TODO: figure out a stricter alternative for Function
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    dragHandleListeners?: Record<string, Function>;
-    dragHandleClass?: string;
-    style?: React.CSSProperties;
-    children: ReactNode;
-    separator?: boolean;
-}
-
-const DefaultContainer: React.FC<SortableItemContainerProps> = ({
-    setRef,
-    isDragging,
-    dragHandleAttributes,
-    dragHandleListeners,
-    dragHandleClass,
-    style,
-    separator,
-    children
-}) => (
-    <div
-        ref={setRef}
-        className={clsx(
-            'group flex w-full items-center gap-3 bg-white py-1 dark:bg-black',
-            separator && 'border-b border-grey-200',
-            isDragging && 'opacity-75'
-        )}
-        style={style}
-    >
-        <button
-            className={clsx(
-                'h-7 opacity-50 group-hover:opacity-100',
-                isDragging ? 'cursor-grabbing' : 'cursor-grab',
-                dragHandleClass
-            )}
-            type='button'
-            {...dragHandleAttributes}
-            {...dragHandleListeners}
-        >
-            <Icon colorClass='text-grey-500' name='hamburger' size='sm' />
-        </button>
-        {children}
-    </div>
-);
-
-const SortableItem: React.FC<{
-    id: string
-    children: ReactNode;
-    separator?: boolean;
-    dragHandleClass?: string;
-    container: (props: SortableItemContainerProps) => ReactNode;
-}> = ({id, children, separator, dragHandleClass, container}) => {
-    const {
-        attributes,
-        listeners,
-        setNodeRef,
-        transform,
-        transition
-    } = useSortable({id});
-
-    const style = {
-        transform: CSS.Transform.toString(transform),
-        transition
-    };
-
-    return container({
-        setRef: setNodeRef,
-        isDragging: false,
-        separator: separator,
-        dragHandleClass: dragHandleClass,
-        dragHandleAttributes: attributes,
-        dragHandleListeners: listeners,
-        style,
-        children
-    });
-};
-
-export interface SortableListProps<Item extends {id: string}> extends HTMLProps<HTMLDivElement> {
-    title?: string;
-    titleSeparator?: boolean;
-    hint?: React.ReactNode;
-    items: Item[];
-    itemSeparator?: boolean;
-    dragHandleClass?: string;
-    onMove: (id: string, overId: string) => void;
-    renderItem: (item: Item) => ReactNode;
-    container?: (props: SortableItemContainerProps) => ReactNode;
-}
-
-/**
- * Note: For lists which don't have an ID, you can use `useSortableIndexedList` to give items a consistent index-based ID.
- */
-const SortableList = <Item extends {id: string}>({
-    title,
-    titleSeparator,
-    hint,
-    items,
-    itemSeparator = true,
-    dragHandleClass,
-    onMove,
-    renderItem,
-    container = props => <DefaultContainer {...props} />,
-    ...props
-}: SortableListProps<Item>) => {
-    const [draggingId, setDraggingId] = useState<string | null>(null);
-
-    if (!items.length) {
-        return <></>;
-    }
-
-    return (
-        <div {...props}>
-            {title && <Heading level={6} separator={titleSeparator} grey>{title}</Heading>}
-            <div className={`${title && titleSeparator ? '-mt-2' : ''}`}>
-                <DndContext
-                    collisionDetection={closestCenter}
-                    onDragEnd={event => onMove(event.active.id as string, event.over?.id as string)}
-                    onDragStart={event => setDraggingId(event.active.id as string)}
-                >
-                    <SortableContext
-                        items={items}
-                        strategy={verticalListSortingStrategy}
-                    >
-                        {items.map(item => (
-                            <SortableItem key={item.id} container={container} dragHandleClass={dragHandleClass} id={item.id} separator={itemSeparator}>{renderItem(item)}</SortableItem>
-                        ))}
-                    </SortableContext>
-                    <DragOverlay>
-                        {draggingId ? container({
-                            isDragging: true,
-                            children: renderItem(items.find(({id}) => id === draggingId)!)
-                        }) : null}
-                    </DragOverlay>
-                </DndContext>
-            </div>
-            {hint &&
-            <>
-                {!itemSeparator && <Separator />}
-                <Hint>{hint}</Hint>
-            </>
-            }
-        </div>
-    );
-};
-
-export default SortableList;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TabView.tsx b/apps/admin-x-settings/src/admin-x-ds/global/TabView.tsx
deleted file mode 100644
index aa959ce572c..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/TabView.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import React from 'react';
-import clsx from 'clsx';
-
-export type Tab<ID = string> = {
-    id: ID;
-    title: string;
-    counter?: number | null;
-
-    /**
-     * Optional, so you can just use the tabs to other views
-    */
-    contents?: React.ReactNode;
-}
-
-interface TabViewProps<ID = string> {
-    tabs: readonly Tab<ID>[];
-    onTabChange: (id: ID) => void;
-    selectedTab?: ID;
-    border?: boolean;
-    width?: 'narrow' | 'normal' | 'wide';
-}
-
-function TabView<ID extends string = string>({
-    tabs,
-    onTabChange,
-    selectedTab,
-    border = true,
-    width = 'normal'
-}: TabViewProps<ID>) {
-    if (tabs.length !== 0 && selectedTab === undefined) {
-        selectedTab = tabs[0].id;
-    }
-
-    if (tabs.length === 0) {
-        return (<></>);
-    }
-
-    const handleTabChange = (e: React.MouseEvent<HTMLButtonElement>) => {
-        const newTab = e.currentTarget.id as ID;
-        onTabChange(newTab);
-    };
-
-    const containerClasses = clsx(
-        'no-scrollbar flex w-full overflow-x-auto',
-        width === 'narrow' && 'gap-3',
-        width === 'normal' && 'gap-5',
-        width === 'wide' && 'gap-7',
-        border && 'border-b border-grey-300 dark:border-grey-900'
-    );
-
-    return (
-        <section>
-            <div className={containerClasses} role='tablist'>
-                {tabs.map(tab => (
-                    <div>
-                        <button
-                            key={tab.id}
-                            aria-selected={selectedTab === tab.id}
-                            className={clsx(
-                                '-m-b-px cursor-pointer appearance-none whitespace-nowrap py-1 text-sm transition-all after:invisible after:block after:h-px after:overflow-hidden after:font-bold after:text-transparent after:content-[attr(title)] dark:text-white',
-                                border && 'border-b-[3px]',
-                                selectedTab === tab.id && border ? 'border-black dark:border-white' : 'border-transparent hover:border-grey-500',
-                                selectedTab === tab.id && 'font-bold'
-                            )}
-                            id={tab.id}
-                            role='tab'
-                            title={tab.title}
-                            type="button"
-                            onClick={handleTabChange}
-                        >
-                            {tab.title}
-                            {(typeof tab.counter === 'number') && <span className='ml-1.5 rounded-full bg-grey-200 px-1.5 py-[2px] text-xs font-normal text-grey-800 dark:bg-grey-900 dark:text-grey-300'>{tab.counter}</span>}
-                        </button>
-                    </div>
-                ))}
-            </div>
-            {tabs.map((tab) => {
-                return (
-                    <>
-                        {tab.contents &&
-                            <div key={tab.id} className={`${selectedTab === tab.id ? 'block' : 'hidden'}`} role='tabpanel'>
-                                <div>{tab.contents}</div>
-                            </div>
-                        }
-                    </>
-                );
-            })}
-        </section>
-    );
-};
-
-export default TabView;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Table.stories.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Table.stories.tsx
deleted file mode 100644
index bbadc5d21a0..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Table.stories.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import {ReactNode} from 'react';
-import type {Meta, StoryObj} from '@storybook/react';
-
-import * as TableRowStories from './TableRow.stories';
-import Table from './Table';
-import TableCell from './TableCell';
-import TableHead from './TableHead';
-import TableRow from './TableRow';
-
-const meta = {
-    title: 'Global / Table',
-    component: Table,
-    tags: ['autodocs']
-} satisfies Meta<typeof Table>;
-
-const {/*id,*/ ...tableRowProps} = TableRowStories.HiddenAction.args || {};
-
-const tableHeader = (
-    <>
-        <TableHead>Name</TableHead>
-        <TableHead>Email</TableHead>
-    </>
-);
-
-const tableRows = (
-    <>
-        <TableRow {...tableRowProps}>
-            <TableCell>Jamie Larson</TableCell>
-            <TableCell>jamie@example.com</TableCell>
-        </TableRow>
-        <TableRow {...tableRowProps}>
-            <TableCell>Jamie Larson</TableCell>
-            <TableCell>jamie@example.com</TableCell>
-        </TableRow>
-        <TableRow {...tableRowProps}>
-            <TableCell>Jamie Larson</TableCell>
-            <TableCell>jamie@example.com</TableCell>
-        </TableRow>
-        <TableRow {...tableRowProps}>
-            <TableCell>Jamie Larson</TableCell>
-            <TableCell>jamie@example.com</TableCell>
-        </TableRow>
-        <TableRow {...tableRowProps}>
-            <TableCell>Jamie Larson</TableCell>
-            <TableCell>jamie@example.com</TableCell>
-        </TableRow>
-    </>
-);
-
-export default meta;
-type Story = StoryObj<typeof Table>;
-
-export const Default: Story = {
-    args: {
-        children: tableRows
-    },
-    decorators: [(_story: () => ReactNode) => (<div style={{maxWidth: '600px'}}>{_story()}</div>)]
-};
-
-export const WithHeader: Story = {
-    args: {
-        header: tableHeader,
-        children: tableRows
-    }
-};
-
-export const WithPageTitle: Story = {
-    args: {
-        pageTitle: 'This is a page title',
-        children: tableRows
-    }
-};
-
-export const WithRowAction: Story = {
-    args: {
-        header: tableHeader,
-        children: tableRows
-    }
-};
-
-export const WithHint: Story = {
-    args: {
-        header: tableHeader,
-        children: tableRows,
-        hint: 'This is a hint',
-        hintSeparator: true
-    }
-};
-
-export const Loading: Story = {
-    args: {
-        header: tableHeader,
-        children: tableRows,
-        isLoading: true,
-        hint: 'This is a hint',
-        hintSeparator: true
-    }
-};
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Table.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Table.tsx
deleted file mode 100644
index 68db36fa239..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Table.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import Heading from './Heading';
-import Hint from './Hint';
-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 {
-    /**
-     * If the table is the primary content on a page (e.g. Members table) then you can set a pagetitle to be consistent
-     */
-    pageTitle?: string;
-    header?: React.ReactNode;
-    children?: React.ReactNode;
-    borderTop?: boolean;
-    hint?: React.ReactNode;
-    hintSeparator?: boolean;
-    className?: string;
-    isLoading?: boolean;
-    pagination?: PaginationData;
-    showMore?: ShowMoreData;
-}
-
-const OptionalPagination = ({pagination}: {pagination?: PaginationData}) => {
-    if (!pagination) {
-        return null;
-    }
-
-    return <Pagination {...pagination}/>;
-};
-
-const OptionalShowMore = ({showMore}: {showMore?: ShowMoreData}) => {
-    if (!showMore) {
-        return null;
-    } else if (!showMore.hasMore) {
-        return <div></div>;
-    }
-
-    return (
-        <div className={`mt-1 flex items-center gap-2 text-sm font-bold text-green hover:text-green-400`}>
-            <button type='button' onClick={showMore.loadMore}>Show all</button>
-        </div>
-    );
-};
-
-const Table: React.FC<TableProps> = ({header, children, borderTop, hint, hintSeparator, pageTitle, className, pagination, showMore, isLoading}) => {
-    const tableClasses = clsx(
-        (borderTop || pageTitle) && 'border-t border-grey-300',
-        'w-full overflow-x-auto',
-        pageTitle ? 'mb-0 mt-14' : 'my-0',
-        className
-    );
-
-    const table = React.useRef<HTMLTableSectionElement>(null);
-    const maxTableHeight = React.useRef(0);
-    const [tableHeight, setTableHeight] = React.useState<number | undefined>(undefined);
-
-    const multiplePages = pagination && pagination.pages && pagination.pages > 1;
-
-    // Observe the height of the table content. This is used to:
-    // 1) avoid layout jumps when loading a new page of the table
-    // 2) keep the same table height between pages, cf. https://github.com/TryGhost/Product/issues/3881
-    React.useEffect(() => {
-        if (table.current) {
-            const resizeObserver = new ResizeObserver((entries) => {
-                const height = entries[0].target.clientHeight;
-                setTableHeight(height);
-
-                if (height > maxTableHeight.current) {
-                    maxTableHeight.current = height;
-                }
-            });
-
-            resizeObserver.observe(table.current);
-
-            return () => {
-                resizeObserver.disconnect();
-            };
-        }
-    }, [isLoading, pagination]);
-
-    const loadingStyle = React.useMemo(() => {
-        if (tableHeight === undefined) {
-            return {
-                height: 'auto'
-            };
-        }
-
-        return {
-            height: maxTableHeight.current
-        };
-    }, [tableHeight]);
-
-    const spaceHeightStyle = React.useMemo(() => {
-        if (tableHeight === undefined) {
-            return {
-                height: 0
-            };
-        }
-
-        return {
-            height: maxTableHeight.current - tableHeight
-        };
-    }, [tableHeight]);
-
-    return (
-        <>
-            <div className='w-full'>
-                {pageTitle && <Heading>{pageTitle}</Heading>}
-
-                <table className={tableClasses}>
-                    {header && <thead className='border-b border-grey-200 dark:border-grey-600'>
-                        <TableRow bgOnHover={false} separator={false}>{header}</TableRow>
-                    </thead>}
-                    {!isLoading && <tbody ref={table}>
-                        {children}
-                    </tbody>}
-
-                    {multiplePages && <div style={spaceHeightStyle} />}
-                </table>
-
-                {isLoading && <LoadingIndicator delay={200} size='lg' style={loadingStyle} />}
-
-                {(hint || pagination || showMore) &&
-                <div className="-mt-px">
-                    {(hintSeparator || pagination) && <Separator />}
-                    <div className="mt-1 flex flex-col-reverse items-start justify-between gap-1 pt-2 md:flex-row md:items-center md:gap-0 md:pt-0">
-                        <OptionalShowMore showMore={showMore} />
-                        <Hint>{hint ?? ' '}</Hint>
-                        <OptionalPagination pagination={pagination} />
-                    </div>
-                </div>}
-            </div>
-        </>
-    );
-};
-
-export default Table;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TableCell.tsx b/apps/admin-x-settings/src/admin-x-ds/global/TableCell.tsx
deleted file mode 100644
index 0e284261ba4..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/TableCell.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React, {HTMLProps} from 'react';
-import clsx from 'clsx';
-
-interface TableCellProps extends HTMLProps<HTMLTableCellElement> {
-    padding?: boolean;
-}
-
-const TableCell: React.FC<TableCellProps> = ({className, children, padding = true, ...props}) => {
-    const tableCellClasses = clsx(
-        padding ? '!py-3 !pl-0 !pr-6' : '',
-        'align-top',
-        props.onClick && 'hover:cursor-pointer',
-        className
-    );
-
-    return (
-        <td className={tableCellClasses} {...props}>
-            {children}
-        </td>
-    );
-};
-
-export default TableCell;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TableHead.tsx b/apps/admin-x-settings/src/admin-x-ds/global/TableHead.tsx
deleted file mode 100644
index 78a6c0e0924..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/TableHead.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import Heading from './Heading';
-import React, {HTMLProps} from 'react';
-import clsx from 'clsx';
-
-const TableHead: React.FC<HTMLProps<HTMLTableCellElement>> = ({className, children, colSpan, ...props}) => {
-    const tableCellClasses = clsx(
-        '!py-2 !pl-0 !pr-6 text-left align-top',
-        props.onClick && 'hover:cursor-pointer',
-        className
-    );
-
-    return (
-        <th className={tableCellClasses} colSpan={colSpan} {...props}>
-            <Heading className='whitespace-nowrap' level={6}>{children}</Heading>
-        </th>
-    );
-};
-
-export default TableHead;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/TableRow.tsx b/apps/admin-x-settings/src/admin-x-ds/global/TableRow.tsx
deleted file mode 100644
index bf7567ea647..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/TableRow.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import clsx from 'clsx';
-
-interface TableRowProps {
-    id?: string;
-    action?: React.ReactNode;
-    hideActions?: boolean;
-    className?: string;
-    testId?: string;
-
-    /**
-     * Hidden for the last item in the table
-     */
-    separator?: boolean;
-
-    bgOnHover?: boolean;
-    onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
-    children?: React.ReactNode;
-}
-
-const TableRow: React.FC<TableRowProps> = ({id, action, hideActions, className, testId, separator, bgOnHover = true, onClick, children}) => {
-    const handleClick = (e: React.MouseEvent<HTMLDivElement>) => {
-        onClick?.(e);
-    };
-
-    separator = (separator === undefined) ? true : separator;
-    const tableRowClasses = clsx(
-        'group/table-row',
-        bgOnHover && 'hover:bg-gradient-to-r hover:from-white hover:to-grey-50 dark:hover:from-black dark:hover:to-grey-950',
-        onClick && 'cursor-pointer',
-        separator ? 'border-b border-grey-100 last-of-type:border-b-transparent hover:border-grey-200 dark:border-grey-950 dark:hover:border-grey-900' : 'border-y border-none first-of-type:hover:border-t-transparent',
-        className
-    );
-
-    return (
-        <tr className={tableRowClasses} data-testid={testId} id={id} onClick={handleClick}>
-            {children}
-            {action &&
-                <td className={`w-[1%] whitespace-nowrap p-0 hover:cursor-pointer`}>
-                    <div className={`visible flex items-center justify-end py-3 pr-6 ${hideActions ? 'group-hover/table-row:visible md:invisible' : ''}`}>
-                        {action}
-                    </div>
-                </td>
-            }
-        </tr>
-    );
-};
-
-export default TableRow;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Toast.stories.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Toast.stories.tsx
deleted file mode 100644
index f806ef499cd..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Toast.stories.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import {ReactNode} from 'react';
-import type {Meta, StoryObj} from '@storybook/react';
-
-import ToastContainer from './ToastContainer';
-import {Toaster} from 'react-hot-toast';
-
-const meta = {
-    title: 'Global / Toast',
-    component: ToastContainer,
-    tags: ['autodocs'],
-    decorators: [(_story: () => ReactNode) => (
-        <>
-            <Toaster />
-            {_story()}
-        </>
-    )]
-} satisfies Meta<typeof ToastContainer>;
-
-export default meta;
-type Story = StoryObj<typeof ToastContainer>;
-
-export const Default: Story = {
-    args: {
-        message: 'Hello notification in a toast'
-    }
-};
-
-export const Success: Story = {
-    args: {
-        message: 'Hello success message in a toast',
-        type: 'success'
-    }
-};
-
-export const Error: Story = {
-    args: {
-        message: 'Hello error message in a toast',
-        type: 'error'
-    }
-};
-
-export const PageError: Story = {
-    args: {
-        message: 'This is a page error which should not be automatically dismissed.',
-        type: 'pageError'
-    }
-};
-
-export const Icon: Story = {
-    args: {
-        message: 'Custom icon in a toast',
-        icon: 'user-add'
-    }
-};
-
-export const Custom: Story = {
-    args: {
-        message: (
-            <div>
-                And here is one with a longer notification and a <a className='underline' href="https://ghost.org" rel="noreferrer" target="_blank">link</a>, custom <strong>formatting</strong>, icon and duration.
-            </div>
-        ),
-        icon: (
-            <>
-                👋
-            </>
-        ),
-        options: {
-            duration: 10000
-        }
-    }
-};
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/Toast.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Toast.tsx
deleted file mode 100644
index 0287abba596..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Toast.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import Icon from './Icon';
-import React from 'react';
-import clsx from 'clsx';
-import {Toast as HotToast, ToastOptions, toast} from 'react-hot-toast';
-
-export type ToastType = 'neutral' | 'success' | 'error' | 'pageError';
-
-export interface ShowToastProps {
-    message?: React.ReactNode;
-    type?: ToastType;
-    icon?: React.ReactNode | string;
-    options?: ToastOptions
-}
-
-interface ToastProps {
-    t: HotToast;
-
-    /**
-     * Can be a name of an icon from the icon library or a react component
-     */
-    children?: React.ReactNode;
-    props?: ShowToastProps;
-}
-
-const Toast: React.FC<ToastProps> = ({
-    t,
-    children,
-    props
-}) => {
-    switch (props?.type) {
-    case 'success':
-        props.icon = props.icon || 'check-circle';
-        break;
-    case 'error':
-        props.icon = props.icon || 'warning';
-        break;
-    }
-
-    const classNames = clsx(
-        'z-[90] flex items-start justify-between gap-6 rounded px-4 py-3 text-sm font-medium text-white',
-        (props?.type === 'success' || props?.type === 'neutral') && 'w-[300px] bg-black dark:bg-grey-950',
-        props?.type === 'error' && 'w-[300px] bg-red',
-        props?.options?.position === 'top-center' && 'w-full max-w-[520px] bg-red',
-        t.visible ? (props?.options?.position === 'top-center' ? 'animate-toaster-top-in' : 'animate-toaster-in') : 'animate-toaster-out'
-    );
-
-    return (
-        <div className={classNames} data-testid={`toast-${props?.type}`}>
-            <div className='flex items-start gap-3'>
-                {props?.icon && (typeof props.icon === 'string' ?
-                    <div className='mt-0.5'><Icon className='grow' colorClass={props.type === 'success' ? 'text-green' : 'text-white'} name={props.icon} size='sm' /></div> : props.icon)}
-                {children}
-            </div>
-            <button className='cursor-pointer' type='button' onClick={() => {
-                toast.dismiss(t.id);
-            }}>
-                <div className='mt-1'>
-                    <Icon colorClass='text-white' name='close' size='xs' />
-                </div>
-            </button>
-        </div>
-    );
-};
-
-export default Toast;
-
-export const showToast = ({
-    message,
-    type = 'neutral',
-    icon = '',
-    options = {
-        position: 'bottom-left',
-        duration: 5000
-    }
-}: ShowToastProps): void => {
-    if (!options.position) {
-        options.position = 'bottom-left';
-    }
-
-    if (type === 'pageError') {
-        type = 'error';
-        options.position = 'top-center';
-        options.duration = Infinity;
-    }
-
-    toast.custom(t => (
-        <Toast props={{
-            type: type,
-            icon: icon,
-            options: options
-        }} t={t}>
-            {message}
-        </Toast>
-    ),
-    {
-        ...options
-    }
-    );
-};
-
-export const dismissAllToasts = (): void => {
-    toast.dismiss();
-};
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/Tooltip.tsx b/apps/admin-x-settings/src/admin-x-ds/global/Tooltip.tsx
deleted file mode 100644
index 0f5a1d1a699..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/Tooltip.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import clsx from 'clsx';
-
-interface TooltipProps {
-    content?: React.ReactNode;
-    size?: 'sm' | 'md';
-    children?: React.ReactNode;
-    containerClassName?: string;
-    tooltipClassName?: string;
-    origin?: 'right' | 'center' | 'left'
-}
-
-const Tooltip: React.FC<TooltipProps> = ({content, size = 'sm', children, containerClassName, tooltipClassName, origin = 'center'}) => {
-    containerClassName = clsx(
-        'group/tooltip relative',
-        containerClassName
-    );
-
-    tooltipClassName = clsx(
-        'absolute -mt-1 -translate-y-full whitespace-nowrap rounded-sm bg-black px-2 py-0.5 leading-normal text-white opacity-0 transition-all group-hover/tooltip:opacity-100 dark:bg-grey-950',
-        size === 'sm' && 'text-xs',
-        size === 'md' && 'text-sm',
-        origin === 'center' && 'left-1/2 -translate-x-1/2',
-        origin === 'left' && 'left-0',
-        origin === 'right' && 'right-0'
-    );
-
-    return (
-        <span className={containerClassName}>
-            {children}
-            <span className={tooltipClassName}>{content}</span>
-        </span>
-    );
-};
-
-export default Tooltip;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Checkbox.tsx b/apps/admin-x-settings/src/admin-x-ds/global/form/Checkbox.tsx
deleted file mode 100644
index d1b52757a28..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/Checkbox.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import Heading from '../Heading';
-import Hint from '../Hint';
-import React, {useEffect, useId, useState} from 'react';
-import Separator from '../Separator';
-
-export interface CheckboxProps {
-    title?: string;
-    label: string;
-    value: string;
-    onChange: (checked: boolean) => void;
-    disabled?: boolean;
-    error?: boolean;
-    hint?: React.ReactNode;
-    key?: string;
-    checked?: boolean;
-    separator?: boolean;
-}
-
-const Checkbox: React.FC<CheckboxProps> = ({title, label, value, onChange, disabled, error, hint, checked, separator}) => {
-    const id = useId();
-    const [isChecked, setIsChecked] = useState(checked);
-
-    useEffect(() => {
-        setIsChecked(checked);
-    }, [checked]);
-
-    const handleOnChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-        const checkedValue = event.target.checked;
-        setIsChecked(checkedValue);
-        onChange(checkedValue);
-    };
-
-    return (
-        <div>
-            <div className={`flex flex-col gap-1 ${separator && 'pb-2'}`}>
-                {title && <Heading grey={true} level={6}>{title}</Heading>}
-                <label className={`flex cursor-pointer items-start ${title && '-mb-1 mt-1'}`} htmlFor={id}>
-                    <input
-                        checked={isChecked}
-                        className="relative float-left mt-[3px] h-4 w-4 appearance-none border-2 border-solid border-grey-200 bg-grey-200 outline-none checked:border-black checked:bg-black checked:after:absolute checked:after:-mt-px checked:after:ml-[3px] checked:after:block checked:after:h-[11px] checked:after:w-[6px] checked:after:rotate-45 checked:after:border-[2px] checked:after:border-l-0 checked:after:border-t-0 checked:after:border-solid checked:after:border-white checked:after:bg-transparent checked:after:content-[''] hover:cursor-pointer focus:shadow-none focus:transition-[border-color_0.2s] dark:border-grey-800 dark:bg-grey-800 dark:checked:border-green dark:checked:bg-green"
-                        disabled={disabled}
-                        id={id}
-                        type='checkbox'
-                        value={value}
-                        onChange={handleOnChange}
-                    />
-                    <div className={`ml-2 flex flex-col ${hint && 'mb-2'}`}>
-                        <span className={`inline-block text-[1.425rem] dark:text-white ${hint && '-mb-1'}`}>{label}</span>
-                        {hint && <Hint color={error ? 'red' : ''}>{hint}</Hint>}
-                    </div>
-                </label>
-            </div>
-            {(separator || error) && <Separator className={error ? 'border-red' : ''} />}
-        </div>
-    );
-};
-
-export default Checkbox;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Radio.tsx b/apps/admin-x-settings/src/admin-x-ds/global/form/Radio.tsx
deleted file mode 100644
index f260919e030..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/Radio.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import Heading from '../Heading';
-import Hint from '../Hint';
-import React from 'react';
-import Separator from '../Separator';
-
-export interface RadioOption {
-    value: string;
-    label: string;
-    hint?: React.ReactNode;
-}
-
-interface RadioProps {
-    id: string;
-    title?: string;
-    selectedOption?: string;
-    options: RadioOption[];
-    onSelect: (value: string) => void;
-    error?:boolean;
-    hint?: React.ReactNode;
-    separator?: boolean;
-}
-
-const Radio: React.FC<RadioProps> = ({id, title, options, onSelect, error, hint, selectedOption, separator}) => {
-    const handleOptionChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-        onSelect(event.target.value);
-    };
-
-    return (
-        <div>
-            <div className={`flex flex-col gap-2 ${separator && 'pb-2'}`}>
-                {title && <Heading level={6}>{title}</Heading>}
-                {options.map(option => (
-                    <label key={option.value} className={`flex cursor-pointer items-start ${title && '-mb-1 mt-1'}`} htmlFor={option.value}>
-                        <input
-                            checked={selectedOption === option.value}
-                            className="relative float-left mt-[3px] h-4 w-4 min-w-[16px] appearance-none rounded-full border-2 border-solid border-grey-300 after:absolute after:z-[1] after:block after:h-3 after:w-3 after:rounded-full after:content-[''] checked:border-green checked:after:absolute checked:after:left-1/2 checked:after:top-1/2 checked:after:h-[0.625rem] checked:after:w-[0.625rem] checked:after:rounded-full checked:after:border-green checked:after:bg-green checked:after:content-[''] checked:after:[transform:translate(-50%,-50%)] hover:cursor-pointer focus:shadow-none focus:outline-none focus:ring-0 checked:focus:border-green dark:border-grey-800 dark:text-white dark:checked:border-green dark:checked:after:border-green dark:checked:after:bg-green dark:checked:focus:border-green"
-                            id={option.value}
-                            name={id}
-                            type='radio'
-                            value={option.value}
-                            onChange={handleOptionChange}
-                        />
-                        <div className={`ml-2 flex flex-col ${option.hint && 'mb-2'}`}>
-                            <span className={`inline-block text-md dark:text-white ${option.hint && '-mb-1'}`}>{option.label}</span>
-                            {option.hint && <Hint>{option.hint}</Hint>}
-                        </div>
-                    </label>
-                ))}
-                {hint && <Hint color={error ? 'red' : ''}>{hint}</Hint>}
-            </div>
-            {(separator || error) && <Separator className={error ? 'border-red' : ''} />}
-        </div>
-    );
-};
-
-export default Radio;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.tsx b/apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.tsx
deleted file mode 100644
index 8025b0d22a1..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/TextArea.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, {FocusEventHandler, HTMLProps, useId} from 'react';
-
-import Heading from '../Heading';
-import Hint from '../Hint';
-import clsx from 'clsx';
-import {useFocusContext} from '../../providers/DesignSystemProvider';
-
-type ResizeOptions = 'both' | 'vertical' | 'horizontal' | 'none';
-type FontStyles = 'sans' | 'mono';
-
-interface TextAreaProps extends HTMLProps<HTMLTextAreaElement> {
-    inputRef?: React.RefObject<HTMLTextAreaElement>;
-    title?: string;
-    value?: string;
-    rows?: number;
-    maxLength?: number;
-    resize?: ResizeOptions;
-    error?: boolean;
-    placeholder?: string;
-    hint?: React.ReactNode;
-    clearBg?: boolean;
-    fontStyle?: FontStyles;
-    className?: string;
-    onChange?: (event: React.ChangeEvent<HTMLTextAreaElement>) => void;
-}
-
-const TextArea: React.FC<TextAreaProps> = ({
-    inputRef,
-    title,
-    value,
-    rows = 3,
-    maxLength,
-    resize = 'none',
-    error,
-    placeholder,
-    hint,
-    fontStyle = 'sans',
-    className,
-    onChange,
-    onFocus,
-    onBlur,
-    ...props
-}) => {
-    const id = useId();
-    const {setFocusState} = useFocusContext();
-
-    const handleFocus: FocusEventHandler<HTMLTextAreaElement> = (e) => {
-        setFocusState(true);
-        onFocus?.(e);
-    };
-
-    const handleBlur: FocusEventHandler<HTMLTextAreaElement> = (e) => {
-        setFocusState(false);
-        onBlur?.(e);
-    };
-
-    let styles = clsx(
-        'order-2 rounded-md border bg-grey-150 px-3 py-2 transition-all dark:bg-grey-900 dark:text-white',
-        error ? 'border-red bg-white' : 'border-transparent placeholder:text-grey-500 hover:bg-grey-100 focus:border-green focus:bg-white focus:shadow-[0_0_0_1px_rgba(48,207,67,1)] dark:placeholder:text-grey-800 dark:hover:bg-grey-925 dark:focus:bg-grey-925',
-        title && 'mt-1.5',
-        fontStyle === 'mono' && 'font-mono text-sm',
-        className
-    );
-
-    switch (resize) {
-    case 'both':
-        styles += ' resize ';
-        break;
-    case 'vertical':
-        styles += ' resize-y ';
-        break;
-    case 'horizontal':
-        styles += ' resize-x ';
-        break;
-    case 'none':
-        styles += ' resize-none ';
-        break;
-    default:
-        styles += ' resize ';
-        break;
-    }
-
-    return (
-        <div className='flex flex-col'>
-            <textarea
-                ref={inputRef}
-                className={styles}
-                id={id}
-                maxLength={maxLength}
-                placeholder={placeholder}
-                rows={rows}
-                value={value}
-                onBlur={handleBlur}
-                onChange={onChange}
-                onFocus={handleFocus}
-                {...props}>
-            </textarea>
-            {title && <Heading className={'order-1 dark:!text-grey-300'} grey={false} htmlFor={id} useLabelTag={true}>{title}</Heading>}
-            {hint && <Hint className='order-3' color={error ? 'red' : ''}>{hint}</Hint>}
-            {maxLength && <Hint>Max length is {maxLength}</Hint>}
-        </div>
-    );
-};
-
-export default TextArea;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/TextField.tsx b/apps/admin-x-settings/src/admin-x-ds/global/form/TextField.tsx
deleted file mode 100644
index ee8d6f30e56..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/TextField.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import Heading from '../Heading';
-import Hint from '../Hint';
-import React, {FocusEventHandler, useId} from 'react';
-import clsx from 'clsx';
-import {useFocusContext} from '../../providers/DesignSystemProvider';
-
-export type TextFieldProps = React.InputHTMLAttributes<HTMLInputElement> & {
-    inputRef?: React.RefObject<HTMLInputElement>;
-    title?: string;
-    titleColor?: 'auto' | 'black' | 'grey';
-    hideTitle?: boolean;
-    type?: React.InputHTMLAttributes<HTMLInputElement>['type'];
-    value?: string;
-    error?: boolean;
-    placeholder?: string;
-    rightPlaceholder?: React.ReactNode;
-    hint?: React.ReactNode;
-    clearBg?: boolean;
-    onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-    onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
-    className?: string;
-    maxLength?: number;
-    containerClassName?: string;
-    hintClassName?: string;
-    unstyled?: boolean;
-    disabled?: boolean;
-    border?: boolean;
-    autoFocus?: boolean;
-}
-
-const TextField: React.FC<TextFieldProps> = ({
-    type = 'text',
-    inputRef,
-    title,
-    hideTitle,
-    value,
-    error,
-    placeholder,
-    rightPlaceholder,
-    hint,
-    onChange,
-    onFocus,
-    onBlur,
-    clearBg = false,
-    className = '',
-    maxLength,
-    containerClassName = '',
-    hintClassName = '',
-    unstyled = false,
-    disabled,
-    ...props
-}) => {
-    const id = useId();
-    const {setFocusState} = useFocusContext();
-
-    const handleFocus: FocusEventHandler<HTMLInputElement> = (e) => {
-        onFocus?.(e);
-        setFocusState(true);
-    };
-
-    const handleBlur: FocusEventHandler<HTMLInputElement> = (e) => {
-        onBlur?.(e);
-        setFocusState(false);
-    };
-
-    const fieldContainerClasses = clsx(
-        'relative order-2 flex w-full items-center',
-        (title && !hideTitle) && `mt-1.5`
-    );
-
-    const bgClasses = 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'
-    );
-
-    const textFieldClasses = !unstyled && clsx(
-        'peer z-[1] order-2 h-8 w-full bg-transparent px-3 py-1 text-sm placeholder:text-grey-500 dark:placeholder:text-grey-700 md:h-9 md:py-2 md:text-md',
-        disabled ? 'cursor-not-allowed text-grey-700 opacity-60 dark:text-grey-700' : 'dark:text-white',
-        rightPlaceholder ? 'w-0 grow rounded-l-md' : 'rounded-md',
-        className
-    );
-
-    const rightPlaceholderClasses = !unstyled && clsx(
-        'z-[1] order-3 rounded-r-lg',
-        (rightPlaceholder ?
-            ((typeof (rightPlaceholder) === 'string') ? 'flex h-8 items-center py-1 pr-3 text-right text-sm text-grey-500 md:h-9 md:text-base' : 'h-9 pr-1')
-            : 'pr-2')
-    );
-
-    let field = <></>;
-
-    const inputField = <input
-        ref={inputRef}
-        className={textFieldClasses || className}
-        disabled={disabled}
-        id={id}
-        maxLength={maxLength}
-        placeholder={placeholder}
-        type={type}
-        value={value}
-        onBlur={handleBlur}
-        onChange={onChange}
-        onFocus={handleFocus}
-        {...props} />;
-
-    field = (
-        <div className={fieldContainerClasses}>
-            {inputField}
-            {!clearBg && <div className={bgClasses}></div>}
-            {rightPlaceholder && <span className={rightPlaceholderClasses || ''}>{rightPlaceholder}</span>}
-        </div>
-    );
-
-    hintClassName = clsx(
-        'order-3',
-        hintClassName
-    );
-
-    containerClassName = clsx(
-        'flex flex-col',
-        containerClassName
-    );
-
-    if (title || hint) {
-        return (
-            <div className={containerClassName}>
-                {field}
-                {title && <Heading className={hideTitle ? 'sr-only' : 'order-1 peer-focus:!text-black dark:!text-grey-300 dark:peer-focus:!text-white'} htmlFor={id} useLabelTag={true}>{title}</Heading>}
-                {hint && <Hint className={hintClassName} color={error ? 'red' : 'default'}>{hint}</Hint>}
-            </div>
-        );
-    } else {
-        return (field);
-    }
-};
-
-export default TextField;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.tsx b/apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.tsx
deleted file mode 100644
index 9ed8f6b1591..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/form/Toggle.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, {useId} from 'react';
-import Separator from '../Separator';
-import clsx from 'clsx';
-import {Heading6StylesGrey} from '../Heading';
-
-type ToggleSizes = 'sm' | 'md' | 'lg';
-export type ToggleDirections = 'ltr' | 'rtl';
-
-interface ToggleProps {
-    checked?: boolean;
-    disabled?: boolean;
-    error?: boolean;
-    size?: ToggleSizes;
-    label?: React.ReactNode;
-    labelStyle?: 'heading' | 'value';
-    labelClasses?: string;
-    toggleBg?: 'green' | 'black' | 'stripetest';
-    separator?: boolean;
-    direction?: ToggleDirections;
-    hint?: React.ReactNode;
-    onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-}
-
-const Toggle: React.FC<ToggleProps> = ({
-    size,
-    direction,
-    label,
-    labelStyle = 'value',
-    labelClasses,
-    toggleBg = 'black',
-    hint,
-    separator,
-    error,
-    checked,
-    disabled,
-    onChange
-}) => {
-    const id = useId();
-
-    let sizeStyles = '';
-    let labelStyles = '';
-    switch (size) {
-    case 'sm':
-        sizeStyles = ' h-3 w-5 after:h-2 after:w-2 checked:after:ml-[1.0rem]';
-        labelStyles = 'mt-[-5.5px]';
-        break;
-
-    case 'lg':
-        sizeStyles = ' h-5 w-8 after:h-4 after:w-4 checked:after:ml-[1.4rem]';
-        labelStyles = 'mt-[-1px]';
-        break;
-
-    default:
-        sizeStyles = ' min-w-[28px] h-4 w-7 after:h-3 after:w-3 checked:after:ml-[1.4rem]';
-        labelStyles = 'mt-[-3px]';
-        break;
-    }
-
-    labelStyles = clsx(
-        labelClasses,
-        labelStyles
-    );
-
-    if (labelStyle === 'heading') {
-        direction = 'rtl';
-    }
-
-    let toggleBgClass;
-    switch (toggleBg) {
-    case 'stripetest':
-        toggleBgClass = 'checked:bg-[#EC6803] dark:checked:bg-[#EC6803]';
-        break;
-
-    case 'green':
-        toggleBgClass = 'checked:bg-green';
-        break;
-
-    default:
-        toggleBgClass = 'checked:bg-black dark:checked:bg-green';
-        break;
-    }
-
-    return (
-        <div>
-            <div className={`group flex items-start gap-2 dark:text-white ${direction === 'rtl' && 'justify-between'} ${separator && 'pb-2'}`}>
-                <input checked={checked}
-                    className={clsx(
-                        toggleBgClass,
-                        'appearance-none rounded-full bg-grey-300 transition dark:bg-grey-800',
-                        `after:absolute after:ml-0.5 after:mt-0.5 after:rounded-full after:border-none after:bg-white after:transition-[background-color_0.2s,transform_0.2s] after:content-['']`,
-                        `checked:after:absolute checked:after:rounded-full checked:after:border-none checked:after:bg-white checked:after:transition-[background-color_0.2s,transform_0.2s] checked:after:content-['']`,
-                        'enabled:hover:cursor-pointer disabled:opacity-40 enabled:group-hover:opacity-80',
-                        sizeStyles,
-                        direction === 'rtl' && ' order-2'
-                    )}
-                    disabled={disabled}
-                    id={id}
-                    role="switch"
-                    type="checkbox"
-                    onChange={onChange} />
-                {label &&
-                    <label className={`flex grow flex-col hover:cursor-pointer ${direction === 'rtl' && 'order-1'} ${labelStyles}`} htmlFor={id}>
-                        {
-                            labelStyle === 'heading' ?
-                                <span className={`${Heading6StylesGrey} mt-1`}>{label}</span>
-                                :
-                                <span>{label}</span>
-                        }
-                        {hint && <span className={`text-xs ${error ? 'text-red' : 'text-grey-700 dark:text-grey-600'}`}>{hint}</span>}
-                    </label>
-                }
-            </div>
-            {(separator || error) && <Separator className={error ? 'border-red' : ''} />}
-        </div>
-    );
-};
-
-export default Toggle;
diff --git a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.stories.tsx b/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.stories.tsx
deleted file mode 100644
index 3355112e857..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/global/modal/ConfirmationModal.stories.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import {ReactNode} from 'react';
-import type {Meta, StoryContext, StoryObj} from '@storybook/react';
-
-import ConfirmationModal from './ConfirmationModal';
-import ConfirmationModalContainer from './ConfirmationModalContainer';
-import NiceModal from '@ebay/nice-modal-react';
-
-const meta = {
-    title: 'Global / Modal / Confirmation Modal',
-    component: ConfirmationModal,
-    tags: ['autodocs'],
-    decorators: [(_story: () => ReactNode, context: StoryContext) => (
-        <NiceModal.Provider>
-            <ConfirmationModalContainer {...context.args} />
-        </NiceModal.Provider>
-    )]
-} satisfies Meta<typeof ConfirmationModal>;
-
-export default meta;
-type Story = StoryObj<typeof ConfirmationModal>;
-
-export const Default: Story = {
-    args: {
-        title: 'Are you sure?',
-        prompt: 'Watch out, you\'re doing something super-super dangerous. Don\'t press the red button (you know you will).'
-    }
-};
-
-export const CustomButtons: Story = {
-    args: {
-        ...Default.args,
-        title: 'You want to delete?',
-        cancelLabel: 'Meh',
-        okLabel: 'Alrite',
-        okColor: 'red'
-    }
-};
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/admin-x-ds/providers/DesignSystemProvider.tsx b/apps/admin-x-settings/src/admin-x-ds/providers/DesignSystemProvider.tsx
deleted file mode 100644
index 9f095408f0c..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/providers/DesignSystemProvider.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-// FocusContext.tsx
-import React, {createContext, useContext, useState} from 'react';
-
-interface DesignSystemContextType {
-    isAnyTextFieldFocused: boolean;
-    setFocusState: (value: boolean) => void;
-}
-
-const DesignSystemContext = createContext<DesignSystemContextType | undefined>(undefined);
-
-export const useFocusContext = () => {
-    const context = useContext(DesignSystemContext);
-    if (!context) {
-        throw new Error('useFocusContext must be used within a FocusProvider');
-    }
-    return context;
-};
-
-interface DesignSystemProviderProps {
-    children: React.ReactNode;
-}
-
-const DesignSystemProvider: React.FC<DesignSystemProviderProps> = ({children}) => {
-    const [isAnyTextFieldFocused, setIsAnyTextFieldFocused] = useState(false);
-
-    const setFocusState = (value: boolean) => {
-        setIsAnyTextFieldFocused(value);
-    };
-
-    return (
-        <DesignSystemContext.Provider value={{isAnyTextFieldFocused, setFocusState}}>
-            {children}
-        </DesignSystemContext.Provider>
-    );
-};
-
-export default DesignSystemProvider;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx b/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx
deleted file mode 100644
index 7e5bfb2df5c..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-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 {ButtonProps} from '../global/Button';
-import {SaveState} from '../../hooks/useForm';
-import {useScrollSection} from '../../hooks/useScrollSection';
-import {useSearch} from '../../components/providers/ServiceProvider';
-
-interface SettingGroupProps {
-    navid?:string;
-    testId?: string;
-    title?: string;
-    description?: React.ReactNode;
-    keywords?: string[];
-    isEditing?: boolean;
-    saveState?: SaveState;
-    customHeader?: React.ReactNode;
-    customButtons?: React.ReactNode;
-    children?: React.ReactNode;
-    hideEditButton?: boolean;
-    alwaysShowSaveButton?: boolean;
-
-    /**
-     * Show a green outline in case the modal that's been triggered from the group is closed
-     */
-    highlightOnModalClose?: boolean;
-
-    /**
-     * Remove borders and paddings
-     */
-    border?: boolean;
-    styles?: string;
-
-    /**
-     * Default buttons only appear if onStateChange is implemented
-     */
-    onEditingChange?: (isEditing: boolean) => void
-    onSave?: () => void
-    onCancel?: () => void
-    enableCMDS?: boolean
-}
-
-const SettingGroup: React.FC<SettingGroupProps> = ({
-    navid,
-    testId,
-    title,
-    description,
-    keywords = [],
-    isEditing,
-    saveState,
-    customHeader,
-    customButtons,
-    children,
-    hideEditButton,
-    alwaysShowSaveButton = true,
-    border = true,
-    highlightOnModalClose = true,
-    styles,
-    onEditingChange,
-    onSave,
-    onCancel,
-    enableCMDS = true
-}) => {
-    const {checkVisible} = useSearch();
-    const {route} = useRouting();
-    const [highlight, setHighlight] = useState(false);
-    const {ref} = useScrollSection(navid);
-
-    const handleEdit = () => {
-        onEditingChange?.(true);
-    };
-
-    const handleCancel = () => {
-        onCancel?.();
-        onEditingChange?.(false);
-    };
-
-    const handleSave = () => {
-        onSave?.();
-    };
-
-    if (saveState === 'unsaved') {
-        styles += ' border-green';
-    } else if (isEditing){
-        styles += ' border-grey-700 dark:border-grey-600';
-    } else {
-        styles += ' border-grey-300 dark:border-grey-800 hover:border-grey-500';
-    }
-
-    let viewButtons: ButtonProps[] = [];
-
-    if (!hideEditButton) {
-        let label = 'Edit';
-        if (saveState === 'saved') {
-            label = 'Saved';
-        }
-        viewButtons.push(
-            {
-                label,
-                key: 'edit',
-                color: 'green',
-                onClick: handleEdit
-            }
-        );
-    } else if (saveState === 'saved') {
-        viewButtons.push(
-            {
-                label: 'Saved',
-                key: 'edit',
-                color: 'green',
-                onClick: handleEdit
-            }
-        );
-    }
-
-    let editButtons: ButtonProps[] = [
-        {
-            label: 'Cancel',
-            key: 'cancel',
-            onClick: handleCancel
-        }
-    ];
-
-    if (saveState === 'unsaved' || alwaysShowSaveButton) {
-        let label = 'Save';
-        if (saveState === 'saving') {
-            label = 'Saving...';
-        }
-        editButtons.push(
-            {
-                label,
-                key: 'save',
-                color: 'green',
-                onClick: handleSave
-            }
-        );
-    }
-
-    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') {
-                e.preventDefault();
-                handleSave();
-            }
-        };
-        if (enableCMDS) {
-            window.addEventListener('keydown', handleCMDS);
-            return () => {
-                window.removeEventListener('keydown', handleCMDS);
-            };
-        }
-    });
-
-    const containerClasses = clsx(
-        'relative flex-col gap-6 rounded-lg transition-all',
-        border && 'border p-5 md:p-7',
-        !checkVisible(keywords) ? 'hidden' : 'flex',
-        (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
-    );
-
-    return (
-        <div className={containerClasses} data-testid={testId}>
-            <div ref={ref} className='absolute' id={navid && navid}></div>
-            {customHeader ? customHeader :
-                <SettingGroupHeader description={description} title={title!}>
-                    {customButtons ? customButtons :
-                        (onEditingChange && <ButtonGroup buttons={isEditing ? editButtons : viewButtons} link linkWithPadding />)}
-                </SettingGroupHeader>
-            }
-            {children}
-        </div>
-    );
-};
-
-export default SettingGroup;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.tsx b/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.tsx
deleted file mode 100644
index 62798901b69..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupContent.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-
-import SettingValue from './SettingValue';
-import {SettingValueProps} from './SettingValue';
-
-interface ISettingGroupContent {
-    columns?: 1 | 2;
-
-    /**
-     * Use this array to display setting values with standard formatting in the content area of a setting group
-     */
-    values?: Array<SettingValueProps>;
-    children?: React.ReactNode;
-    className?: string;
-}
-
-const SettingGroupContent: React.FC<ISettingGroupContent> = ({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';
-    }
-
-    styles += ` ${className}`;
-
-    return (
-        <div className={styles}>
-            {values && values.map(({key, ...props}) => (
-                <SettingValue key={key} {...props} />
-            ))}
-            {children}
-        </div>
-    );
-};
-
-export default SettingGroupContent;
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx b/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx
deleted file mode 100644
index 4efc6945650..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import Heading from '../global/Heading';
-import React from 'react';
-import {useSearch} from '../../components/providers/ServiceProvider';
-
-interface Props {
-    title?: string;
-    description?: React.ReactNode;
-    children?: React.ReactNode;
-}
-
-const SettingGroupHeader: React.FC<Props> = ({title, description, children}) => {
-    const {highlightKeywords} = useSearch();
-
-    return (
-        <div className="flex items-start justify-between gap-4">
-            {(title || description) &&
-                <div>
-                    <Heading level={5}>{highlightKeywords(title || '')}</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>}
-                </div>
-            }
-            <div className='-mt-0.5'>
-                {children}
-            </div>
-        </div>
-    );
-};
-
-export default SettingGroupHeader;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx b/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx
deleted file mode 100644
index dbae0c02fc8..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-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';
-
-interface Props {
-    title: React.ReactNode;
-    navid?: string;
-    icon?: string;
-    keywords?: string[];
-    onClick?: (e:React.MouseEvent<HTMLAnchorElement>) => void;
-}
-
-const SettingNavItem: React.FC<Props> = ({
-    title,
-    navid = '',
-    icon,
-    keywords,
-    onClick
-}) => {
-    const {ref, props} = useScrollSectionNav(navid);
-    const {currentSection} = useScrollSectionContext();
-    const {checkVisible} = useSearch();
-
-    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'
-    );
-
-    return (
-        <li ref={ref} {...props}><a className={classNames} id={navid} onClick={onClick}>
-            {icon && <Icon className='mr-[7px]' name={icon} size='sm' />}
-            {title}
-        </a></li>
-    );
-};
-
-export default SettingNavItem;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.tsx b/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.tsx
deleted file mode 100644
index 39c9195fb39..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingNavSection.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import {useSearch} from '../../components/providers/ServiceProvider';
-
-interface Props {
-    title?: string;
-    keywords?: string[];
-    children?: React.ReactNode;
-}
-
-const SettingNavSection: React.FC<Props> = ({title, keywords, children}) => {
-    const {checkVisible} = useSearch();
-
-    if (!checkVisible(keywords || [])) {
-        return null;
-    }
-
-    return (
-        <>
-            {title && <h2 className='mb-4 ml-2 text-[16px] tracking-tight'>{title}</h2>}
-            {children &&
-                <ul className="mb-14 mt-[-8px]">
-                    {children}
-                </ul>
-            }
-        </>
-    );
-};
-
-export default SettingNavSection;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.tsx b/apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.tsx
deleted file mode 100644
index fce4585666b..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSection.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import SettingSectionHeader from './SettingSectionHeader';
-import clsx from 'clsx';
-import {useSearch} from '../../components/providers/ServiceProvider';
-
-interface Props {
-    title?: string;
-    keywords?: string[];
-    children?: React.ReactNode;
-}
-
-const SettingSection: React.FC<Props> = ({title, keywords = [], children}) => {
-    const {checkVisible} = useSearch();
-
-    const containerClassNames = clsx(
-        'mb-[16vh]',
-        checkVisible(keywords) ? '' : 'hidden'
-    );
-
-    return (
-        <div className={containerClassNames}>
-            {title && <SettingSectionHeader title={title} />}
-            {children &&
-                <div className="mb-[100px] flex flex-col gap-12">
-                    {children}
-                </div>
-            }
-        </div>
-    );
-};
-
-export default SettingSection;
diff --git a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.tsx b/apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.tsx
deleted file mode 100644
index bc89701b991..00000000000
--- a/apps/admin-x-settings/src/admin-x-ds/settings/SettingSectionHeader.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import clsx from 'clsx';
-
-interface Props {
-    title: string;
-    sticky?: boolean;
-}
-
-const SettingSectionHeader: React.FC<Props> = ({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]')
-    );
-
-    return (
-        <h2 className={classNames}>{title}</h2>
-    );
-};
-
-export default SettingSectionHeader;
\ 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
deleted file mode 100644
index 7aba3330de6..00000000000
--- a/apps/admin-x-settings/src/api/offers.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {Meta, createQuery} from '../utils/api/hooks';
-
-export type Offer = {
-    id: string;
-    name: string;
-    code: string;
-    display_title: string;
-    display_description: string;
-    type: string;
-    cadence: string;
-    amount: number;
-    duration: string;
-    duration_in_months: number | null;
-    currency_restriction: boolean;
-    currency: string | null;
-    status: string;
-    redemption_count: number;
-    tier: {
-        id: string;
-        name: string;
-    }
-}
-
-export interface OffersResponseType {
-    meta?: Meta
-    offers: Offer[]
-}
-
-const dataType = 'OffersResponseType';
-
-export const useBrowseOffers = createQuery<OffersResponseType>({
-    dataType,
-    path: '/offers/'
-});
diff --git a/apps/admin-x-settings/src/api/site.ts b/apps/admin-x-settings/src/api/site.ts
deleted file mode 100644
index 5367e757d9d..00000000000
--- a/apps/admin-x-settings/src/api/site.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {createQuery} from '../utils/api/hooks';
-
-// Types
-
-export type SiteData = {
-    title: string;
-    description: string;
-    logo: string;
-    icon: string;
-    accent_color: string;
-    url: string;
-    locale: string;
-    version: string;
-};
-
-export interface SiteResponseType {
-    site: SiteData;
-}
-
-// Requests
-
-const dataType = 'SiteResponseType';
-
-export const useBrowseSite = createQuery<SiteResponseType>({
-    dataType,
-    path: '/site/'
-});
-
-// Helpers
-
-export function getHomepageUrl(siteData: SiteData): string {
-    const url = new URL(siteData.url);
-    const subdir = url.pathname.endsWith('/') ? url.pathname : `${url.pathname}/`;
-
-    return `${url.origin}${subdir}`;
-}
-
-export function getEmailDomain(siteData: SiteData): string {
-    const domain = new URL(siteData.url).hostname || '';
-    if (domain.startsWith('www.')) {
-        return domain.replace(/^(www)\.(?=[^/]*\..{2,5})/, '');
-    }
-    return domain;
-}
-
-export function fullEmailAddress(value: 'noreply' | string, siteData: SiteData) {
-    const emailDomain = getEmailDomain(siteData);
-    return value === 'noreply' ? `noreply@${emailDomain}` : value;
-}
diff --git a/apps/admin-x-settings/src/api/slack.ts b/apps/admin-x-settings/src/api/slack.ts
deleted file mode 100644
index ac2f14f5f65..00000000000
--- a/apps/admin-x-settings/src/api/slack.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {createMutation} from '../utils/api/hooks';
-
-export const useTestSlack = createMutation<unknown, null>({
-    method: 'POST',
-    path: () => '/slack/test/'
-});
diff --git a/apps/admin-x-settings/src/assets/icons/mailchimp.svg b/apps/admin-x-settings/src/assets/icons/mailchimp.svg
new file mode 100644
index 00000000000..686868d51f2
--- /dev/null
+++ b/apps/admin-x-settings/src/assets/icons/mailchimp.svg
@@ -0,0 +1,9 @@
+<svg width="290" height="306" viewBox="0 0 290 306" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M65.848 158.776C63.5884 158.663 61.3234 158.816 59.0997 159.233C55.3901 159.831 51.8367 161.161 48.6465 163.145C45.4563 165.13 42.6932 167.729 40.5181 170.791C38.343 173.853 36.7994 177.317 35.9773 180.982C35.1552 184.646 35.071 188.437 35.7297 192.134C37.3464 207.382 53.6124 220.24 68.6704 220.623C70.2159 220.662 71.7617 220.559 73.2884 220.316C89.5829 217.68 93.8492 200.899 91.1633 184.416C88.1293 165.805 74.8568 159.244 65.848 158.776ZM81.8142 202.87C81.1264 203.9 80.1716 204.723 79.052 205.252C77.9323 205.781 76.6899 205.995 75.4576 205.873C73.2912 205.702 71.2711 204.714 69.8063 203.11C68.3415 201.505 67.5416 199.405 67.5686 197.233C67.5309 194.339 68.0892 191.469 69.2086 188.799C69.9077 187.104 69.975 185.214 69.398 183.473C68.8211 181.732 67.6383 180.256 66.0647 179.312C64.1311 178.114 61.8111 177.704 59.5835 178.165C57.4259 178.579 55.5194 179.829 54.2791 181.641C53.4418 182.994 52.7882 184.451 52.3354 185.976C52.2471 186.243 52.1771 186.453 52.1239 186.589C51.3856 188.471 50.2074 189.021 49.4108 188.919C49.1174 188.865 48.8457 188.728 48.628 188.524C48.4104 188.321 48.256 188.059 48.1833 187.769C47.7701 185.257 47.9637 182.683 48.748 180.261C49.5324 177.839 50.8847 175.64 52.6922 173.846C54.2664 172.276 56.1785 171.085 58.2828 170.366C60.387 169.646 62.6279 169.416 64.8347 169.692C67.152 169.971 69.3668 170.808 71.2877 172.133C73.2085 173.459 74.7778 175.231 75.8598 177.298C76.901 179.785 77.3221 182.488 77.0871 185.174C76.852 187.86 75.9678 190.449 74.5104 192.718C74.3262 193.11 74.1575 193.47 74.0134 193.791C73.4893 194.68 73.1999 195.688 73.1727 196.719C73.1455 197.75 73.3812 198.772 73.8577 199.687C74.277 200.245 74.8244 200.695 75.4537 200.997C76.083 201.3 76.7759 201.447 77.474 201.426C78.1405 201.418 78.8035 201.329 79.4489 201.163C80.2858 200.978 81.1512 200.787 81.678 201.414C81.8528 201.611 81.9602 201.858 81.9847 202.12C82.0092 202.382 81.9495 202.645 81.8142 202.87Z" fill="white"/>
+<path d="M274.076 234.139C277.476 225.517 279.441 216.397 279.895 207.141C279.895 195.761 273.447 191.044 269.342 191.044C269.217 190.605 268.405 187.638 267.286 184.066C266.647 181.994 265.888 179.961 265.014 177.978C268.373 173.339 269.795 167.576 268.978 161.908C268.306 157.538 266.227 153.506 263.056 150.423C257.037 145.317 249.854 141.767 242.141 140.085C240.978 139.761 237.148 138.711 236.812 138.608C236.785 138.389 236.532 126.072 236.301 120.784C236.201 115.482 235.411 110.215 233.949 105.117C232.132 97.8006 228.375 91.109 223.075 85.7457C236.346 72.0173 244.63 56.8948 244.61 43.9216C244.572 18.9721 213.869 11.4221 176.034 27.0581C175.992 27.0757 168.073 30.4261 168.016 30.4549C167.981 30.4198 153.523 16.2643 153.306 16.0739C110.169 -21.4759 -24.709 128.138 18.414 164.475L27.8381 172.443C25.295 179.253 24.3972 186.567 25.2176 193.79C26.495 204.298 31.6922 213.937 39.771 220.782C47.6127 227.895 57.7438 231.966 68.3294 232.257C85.1105 270.85 123.452 294.524 168.409 295.857C216.633 297.286 257.115 274.704 274.076 234.139ZM283.975 188.467C288.106 193.795 290.232 200.405 289.98 207.141C289.546 217.648 287.347 228.007 283.476 237.786L283.385 238.015C274.634 259.045 259.356 276.71 239.801 288.408C219.448 300.238 196.259 306.315 172.716 305.987C171.192 305.987 169.64 305.964 168.11 305.918C144.874 305.433 122.191 298.742 102.416 286.539C85.0095 275.637 70.9232 260.179 61.6865 241.841C51.0448 240.19 41.1099 235.492 33.0829 228.317C23.1029 219.796 16.7097 207.824 15.1823 194.794C14.5016 188.464 14.8688 182.064 16.2692 175.853L11.8941 172.156C8.35277 169.099 5.47487 165.35 3.43752 161.14C1.40018 156.93 0.246519 152.348 0.0475372 147.676C-0.311426 137.977 1.36575 128.311 4.97109 119.3C13.9521 94.7948 34.6126 65.6157 60.2417 41.2436C71.6788 30.1519 84.366 20.4251 98.0485 12.2586C109.46 4.96396 122.567 0.744965 136.094 0.0119642C144.818 -0.215438 153.315 2.80569 159.936 8.48861C160.314 8.81806 165.978 14.3541 170.274 18.5598C171.352 18.1052 172.127 17.7782 172.15 17.7695C184.859 12.237 198.517 9.2078 212.375 8.84808C238.052 8.84808 254.664 22.6091 254.696 43.9064C254.716 57.0474 248.26 71.779 236.359 86.0399C239.597 91.0436 242.046 96.5149 243.622 102.262C245.312 108.146 246.238 114.222 246.376 120.342C246.492 122.974 246.61 127.199 246.705 130.928C255.486 133.149 263.6 137.455 270.359 143.481C274.941 148.025 277.946 153.916 278.933 160.291C279.926 166.584 278.953 173.029 276.147 178.749C276.397 179.465 276.657 180.243 276.915 181.067C277.14 181.786 277.352 182.479 277.55 183.137C280.022 184.474 282.205 186.285 283.975 188.467Z" fill="white"/>
+<path d="M253.405 176.007C255.04 174.471 256.316 172.592 257.14 170.506C257.965 168.42 258.318 166.177 258.174 163.939C257.846 161.682 256.793 159.594 255.173 157.989C250.419 154.045 244.763 151.339 238.709 150.11C235.944 149.326 234.068 148.824 232.046 148.152C228.451 146.956 226.675 145.993 226.273 139.164C226.097 136.177 225.581 125.772 225.396 121.473C225.068 113.938 224.17 103.64 217.847 99.3887C216.239 98.3224 214.368 97.7184 212.44 97.6428C211.36 97.5764 210.277 97.6835 209.231 97.96C206.022 98.7093 203.101 100.378 200.826 102.76C197.88 105.449 194.408 107.495 190.628 108.77C186.849 110.045 182.846 110.52 178.873 110.166C174.447 109.979 169.757 109.283 164.381 108.96C163.334 108.899 162.285 108.833 161.238 108.778C154.291 108.983 147.649 111.677 142.524 116.368C137.399 121.059 134.131 127.436 133.318 134.334C130.24 155.73 145.575 166.787 150.002 173.276C150.687 174.104 151.111 175.116 151.221 176.184C151.106 177.369 150.542 178.466 149.645 179.249L149.646 179.255C143.515 186.153 139.211 194.475 137.127 203.462C135.042 212.449 135.243 221.815 137.712 230.704C138.297 232.839 139.047 234.926 139.955 236.945C151.145 263.366 185.857 275.67 219.769 264.479C224.212 263.013 228.522 261.173 232.653 258.979C240.088 255.265 246.776 250.215 252.383 244.082C261.129 235.215 266.874 223.831 268.809 211.531C269.83 204.722 268.334 202.086 266.298 200.819C264.859 200.01 263.193 199.703 261.56 199.945C260.697 194.6 259.182 189.38 257.049 184.403L253.405 176.007Z" fill="white"/>
+<path d="M197.829 73.9634C198.376 74.0889 198.724 73.1442 198.235 72.87C190.133 68.6741 181.197 66.337 172.077 66.0288C171.989 66.0274 171.904 66.0019 171.83 65.955C171.756 65.9081 171.696 65.8417 171.657 65.763C171.619 65.6844 171.602 65.5966 171.61 65.5093C171.619 65.4221 171.651 65.3387 171.703 65.2685C173.121 63.4167 174.775 61.7593 176.625 60.3387C176.708 60.2745 176.768 60.1854 176.797 60.0845C176.825 59.9837 176.821 59.8763 176.784 59.7782C176.747 59.68 176.68 59.5963 176.592 59.5392C176.504 59.4821 176.4 59.4546 176.295 59.4607C165.129 60.5569 154.394 64.3391 145.009 70.484C144.929 70.538 144.834 70.5667 144.738 70.5664C144.641 70.5662 144.547 70.537 144.467 70.4826C144.387 70.4283 144.326 70.3512 144.29 70.2615C144.255 70.1717 144.247 70.0734 144.268 69.9793C145.024 67.1617 146.137 64.452 147.579 61.9158C147.626 61.8287 147.645 61.7287 147.631 61.6305C147.618 61.5322 147.573 61.441 147.503 61.3701C147.434 61.2993 147.343 61.2526 147.245 61.237C147.147 61.2213 147.047 61.2375 146.959 61.2832C133.406 68.7226 121.327 78.5735 111.316 90.3509C111.238 90.4405 111.195 90.5558 111.196 90.6747C111.198 90.7937 111.243 90.908 111.323 90.996C111.403 91.084 111.513 91.1395 111.631 91.1519C111.749 91.1644 111.868 91.1329 111.965 91.0635C123.566 82.9617 136.635 77.1963 150.443 74.0897C166.029 70.4966 182.224 70.4535 197.829 73.9634Z" fill="white"/>
+<path d="M157.912 35.7452C157.912 35.7452 146.171 22.1607 142.627 21.1587C120.822 15.2783 73.7203 47.6962 43.6459 90.5263C31.477 107.856 14.0571 138.544 22.3868 154.328C25.3475 157.872 28.685 161.083 32.3405 163.906C37.9215 156.088 46.321 150.74 55.7695 148.989C67.6275 115.857 88.4426 86.6593 115.903 64.6375C129.08 53.8595 143.132 44.1954 157.912 35.7452Z" fill="white"/>
+<path d="M81.0244 202.282C81.1935 202.486 81.2966 202.737 81.3203 203.002C81.3439 203.266 81.2869 203.532 81.1568 203.763C80.5238 204.789 79.6165 205.619 78.5372 206.158C77.4578 206.697 76.2493 206.923 75.0479 206.813C72.9068 206.582 70.9332 205.548 69.5258 203.919C68.1184 202.29 67.3822 200.188 67.4661 198.037C67.4298 195.106 67.9653 192.197 69.0424 189.47C69.7224 187.762 69.7933 185.872 69.2433 184.118C68.6933 182.364 67.556 180.852 66.0223 179.837C65.1146 179.237 64.0958 178.824 63.0259 178.624C61.9561 178.424 60.857 178.44 59.7935 178.671C58.7516 178.89 57.764 179.316 56.8889 179.922C56.0137 180.528 55.2687 181.303 54.6976 182.201C53.8898 183.583 53.2617 185.063 52.8285 186.604C52.7449 186.875 52.6775 187.088 52.6264 187.225C51.9167 189.139 50.7852 189.696 50.0186 189.594C49.6562 189.544 49.1578 189.302 48.8384 188.426C48.4375 185.895 48.6194 183.305 49.3704 180.854C50.1214 178.404 51.4217 176.157 53.1724 174.284C54.6426 172.706 56.4676 171.501 58.4964 170.767C60.5252 170.034 62.6995 169.794 64.8395 170.067C67.1066 170.379 69.2611 171.247 71.1099 172.595C72.9587 173.943 74.4443 175.728 75.4335 177.79C76.4353 180.325 76.8395 183.056 76.6149 185.772C76.3903 188.488 75.5429 191.116 74.1383 193.452C73.9606 193.849 73.7979 194.213 73.6608 194.543C73.1557 195.455 72.8784 196.476 72.8523 197.518C72.8262 198.561 73.0522 199.594 73.511 200.53C73.8989 201.089 74.4193 201.542 75.0257 201.85C75.632 202.158 76.3053 202.311 76.9853 202.296C77.6264 202.286 78.2638 202.196 78.8823 202.028C79.6873 201.839 80.519 201.646 81.0244 202.282ZM279.46 207.233C279.01 216.467 277.058 225.567 273.68 234.174C256.828 274.654 216.612 297.19 168.704 295.763C124.042 294.433 85.9507 270.808 69.2793 232.296C58.7548 232.002 48.6864 227.938 40.9093 220.845C32.8754 214 27.7137 204.384 26.4506 193.909C25.6354 186.703 26.5272 179.406 29.054 172.607L19.6913 164.656C-23.1488 128.396 110.844 -20.9043 153.7 16.5674C153.917 16.7561 168.279 30.8832 168.315 30.918C168.372 30.8889 176.239 27.5446 176.279 27.5283C213.868 11.9248 244.369 19.4588 244.407 44.3546C244.427 57.302 236.197 72.3932 223.014 86.0917C228.283 91.451 232.013 98.1271 233.815 105.421C235.268 110.51 236.054 115.766 236.152 121.057C236.381 126.334 236.634 138.626 236.659 138.844C236.994 138.946 240.799 139.992 241.953 140.317C249.622 141.998 256.759 145.542 262.732 150.634C265.885 153.715 267.95 157.738 268.615 162.095C269.428 167.748 268.017 173.496 264.678 178.13C265.546 180.111 266.3 182.139 266.936 184.206C268.045 187.772 268.852 190.731 268.977 191.17C273.055 191.17 279.46 195.876 279.46 207.233ZM90.1383 185.02C87.225 166.118 74.4694 159.456 65.8142 158.981C63.6416 158.866 61.4632 159.021 59.3289 159.443C43.8807 162.567 35.1559 175.741 36.8727 192.858C38.123 200.536 41.9274 207.568 47.671 212.819C53.4146 218.069 60.7619 221.23 68.5254 221.792C70.0111 221.831 71.4972 221.727 72.9628 221.48C88.6201 218.803 92.7194 201.76 90.1383 185.02ZM116.543 65.028C129.629 54.2762 143.588 44.6324 158.276 36.1964C158.276 36.1964 146.613 22.6411 143.091 21.6421C121.43 15.7721 74.6355 48.1225 44.7589 90.8623C32.67 108.155 15.3643 138.78 23.6385 154.53C26.5779 158.066 29.8937 161.27 33.5273 164.088C39.0591 156.295 47.4059 150.958 56.8036 149.203C68.5609 116.172 89.2374 87.0378 116.543 65.028ZM163.623 214.611C164.197 217.123 165.439 219.434 167.219 221.298C168.998 223.163 171.249 224.513 173.732 225.205C176.316 226.167 178.982 226.893 181.697 227.373C215.962 233.282 247.996 213.642 255.208 208.696C255.75 208.324 256.107 208.686 255.673 209.342C255.456 209.691 255.22 210.028 254.967 210.351C246.14 221.765 222.409 234.983 191.535 234.978C178.069 234.976 164.611 230.22 159.669 222.913C152.003 211.575 159.289 195.026 172.064 196.751C172.079 196.753 176.435 197.248 177.659 197.384C197.517 199.293 217.533 196.082 235.795 188.058C253.224 179.948 259.808 171.022 258.82 163.797C258.49 161.553 257.435 159.479 255.815 157.89C251.049 153.969 245.39 151.282 239.338 150.066C236.57 149.287 234.691 148.79 232.668 148.122C229.07 146.934 227.292 145.978 226.889 139.196C226.713 136.23 226.198 125.898 226.011 121.628C225.682 114.147 224.785 103.92 218.454 99.6982C216.843 98.6381 214.972 98.0385 213.044 97.9643C211.963 97.8985 210.878 98.0051 209.831 98.2799C206.624 99.0215 203.701 100.678 201.418 103.047C198.46 105.72 194.981 107.752 191.199 109.018C187.418 110.283 183.415 110.754 179.443 110.401C175.014 110.215 170.32 109.524 164.939 109.203C163.892 109.142 162.841 109.077 161.792 109.023C154.864 109.205 148.232 111.867 143.103 116.524C137.974 121.182 134.689 127.526 133.846 134.401C130.766 155.648 146.115 166.628 150.547 173.071C151.231 173.891 151.656 174.897 151.766 175.96C151.649 177.138 151.085 178.227 150.189 179.002V179.009C144.059 185.834 139.751 194.094 137.663 203.024C135.575 211.954 135.775 221.267 138.244 230.099C138.83 232.22 139.581 234.292 140.489 236.296C151.69 262.533 186.435 274.751 220.379 263.637C224.824 262.183 229.138 260.357 233.275 258.178C240.709 254.496 247.402 249.481 253.024 243.383C261.766 234.602 267.519 223.293 269.465 211.059C270.487 204.296 268.991 201.681 266.952 200.422C265.51 199.619 263.843 199.314 262.21 199.554C261.345 194.243 259.829 189.059 257.695 184.119C248 191.43 237.041 196.894 225.366 200.237C211.319 204.204 196.706 205.788 182.135 204.923C172.76 204.164 166.559 201.42 164.226 209.02C178.406 213.759 193.461 215.294 208.307 213.514C208.411 213.504 208.517 213.514 208.617 213.544C208.718 213.574 208.811 213.624 208.893 213.69C208.974 213.757 209.041 213.839 209.091 213.931C209.14 214.024 209.171 214.125 209.181 214.229C209.197 214.405 209.158 214.581 209.069 214.733C208.981 214.885 208.847 215.006 208.687 215.08C208.687 215.08 191.275 223.184 163.623 214.611ZM112.629 91.3979C124.146 83.3176 137.131 77.5642 150.856 74.4611C166.338 70.8754 182.431 70.832 197.932 74.3342C198.475 74.4588 198.821 73.5168 198.335 73.2444C190.291 69.0585 181.412 66.7254 172.348 66.4161C172.261 66.4145 172.175 66.3889 172.102 66.3421C172.028 66.2952 171.969 66.229 171.93 66.1506C171.892 66.0722 171.876 65.9848 171.884 65.8979C171.892 65.811 171.924 65.728 171.976 65.658C173.384 63.8111 175.029 62.1571 176.868 60.7383C176.95 60.674 177.01 60.5852 177.038 60.4846C177.066 60.3841 177.062 60.2771 177.025 60.1793C176.989 60.0815 176.922 59.9979 176.834 59.9407C176.747 59.8836 176.643 59.8558 176.539 59.8615C165.439 60.9582 154.773 64.7333 145.457 70.8622C145.377 70.9161 145.283 70.9448 145.187 70.9445C145.091 70.9443 144.997 70.9152 144.917 70.8609C144.838 70.8066 144.777 70.7297 144.742 70.6403C144.707 70.5508 144.7 70.4528 144.721 70.3592C145.471 67.5486 146.577 64.8448 148.01 62.3129C148.057 62.2263 148.076 62.1268 148.062 62.0289C148.049 61.931 148.005 61.84 147.936 61.7692C147.867 61.6984 147.777 61.6516 147.68 61.6357C147.582 61.6197 147.482 61.6355 147.394 61.6806C133.921 69.1129 121.92 78.944 111.985 90.6892C111.907 90.7782 111.864 90.8928 111.866 91.0111C111.867 91.1294 111.911 91.2431 111.991 91.3306C112.071 91.4181 112.18 91.4733 112.297 91.4857C112.415 91.4982 112.533 91.4669 112.629 91.3979ZM202.862 163.522C203.8 164.115 204.924 164.343 206.019 164.161C207.114 163.979 208.103 163.401 208.799 162.536C209.663 160.864 208.408 158.597 205.995 157.47C205.057 156.877 203.933 156.65 202.838 156.832C201.743 157.015 200.753 157.594 200.058 158.459C199.193 160.129 200.449 162.397 202.862 163.522ZM210.265 136.412C210.844 139.422 212.093 142.263 213.92 144.725C215.808 144.493 217.717 144.493 219.604 144.725C220.708 141.421 220.804 137.864 219.882 134.505C218.518 128.307 216.672 124.556 212.857 125.139C209.043 125.724 208.902 130.214 210.265 136.412ZM218.381 150.649C217.419 150.373 216.394 150.405 215.451 150.741C214.509 151.077 213.695 151.7 213.125 152.521C212.554 153.343 212.256 154.323 212.271 155.323C212.287 156.324 212.615 157.294 213.211 158.098C213.807 158.902 214.639 159.499 215.592 159.805C216.545 160.112 217.57 160.112 218.523 159.807C219.476 159.501 220.309 158.905 220.906 158.102C221.502 157.298 221.832 156.329 221.848 155.329C221.987 154.252 221.703 153.164 221.057 152.291C220.41 151.419 219.451 150.83 218.381 150.649Z" fill="black"/>
+<path d="M155.047 150.095C154.438 150.009 154.179 149.749 154.102 149.404C153.866 148.335 155.511 146.575 157.246 145.305C159.777 143.456 162.742 142.288 165.855 141.915C168.969 141.541 172.126 141.974 175.023 143.173C177.73 144.289 180.058 146.161 181.728 148.566C182.348 149.577 182.468 150.361 182.067 150.771C181.443 151.43 179.85 150.676 177.257 149.539C174.142 148.011 170.699 147.271 167.231 147.381C163.122 148.057 159.054 148.963 155.047 150.095ZM180.892 155.413C179.772 154.235 178.377 153.354 176.832 152.848C175.287 152.342 173.641 152.227 172.041 152.513C169.681 152.764 167.445 153.695 165.605 155.193C164.748 155.808 164.159 156.728 163.959 157.763C163.954 157.878 163.975 157.993 164.019 158.099C164.064 158.206 164.131 158.301 164.217 158.378C164.369 158.516 164.568 158.592 164.773 158.589C165.622 158.465 166.452 158.235 167.244 157.905C170.711 156.599 174.456 156.21 178.118 156.776C179.814 156.967 180.616 157.073 180.988 156.491C181.084 156.323 181.126 156.129 181.109 155.937C181.091 155.744 181.016 155.561 180.892 155.413Z" fill="black"/>
+</svg>
diff --git a/apps/admin-x-settings/src/assets/icons/medium.svg b/apps/admin-x-settings/src/assets/icons/medium.svg
new file mode 100644
index 00000000000..27c179ca521
--- /dev/null
+++ b/apps/admin-x-settings/src/assets/icons/medium.svg
@@ -0,0 +1,10 @@
+<svg width="260" height="150" viewBox="0 0 260 150" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_480_8)">
+<path d="M146.656 75.0013C146.656 116.422 113.825 150 73.3291 150C32.8329 150 0 116.414 0 75.0013C0 33.5881 32.8304 0 73.3291 0C113.828 0 146.656 33.5805 146.656 75.0013ZM227.097 75.0013C227.097 113.99 210.682 145.609 190.433 145.609C170.184 145.609 153.768 113.99 153.768 75.0013C153.768 36.0125 170.181 4.39338 190.43 4.39338C210.68 4.39338 227.095 36.0024 227.095 75.0013M260 75.0013C260 109.926 254.228 138.255 247.105 138.255C239.982 138.255 234.213 109.933 234.213 75.0013C234.213 40.0693 239.985 11.7477 247.105 11.7477C254.225 11.7477 260 40.0668 260 75.0013Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_480_8">
+<rect width="260" height="150" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/apps/admin-x-settings/src/assets/icons/substack.svg b/apps/admin-x-settings/src/assets/icons/substack.svg
new file mode 100644
index 00000000000..73a92e12029
--- /dev/null
+++ b/apps/admin-x-settings/src/assets/icons/substack.svg
@@ -0,0 +1,5 @@
+<svg width="168" height="200" viewBox="0 0 168 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M168 44.4445H0V66.6667H168V44.4445Z" fill="#FF6719"/>
+<path d="M0 88.8889V200L83.9927 150.378L168 200V88.8889H0Z" fill="#FF6719"/>
+<path d="M168 0H0V22.2222H168V0Z" fill="#FF6719"/>
+</svg>
diff --git a/apps/admin-x-settings/src/components/ExitSettingsButton.tsx b/apps/admin-x-settings/src/components/ExitSettingsButton.tsx
index d0b7e5df8e9..742682f2f2f 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();
@@ -11,7 +9,7 @@ const ExitSettingsButton: React.FC = () => {
     };
 
     return (
-        <Button data-testid="exit-settings" label='&larr; Done' link={true} onClick={() => confirmIfDirty(isDirty, navigateAway)} />
+        <Button className='text-grey-700 hover:!text-black' data-testid="exit-settings" icon='close' id="done-button" label='' link={true} title='Close (ESC)' onClick={() => confirmIfDirty(isDirty, navigateAway)} />
     );
 };
 
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..3b900b19ea8
--- /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/SettingsAppProvider';
+
+const SearchableSection: React.FC<Omit<SettingSectionProps, 'isVisible'> & {keywords: string[]}> = ({keywords, ...props}) => {
+    const {checkVisible, noResult} = useSearch();
+
+    return (
+        <SettingSection isVisible={checkVisible(keywords) || noResult} {...props} />
+    );
+};
+
+export default SearchableSection;
diff --git a/apps/admin-x-settings/src/components/Settings.tsx b/apps/admin-x-settings/src/components/Settings.tsx
index e8d2983923b..f467071bdba 100644
--- a/apps/admin-x-settings/src/components/Settings.tsx
+++ b/apps/admin-x-settings/src/components/Settings.tsx
@@ -3,16 +3,18 @@ import React from 'react';
 import AdvancedSettings from './settings/advanced/AdvancedSettings';
 import EmailSettings from './settings/email/EmailSettings';
 import GeneralSettings from './settings/general/GeneralSettings';
+import GrowthSettings from './settings/growth/GrowthSettings';
 import MembershipSettings from './settings/membership/MembershipSettings';
 import SiteSettings from './settings/site/SiteSettings';
 
 const Settings: React.FC = () => {
     return (
         <>
-            <div className='mb-[40vh]'>
+            <div className='mb-[40vh] px-8 pt-16 tablet:max-w-[760px] tablet:px-14 tablet:pt-0'>
                 <GeneralSettings />
                 <SiteSettings />
                 <MembershipSettings />
+                <GrowthSettings />
                 <EmailSettings />
                 <AdvancedSettings />
             </div>
diff --git a/apps/admin-x-settings/src/components/Sidebar.tsx b/apps/admin-x-settings/src/components/Sidebar.tsx
index 084b1e5c81f..18631f21fa5 100644
--- a/apps/admin-x-settings/src/components/Sidebar.tsx
+++ b/apps/admin-x-settings/src/components/Sidebar.tsx
@@ -1,25 +1,36 @@
-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 {checkStripeEnabled, getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 import {searchKeywords as emailSearchKeywords} from './settings/email/EmailSettings';
 import {searchKeywords as generalSearchKeywords} from './settings/general/GeneralSettings';
-import {getSettingValues} from '../api/settings';
+import {searchKeywords as growthSearchKeywords} from './settings/growth/GrowthSettings';
 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 {useSearch} from './providers/ServiceProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {useScrollSectionContext, useScrollSectionNav} from '../hooks/useScrollSection';
+import {useSearch} from './providers/SettingsAppProvider';
+
+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, noResult, setNoResult} = useSearch();
     const {updateRoute} = useRouting();
     const searchInputRef = useRef<HTMLInputElement | null>(null);
     const {isAnyTextFieldFocused} = useFocusContext();
@@ -27,6 +38,11 @@ const Sidebar: React.FC = () => {
     // Focus in on search field when pressing "/"
     useEffect(() => {
         const handleKeyPress = (e: KeyboardEvent) => {
+            // ensures it doesn't fire when typing in a text field, particularly useful for the Koenig Editor.
+            if (e.target instanceof HTMLElement &&
+                (e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' || e.target.isContentEditable)) {
+                return;
+            }
             if (e.key === '/' && !isAnyTextFieldFocused) {
                 e?.preventDefault();
                 if (searchInputRef.current) {
@@ -47,96 +63,156 @@ const Sidebar: React.FC = () => {
         }
     }, []);
 
+    useEffect(() => {
+        if (!checkVisible(Object.values(generalSearchKeywords).flat()) &&
+            !checkVisible(Object.values(siteSearchKeywords).flat()) &&
+            !checkVisible(Object.values(membershipSearchKeywords).flat()) &&
+            !checkVisible(Object.values(growthSearchKeywords).flat()) &&
+            !checkVisible(Object.values(emailSearchKeywords).flat()) &&
+            !checkVisible(Object.values(advancedSearchKeywords).flat())) {
+            setNoResult(true);
+        } else {
+            setNoResult(false);
+        }
+    }, [checkVisible, setNoResult, filter]);
+
+    useEffect(() => {
+        const handleKeyDown = (event: KeyboardEvent) => {
+            if (event.key === 'Escape' && filter) {
+                // Blur the field
+                searchInputRef.current?.blur();
+
+                // Prevent the event from bubbling up to the window level
+                event.stopPropagation();
+            }
+        };
+
+        // Add the event listener to the searchInputRef field
+        searchInputRef.current?.addEventListener('keydown', handleKeyDown);
+
+        // Clean up the event listener when the component unmounts
+        return () => {
+            searchInputRef.current?.removeEventListener('keydown', handleKeyDown);
+        };
+    }, [filter]);
+
     const {settings, config} = useGlobalData();
     const [newslettersEnabled] = getSettingValues(settings, ['editor_default_email_recipients']) as [string];
+    const hasStripeEnabled = checkStripeEnabled(settings || [], config || {});
 
     const handleSectionClick = (e?: React.MouseEvent<HTMLAnchorElement>) => {
         if (e) {
             setFilter('');
+            setNoResult(false);
             updateRoute(e.currentTarget.id);
         }
     };
 
-    const hasTipsAndDonations = useFeatureFlag('tipsAndDonations');
-    const hasRecommendations = useFeatureFlag('recommendations');
-
     const updateSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
         setFilter(e.target.value);
 
         if (e.target.value) {
-            document.getElementById('admin-x-root')?.scrollTo({top: 0, left: 0});
+            document.querySelector('.admin-x-settings')?.scrollTo({top: 0, left: 0});
         }
     };
 
     const navClasses = clsx(
-        'no-scrollbar hidden pt-10 tablet:!visible tablet:!block tablet:h-[calc(100vh-8vmin-36px)] tablet:overflow-y-auto'
+        'hidden pt-10 tablet:!visible tablet:!block'
     );
 
     return (
-        <div data-testid="sidebar">
-            <div className='relative flex content-stretch items-end tablet:h-[36px]'>
-                <Icon className='absolute left-2 top-[10px] z-10' colorClass='text-grey-500' name='magnifying-glass' size='sm' />
-                <TextField autoComplete="off" className='-mx-1 flex h-9 w-[calc(100%+8px)] items-center rounded-full border border-transparent bg-grey-150 px-[33px] py-1.5 text-sm transition-all hover:bg-grey-100 focus:border-green focus:bg-white focus:shadow-[0_0_0_1px_rgba(48,207,67,1)] focus:outline-2 dark:bg-grey-900 dark:text-white dark:focus:bg-black' containerClassName='w-100' inputRef={searchInputRef} placeholder="Search settings" title="Search" value={filter} clearBg hideTitle unstyled onChange={updateSearch} />
-                {filter ? <Button className='absolute right-3 top-[10px] p-1' icon='close' iconColorClass='text-grey-700 !w-[10px] !h-[10px]' size='sm' unstyled onClick={() => {
-                    setFilter('');
-                }} /> : <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 className='ml-auto flex w-full flex-col pt-0 tablet:max-w-[240px]' data-testid="sidebar">
+            <div className='sticky top-0 flex content-stretch items-end dark:bg-grey-975 tablet:h-20 tablet:bg-grey-50 dark:tablet:bg-black xl:h-20'>
+                <div className='relative w-full'>
+                    <Icon className='absolute left-3 top-3 z-10' colorClass='text-grey-500' name='magnifying-glass' size='sm' />
+                    <TextField
+                        autoComplete="off"
+                        className='mr-12 flex h-10 w-full items-center rounded-lg border border-transparent bg-white px-[33px] py-1.5 text-[14px] shadow-[0_0_1px_rgba(21,23,26,0.25),0_1px_3px_rgba(0,0,0,0.03),0_8px_10px_-12px_rgba(0,0,0,.1)] transition-colors hover:shadow-sm focus:border-green focus:bg-white focus:shadow-[0_0_0_2px_rgba(48,207,67,0.25)] focus:outline-2 dark:border-transparent dark:bg-grey-925 dark:text-white dark:placeholder:text-grey-800 dark:focus:border-green dark:focus:bg-grey-950 tablet:mr-0'
+                        containerClassName='w-100'
+                        inputRef={searchInputRef}
+                        placeholder="Search settings"
+                        title="Search"
+                        value={filter}
+                        clearBg
+                        hideTitle
+                        unstyled
+                        onChange={updateSearch}
+                    />
+                    {filter ? <Button className='absolute top-3 p-1 sm:right-14 tablet:right-3' icon='close' iconColorClass='text-grey-700 !w-[10px] !h-[10px]' size='sm' unstyled onClick={() => {
+                        setFilter('');
+                        searchInputRef.current?.focus();
+                    }} /> : <div className='absolute -right-1/2 top-[9px] 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:border-grey-800 dark:bg-grey-900 dark:text-grey-500 dark:shadow-[0px_1px_#626D79] tablet:!visible tablet:right-3 tablet:!block'>/</div>}
+                </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} />
+            <nav className={navClasses} id='admin-x-settings-sidebar'>
+                {noResult &&
+                <div className='ml-2 text-base text-grey-700'>
+                    <h2 className='mb-2 text-base font-semibold tracking-normal text-black dark:text-white'>No result</h2>
+                    <div>
+                        {`We couldn't find any setting matching '${filter}'`}.
+                    </div>
+                </div>
+                }
+                <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 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(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(membershipSearchKeywords).flat())} title="Membership">
+                    <NavItem icon='portal' keywords={membershipSearchKeywords.portal} navid='portal' title="Portal settings" onClick={handleSectionClick} />
+                    <NavItem icon='key' keywords={membershipSearchKeywords.access} navid='members' title="Access" onClick={handleSectionClick} />
+                    <NavItem icon='bills' keywords={membershipSearchKeywords.tiers} navid='tiers' title="Tiers" onClick={handleSectionClick} />
+                    <NavItem icon='baseline-chart' keywords={membershipSearchKeywords.analytics} navid='analytics' title="Analytics" 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(growthSearchKeywords).flat())} title="Growth">
+                    <NavItem icon='heart' keywords={growthSearchKeywords.recommendations} navid='recommendations' title="Recommendations" onClick={handleSectionClick} />
+                    <NavItem icon='emailfield' keywords={growthSearchKeywords.embedSignupForm} navid='embed-signup-form' title="Embeddable signup form" onClick={handleSectionClick} />
+                    {hasStripeEnabled && <NavItem icon='discount' keywords={growthSearchKeywords.offers} navid='offers' title="Offers" onClick={handleSectionClick} />}
+                    {hasStripeEnabled && <NavItem icon='piggybank' keywords={growthSearchKeywords.tips} navid='tips-and-donations' title="Tips & donations" 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='download' keywords={advancedSearchKeywords.migrationtools} navid='migration' title="Import/Export" 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 &&
-                <a className='mb-10 ml-1 flex cursor-pointer items-center gap-1.5 pl-1 text-sm !font-normal' onClick={() => {
+                <a className='w-100 mb-10 mt-1 flex h-[38px] cursor-pointer items-center rounded-lg px-3 py-2 text-left text-[14px] font-medium text-grey-800 transition-all hover:bg-grey-200 focus:bg-grey-100 dark:text-grey-600 dark:hover:bg-grey-950 dark:focus:bg-grey-925' onClick={() => {
                     updateRoute('about');
                 }}>
-                    <img alt='Ghost Logo' className='h-[18px] w-[18px]' src={GhostLogo} />
+                    <img alt='Ghost Logo' className='mr-[7px] h-[18px] w-[18px]' src={GhostLogo} />
                     About Ghost
                 </a>
                 }
-            </div>
+            </nav>
         </div>
     );
 };
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..aade1d170d7
--- /dev/null
+++ b/apps/admin-x-settings/src/components/TopLevelGroup.tsx
@@ -0,0 +1,28 @@
+import React, {useEffect, useState} from 'react';
+import {SettingGroup as Base, SettingGroupProps} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {useScrollSection} from '../hooks/useScrollSection';
+import {useSearch} from './providers/SettingsAppProvider';
+
+const TopLevelGroup: React.FC<Omit<SettingGroupProps, 'isVisible' | 'highlight'> & {keywords: string[]}> = ({keywords, navid, ...props}) => {
+    const {checkVisible, noResult} = 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);
+            }, 2000);
+        }
+    }, [highlight]);
+
+    return <Base ref={ref} highlight={highlight} isVisible={checkVisible(keywords) || noResult} navid={navid} {...props} />;
+};
+
+export default TopLevelGroup;
diff --git a/apps/admin-x-settings/src/components/providers/GlobalDataProvider.tsx b/apps/admin-x-settings/src/components/providers/GlobalDataProvider.tsx
index 2bfb5970b88..9678565810f 100644
--- a/apps/admin-x-settings/src/components/providers/GlobalDataProvider.tsx
+++ b/apps/admin-x-settings/src/components/providers/GlobalDataProvider.tsx
@@ -1,9 +1,10 @@
 import SpinningOrb from '../../assets/videos/logo-loader.mp4';
-import {Config, useBrowseConfig} from '../../api/config';
+import {Config, useBrowseConfig} from '@tryghost/admin-x-framework/api/config';
 import {ReactNode, createContext, useContext} from 'react';
-import {Setting, useBrowseSettings} from '../../api/settings';
-import {SiteData, useBrowseSite} from '../../api/site';
-import {User, useCurrentUser} from '../../api/users';
+import {Setting, useBrowseSettings} from '@tryghost/admin-x-framework/api/settings';
+import {SiteData, useBrowseSite} from '@tryghost/admin-x-framework/api/site';
+import {User} from '@tryghost/admin-x-framework/api/users';
+import {useCurrentUser} from '@tryghost/admin-x-framework/api/currentUser';
 
 interface GlobalData {
     settings: Setting[]
diff --git a/apps/admin-x-settings/src/components/providers/RoutingProvider.tsx b/apps/admin-x-settings/src/components/providers/RoutingProvider.tsx
deleted file mode 100644
index 2c31a6766a9..00000000000
--- a/apps/admin-x-settings/src/components/providers/RoutingProvider.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import NiceModal from '@ebay/nice-modal-react';
-import React, {createContext, useCallback, useEffect, useState} from 'react';
-import {useScrollSectionContext} from '../../hooks/useScrollSection';
-import type {ModalComponent, ModalName} from './routing/modals';
-
-export type RouteParams = {[key: string]: string}
-
-export type ExternalLink = {
-    isExternal: true;
-    route: string;
-    models?: string[] | null
-};
-
-export type InternalLink = {
-    isExternal?: false;
-    route: string;
-}
-
-export type RoutingContextData = {
-    route: string;
-    updateRoute: (to: string | InternalLink | ExternalLink) => void;
-    loadingModal: boolean;
-};
-
-export const RouteContext = createContext<RoutingContextData>({
-    route: '',
-    updateRoute: () => {},
-    loadingModal: false
-});
-
-export type RoutingModalProps = {
-    pathName: string;
-    params?: Record<string, string>,
-    searchParams?: URLSearchParams
-}
-
-const modalPaths: {[key: string]: ModalName} = {
-    'design/change-theme': 'DesignAndThemeModal',
-    'design/edit': 'DesignAndThemeModal',
-    // this is a special route, because it can install a theme directly from the Ghost Marketplace
-    'design/change-theme/install': 'DesignAndThemeModal',
-    'navigation/edit': 'NavigationModal',
-    'staff/invite': 'InviteUserModal',
-    'staff/:slug': 'UserDetailModal',
-    'portal/edit': 'PortalModal',
-    'tiers/add': 'TierDetailModal',
-    'tiers/:id': 'TierDetailModal',
-    'stripe-connect': 'StripeConnectModal',
-    'newsletters/new': 'AddNewsletterModal',
-    'newsletters/:id': 'NewsletterDetailModal',
-    'history/view': 'HistoryModal',
-    'history/view/:user': 'HistoryModal',
-    'integrations/zapier': 'ZapierModal',
-    'integrations/slack': 'SlackModal',
-    'integrations/amp': 'AmpModal',
-    'integrations/unsplash': 'UnsplashModal',
-    'integrations/firstpromoter': 'FirstpromoterModal',
-    'integrations/pintura': 'PinturaModal',
-    'integrations/new': 'AddIntegrationModal',
-    'integrations/:id': 'CustomIntegrationModal',
-    'recommendations/add': 'AddRecommendationModal',
-    'recommendations/edit': 'EditRecommendationModal',
-    'announcement-bar/edit': 'AnnouncementBarModal',
-    'embed-signup-form/show': 'EmbedSignupFormModal',
-    about: 'AboutModal'
-};
-
-function getHashPath(urlPath: string | undefined) {
-    if (!urlPath) {
-        return null;
-    }
-    const regex = /\/settings\/(.*)/;
-    const match = urlPath?.match(regex);
-
-    if (match) {
-        const afterSettingsX = match[1];
-        return afterSettingsX;
-    }
-    return null;
-}
-
-const handleNavigation = (currentRoute: string | undefined) => {
-    // Get the hash from the URL
-    let hash = window.location.hash;
-    hash = hash.substring(1);
-
-    // Create a URL to easily extract the path without query parameters
-    const domain = `${window.location.protocol}//${window.location.hostname}`;
-    let url = new URL(hash, domain);
-
-    const pathName = getHashPath(url.pathname);
-    const searchParams = url.searchParams;
-
-    if (pathName) {
-        const [, currentModalName] = Object.entries(modalPaths).find(([modalPath]) => matchRoute(currentRoute || '', modalPath)) || [];
-        const [path, modalName] = Object.entries(modalPaths).find(([modalPath]) => matchRoute(pathName, modalPath)) || [];
-
-        return {
-            pathName,
-            changingModal: modalName && modalName !== currentModalName,
-            modal: (path && modalName) ? // we should consider adding '&& modalName !== currentModalName' here, but this breaks tests
-                import('./routing/modals').then(({default: modals}) => {
-                    NiceModal.show(modals[modalName] as ModalComponent, {pathName, params: matchRoute(pathName, path), searchParams});
-                }) :
-                undefined
-        };
-    }
-    return {pathName: ''};
-};
-
-const matchRoute = (pathname: string, routeDefinition: string) => {
-    const regex = new RegExp('^' + routeDefinition.replace(/:(\w+)/, '(?<$1>[^/]+)') + '$');
-    const match = pathname.match(regex);
-    if (match) {
-        return match.groups || {};
-    }
-};
-
-type RouteProviderProps = {
-    externalNavigate: (link: ExternalLink) => void;
-    children: React.ReactNode;
-};
-
-const RoutingProvider: React.FC<RouteProviderProps> = ({externalNavigate, children}) => {
-    const [route, setRoute] = useState<string | undefined>(undefined);
-    const [loadingModal, setLoadingModal] = useState(false);
-    const {updateNavigatedSection, scrollToSection} = useScrollSectionContext();
-
-    useEffect(() => {
-        // Preload all the modals after initial render to avoid a delay when opening them
-        setTimeout(() => {
-            import('./routing/modals');
-        }, 1000);
-    }, []);
-
-    const updateRoute = useCallback((to: string | InternalLink | ExternalLink) => {
-        const options = typeof to === 'string' ? {route: to} : to;
-
-        if (options.isExternal) {
-            externalNavigate(options);
-            return;
-        }
-
-        const newPath = options.route;
-
-        if (newPath === route) {
-            scrollToSection(newPath.split('/')[0]);
-        } else if (newPath) {
-            window.location.hash = `/settings/${newPath}`;
-        } else {
-            window.location.hash = `/settings`;
-        }
-    }, [externalNavigate, route, scrollToSection]);
-
-    useEffect(() => {
-        const handleHashChange = () => {
-            setRoute((currentRoute) => {
-                const {pathName, modal, changingModal} = handleNavigation(currentRoute);
-
-                if (modal && changingModal) {
-                    setLoadingModal(true);
-                    modal.then(() => setLoadingModal(false));
-                }
-
-                return pathName;
-            });
-        };
-
-        handleHashChange();
-
-        window.addEventListener('hashchange', handleHashChange);
-
-        return () => {
-            window.removeEventListener('hashchange', handleHashChange);
-        };
-    }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
-    useEffect(() => {
-        if (route !== undefined) {
-            updateNavigatedSection(route.split('/')[0]);
-        }
-    }, [route, updateNavigatedSection]);
-
-    if (route === undefined) {
-        return null;
-    }
-
-    return (
-        <RouteContext.Provider
-            value={{
-                route,
-                updateRoute,
-                loadingModal
-            }}
-        >
-            {children}
-        </RouteContext.Provider>
-    );
-};
-
-export default RoutingProvider;
diff --git a/apps/admin-x-settings/src/components/providers/ServiceProvider.tsx b/apps/admin-x-settings/src/components/providers/ServiceProvider.tsx
deleted file mode 100644
index 8b1b541771a..00000000000
--- a/apps/admin-x-settings/src/components/providers/ServiceProvider.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import React, {createContext, useContext} from 'react';
-import useSearchService, {SearchService} from '../../utils/search';
-import {DefaultHeaderTypes} from '../../unsplash/UnsplashTypes';
-import {UpgradeStatusType} from '../../utils/globalTypes';
-import {ZapierTemplate} from '../settings/advanced/integrations/ZapierModal';
-
-export type ThemeVariant = {
-    category: string;
-    previewUrl: string;
-    image: string;
-};
-
-export type OfficialTheme = {
-    name: string;
-    category: string;
-    previewUrl: string;
-    ref: string;
-    image: string;
-    url?: string;
-    variants?: ThemeVariant[]
-};
-
-export type FetchKoenigLexical = () => Promise<any>
-
-interface ServicesContextProps {
-    ghostVersion: string
-    officialThemes: OfficialTheme[];
-    zapierTemplates: ZapierTemplate[];
-    search: SearchService;
-    unsplashConfig: DefaultHeaderTypes;
-    sentryDSN: string | null;
-    onUpdate: (dataType: string, response: unknown) => void;
-    onInvalidate: (dataType: string) => void;
-    onDelete: (dataType: string, id: string) => void;
-    fetchKoenigLexical: FetchKoenigLexical;
-    upgradeStatus?: UpgradeStatusType;
-}
-
-interface ServicesProviderProps {
-    children: React.ReactNode;
-    ghostVersion: string;
-    zapierTemplates: ZapierTemplate[];
-    officialThemes: OfficialTheme[];
-    unsplashConfig: DefaultHeaderTypes;
-    sentryDSN: string | null;
-    onUpdate: (dataType: string, response: unknown) => void;
-    onInvalidate: (dataType: string) => void;
-    onDelete: (dataType: string, id: string) => void;
-    fetchKoenigLexical: FetchKoenigLexical;
-    upgradeStatus?: UpgradeStatusType;
-}
-
-const ServicesContext = createContext<ServicesContextProps>({
-    ghostVersion: '',
-    officialThemes: [],
-    zapierTemplates: [],
-    search: {filter: '', setFilter: () => {}, checkVisible: () => true, highlightKeywords: () => ''},
-    unsplashConfig: {
-        Authorization: '',
-        'Accept-Version': '',
-        'Content-Type': '',
-        'App-Pragma': '',
-        'X-Unsplash-Cache': true
-    },
-    sentryDSN: null,
-    onUpdate: () => {},
-    onInvalidate: () => {},
-    onDelete: () => {},
-    fetchKoenigLexical: async () => {},
-    upgradeStatus: {
-        isRequired: false,
-        message: ''
-    }
-});
-
-const ServicesProvider: React.FC<ServicesProviderProps> = ({children, ghostVersion, zapierTemplates, officialThemes, unsplashConfig, sentryDSN, onUpdate, onInvalidate, onDelete, fetchKoenigLexical, upgradeStatus}) => {
-    const search = useSearchService();
-
-    return (
-        <ServicesContext.Provider value={{
-            ghostVersion,
-            officialThemes,
-            zapierTemplates,
-            search,
-            unsplashConfig,
-            sentryDSN,
-            onUpdate,
-            onInvalidate,
-            onDelete,
-            fetchKoenigLexical,
-            upgradeStatus
-        }}>
-            {children}
-        </ServicesContext.Provider>
-    );
-};
-
-export {ServicesContext, ServicesProvider};
-
-export const useServices = () => useContext(ServicesContext);
-
-export const useOfficialThemes = () => useServices().officialThemes;
-
-export const useSearch = () => useServices().search;
-
-export const useSentryDSN = () => useServices().sentryDSN;
-
-export const useUpgradeStatus = () => useServices().upgradeStatus;
diff --git a/apps/admin-x-settings/src/components/providers/SettingsAppProvider.tsx b/apps/admin-x-settings/src/components/providers/SettingsAppProvider.tsx
new file mode 100644
index 00000000000..f059ee8b608
--- /dev/null
+++ b/apps/admin-x-settings/src/components/providers/SettingsAppProvider.tsx
@@ -0,0 +1,98 @@
+import GlobalDataProvider from './GlobalDataProvider';
+import useSearchService, {SearchService} from '../../utils/search';
+import {ReactNode, createContext, useContext, useState} from 'react';
+import {ScrollSectionProvider} from '../../hooks/useScrollSection';
+import {ZapierTemplate} from '../settings/advanced/integrations/ZapierModal';
+
+export type ThemeVariant = {
+    category: string;
+    previewUrl: string;
+    image: string;
+};
+
+export type OfficialTheme = {
+    name: string;
+    category: string;
+    previewUrl: string;
+    ref: string;
+    image: string;
+    url?: string;
+    variants?: ThemeVariant[]
+};
+
+export type Sorting = {
+    type: string;
+    option?: string;
+    direction?: string;
+}
+
+export interface UpgradeStatusType {
+    isRequired: boolean;
+    message: string;
+}
+
+interface SettingsAppContextType {
+    officialThemes: OfficialTheme[];
+    zapierTemplates: ZapierTemplate[];
+    search: SearchService;
+    upgradeStatus?: UpgradeStatusType;
+    sortingState?: Sorting[];
+    setSortingState?: (sortingState: Sorting[]) => void;
+}
+
+const SettingsAppContext = createContext<SettingsAppContextType>({
+    officialThemes: [],
+    zapierTemplates: [],
+    search: {
+        filter: '',
+        setFilter: () => {},
+        checkVisible: () => true,
+        highlightKeywords: () => '',
+        noResult: false,
+        setNoResult: () => {}
+    },
+    sortingState: []
+});
+
+type SettingsAppProviderProps = Omit<SettingsAppContextType, 'search'> & {children: ReactNode};
+
+const SettingsAppProvider: React.FC<SettingsAppProviderProps> = ({children, ...props}) => {
+    const search = useSearchService();
+
+    // a few sane defaults for keeping a sorting state
+    const [sortingState, setSortingState] = useState<Sorting[]>([{
+        type: 'offers',
+        option: 'date-added',
+        direction: 'desc'
+    }]);
+
+    return (
+        <SettingsAppContext.Provider value={{
+            ...props,
+            search,
+            sortingState,
+            setSortingState
+        }}>
+            <GlobalDataProvider>
+                <ScrollSectionProvider>
+                    {children}
+                </ScrollSectionProvider>
+            </GlobalDataProvider>
+        </SettingsAppContext.Provider>
+    );
+};
+
+export default SettingsAppProvider;
+
+export const useSettingsApp = () => useContext(SettingsAppContext);
+
+export const useOfficialThemes = () => useSettingsApp().officialThemes;
+
+export const useSearch = () => useSettingsApp().search;
+
+export const useUpgradeStatus = () => useSettingsApp().upgradeStatus;
+
+export const useSortingState = () => {
+    const {sortingState, setSortingState} = useSettingsApp();
+    return {sortingState, setSortingState};
+};
diff --git a/apps/admin-x-settings/src/components/providers/SettingsRouter.tsx b/apps/admin-x-settings/src/components/providers/SettingsRouter.tsx
new file mode 100644
index 00000000000..c2fff273d16
--- /dev/null
+++ b/apps/admin-x-settings/src/components/providers/SettingsRouter.tsx
@@ -0,0 +1,62 @@
+import React, {useEffect} from 'react';
+import {useRouteChangeCallback, useRouting} from '@tryghost/admin-x-framework/routing';
+import {useScrollSectionContext} from '../../hooks/useScrollSection';
+import type {ModalName} from './routing/modals';
+
+export const modalPaths: {[key: string]: ModalName} = {
+    'design/change-theme': 'DesignAndThemeModal',
+    'design/edit': 'DesignAndThemeModal',
+    // this is a special route, because it can install a theme directly from the Ghost Marketplace
+    'design/change-theme/install': 'DesignAndThemeModal',
+    'navigation/edit': 'NavigationModal',
+    'staff/invite': 'InviteUserModal',
+    'staff/:slug': 'UserDetailModal',
+    'staff/:slug/edit': 'UserDetailModal',
+    'portal/edit': 'PortalModal',
+    'tiers/add': 'TierDetailModal',
+    'tiers/:id': 'TierDetailModal',
+    'stripe-connect': 'StripeConnectModal',
+    'newsletters/new': 'AddNewsletterModal',
+    'newsletters/:id': 'NewsletterDetailModal',
+    'history/view': 'HistoryModal',
+    'history/view/:user': 'HistoryModal',
+    'integrations/zapier': 'ZapierModal',
+    'integrations/slack': 'SlackModal',
+    'integrations/amp': 'AmpModal',
+    'integrations/unsplash': 'UnsplashModal',
+    'integrations/firstpromoter': 'FirstpromoterModal',
+    'integrations/pintura': 'PinturaModal',
+    'integrations/new': 'AddIntegrationModal',
+    'integrations/:id': 'CustomIntegrationModal',
+    'recommendations/add': 'AddRecommendationModal',
+    'recommendations/edit': 'EditRecommendationModal',
+    'announcement-bar/edit': 'AnnouncementBarModal',
+    'embed-signup-form/show': 'EmbedSignupFormModal',
+    'offers/edit': 'OffersContainerModal',
+    'offers/edit/:id': 'OffersContainerModal',
+    'offers/new': 'OffersContainerModal',
+    about: 'AboutModal'
+};
+
+export const loadModals = () => import('./routing/modals');
+
+const SettingsRouter: React.FC = () => {
+    const {updateNavigatedSection, scrollToSection} = useScrollSectionContext();
+    const {route} = useRouting();
+
+    useRouteChangeCallback((newPath, oldPath) => {
+        if (newPath === oldPath) {
+            scrollToSection(newPath.split('/')[0]);
+        }
+    }, [scrollToSection]);
+
+    useEffect(() => {
+        if (route !== undefined) {
+            updateNavigatedSection(route.split('/')[0]);
+        }
+    }, [route, updateNavigatedSection]);
+
+    return null;
+};
+
+export default SettingsRouter;
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..57845003a39 100644
--- a/apps/admin-x-settings/src/components/providers/routing/modals.tsx
+++ b/apps/admin-x-settings/src/components/providers/routing/modals.tsx
@@ -1,21 +1,26 @@
 import type {NiceModalHocProps} from '@ebay/nice-modal-react';
-import type {RoutingModalProps} from '../RoutingProvider';
+import type {RoutingModalProps} from '@tryghost/admin-x-framework/routing';
 
 import AboutModal from '../../settings/general/About';
 import AddIntegrationModal from '../../settings/advanced/integrations/AddIntegrationModal';
 import AddNewsletterModal from '../../settings/email/newsletters/AddNewsletterModal';
-import AddRecommendationModal from '../../settings/membership/recommendations/AddRecommendationModal';
+// import AddOfferModal from '../../settings/growth/offers/AddOfferModal';
+import AddRecommendationModal from '../../settings/growth/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 EditRecommendationModal from '../../settings/membership/recommendations/EditRecommendationModal';
-import EmbedSignupFormModal from '../../settings/membership/embedSignup/EmbedSignupFormModal';
+// import EditOfferModal from '../../settings/growth/offers/EditOfferModal';
+import EditRecommendationModal from '../../settings/growth/recommendations/EditRecommendationModal';
+import EmbedSignupFormModal from '../../settings/growth/embedSignup/EmbedSignupFormModal';
 import FirstpromoterModal from '../../settings/advanced/integrations/FirstPromoterModal';
 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 OfferSuccess from '../../settings/growth/offers/OfferSuccess';
+// import OffersModal from '../../settings/growth/offers/OffersIndex';
+import OffersContainerModal from '../../settings/growth/offers/OffersContainerModal';
 import PinturaModal from '../../settings/advanced/integrations/PinturaModal';
 import PortalModal from '../../settings/membership/portal/PortalModal';
 import SlackModal from '../../settings/advanced/integrations/SlackModal';
@@ -48,7 +53,12 @@ const modals = {
     ZapierModal,
     AnnouncementBarModal,
     EmbedSignupFormModal,
-    AboutModal
+    OffersContainerModal,
+    // OffersModal,
+    // AddOfferModal,
+    // EditOfferModal,
+    AboutModal,
+    OfferSuccess
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } satisfies {[key: string]: ModalComponent<any>};
 
diff --git a/apps/admin-x-settings/src/components/selectors/UnsplashSelector.tsx b/apps/admin-x-settings/src/components/selectors/UnsplashSelector.tsx
new file mode 100644
index 00000000000..0e6665b9126
--- /dev/null
+++ b/apps/admin-x-settings/src/components/selectors/UnsplashSelector.tsx
@@ -0,0 +1,24 @@
+import '@tryghost/kg-unsplash-selector/dist/style.css';
+import Portal from '../../utils/portal';
+import React from 'react';
+import {DefaultHeaderTypes, PhotoType, UnsplashSearchModal} from '@tryghost/kg-unsplash-selector';
+
+type UnsplashSelectorModalProps = {
+    onClose: () => void;
+    onImageInsert: (image: PhotoType) => void;
+    unsplashProviderConfig: DefaultHeaderTypes | null;
+};
+
+const UnsplashSelector : React.FC<UnsplashSelectorModalProps> = ({unsplashProviderConfig, onClose, onImageInsert}) => {
+    return (
+        <Portal classNames='admin-x-settings'>
+            <UnsplashSearchModal
+                unsplashProviderConfig={unsplashProviderConfig}
+                onClose={onClose}
+                onImageInsert={onImageInsert}
+            />
+        </Portal>
+    );
+};
+
+export default UnsplashSelector;
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..8cf975334ea 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/AdvancedSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/AdvancedSettings.tsx
@@ -1,25 +1,31 @@
 import CodeInjection from './CodeInjection';
+import DangerZone from './DangerZone';
 import History from './History';
 import Integrations from './Integrations';
 import Labs from './Labs';
+import MigrationTools from './MigrationTools';
 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'],
+    migrationtools: ['import', 'export', 'migrate', 'substack', 'substack', 'migration', 'medium'],
+    codeInjection: ['advanced', 'code injection', 'head', 'footer'],
+    labs: ['advanced', 'labs', 'alpha', 'beta', 'flag', 'routes', 'redirect', 'translation', 'editor', 'portal'],
+    history: ['advanced', 'history', 'log', 'events', 'user events', 'staff'],
+    dangerzone: ['danger', 'danger zone', 'delete', 'content', 'delete all content', 'delete site']
 };
 
 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} />
+            <MigrationTools keywords={searchKeywords.migrationtools} />
             <CodeInjection keywords={searchKeywords.codeInjection} />
             <Labs keywords={searchKeywords.labs} />
             <History keywords={searchKeywords.history} />
-        </SettingSection>
+            <DangerZone keywords={searchKeywords.dangerzone} />
+        </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..484d52319dd 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
@@ -1,96 +1,26 @@
-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 useSettingGroup from '../../../hooks/useSettingGroup';
-import {ReactCodeMirrorRef} from '@uiw/react-codemirror';
-import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import React from 'react';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, SettingGroupHeader, withErrorBoundary} from '@tryghost/admin-x-design-system';
 
 const CodeInjection: React.FC<{ keywords: string[] }> = ({keywords}) => {
-    const {
-        localSettings,
-        isEditing,
-        saveState,
-        handleSave,
-        handleCancel,
-        updateSetting,
-        handleEditingChange
-    } = useSettingGroup();
-
-    const [headerContent, footerContent] = getSettingValues<string>(localSettings, ['codeinjection_head', 'codeinjection_foot']);
-
-    const [selectedTab, setSelectedTab] = useState<'header' | 'footer'>('header');
-
-    const headerEditorRef = useRef<ReactCodeMirrorRef>(null);
-    const footerEditorRef = useRef<ReactCodeMirrorRef>(null);
-
-    const html = useMemo(() => import('@codemirror/lang-html').then(module => module.html()), []);
-
-    const headerProps = {
-        extensions: [html],
-        hint: 'Code here will be injected into the {{ghost_head}} tag on every page of the site',
-        value: headerContent || '',
-        onChange: (value: string) => updateSetting('codeinjection_head', value)
-    };
-
-    const footerProps = {
-        extensions: [html],
-        hint: 'Code here will be injected into the {{ghost_foot}} tag on every page of the site',
-        value: footerContent || '',
-        onChange: (value: string) => updateSetting('codeinjection_foot', value)
-    };
-
-    const tabs = [
-        {
-            id: 'header',
-            title: 'Site header',
-            contents: (<CodeEditor {...headerProps} ref={headerEditorRef} className='mt-2' data-testid='header-code' autoFocus />)
-        },
-        {
-            id: 'footer',
-            title: 'Site footer',
-            contents: (<CodeEditor {...footerProps} ref={footerEditorRef} className='mt-2' data-testid='footer-code' />)
-        }
-    ] as const;
-
     return (
-        <SettingGroup
+        <TopLevelGroup
+            customHeader={
+                <div className='z-10 flex items-start justify-between'>
+                    <SettingGroupHeader description='Add custom code to your publication.' title='Code injection' />
+                    <Button className='mt-[-5px]' color='clear' label='Open' size='sm' onClick={() => {
+                        NiceModal.show(CodeModal);
+                    }} />
+                </div>
+            }
             description="Add custom code to your publication"
-            isEditing={isEditing}
             keywords={keywords}
             navid='code-injection'
-            saveState={saveState}
             testId='code-injection'
             title="Code injection"
-            onCancel={handleCancel}
-            onEditingChange={handleEditingChange}
-            onSave={handleSave}
-        >
-            {isEditing && (
-                <div className='relative'>
-                    <TabView<'header' | 'footer'> selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
-                    <Button
-                        className='absolute right-0 top-1 text-sm'
-                        label='Fullscreen'
-                        unstyled
-                        onClick={() => NiceModal.show(CodeModal, {
-                            ...(selectedTab === 'header' ? headerProps : footerProps),
-                            afterClose: () => {
-                                if (selectedTab === 'header') {
-                                    headerEditorRef.current?.view?.focus();
-                                } else {
-                                    footerEditorRef.current?.view?.focus();
-                                }
-                            }
-                        })}
-                    />
-                </div>
-            )}
-        </SettingGroup>
+        />
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/advanced/DangerZone.tsx b/apps/admin-x-settings/src/components/settings/advanced/DangerZone.tsx
new file mode 100644
index 00000000000..3c1c50f3442
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/advanced/DangerZone.tsx
@@ -0,0 +1,52 @@
+import NiceModal from '@ebay/nice-modal-react';
+import React from 'react';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, ConfirmationModal, SettingGroupHeader, showToast, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {useDeleteAllContent} from '@tryghost/admin-x-framework/api/db';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useQueryClient} from '@tryghost/admin-x-framework';
+
+const DangerZone: React.FC<{ keywords: string[] }> = ({keywords}) => {
+    const {mutateAsync: deleteAllContent} = useDeleteAllContent();
+    const client = useQueryClient();
+    const handleError = useHandleError();
+
+    const handleDeleteAllContent = () => {
+        NiceModal.show(ConfirmationModal, {
+            title: 'Would you really like to delete all content from your blog?',
+            prompt: 'This is permanent! No backups, no restores, no magic undo button. We warned you, k?',
+            okColor: 'red',
+            okLabel: 'Delete',
+            onOk: async (modal) => {
+                try {
+                    await deleteAllContent(null);
+                    showToast({
+                        title: 'All content deleted from database.',
+                        type: 'success'
+                    });
+                    modal?.remove();
+                    await client.refetchQueries();
+                } catch (e) {
+                    handleError(e);
+                }
+            }
+        });
+    };
+
+    return (
+        <TopLevelGroup
+            customHeader={
+                <SettingGroupHeader description='Permanently delete all posts and tags from the database, a hard reset' title='Danger zone' />
+            }
+            keywords={keywords}
+            navid='dangerzone'
+            testId='dangerzone'
+        >
+            <div>
+                <Button color='red' label='Delete all content' onClick={handleDeleteAllContent} />
+            </div>
+        </TopLevelGroup>
+    );
+};
+
+export default withErrorBoundary(DangerZone, 'Danger zone');
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..8b05a073cc2 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 useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const History: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,8 +10,8 @@ const History: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
-            customButtons={<Button color='green' label='View history' link linkWithPadding onClick={openHistoryModal}/>}
+        <TopLevelGroup
+            customButtons={<Button className='mt-[-5px]' color='clear' label='View history' size='sm' onClick={openHistoryModal}/>}
             description="View system event log"
             keywords={keywords}
             navid='history'
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..19e17d72fbc 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/HistoryModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/HistoryModal.tsx
@@ -1,25 +1,11 @@
-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 {RoutingModalProps} from '../../providers/RoutingProvider';
-import {User} from '../../../api/users';
-import {debounce} from '../../../utils/debounce';
+import {Action, getActionTitle, getContextResource, getLinkTarget, isBulkAction, useBrowseActions} from '@tryghost/admin-x-framework/api/actions';
+import {Avatar, Button, Icon, InfiniteScrollListener, List, ListItem, LoadSelectOptions, Modal, NoValueLabel, Popover, Select, SelectOption, Toggle, ToggleGroup, debounce} from '@tryghost/admin-x-design-system';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {User} from '@tryghost/admin-x-framework/api/users';
 import {generateAvatarColor, getInitials} from '../../../utils/helpers';
 import {useCallback, useState} from 'react';
+import {useFilterableApi} from '@tryghost/admin-x-framework/hooks';
 
 const HistoryIcon: React.FC<{action: Action}> = ({action}) => {
     let name = 'pen';
@@ -41,7 +27,7 @@ const HistoryAvatar: React.FC<{action: Action}> = ({action}) => {
         <div className='relative shrink-0'>
             <Avatar
                 bgColor={generateAvatarColor(action.actor?.name || action.actor?.slug || '')}
-                image={action.actor?.image}
+                image={action.actor?.image ?? undefined}
                 label={getInitials(action.actor?.name || action.actor?.slug)}
                 labelColor='white'
                 size='md'
@@ -78,7 +64,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})));
     };
@@ -91,7 +77,7 @@ const HistoryFilter: React.FC<{
 
     return (
         <div className='flex items-center gap-4'>
-            <Popover position='right' trigger={<Button color='outline' label='Filter' size='sm' />}>
+            <Popover position='end' trigger={<Button color='outline' label='Filter' size='sm' />}>
                 <div className='flex w-[220px] flex-col gap-8 p-5'>
                     <ToggleGroup>
                         <HistoryFilterToggle excludedItems={excludedEvents} item='added' label='Added' toggleItem={toggleEventType} />
@@ -141,16 +127,16 @@ const HistoryActionDescription: React.FC<{action: Action}> = ({action}) => {
             {group.slice(0, 1).toUpperCase()}{group.slice(1)}
             {group !== key && <span className='text-xs'> <code className='mb-1 bg-white text-grey-800 dark:bg-grey-900 dark:text-white'>({key})</code></span>}
         </>;
-    } else if (action.resource?.title || action.resource?.name || action.context.primary_name) {
+    } else if (action.resource?.title || action.resource?.name || action.context?.primary_name) {
         const linkTarget = getLinkTarget(action);
 
         if (linkTarget) {
-            return <a className='font-bold' href='#' onClick={(e) => {
+            return <a className='cursor-pointer font-bold' onClick={(e) => {
                 e.preventDefault();
                 updateRoute(linkTarget);
             }}>{action.resource?.title || action.resource?.name}</a>;
         } else {
-            return <>{action.resource?.title || action.resource?.name || action.context.primary_name}</>;
+            return <>{action.resource?.title || action.resource?.name || action.context?.primary_name}</>;
         }
     } else {
         return <span className='text-grey-500'>(unknown)</span>;
@@ -188,7 +174,7 @@ const HistoryModal = NiceModal.create<RoutingModalProps>(({params}) => {
             filter: [
                 excludedEvents.length && `event:-[${excludedEvents.join(',')}]`,
                 excludedResources.length && `resource_type:-[${excludedResources.join(',')}]`,
-                params?.user && `actor_id:${params.user}`
+                params?.user && `actor_id:'${params.user}'`
             ].filter(Boolean).join('+')
         },
         getNextPageParams: (lastPage, otherParams) => ({
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..9d6be4d288a 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx
@@ -1,26 +1,19 @@
-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 useHandleError from '../../../utils/api/handleError';
-import useRouting from '../../../hooks/useRouting';
+import TopLevelGroup from '../../TopLevelGroup';
+import usePinturaEditor from '../../../hooks/usePinturaEditor';
 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 {Integration, useBrowseIntegrations, useDeleteIntegration} from '@tryghost/admin-x-framework/api/integrations';
 import {ReactComponent as PinturaIcon} from '../../../assets/icons/pintura.svg';
 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 {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface IntegrationItemProps {
     icon?: React.ReactNode,
@@ -49,7 +42,7 @@ const IntegrationItem: React.FC<IntegrationItemProps> = ({
 
     const handleClick = () => {
         if (disabled) {
-            updateRoute({route: 'pro'});
+            updateRoute({route: 'pro', isExternal: true});
         } else {
             action();
         }
@@ -85,8 +78,16 @@ 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',
+        'firstpromoter',
+        'slack_url',
+        'slack_username'
+    ]);
 
     return (
         <List titleSeparator={false}>
@@ -107,6 +108,7 @@ const BuiltInIntegrations: React.FC = () => {
                 active={slackUrl && slackUsername}
                 detail='A messaging app for teams'
                 icon={<SlackIcon className='h-8 w-8' />}
+                testId='slack-integration'
                 title='Slack' />
 
             <IntegrationItem
@@ -114,8 +116,9 @@ const BuiltInIntegrations: React.FC = () => {
                     openModal('integrations/amp');
                 }}
                 active={ampEnabled}
-                detail='Google Accelerated Mobile Pages'
+                detail='Google AMP will be removed in Ghost 6.0'
                 icon={<AmpIcon className='h-8 w-8' />}
+                testId='amp-integration'
                 title='AMP' />
 
             <IntegrationItem
@@ -125,6 +128,7 @@ const BuiltInIntegrations: React.FC = () => {
                 active={unsplashEnabled}
                 detail='Beautiful, free photos'
                 icon={<UnsplashIcon className='h-8 w-8' />}
+                testId='unsplash-integration'
                 title='Unsplash' />
 
             <IntegrationItem
@@ -134,16 +138,18 @@ const BuiltInIntegrations: React.FC = () => {
                 active={firstPromoterEnabled}
                 detail='Launch your member referral program'
                 icon={<FirstPromoterIcon className='h-8 w-8' />}
+                testId='firstpromoter-integration'
                 title='FirstPromoter' />
 
             <IntegrationItem
                 action={() => {
                     openModal('integrations/pintura');
                 }}
-                active={pinturaEnabled}
-                detail='Advanced image editing' icon=
-                    {<PinturaIcon className='h-8 w-8' />} title
-                    ='Pintura' />
+                active={pinturaEditor.isEnabled}
+                detail='Advanced image editing'
+                icon={<PinturaIcon className='h-8 w-8' />}
+                testId='pintura-integration'
+                title='Pintura' />
         </List>
     );
 };
@@ -178,8 +184,11 @@ const CustomIntegrations: React.FC<{integrations: Integration[]}> = ({integratio
                                         await deleteIntegration(integration.id);
                                         confirmModal?.remove();
                                         showToast({
-                                            message: 'Integration deleted',
-                                            type: 'success'
+                                            title: 'Integration deleted',
+                                            type: 'info',
+                                            options: {
+                                                position: 'bottom-left'
+                                            }
                                         });
                                     } catch (e) {
                                         handleError(e);
@@ -217,14 +226,14 @@ const Integrations: React.FC<{ keywords: string[] }> = ({keywords}) => {
     ] as const;
 
     const buttons = (
-        <Button className='hidden md:!visible md:!block' color='green' label='Add custom integration' link linkWithPadding onClick={() => {
+        <Button className='mt-[-5px] hidden md:!visible md:!block' color='clear' label='Add custom integration' size='sm' onClick={() => {
             updateRoute('integrations/new');
             setSelectedTab('custom');
         }} />
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={buttons}
             description="Make Ghost work with apps and tools"
             keywords={keywords}
@@ -239,7 +248,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..57009d73de5 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/Labs.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/Labs.tsx
@@ -1,28 +1,19 @@
 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';
+type LabsTab = 'labs-alpha-features' | 'labs-beta-features';
 
 const Labs: React.FC<{ keywords: string[] }> = ({keywords}) => {
-    const [selectedTab, setSelectedTab] = useState<LabsTab>('labs-migration-options');
+    const [selectedTab, setSelectedTab] = useState<LabsTab>('labs-beta-features');
     const [isOpen, setIsOpen] = useState(false);
     const {config} = useGlobalData();
 
     const tabs = [
-        {
-            id: 'labs-migration-options',
-            title: 'Migration options',
-            contents: <MigrationOptions />
-        },
         {
             id: 'labs-beta-features',
             title: 'Beta features',
@@ -36,16 +27,16 @@ 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' />
                     {
                         !isOpen ?
-                            <Button color='green' label='Open' link linkWithPadding onClick={() => {
+                            <Button className='mt-[-5px]' color='clear' label='Open' size='sm' onClick={() => {
                                 setIsOpen(true);
                             }} /> :
-                            <Button color='green' label='Close' link linkWithPadding onClick={() => {
+                            <Button className='mt-[-5px]' color='grey' label='Close' size='sm' onClick={() => {
                                 setIsOpen(false);
                             }} />
                     }
@@ -57,13 +48,13 @@ const Labs: React.FC<{ keywords: string[] }> = ({keywords}) => {
             testId='labs'
         >
             {isOpen ?
-                <TabView<'labs-migration-options' | 'labs-alpha-features' | 'labs-beta-features'> selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
+                <TabView<'labs-alpha-features' | 'labs-beta-features'> selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
                 :
                 <div className='absolute inset-0 z-0 overflow-hidden opacity-70'>
                     <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/MigrationTools.tsx b/apps/admin-x-settings/src/components/settings/advanced/MigrationTools.tsx
new file mode 100644
index 00000000000..77079050bd1
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/advanced/MigrationTools.tsx
@@ -0,0 +1,39 @@
+import MigrationToolsExport from './migrationtools/MigrationToolsExport';
+import MigrationToolsImport from './migrationtools/MigrationToolsImport';
+import React, {useState} from 'react';
+import TopLevelGroup from '../../TopLevelGroup';
+import {SettingGroupHeader, Tab, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
+
+type MigrationTab = 'import' | 'export';
+
+const MigrationTools: React.FC<{ keywords: string[] }> = ({keywords}) => {
+    const [selectedTab, setSelectedTab] = useState<MigrationTab>('import');
+
+    const tabs = [
+        {
+            id: 'import',
+            title: 'Import',
+            contents: <MigrationToolsImport />
+        },
+        {
+            id: 'export',
+            title: 'Export',
+            contents: <MigrationToolsExport />
+        }
+    ].filter(Boolean) as Tab<MigrationTab>[];
+
+    return (
+        <TopLevelGroup
+            customHeader={
+                <SettingGroupHeader description='Import content, members and subscriptions from other platforms or export your Ghost data.' title='Migration tools' />
+            }
+            keywords={keywords}
+            navid='migration'
+            testId='migrationtools'
+        >
+            <TabView<'import' | 'export'> selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
+        </TopLevelGroup>
+    );
+};
+
+export default withErrorBoundary(MigrationTools, 'Migration tools');
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..0bc01517db4 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,10 @@
-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 React, {useEffect, useMemo, useRef, useState} from 'react';
+import useSettingGroup from '../../../../hooks/useSettingGroup';
+import {ButtonGroup, CodeEditor, Heading, Modal, TabView} from '@tryghost/admin-x-design-system';
+import {ReactCodeMirrorRef} from '@uiw/react-codemirror';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useSaveButton} from '../../../../hooks/useSaveButton';
 
 interface CodeModalProps {
     hint?: React.ReactNode;
@@ -10,18 +13,105 @@ interface CodeModalProps {
     afterClose?: () => void
 }
 
-const CodeModal: React.FC<CodeModalProps> = ({hint, value, onChange, afterClose}) => {
+const CodeModal: React.FC<CodeModalProps> = ({afterClose}) => {
+    const {
+        localSettings,
+        handleSave,
+        updateSetting
+    } = useSettingGroup();
     const modal = useModal();
 
+    const [headerContent, footerContent] = getSettingValues<string>(localSettings, ['codeinjection_head', 'codeinjection_foot']);
+
+    const [selectedTab, setSelectedTab] = useState<'header' | 'footer'>('header');
+
+    const headerEditorRef = useRef<ReactCodeMirrorRef>(null);
+    const footerEditorRef = useRef<ReactCodeMirrorRef>(null);
+
     const html = useMemo(() => import('@codemirror/lang-html').then(module => module.html()), []);
 
-    const onOk = () => {
-        modal.remove();
-        afterClose?.();
+    const headerProps = {
+        extensions: [html],
+        hint: 'Code here will be injected into the {{ghost_head}} tag on every page of the site',
+        value: headerContent || '',
+        onChange: (value: string) => updateSetting('codeinjection_head', value)
+    };
+
+    const footerProps = {
+        extensions: [html],
+        hint: 'Code here will be injected into the {{ghost_foot}} tag on every page of the site',
+        value: footerContent || '',
+        onChange: (value: string) => updateSetting('codeinjection_foot', value)
     };
 
-    return <Modal afterClose={afterClose} cancelLabel='' okColor='grey' okLabel='Done' size='full' testId='modal-code' onOk={onOk}>
-        <CodeEditor extensions={[html]} height='full' hint={hint} value={value} autoFocus onChange={onChange} />
+    const tabs = [
+        {
+            id: 'header',
+            title: 'Site header',
+            contents: (<CodeEditor height='full' {...headerProps} ref={headerEditorRef} className='mt-2' data-testid='header-code' autoFocus />),
+            tabWrapperClassName: 'flex-auto',
+            containerClassName: 'h-full'
+        },
+        {
+            id: 'footer',
+            title: 'Site footer',
+            contents: (<CodeEditor height='full' {...footerProps} ref={footerEditorRef} className='mt-2' data-testid='footer-code' />),
+            tabWrapperClassName: 'flex-auto',
+            containerClassName: 'h-full'
+        }
+    ] as const;
+
+    const {savingTitle, isSaving, onSaveClick} = useSaveButton(handleSave, true);
+
+    useEffect(() => {
+        const handleCMDS = (e: KeyboardEvent) => {
+            if ((e.metaKey || e.ctrlKey) && e.key === 's') {
+                e.preventDefault();
+                onSaveClick();
+            }
+        };
+        window.addEventListener('keydown', handleCMDS);
+        return () => {
+            window.removeEventListener('keydown', handleCMDS);
+        };
+    });
+
+    return <Modal
+        afterClose={afterClose}
+        backDropClick={false}
+        cancelLabel='Close'
+        footer={<></>}
+        height='full'
+        size='full'
+        testId='modal-code-injection'
+    >
+        <div className='flex h-full flex-col'>
+            <div className='mb-4 flex items-center justify-between'>
+                <Heading level={2}>Code injection</Heading>
+                <ButtonGroup buttons={[
+                    {
+                        label: 'Close',
+                        color: 'outline',
+                        onClick: () => {
+                            modal.remove();
+                            afterClose?.();
+                        }
+                    },
+                    {
+                        disabled: isSaving,
+                        label: savingTitle,
+                        color: savingTitle === 'Saved' ? 'green' : 'black',
+                        onClick: onSaveClick
+                    }
+                ]} />
+            </div>
+            <TabView<'header' | 'footer'>
+                containerClassName='flex-auto flex flex-col mb-16'
+                selectedTab={selectedTab}
+                tabs={tabs}
+                onTabChange={setSelectedTab}
+            />
+        </div>
     </Modal>;
 };
 
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..db05152d6cc 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;
@@ -28,9 +27,9 @@ const APIKeyField: React.FC<APIKeyFieldProps> = ({label, text = '', hint, onRege
         <div className={containerClasses}>
             <span>{text}</span>
             {hint}
-            <div className='visible absolute right-0 top-1/2 flex translate-y-[-50%] gap-1 pl-1 text-sm group-hover/api-keys:visible dark:bg-black md:invisible'>
-                {onRegenerate && <Button className='!bg-white' color='outline' label='Regenerate' size='sm' onClick={onRegenerate} />}
-                <Button className='!bg-white' color='outline' label={copied ? 'Copied' : 'Copy'} size='sm' onClick={copyText} />
+            <div className='visible absolute right-0 top-1/2 flex translate-y-[-50%] gap-1 bg-white pl-1 text-sm group-hover/api-keys:visible dark:bg-black md:invisible'>
+                {onRegenerate && <Button color='outline' label='Regenerate' size='sm' onClick={onRegenerate} />}
+                <Button color='outline' label={copied ? 'Copied' : 'Copy'} size='sm' onClick={copyText} />
             </div>
         </div>
     </div>;
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..8aee196bf01 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,14 +1,10 @@
-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';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {useCreateIntegration} from '@tryghost/admin-x-framework/api/integrations';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const AddIntegrationModal: React.FC<RoutingModalProps> = () => {
     const modal = useModal();
@@ -24,7 +20,8 @@ const AddIntegrationModal: React.FC<RoutingModalProps> = () => {
             limiter.errorIfWouldGoOverLimit('customIntegrations').catch((error) => {
                 if (error instanceof HostLimitError) {
                     NiceModal.show(LimitModal, {
-                        prompt: error.message || `Your current plan doesn't support more custom integrations.`
+                        prompt: error.message || `Your current plan doesn't support more custom integrations.`,
+                        onOk: () => updateRoute({route: '/pro', isExternal: true})
                     });
                     modal.remove();
                     updateRoute('integrations');
@@ -44,7 +41,7 @@ const AddIntegrationModal: React.FC<RoutingModalProps> = () => {
         title='Add integration'
         onOk={async () => {
             if (!name) {
-                setErrors({name: 'Please enter a name'});
+                setErrors({name: 'Name is required'});
                 return;
             }
 
@@ -66,6 +63,7 @@ const AddIntegrationModal: React.FC<RoutingModalProps> = () => {
                     autoFocus={true}
                     error={!!errors.name}
                     hint={errors.name}
+                    maxLength={191}
                     placeholder='Custom integration'
                     title='Name'
                     value={name}
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..9a7e52414e8 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,26 +1,23 @@
-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 {Setting, getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
 import {useEffect, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const AmpModal = NiceModal.create(() => {
     const {updateRoute} = useRouting();
     const {settings} = useGlobalData();
     const [ampEnabled] = getSettingValues<boolean>(settings, ['amp']);
     const [ampId] = getSettingValues<string>(settings, ['amp_gtag_id']);
-    const modal = NiceModal.useModal();
-    const [enabled, setEnabled] = useState(false);
     const [trackingId, setTrackingId] = useState<string | null>('');
     const {mutateAsync: editSettings} = useEditSettings();
     const handleError = useHandleError();
+    const [okLabel, setOkLabel] = useState('Save');
+    const [enabled, setEnabled] = useState<boolean>(!!ampEnabled);
 
     useEffect(() => {
         setEnabled(ampEnabled || false);
@@ -33,26 +30,36 @@ const AmpModal = NiceModal.create(() => {
             {key: 'amp_gtag_id', value: trackingId}
         ];
         try {
-            await editSettings(updates);
+            setOkLabel('Saving...');
+            await Promise.all([
+                editSettings(updates),
+                new Promise((resolve) => {
+                    setTimeout(resolve, 1000);
+                })
+            ]);
+            setOkLabel('Saved');
         } catch (e) {
             handleError(e);
+        } finally {
+            setTimeout(() => setOkLabel('Save'), 1000);
         }
     };
 
+    const isDirty = !(enabled === ampEnabled) || !(trackingId === ampId);
+
     return (
         <Modal
             afterClose={() => {
                 updateRoute('integrations');
             }}
-            dirty={!(enabled === ampEnabled) || !(trackingId === ampId)}
-            okColor='black'
-            okLabel='Save & close'
+            cancelLabel='Close'
+            dirty={isDirty}
+            okColor={okLabel === 'Saved' ? 'green' : 'black'}
+            okLabel={okLabel}
             testId='amp-modal'
             title=''
             onOk={async () => {
                 await handleSave();
-                modal.remove();
-                updateRoute('integrations');
             }}
         >
             <IntegrationHeader
@@ -65,7 +72,7 @@ const AmpModal = NiceModal.create(() => {
                     <Toggle
                         checked={enabled}
                         direction='rtl'
-                        hint={<>Enable <a className='text-green' href="https://amp.dev" rel="noopener noreferrer" target='_blank'>Google Accelerated Mobile Pages</a> for your posts</>}
+                        hint={<>Google AMP is <a className='text-green' href="https://en.m.wikipedia.org/wiki/Accelerated_Mobile_Pages" rel="noopener noreferrer" target='_blank'>being retired</a> — this feature will be removed in Ghost 6.0</>}
                         label='Enable AMP'
                         onChange={(e) => {
                             setEnabled(e.target.checked);
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..a6daf3fd477 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,22 +1,15 @@
 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 {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';
+import {APIError} from '@tryghost/admin-x-framework/errors';
+import {APIKey, useRefreshAPIKey} from '@tryghost/admin-x-framework/api/apiKeys';
+import {ConfirmationModal, Form, ImageUpload, Modal, TextField} from '@tryghost/admin-x-design-system';
+import {Integration, useBrowseIntegrations, useEditIntegration} from '@tryghost/admin-x-framework/api/integrations';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {getGhostPaths} from '@tryghost/admin-x-framework/helpers';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
+import {useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const CustomIntegrationModalContent: React.FC<{integration: Integration}> = ({integration}) => {
     const modal = useModal();
@@ -27,17 +20,22 @@ 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, okProps} = useForm({
         initialState: integration,
+        savingDelay: 500,
+        savedDelay: 500,
         onSave: async () => {
             await editIntegration(formState);
         },
+        onSavedStateReset: () => {
+            updateRoute('integrations');
+        },
         onSaveError: handleError,
         onValidate: () => {
             const newErrors: Record<string, string> = {};
 
             if (!formState.name) {
-                newErrors.name = 'Please enter a name';
+                newErrors.name = 'Enter integration title';
             }
 
             return newErrors;
@@ -82,24 +80,17 @@ const CustomIntegrationModalContent: React.FC<{integration: Integration}> = ({in
         afterClose={() => {
             updateRoute('integrations');
         }}
+        buttonsDisabled={okProps.disabled}
+        cancelLabel='Close'
         dirty={saveState === 'unsaved'}
-        okColor='black'
-        okLabel='Save & close'
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
         size='md'
         testId='custom-integration-modal'
-        title={formState.name}
+        title={formState.name || 'Custom integration'}
         stickyFooter
         onOk={async () => {
-            toast.remove();
-            if (await handleSave()) {
-                modal.remove();
-                updateRoute('integrations');
-            } else {
-                showToast({
-                    type: 'pageError',
-                    message: 'Can\'t save integration, please double check that you\'ve filled all mandatory fields.'
-                });
-            }
+            await handleSave({fakeWhenUnchanged: true});
         }}
     >
         <div className='mt-7 flex w-full flex-col gap-7 md:flex-row'>
@@ -115,7 +106,11 @@ const CustomIntegrationModalContent: React.FC<{integration: Integration}> = ({in
                             const imageUrl = getImageUrl(await uploadImage({file}));
                             updateForm(state => ({...state, icon_image: imageUrl}));
                         } catch (e) {
-                            handleError(e);
+                            const error = e as APIError;
+                            if (error.response!.status === 415) {
+                                error.message = 'Unsupported file type';
+                            }
+                            handleError(error);
                         }
                     }}
                 >
@@ -127,13 +122,13 @@ const CustomIntegrationModalContent: React.FC<{integration: Integration}> = ({in
                     <TextField
                         error={Boolean(errors.name)}
                         hint={errors.name}
+                        maxLength={191}
                         title='Title'
                         value={formState.name}
-                        onBlur={validate}
                         onChange={e => updateForm(state => ({...state, name: e.target.value}))}
                         onKeyDown={() => clearError('name')}
                     />
-                    <TextField title='Description' value={formState.description || ''} onChange={e => updateForm(state => ({...state, description: e.target.value}))} />
+                    <TextField maxLength={2000} title='Description' value={formState.description || ''} onChange={e => updateForm(state => ({...state, description: e.target.value}))} />
                     <APIKeys keys={[
                         {
                             label: 'Content API key',
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..0efca1d1e53 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,30 +1,28 @@
-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 {Setting, getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
 import {useEffect, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const FirstpromoterModal = NiceModal.create(() => {
     const {updateRoute} = useRouting();
-    const modal = NiceModal.useModal();
 
     const {settings} = useGlobalData();
     const {mutateAsync: editSettings} = useEditSettings();
     const handleError = useHandleError();
 
     const [accountId, setAccountId] = useState<string | null>('');
-    const [enabled, setEnabled] = useState(false);
 
     const [firstPromoterEnabled] = getSettingValues<boolean>(settings, ['firstpromoter']);
     const [firstPromoterId] = getSettingValues<string>(settings, ['firstpromoter_id']);
 
+    const [okLabel, setOkLabel] = useState('Save');
+    const [enabled, setEnabled] = useState<boolean>(!!firstPromoterEnabled);
+
     useEffect(() => {
         setEnabled(firstPromoterEnabled || false);
         setAccountId(firstPromoterId || null);
@@ -41,8 +39,20 @@ const FirstpromoterModal = NiceModal.create(() => {
                 value: accountId
             }
         ];
-
-        await editSettings(updates);
+        try {
+            setOkLabel('Saving...');
+            await Promise.all([
+                editSettings(updates),
+                new Promise((resolve) => {
+                    setTimeout(resolve, 1000);
+                })
+            ]);
+            setOkLabel('Saved');
+        } catch (e) {
+            handleError(e);
+        } finally {
+            setTimeout(() => setOkLabel('Save'), 1000);
+        }
     };
 
     return (
@@ -50,16 +60,15 @@ const FirstpromoterModal = NiceModal.create(() => {
             afterClose={() => {
                 updateRoute('integrations');
             }}
+            cancelLabel='Close'
             dirty={enabled !== firstPromoterEnabled || accountId !== firstPromoterId}
-            okColor='black'
-            okLabel='Save & close'
+            okColor={okLabel === 'Saved' ? 'green' : 'black'}
+            okLabel={okLabel}
             testId='firstpromoter-modal'
             title=''
             onOk={async () => {
                 try {
                     await handleSave();
-                    updateRoute('integrations');
-                    modal.remove();
                 } catch (e) {
                     handleError(e);
                 }
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..f2763e1850d 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,23 +1,17 @@
-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 {Setting, getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
 import {useEffect, useRef, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
-import {useUploadFile} from '../../../../api/files';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {useUploadFile} from '@tryghost/admin-x-framework/api/files';
 
 const PinturaModal = NiceModal.create(() => {
     const {updateRoute} = useRouting();
-    const modal = NiceModal.useModal();
-    const [enabled, setEnabled] = useState(false);
     const [uploadingState, setUploadingState] = useState({
         js: false,
         css: false
@@ -33,6 +27,29 @@ const PinturaModal = NiceModal.create(() => {
         setEnabled(pinturaEnabled || false);
     }, [pinturaEnabled]);
 
+    const [okLabel, setOkLabel] = useState('Save');
+    const [enabled, setEnabled] = useState<boolean>(!!pinturaEnabled);
+
+    const handleToggleChange = async () => {
+        const updates: Setting[] = [
+            {key: 'pintura', value: (enabled)}
+        ];
+        try {
+            setOkLabel('Saving...');
+            await Promise.all([
+                editSettings(updates),
+                new Promise((resolve) => {
+                    setTimeout(resolve, 1000);
+                })
+            ]);
+            setOkLabel('Saved');
+        } catch (error) {
+            handleError(error);
+        } finally {
+            setTimeout(() => setOkLabel('Save'), 1000);
+        }
+    };
+
     const jsUploadRef = useRef<HTMLInputElement>(null);
     const cssUploadRef = useRef<HTMLInputElement>(null);
     const triggerUpload = (form: string) => {
@@ -66,7 +83,7 @@ const PinturaModal = NiceModal.create(() => {
 
             showToast({
                 type: 'success',
-                message: `Pintura ${form} uploaded successfully`
+                title: `Pintura ${form} uploaded`
             });
         } catch (e) {
             setUploadingState({js: false, css: false});
@@ -74,23 +91,20 @@ const PinturaModal = NiceModal.create(() => {
         }
     };
 
+    const isDirty = !(enabled === pinturaEnabled);
+
     return (
         <Modal
             afterClose={() => {
                 updateRoute('integrations');
             }}
-            cancelLabel=''
-            okColor='black'
-            okLabel='Save'
+            cancelLabel='Close'
+            dirty={isDirty}
+            okColor={okLabel === 'Saved' ? 'green' : 'black'}
+            okLabel={okLabel}
             testId='pintura-modal'
             title=''
-            onOk={async () => {
-                modal.remove();
-                updateRoute('integrations');
-                await editSettings([
-                    {key: 'pintura', value: enabled}
-                ]);
-            }}
+            onOk={handleToggleChange}
         >
             <IntegrationHeader
                 detail='Advanced image editing'
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..d298f549e82 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,23 +1,17 @@
-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';
+import {getSettingValues, useTestSlack} from '@tryghost/admin-x-framework/api/settings';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const SlackModal = NiceModal.create(() => {
     const {updateRoute} = useRouting();
-    const modal = NiceModal.useModal();
 
-    const {localSettings, updateSetting, handleSave, validate, errors, clearError} = useSettingGroup({
+    const {localSettings, updateSetting, handleSave, validate, errors, clearError, okProps} = useSettingGroup({
         onValidate: () => {
             const newErrors: Record<string, string> = {};
 
@@ -26,7 +20,8 @@ const SlackModal = NiceModal.create(() => {
             }
 
             return newErrors;
-        }
+        },
+        savingDelay: 500
     });
     const [slackUrl, slackUsername] = getSettingValues<string>(localSettings, ['slack_url', 'slack_username']);
 
@@ -37,28 +32,28 @@ const SlackModal = NiceModal.create(() => {
         if (await handleSave()) {
             await testSlack(null);
             showToast({
-                message: 'Check your Slack channel for the test message',
-                type: 'neutral'
+                title: 'Check your Slack channel for the test message',
+                type: 'info'
             });
         }
     };
 
+    const isDirty = localSettings.some(setting => setting.dirty);
+
     return (
         <Modal
             afterClose={() => {
                 updateRoute('integrations');
             }}
-            dirty={localSettings.some(setting => setting.dirty)}
-            okColor='black'
-            okLabel='Save & close'
+            cancelLabel='Close'
+            dirty={isDirty}
+            okColor={okProps.color}
+            okLabel={okProps.label || 'Save'}
             testId='slack-modal'
             title=''
             onOk={async () => {
                 toast.remove();
-                if (await handleSave()) {
-                    modal.remove();
-                    updateRoute('integrations');
-                }
+                await handleSave();
             }}
         >
             <IntegrationHeader
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..c97ee71bca5 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,46 +1,60 @@
-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 {Setting, getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
+import {useEffect, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const UnsplashModal = NiceModal.create(() => {
     const {updateRoute} = useRouting();
-    const modal = NiceModal.useModal();
     const {settings} = useGlobalData();
     const [unsplashEnabled] = getSettingValues<boolean>(settings, ['unsplash']);
     const {mutateAsync: editSettings} = useEditSettings();
     const handleError = useHandleError();
+    const [okLabel, setOkLabel] = useState('Save');
+    const [enabled, setEnabled] = useState<boolean>(!!unsplashEnabled);
 
-    const handleToggleChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
+    useEffect(() => {
+        setEnabled(unsplashEnabled || false);
+    }, [unsplashEnabled]);
+
+    const handleToggleChange = async () => {
         const updates: Setting[] = [
-            {key: 'unsplash', value: (e.target.checked)}
+            {key: 'unsplash', value: (enabled)}
         ];
         try {
-            await editSettings(updates);
+            setOkLabel('Saving...');
+            await Promise.all([
+                editSettings(updates),
+                new Promise((resolve) => {
+                    setTimeout(resolve, 1000);
+                })
+            ]);
+            setOkLabel('Saved');
         } catch (error) {
             handleError(error);
+        } finally {
+            setTimeout(() => setOkLabel('Save'), 1000);
         }
     };
 
+    const isDirty = !(enabled === unsplashEnabled);
+
     return (
         <Modal
             afterClose={() => {
                 updateRoute('integrations');
             }}
-            okColor='black'
-            okLabel='Save & close'
+            cancelLabel='Close'
+            dirty={isDirty}
+            okColor={okLabel === 'Saved' ? 'green' : 'black'}
+            okLabel={okLabel}
             testId='unsplash-modal'
             title=''
-            onOk={() => {
-                modal.remove();
-                updateRoute('integrations');
-            }}
+            onOk={handleToggleChange}
         >
             <IntegrationHeader
                 detail='Beautiful, free photos'
@@ -50,11 +64,13 @@ const UnsplashModal = NiceModal.create(() => {
             <div className='mt-7'>
                 <Form marginBottom={false} grouped>
                     <Toggle
-                        checked={unsplashEnabled}
+                        checked={enabled}
                         direction='rtl'
                         hint={<>Enable <a className='text-green' href="https://unsplash.com" rel="noopener noreferrer" target="_blank">Unsplash</a> image integration for your posts</>}
                         label='Enable Unsplash'
-                        onChange={handleToggleChange}
+                        onChange={(e) => {
+                            setEnabled(e.target.checked);
+                        }}
                     />
                 </Form>
             </div>
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..5c9bdbc8bcd 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,10 @@
-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 {Webhook, useCreateWebhook, useEditWebhook} from '../../../../api/webhooks';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
+import {Form, Modal, Select, TextField} from '@tryghost/admin-x-design-system';
+import {Webhook, useCreateWebhook, useEditWebhook} from '@tryghost/admin-x-framework/api/webhooks';
+import {useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 interface WebhookModalProps {
     webhook?: Webhook;
@@ -23,7 +17,7 @@ const WebhookModal: React.FC<WebhookModalProps> = ({webhook, integrationId}) =>
     const {mutateAsync: editWebhook} = useEditWebhook();
     const handleError = useHandleError();
 
-    const {formState, updateForm, handleSave, errors, clearError, validate} = useForm<Partial<Webhook>>({
+    const {formState, updateForm, handleSave, errors, clearError} = useForm<Partial<Webhook>>({
         initialState: webhook || {},
         onSave: async () => {
             if (formState.id) {
@@ -37,19 +31,19 @@ const WebhookModal: React.FC<WebhookModalProps> = ({webhook, integrationId}) =>
             const newErrors: Record<string, string> = {};
 
             if (!formState.name) {
-                newErrors.name = 'Please enter a name';
+                newErrors.name = 'Enter a name';
             }
 
             if (!formState.event) {
-                newErrors.event = 'Please select an event';
+                newErrors.event = 'Select an event';
             }
 
             if (!formState.target_url) {
-                newErrors.target_url = 'Please enter a target URL';
+                newErrors.target_url = 'Enter a target URL';
             }
 
             if (formState.target_url && !validator.isURL(formState.target_url)) {
-                newErrors.target_url = 'Please enter a valid URL';
+                newErrors.target_url = 'Enter a valid URL';
             }
 
             return newErrors;
@@ -64,14 +58,8 @@ const WebhookModal: React.FC<WebhookModalProps> = ({webhook, integrationId}) =>
         title='Add webhook'
         formSheet
         onOk={async () => {
-            toast.remove();
             if (await handleSave()) {
                 modal.remove();
-            } else {
-                showToast({
-                    type: 'pageError',
-                    message: 'Can\'t save webhook, please double check that you\'ve filled all mandatory fields.'
-                });
             }
         }}
     >
@@ -83,10 +71,10 @@ const WebhookModal: React.FC<WebhookModalProps> = ({webhook, integrationId}) =>
                 <TextField
                     error={Boolean(errors.name)}
                     hint={errors.name}
+                    maxLength={191}
                     placeholder='Custom webhook'
                     title='Name'
                     value={formState.name}
-                    onBlur={validate}
                     onChange={e => updateForm(state => ({...state, name: e.target.value}))}
                     onKeyDown={() => clearError('name')}
                 />
@@ -107,15 +95,16 @@ const WebhookModal: React.FC<WebhookModalProps> = ({webhook, integrationId}) =>
                 <TextField
                     error={Boolean(errors.target_url)}
                     hint={errors.target_url}
+                    maxLength={2000}
                     placeholder='https://example.com'
                     title='Target URL'
                     type='url'
                     value={formState.target_url}
-                    onBlur={validate}
                     onChange={e => updateForm(state => ({...state, target_url: e.target.value}))}
                     onKeyDown={() => clearError('target_url')}
                 />
                 <TextField
+                    maxLength={191}
                     placeholder='https://example.com'
                     title='Secret'
                     value={formState.secret || undefined}
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..10d188e7199 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,16 +1,10 @@
-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 {Integration} from '../../../../api/integrations';
+import {Button, ConfirmationModal, Table, TableCell, TableHead, TableRow, showToast} from '@tryghost/admin-x-design-system';
+import {Integration} from '@tryghost/admin-x-framework/api/integrations';
 import {getWebhookEventLabel} from './webhookEventOptions';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
-import {useDeleteWebhook} from '../../../../api/webhooks';
+import {useDeleteWebhook} from '@tryghost/admin-x-framework/api/webhooks';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const WebhooksTable: React.FC<{integration: Integration}> = ({integration}) => {
     const {mutateAsync: deleteWebhook} = useDeleteWebhook();
@@ -28,7 +22,7 @@ const WebhooksTable: React.FC<{integration: Integration}> = ({integration}) => {
                     confirmModal?.remove();
                     showToast({
                         message: 'Webhook deleted',
-                        type: 'success'
+                        type: 'info'
                     });
                 } catch (e) {
                     handleError(e);
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..c0af89553ae 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,22 +1,18 @@
 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 {getGhostPaths, resolveAsset} from '../../../../utils/helpers';
-import {useBrowseIntegrations} from '../../../../api/integrations';
+import {ReactComponent as ZapierIcon} from '../../../../assets/icons/zapier.svg';
+import {getGhostPaths} from '@tryghost/admin-x-framework/helpers';
+import {resolveAsset} from '../../../../utils/helpers';
+import {useBrowseIntegrations} from '@tryghost/admin-x-framework/api/integrations';
 import {useEffect, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
-import {useRefreshAPIKey} from '../../../../api/apiKeys';
-import {useServices} from '../../../providers/ServiceProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRefreshAPIKey} from '@tryghost/admin-x-framework/api/apiKeys';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {useSettingsApp} from '../../../providers/SettingsAppProvider';
 
 export interface ZapierTemplate {
     ghostImage: string;
@@ -28,7 +24,7 @@ export interface ZapierTemplate {
 const ZapierModal = NiceModal.create(() => {
     const modal = NiceModal.useModal();
     const {updateRoute} = useRouting();
-    const {zapierTemplates} = useServices();
+    const {zapierTemplates} = useSettingsApp();
     const {data: {integrations} = {integrations: []}} = useBrowseIntegrations();
     const {config} = useGlobalData();
     const {adminRoot} = getGhostPaths();
@@ -111,7 +107,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 +121,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..cfe4ec4f00e 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',
@@ -16,11 +16,7 @@ const features = [{
     description: 'Allows viewing received mentions on the dashboard.',
     flag: 'webmentions'
 },{
-    title: 'Websockets',
-    description: <>Test out Websockets functionality at <code>/ghost/#/websockets</code>.</>,
-    flag: 'websockets'
-},{
-    title: 'Stripe Automatic Tax',
+    title: 'Stripe Automatic Tax (private beta)',
     description: 'Use Stripe Automatic Tax at Stripe Checkout. Needs to be enabled in Stripe',
     flag: 'stripeAutomaticTax'
 },{
@@ -44,17 +40,21 @@ const features = [{
     description: 'Enables tier to be specified when importing members',
     flag: 'importMemberTier'
 },{
-    title: 'Tips & donations',
-    description: 'Enables publishers to collect one-time payments',
-    flag: 'tipsAndDonations'
+    title: 'AdminX Demo',
+    description: 'Adds a navigation link to the AdminX demo app',
+    flag: 'adminXDemo'
+},{
+    title: 'NestJS Playground',
+    description: 'Wires up the Ghost NestJS App to the Admin API (also needs GHOST_ENABLE_NEST_FRAMEWORK=1 env var)',
+    flag: 'NestPlayground'
 },{
-    title: 'List-Unsubscribe header',
-    description: 'Set the List-Unsubscribe header in emails',
-    flag: 'listUnsubscribeHeader'
+    title: 'ActivityPub',
+    description: '(Highly) Experimental support for ActivityPub.',
+    flag: 'ActivityPub'
 },{
-    title: 'Editor emoji picker',
-    description: <>Trigger an emoji picker when typing <code>{':{search}'}</code> in the editor</>,
-    flag: 'editorEmojiPicker'
+    title: 'Content Visibility',
+    description: 'Enables content visibility in Emails',
+    flag: 'contentVisibility'
 }];
 
 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..97daa8bb2c8 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,17 +1,12 @@
-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 {downloadRedirects, useUploadRedirects} from '../../../../api/redirects';
-import {downloadRoutes, useUploadRoutes} from '../../../../api/routes';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
+import {Button, FileUpload, List, showToast} from '@tryghost/admin-x-design-system';
+import {downloadRedirects, useUploadRedirects} from '@tryghost/admin-x-framework/api/redirects';
+import {downloadRoutes, useUploadRoutes} from '@tryghost/admin-x-framework/api/routes';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const BetaFeatures: React.FC = () => {
-    const {updateRoute} = useRouting();
     const {mutateAsync: uploadRedirects} = useUploadRedirects();
     const {mutateAsync: uploadRoutes} = useUploadRoutes();
     const handleError = useHandleError();
@@ -21,9 +16,13 @@ const BetaFeatures: React.FC = () => {
     return (
         <List titleSeparator={false}>
             <LabItem
-                action={<Button color='grey' label='Open' size='sm' onClick={() => updateRoute({isExternal: true, route: 'migrate'})} />}
-                detail={<>A <a className='text-green' href="https://ghost.org/help/importing-from-substack/" rel="noopener noreferrer" target="_blank">step-by-step tool</a> to easily import all your content, members and paid subscriptions</>}
-                title='Substack migrator' />
+                action={<FeatureToggle flag="editorExcerpt" />}
+                detail={<>Adds the excerpt input below the post title in the editor</>}
+                title='Show post excerpt inline' />
+            <LabItem
+                action={<FeatureToggle flag="additionalPaymentMethods" />}
+                detail={<>Enable support for CashApp, iDEAL, Bancontact, and others. <a className='text-green' href="https://ghost.org/help/payment-methods" rel="noopener noreferrer" target="_blank">Learn more &rarr;</a></>}
+                title='Additional payment methods' />
             <LabItem
                 action={<FeatureToggle flag='i18n' />}
                 detail={<>Translate your membership flows into your publication language (<a className='text-green' href="https://github.com/TryGhost/Ghost/tree/main/ghost/i18n/locales" rel="noopener noreferrer" target="_blank">supported languages</a>). Don’t see yours? <a className='text-green' href="https://forum.ghost.org/t/help-translate-ghost-beta/37461" rel="noopener noreferrer" target="_blank">Get involved</a></>}
@@ -37,8 +36,8 @@ const BetaFeatures: React.FC = () => {
                                 setRedirectsUploading(true);
                                 await uploadRedirects(file);
                                 showToast({
-                                    type: 'success',
-                                    message: 'Redirects uploaded successfully'
+                                    title: 'Redirects uploaded',
+                                    type: 'success'
                                 });
                             } catch (e) {
                                 handleError(e);
@@ -63,7 +62,7 @@ const BetaFeatures: React.FC = () => {
                                 await uploadRoutes(file);
                                 showToast({
                                     type: 'success',
-                                    message: 'Routes uploaded successfully'
+                                    title: 'Routes uploaded'
                                 });
                             } catch (e) {
                                 handleError(e);
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..44208ff0e7b 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,9 +1,10 @@
 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 {getSettingValue, useEditSettings} from '../../../../api/settings';
+import trackEvent from '../../../../utils/analytics';
+import {ConfigResponseType, configDataType} from '@tryghost/admin-x-framework/api/config';
+import {Toggle} from '@tryghost/admin-x-design-system';
+import {getSettingValue, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 import {useQueryClient} from '@tanstack/react-query';
 
 const FeatureToggle: React.FC<{ flag: string; label?: string; }> = ({label, flag}) => {
@@ -13,13 +14,14 @@ const FeatureToggle: React.FC<{ flag: string; label?: string; }> = ({label, flag
     const client = useQueryClient();
     const handleError = useHandleError();
 
-    return <Toggle checked={labs[flag]} label={label} labelClasses='sr-only' onChange={async () => {
+    return <Toggle checked={labs[flag]} label={label} labelClasses='sr-only' name={`feature-${flag}`} onChange={async () => {
         const newValue = !labs[flag];
         try {
             await editSettings([{
                 key: 'labs',
                 value: JSON.stringify({...labs, [flag]: newValue})
             }]);
+            trackEvent('Feature Toggled', {state: newValue ? 'on' : 'off', feature: flag});
             client.setQueriesData([configDataType], current => ({
                 config: {
                     ...(current as ConfigResponseType).config,
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..57dfdfdd295 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 {downloadAllContent, useDeleteAllContent, useImportContent} from '../../../../api/db';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
+import {Button, ConfirmationModal, FileUpload, List, showToast} from '@tryghost/admin-x-design-system';
+import {downloadAllContent, useDeleteAllContent, useImportContent} from '@tryghost/admin-x-framework/api/db';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 import {useQueryClient} from '@tanstack/react-query';
 
 const ImportModalContent = () => {
@@ -69,7 +65,7 @@ const MigrationOptions: React.FC = () => {
                     await deleteAllContent(null);
                     showToast({
                         type: 'success',
-                        message: 'All content deleted from database.'
+                        title: 'All content deleted from database.'
                     });
                     modal?.remove();
                     await client.refetchQueries();
diff --git a/apps/admin-x-settings/src/components/settings/advanced/migrationtools/MigrationToolsExport.tsx b/apps/admin-x-settings/src/components/settings/advanced/migrationtools/MigrationToolsExport.tsx
new file mode 100644
index 00000000000..99112c7ce89
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/advanced/migrationtools/MigrationToolsExport.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import {Button} from '@tryghost/admin-x-design-system';
+import {downloadAllContent} from '@tryghost/admin-x-framework/api/db';
+
+const MigrationToolsExport: React.FC = () => {
+    return (
+        <div className='flex flex-col items-center gap-3 pb-5 pt-10'>
+            <div>Download all of your <strong>posts and settings</strong> in a single, glorious JSON file.</div>
+            <Button className='!h-9 !font-semibold' color='grey' icon='export' iconColorClass='!h-5 !w-auto' label='Export content' onClick={() => downloadAllContent()} />
+        </div>
+    );
+};
+
+export default MigrationToolsExport;
diff --git a/apps/admin-x-settings/src/components/settings/advanced/migrationtools/MigrationToolsImport.tsx b/apps/admin-x-settings/src/components/settings/advanced/migrationtools/MigrationToolsImport.tsx
new file mode 100644
index 00000000000..d1ff9bbf0fd
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/advanced/migrationtools/MigrationToolsImport.tsx
@@ -0,0 +1,76 @@
+import NiceModal from '@ebay/nice-modal-react';
+import React from 'react';
+import UniversalImportModal from './UniversalImportModal';
+import clsx from 'clsx';
+import {Icon} from '@tryghost/admin-x-design-system';
+import {ReactComponent as MailchimpIcon} from '../../../../assets/icons/mailchimp.svg';
+import {ReactComponent as MediumIcon} from '../../../../assets/icons/medium.svg';
+import {ReactComponent as SubstackIcon} from '../../../../assets/icons/substack.svg';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+const ImportButton: React.FC<{
+    icon?: React.ReactNode,
+    title?: string,
+    onClick?: () => void
+}> = ({
+    icon,
+    title,
+    onClick
+}) => {
+    const classNames = clsx(
+        'flex h-9 cursor-pointer items-center justify-center gap-2 rounded-md bg-grey-100 px-2 text-sm font-semibold transition-all hover:bg-grey-200 dark:bg-grey-900'
+    );
+    if (onClick) {
+        return (
+            <button className={classNames} type='button' onClick={onClick}>
+                {icon}
+                {title}
+            </button>
+        );
+    } else {
+        return <></>;
+    }
+};
+
+const MigrationToolsImport: React.FC = () => {
+    const {updateRoute} = useRouting();
+
+    const handleImportContent = () => {
+        NiceModal.show(UniversalImportModal);
+    };
+
+    return (
+        <div className='grid grid-cols-1 gap-4 pt-4 md:grid-cols-2 lg:grid-cols-3'>
+            <ImportButton
+                icon={
+                    <SubstackIcon className='h-[18px] w-auto' />
+                }
+                title='Substack'
+                onClick={() => updateRoute({isExternal: true, route: '/migrate/substack'})}
+            />
+            <ImportButton
+                icon={
+                    <MediumIcon className='h-[18px] w-auto dark:invert' />
+                }
+                title='Medium'
+                onClick={() => updateRoute({isExternal: true, route: '/migrate/medium'})}
+            />
+            <ImportButton
+                icon={
+                    <MailchimpIcon className='h-5 w-auto' />
+                }
+                title='Mailchimp'
+                onClick={() => updateRoute({isExternal: true, route: '/migrate/mailchimp'})}
+            />
+            <ImportButton
+                icon={
+                    <Icon className='h-4 w-auto' name='import' />
+                }
+                title='Universal import'
+                onClick={handleImportContent}
+            />
+        </div>
+    );
+};
+
+export default MigrationToolsImport;
diff --git a/apps/admin-x-settings/src/components/settings/advanced/migrationtools/UniversalImportModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/migrationtools/UniversalImportModal.tsx
new file mode 100644
index 00000000000..737b6378883
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/advanced/migrationtools/UniversalImportModal.tsx
@@ -0,0 +1,55 @@
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import React, {useState} from 'react';
+import {ConfirmationModal, FileUpload, Modal} from '@tryghost/admin-x-design-system';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useImportContent} from '@tryghost/admin-x-framework/api/db';
+
+const UniversalImportModal: React.FC = () => {
+    const modal = useModal();
+    const {mutateAsync: importContent} = useImportContent();
+    const [uploading, setUploading] = useState(false);
+    const handleError = useHandleError();
+
+    return (
+        <Modal
+            backDropClick={false}
+            okLabel=''
+            size='sm'
+            testId='universal-import-modal'
+            title='Universal import'
+        >
+            <div className='py-4 leading-9'>
+                <FileUpload
+                    id="import-file"
+                    onUpload={async (file) => {
+                        setUploading(true);
+                        try {
+                            await importContent(file);
+                            modal.remove();
+                            NiceModal.show(ConfirmationModal, {
+                                title: 'Import in progress',
+                                prompt: `Your import is being processed, and you'll receive a confirmation email as soon as it's complete. Usually this only takes a few minutes, but larger imports may take longer.`,
+                                cancelLabel: '',
+                                okLabel: 'Got it',
+                                onOk: confirmModal => confirmModal?.remove(),
+                                formSheet: false
+                            });
+                        } catch (e) {
+                            handleError(e);
+                        } finally {
+                            setUploading(false);
+                        }
+                    }}
+                >
+                    <div className="-mb-4 cursor-pointer bg-grey-75 p-10 text-center dark:bg-grey-950">
+                        {uploading ? 'Uploading...' : <>
+                        Select any JSON or zip file that contains <br />posts and settings
+                        </>}
+                    </div>
+                </FileUpload>
+            </div>
+        </Modal>
+    );
+};
+
+export default NiceModal.create(UniversalImportModal);
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..69bb2c0326f 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';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 
 type RefipientValueArgs = {
     defaultEmailRecipients: string;
@@ -128,7 +125,7 @@ const DefaultRecipients: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const form = (
         <SettingGroupContent columns={1}>
             <Select
-                hint='Who should be able to subscribe to your site?'
+                hint='Who should receive your posts by default?'
                 options={RECIPIENT_FILTER_OPTIONS}
                 selectedOption={RECIPIENT_FILTER_OPTIONS.find(option => option.value === selectedOption)}
                 testId='default-recipients-select'
@@ -145,7 +142,6 @@ const DefaultRecipients: React.FC<{ keywords: string[] }> = ({keywords}) => {
                     title='Filter'
                     values={selectedSegments}
                     async
-                    clearBg
                     defaultOptions
                     onChange={updateSelectedSegments}
                 />
@@ -154,7 +150,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 +163,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..ce1fc86931d 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 {getSettingValues} from '../../../api/settings';
+import SearchableSection from '../../SearchableSection';
+import {getSettingValues} from '@tryghost/admin-x-framework/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..15066e23f3c 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 useHandleError from '../../../utils/api/handleError';
-import useRouting from '../../../hooks/useRouting';
-import {Setting, getSettingValues, useEditSettings} from '../../../api/settings';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Banner, Icon, SettingGroupContent, Toggle, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {Setting, getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 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..990ec55c229 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 useHandleError from '../../../utils/api/handleError';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {getSettingValues, useEditSettings} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {IconLabel, Link, Select, SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 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..ef4f74ac743 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,15 @@
-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 useHandleError from '../../../utils/api/handleError';
+import TopLevelGroup from '../../TopLevelGroup';
 import useQueryParams from '../../../hooks/useQueryParams';
-import useRouting from '../../../hooks/useRouting';
-import {APIError} from '../../../utils/errors';
-import {useBrowseNewsletters, useVerifyNewsletterEmail} from '../../../api/newsletters';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {APIError} from '@tryghost/admin-x-framework/errors';
+import {Button, ConfirmationModal, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {InfiniteData, useQueryClient} from '@tryghost/admin-x-framework';
+import {Newsletter, NewslettersResponseType, newslettersDataType, useBrowseNewsletters, useEditNewsletter, useVerifyNewsletterEmail} from '@tryghost/admin-x-framework/api/newsletters';
+import {arrayMove} from '@dnd-kit/sortable';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const NavigateToNewsletter = ({id, children}: {id: string; children: ReactNode}) => {
     const modal = useModal();
@@ -28,33 +27,54 @@ const Newsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
         updateRoute('newsletters/new');
     };
     const [selectedTab, setSelectedTab] = useState('active-newsletters');
-    const {data: {newsletters, meta, isEnd} = {}, fetchNextPage} = useBrowseNewsletters();
+    const {data: {newsletters: apiNewsletters, meta, isEnd} = {}, isLoading, fetchNextPage} = useBrowseNewsletters();
+    const {mutateAsync: editNewsletter} = useEditNewsletter();
+    const queryClient = useQueryClient();
 
     const verifyEmailToken = useQueryParams().getParam('verifyEmail');
     const {mutateAsync: verifyEmail} = useVerifyNewsletterEmail();
     const handleError = useHandleError();
 
+    const [newsletters, setNewsletters] = useState<Newsletter[]>(apiNewsletters || []);
+
+    useEffect(() => {
+        setNewsletters(apiNewsletters || []);
+    }, [apiNewsletters]);
+
     useEffect(() => {
-        if (!verifyEmailToken) {
+        if (!verifyEmailToken || !window.location.href.includes('newsletters')) {
             return;
         }
 
         const verify = async () => {
             try {
-                const {newsletters: [updatedNewsletter]} = await verifyEmail({token: verifyEmailToken});
+                const {newsletters: [updatedNewsletter], meta: {email_verified: emailVerified} = {}} = await verifyEmail({token: verifyEmailToken});
+                let title;
+                let prompt;
+
+                if (emailVerified && emailVerified === 'sender_email') {
+                    title = 'Newsletter email verified';
+                    prompt = <>Newsletter <NavigateToNewsletter id={updatedNewsletter.id}>{updatedNewsletter.name}</NavigateToNewsletter> will now be sent from <strong>{updatedNewsletter.sender_email}</strong>.</>;
+                } else if (emailVerified && emailVerified === 'sender_reply_to') {
+                    title = 'Reply-to address verified';
+                    prompt = <>Newsletter <NavigateToNewsletter id={updatedNewsletter.id}>{updatedNewsletter.name}</NavigateToNewsletter> will now use <strong>{updatedNewsletter.sender_reply_to}</strong> as the reply-to address.</>;
+                } else {
+                    title = 'Email address verified';
+                    prompt = <>Email address for newsletter <NavigateToNewsletter id={updatedNewsletter.id}>{updatedNewsletter.name}</NavigateToNewsletter> has been changed.</>;
+                }
 
                 NiceModal.show(ConfirmationModal, {
-                    title: 'Email address verified',
-                    prompt: <>Success! From address for newsletter <NavigateToNewsletter id={updatedNewsletter.id}>{updatedNewsletter.name}</NavigateToNewsletter> changed to <strong>{updatedNewsletter.sender_email}</strong></>,
+                    title,
+                    prompt,
                     okLabel: 'Close',
                     cancelLabel: '',
                     onOk: confirmModal => confirmModal?.remove()
                 });
             } catch (e) {
-                let prompt = 'There was an error verifying your email address. Please try again.';
+                let prompt = 'There was an error verifying your email address. Try again later.';
 
                 if (e instanceof APIError && e.message === 'Token expired') {
-                    prompt = 'The verification link has expired. Please try again.';
+                    prompt = 'Verification link has expired.';
                 }
                 NiceModal.show(ConfirmationModal, {
                     title: 'Error verifying email address',
@@ -70,26 +90,65 @@ const Newsletters: React.FC<{ keywords: string[] }> = ({keywords}) => {
     }, [verifyEmailToken, handleError, verifyEmail]);
 
     const buttons = (
-        <Button color='green' label='Add newsletter' link linkWithPadding onClick={() => {
+        <Button className='mt-[-5px]' color='clear' label='Add newsletter' size='sm' onClick={() => {
             openNewsletterModal();
         }} />
     );
 
+    const sortedActiveNewsletters = newsletters.filter(n => n.status === 'active').sort((a, b) => a.sort_order - b.sort_order) || [];
+    const archivedNewsletters = newsletters.filter(newsletter => newsletter.status !== 'active');
+
+    const onSort = async (id: string, overId?: string) => {
+        const fromIndex = sortedActiveNewsletters.findIndex(newsletter => newsletter.id === id);
+        const toIndex = sortedActiveNewsletters.findIndex(newsletter => newsletter.id === overId) || 0;
+        const newSortOrder = arrayMove(sortedActiveNewsletters, fromIndex, toIndex);
+
+        const updatedActiveNewsletters = newSortOrder.map((newsletter, index) => (
+            newsletter.sort_order === index ? null : {...newsletter, sort_order: index}
+        )).filter((newsletter): newsletter is Newsletter => !!newsletter);
+
+        const updatedArchivedNewsletters = archivedNewsletters.map((newsletter, index) => (
+            newsletter.sort_order === index + sortedActiveNewsletters.length ? null : {...newsletter, sort_order: index}
+        )).filter((newsletter): newsletter is Newsletter => !!newsletter);
+
+        const orderUpdatedNewsletters = [...updatedActiveNewsletters, ...updatedArchivedNewsletters].sort((a, b) => a.sort_order - b.sort_order);
+
+        // Set the new order in local state and cache first so that the UI updates immediately
+        setNewsletters(newsletters.map(newsletter => orderUpdatedNewsletters.find(n => n.id === newsletter.id) || newsletter));
+        queryClient.setQueriesData<InfiniteData<NewslettersResponseType>>([newslettersDataType], (currentData) => {
+            if (!currentData) {
+                return;
+            }
+
+            return {
+                ...currentData,
+                pages: currentData.pages.map(page => ({
+                    ...page,
+                    newsletters: page.newsletters.map(newsletter => orderUpdatedNewsletters.find(n => n.id === newsletter.id) || newsletter)
+                }))
+            };
+        });
+
+        for (const newsletter of orderUpdatedNewsletters) {
+            await editNewsletter(newsletter);
+        }
+    };
+
     const tabs = [
         {
             id: 'active-newsletters',
             title: 'Active',
-            contents: (<NewslettersList newsletters={newsletters?.filter(newsletter => newsletter.status === 'active') || []} />)
+            contents: (<NewslettersList isLoading={isLoading} newsletters={sortedActiveNewsletters} isSortable onSort={onSort} />)
         },
         {
             id: 'archived-newsletters',
             title: 'Archived',
-            contents: (<NewslettersList newsletters={newsletters?.filter(newsletter => newsletter.status !== 'active') || []} />)
+            contents: (<NewslettersList isLoading={isLoading} newsletters={archivedNewsletters} />)
         }
     ];
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={buttons}
             keywords={keywords}
             navid='newsletters'
@@ -102,7 +161,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..efc2853fde7 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,20 +1,12 @@
-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} 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';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {numberWithCommas} from '../../../../utils/helpers';
+import {useAddNewsletter} from '@tryghost/admin-x-framework/api/newsletters';
+import {useBrowseMembers} from '@tryghost/admin-x-framework/api/members';
+import {useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
     const modal = useModal();
@@ -26,7 +18,7 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
     });
 
     const {mutateAsync: addNewsletter} = useAddNewsletter();
-    const {formState, updateForm, handleSave, errors, clearError} = useForm({
+    const {formState, updateForm, saveState, handleSave, errors, clearError} = useForm({
         initialState: {
             name: '',
             description: '',
@@ -47,7 +39,7 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
             const newErrors: Record<string, string> = {};
 
             if (!formState.name) {
-                newErrors.name = 'Please enter a name';
+                newErrors.name = 'A name is required for your newsletter';
             }
 
             return newErrors;
@@ -60,7 +52,8 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
         limiter?.errorIfWouldGoOverLimit('newsletters').catch((error) => {
             if (error instanceof HostLimitError) {
                 NiceModal.show(LimitModal, {
-                    prompt: error.message || `Your current plan doesn't support more newsletters.`
+                    prompt: error.message || `Your current plan doesn't support more newsletters.`,
+                    onOk: () => updateRoute({route: '/pro', isExternal: true})
                 });
                 modal.remove();
                 updateRoute('newsletters');
@@ -70,24 +63,22 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
         });
     }, [limiter, modal, updateRoute]);
 
+    const subscriberCount = members?.meta?.pagination.total;
+
     return <Modal
         afterClose={() => {
             updateRoute('newsletters');
         }}
+        backDropClick={false}
         okColor='black'
         okLabel='Create'
+        okLoading={saveState === 'saving'}
         size='sm'
         testId='add-newsletter-modal'
         title='Create newsletter'
         onOk={async () => {
-            toast.remove();
             if (await handleSave()) {
                 modal.remove();
-            } else {
-                showToast({
-                    type: 'pageError',
-                    message: 'Can\'t save newsletter, please double check that you\'ve filled all mandatory fields.'
-                });
             }
         }}
     >
@@ -99,6 +90,7 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
                 autoFocus={true}
                 error={Boolean(errors.name)}
                 hint={errors.name}
+                maxLength={191}
                 placeholder='Weekly roundup'
                 title='Name'
                 value={formState.name}
@@ -106,6 +98,7 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
                 onKeyDown={() => clearError('name')}
             />
             <TextArea
+                maxLength={2000}
                 title='Description'
                 value={formState.description}
                 onChange={e => updateForm(state => ({...state, description: e.target.value}))}
@@ -114,7 +107,7 @@ const AddNewsletterModal: React.FC<RoutingModalProps> = () => {
                 checked={formState.optInExistingSubscribers}
                 direction='rtl'
                 hint={formState.optInExistingSubscribers ?
-                    `This newsletter will be available to all members. Your ${members?.meta?.pagination.total} existing subscriber${members?.meta?.pagination.total === 1 ? '' : 's'} will also be opted-in to receive it.` :
+                    `This newsletter will be available to all members. Your ${subscriberCount === undefined ? '' : numberWithCommas(subscriberCount)} existing subscriber${members?.meta?.pagination.total === 1 ? '' : 's'} will also be opted-in to receive it.` :
                     'The newsletter will be available to all new members. Existing members won’t be subscribed, but may visit their account area to opt-in to future emails.'
                 }
                 label='Opt-in existing subscribers'
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..0b737771461 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,41 +1,92 @@
-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 NiceModal from '@ebay/nice-modal-react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 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 {ErrorMessages, useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
 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 {Newsletter, useBrowseNewsletters, useEditNewsletter} from '@tryghost/admin-x-framework/api/newsletters';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {hasSendingDomain, isManagedEmail, sendingDomain} from '@tryghost/admin-x-framework/api/config';
+import {renderReplyToEmail, renderSenderEmail} from '../../../../utils/newsletterEmails';
 import {textColorForBackgroundColor} from '@tryghost/color-utils';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
+const ReplyToEmailField: React.FC<{
+    newsletter: Newsletter;
+    updateNewsletter: (fields: Partial<Newsletter>) => void;
+    errors: ErrorMessages;
+    validate: () => void;
+    clearError: (field: string) => void;
+}> = ({newsletter, updateNewsletter, errors, clearError}) => {
+    const {settings, config} = useGlobalData();
+    const [defaultEmailAddress, supportEmailAddress] = getSettingValues<string>(settings, ['default_email_address', 'support_email_address']);
+    const newEmailAddressesFlag = useFeatureFlag('newEmailAddresses');
+
+    // When editing the senderReplyTo, we use a state, so we don't cause jumps when the 'rendering' method decides to change the value
+    // Because 'newsletter' 'support' or an empty value can be mapped to a default value, we don't want those changes to happen when entering text
+    const [senderReplyTo, setSenderReplyTo] = useState(renderReplyToEmail(newsletter, config, supportEmailAddress, defaultEmailAddress) || '');
+
+    let newsletterAddress = renderSenderEmail(newsletter, config, defaultEmailAddress);
+    const replyToEmails = useMemo(() => [
+        {label: `Newsletter address (${newsletterAddress})`, value: 'newsletter'},
+        {label: `Support address (${supportEmailAddress})`, value: 'support'}
+    ], [newsletterAddress, supportEmailAddress]);
+
+    useEffect(() => {
+        if (!isManagedEmail(config) && !newEmailAddressesFlag) {
+            // Autocorrect invalid values
+            const foundValue = replyToEmails.find(option => option.value === newsletter.sender_reply_to);
+            if (!foundValue) {
+                updateNewsletter({sender_reply_to: 'newsletter'});
+            }
+        }
+    }, [config, replyToEmails, updateNewsletter, newsletter.sender_reply_to, newEmailAddressesFlag]);
+
+    const onChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+        setSenderReplyTo(e.target.value);
+        updateNewsletter({sender_reply_to: e.target.value || 'newsletter'});
+    }, [updateNewsletter, setSenderReplyTo]);
+
+    // Self-hosters, or legacy Pro users
+    if (!isManagedEmail(config) && !newEmailAddressesFlag) {
+        // Only allow some choices
+        return (
+            <Select
+                options={replyToEmails}
+                selectedOption={replyToEmails.find(option => option.value === newsletter.sender_reply_to)}
+                title="Reply-to email"
+                onSelect={option => updateNewsletter({sender_reply_to: option?.value})}
+            />
+        );
+    }
+
+    const onBlur = () => {
+        // Update the senderReplyTo to the rendered value again
+        const rendered = renderReplyToEmail(newsletter, config, supportEmailAddress, defaultEmailAddress) || '';
+        setSenderReplyTo(rendered);
+    };
+
+    // Pro users without custom sending domains
+    return (
+        <TextField
+            error={Boolean(errors.sender_reply_to)}
+            hint={errors.sender_reply_to}
+            maxLength={191}
+            placeholder={newsletterAddress || ''}
+            title="Reply-to email"
+            value={senderReplyTo}
+            onBlur={onBlur}
+            onChange={onChange}
+            onKeyDown={() => clearError('sender_reply_to')}
+        />
+    );
+};
+
 const Sidebar: React.FC<{
     newsletter: Newsletter;
     onlyOne: boolean;
@@ -44,21 +95,26 @@ const Sidebar: React.FC<{
     errors: ErrorMessages;
     clearError: (field: string) => void;
 }> = ({newsletter, onlyOne, updateNewsletter, validate, errors, clearError}) => {
+    const {updateRoute} = useRouting();
     const {mutateAsync: editNewsletter} = useEditNewsletter();
     const limiter = useLimiter();
-    const {settings, siteData} = useGlobalData();
-    const [membersSupportAddress, icon] = getSettingValues<string>(settings, ['members_support_address', 'icon']);
+    const {settings, siteData, config} = useGlobalData();
+    const [icon, defaultEmailAddress] = getSettingValues<string>(settings, ['icon', 'default_email_address', 'support_email_address']);
     const {mutateAsync: uploadImage} = useUploadImage();
     const [selectedTab, setSelectedTab] = useState('generalSettings');
     const hasEmailCustomization = useFeatureFlag('emailCustomization');
     const {localSettings} = useSettingGroup();
     const [siteTitle] = getSettingValues(localSettings, ['title']) as string[];
     const handleError = useHandleError();
+    const {data: {newsletters: apiNewsletters} = {}} = useBrowseNewsletters();
 
-    const replyToEmails = [
-        {label: `Newsletter address (${fullEmailAddress(newsletter.sender_email || 'noreply', siteData)})`, value: 'newsletter'},
-        {label: `Support address (${fullEmailAddress(membersSupportAddress || 'noreply', siteData)})`, value: 'support'}
-    ];
+    let newsletterAddress = renderSenderEmail(newsletter, config, defaultEmailAddress);
+    const [newsletters, setNewsletters] = useState<Newsletter[]>(apiNewsletters || []);
+    const activeNewsletters = newsletters.filter(n => n.status === 'active');
+
+    useEffect(() => {
+        setNewsletters(apiNewsletters || []);
+    }, [apiNewsletters]);
 
     const fontOptions: SelectOption[] = [
         {value: 'serif', label: 'Elegant serif', className: 'font-serif'},
@@ -80,8 +136,8 @@ const Sidebar: React.FC<{
             NiceModal.show(ConfirmationModal, {
                 title: 'Archive newsletter',
                 prompt: <>
-                    <p>Your newsletter <strong>{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 className="mb-6">Your newsletter <strong>{newsletter.name}</strong> will no longer be visible to members or available as an option when publishing new posts.</div>
+                    <div>Existing posts previously sent as this newsletter will remain unchanged.</div>
                 </>,
                 okLabel: 'Archive',
                 okColor: 'red',
@@ -91,7 +147,7 @@ const Sidebar: React.FC<{
                         modal?.remove();
                         showToast({
                             type: 'success',
-                            message: 'Newsletter archived successfully'
+                            message: 'Newsletter archived'
                         });
                     } catch (e) {
                         handleError(e);
@@ -104,7 +160,8 @@ const Sidebar: React.FC<{
             } catch (error) {
                 if (error instanceof HostLimitError) {
                     NiceModal.show(LimitModal, {
-                        prompt: error.message || `Your current plan doesn't support more newsletters.`
+                        prompt: error.message || `Your current plan doesn't support more newsletters.`,
+                        onOk: () => updateRoute({route: '/pro', isExternal: true})
                     });
                     return;
                 } else {
@@ -123,13 +180,51 @@ const Sidebar: React.FC<{
                     modal?.remove();
                     showToast({
                         type: 'success',
-                        message: 'Newsletter reactivated successfully'
+                        message: 'Newsletter reactivated'
                     });
                 }
             });
         }
     };
 
+    const renderSenderEmailField = () => {
+        // Self-hosters, or legacy Pro users
+        if (!isManagedEmail(config)) {
+            return (
+                <TextField
+                    error={Boolean(errors.sender_email)}
+                    hint={errors.sender_email}
+                    placeholder={newsletterAddress || ''}
+                    title="Sender email address"
+                    value={newsletter.sender_email || ''}
+                    onChange={e => updateNewsletter({sender_email: e.target.value})}
+                    onKeyDown={() => clearError('sender_email')}
+                />
+            );
+        }
+
+        // Pro users with custom sending domains
+        if (hasSendingDomain(config)) {
+            return (
+                <TextField
+                    error={Boolean(errors.sender_email)}
+                    hint={errors.sender_email}
+                    maxLength={191}
+                    placeholder={defaultEmailAddress}
+                    title="Sender email address"
+                    value={newsletter.sender_email || ''}
+                    onChange={(e) => {
+                        updateNewsletter({sender_email: e.target.value});
+                    }}
+                    onKeyDown={() => clearError('sender_email')}
+                />
+            );
+        }
+
+        // Pro users without custom sending domains
+        // We're not showing the field since it's not editable
+    };
+
     const tabs: Tab[] = [
         {
             id: 'generalSettings',
@@ -140,33 +235,19 @@ const Sidebar: React.FC<{
                     <TextField
                         error={Boolean(errors.name)}
                         hint={errors.name}
+                        maxLength={191}
                         placeholder="Weekly Roundup"
                         title="Name"
                         value={newsletter.name || ''}
-                        onBlur={validate}
                         onChange={e => updateNewsletter({name: e.target.value})}
                         onKeyDown={() => clearError('name')}
                     />
-                    <TextArea rows={2} title="Description" value={newsletter.description || ''} onChange={e => updateNewsletter({description: e.target.value})} />
+                    <TextArea maxLength={2000} rows={2} title="Description" value={newsletter.description || ''} onChange={e => updateNewsletter({description: e.target.value})} />
                 </Form>
-                <Form className='mt-6' gap='sm' margins='lg' title='Email addresses'>
-                    <TextField placeholder={siteTitle} title="Sender name" value={newsletter.sender_name || ''} onChange={e => updateNewsletter({sender_name: e.target.value})} />
-                    <TextField
-                        error={Boolean(errors.sender_email)}
-                        hint={errors.sender_email}
-                        placeholder={fullEmailAddress(newsletter.sender_email || 'noreply', siteData)}
-                        title="Sender email address"
-                        value={newsletter.sender_email || ''}
-                        onBlur={validate}
-                        onChange={e => updateNewsletter({sender_email: e.target.value})}
-                        onKeyDown={() => clearError('sender_email')}
-                    />
-                    <Select
-                        options={replyToEmails}
-                        selectedOption={replyToEmails.find(option => option.value === newsletter.sender_reply_to)}
-                        title="Reply-to email"
-                        onSelect={option => updateNewsletter({sender_reply_to: option?.value})}
-                    />
+                <Form className='mt-6' gap='sm' margins='lg' title='Email info'>
+                    <TextField maxLength={191} placeholder={siteTitle} title="Sender name" value={newsletter.sender_name || ''} onChange={e => updateNewsletter({sender_name: e.target.value})} />
+                    {renderSenderEmailField()}
+                    <ReplyToEmailField clearError={clearError} errors={errors} newsletter={newsletter} updateNewsletter={updateNewsletter} validate={validate} />
                 </Form>
                 <Form className='mt-6' gap='sm' margins='lg' title='Member settings'>
                     <Toggle
@@ -177,29 +258,8 @@ const Sidebar: React.FC<{
                         onChange={e => updateNewsletter({subscribe_on_signup: e.target.checked})}
                     />
                 </Form>
-                <Separator />
-                <div className='my-5 flex w-full items-start'>
-                    <span>
-                        <Icon className='mr-2 mt-[-1px]' colorClass='text-red' name='heart'/>
-                    </span>
-                    <Form marginBottom={false}>
-                        <Toggle
-                            checked={newsletter.show_badge}
-                            direction='rtl'
-                            label={
-                                <div className='flex flex-col gap-0.5'>
-                                    <span className='text-sm md:text-base'>Promote independent publishing</span>
-                                    <span className='text-[11px] leading-tight text-grey-700 md:text-xs md:leading-tight'>Show you’re a part of the indie publishing movement with a small badge in the footer</span>
-                                </div>
-                            }
-                            labelStyle='value'
-                            onChange={e => updateNewsletter({show_badge: e.target.checked})}
-                        />
-                    </Form>
-                </div>
-                <Separator />
                 <div className='mb-5 mt-10'>
-                    {newsletter.status === 'active' ? (!onlyOne && <Button color='red' label='Archive newsletter' link onClick={confirmStatusChange} />) : <Button color='green' label='Reactivate newsletter' link onClick={confirmStatusChange} />}
+                    {newsletter.status === 'active' ? (!onlyOne && <Button color='red' disabled={activeNewsletters.length === 1} label='Archive newsletter' link onClick={confirmStatusChange}/>) : <Button color='green' label='Reactivate newsletter' link onClick={confirmStatusChange} />}
                 </div>
             </>
         },
@@ -363,6 +423,22 @@ const Sidebar: React.FC<{
                         value={newsletter.title_color}
                         onChange={color => updateNewsletter({title_color: color})}
                     />}
+                    <ToggleGroup gap='lg'>
+                        {newsletter.show_post_title_section &&
+                            <Toggle
+                                checked={newsletter.show_excerpt}
+                                direction="rtl"
+                                label="Post excerpt"
+                                onChange={e => updateNewsletter({show_excerpt: e.target.checked})}
+                            />
+                        }
+                        <Toggle
+                            checked={newsletter.show_feature_image}
+                            direction="rtl"
+                            label='Feature image'
+                            onChange={e => updateNewsletter({show_feature_image: e.target.checked})}
+                        />
+                    </ToggleGroup>
                     <Select
                         options={fontOptions}
                         selectedOption={fontOptions.find(option => option.value === newsletter.body_font_category)}
@@ -370,12 +446,6 @@ const Sidebar: React.FC<{
                         title='Body style'
                         onSelect={option => updateNewsletter({body_font_category: option?.value})}
                     />
-                    <Toggle
-                        checked={newsletter.show_feature_image}
-                        direction="rtl"
-                        label='Feature image'
-                        onChange={e => updateNewsletter({show_feature_image: e.target.checked})}
-                    />
                 </Form>
 
                 <Form className='mt-6' gap='sm' margins='lg' title='Footer'>
@@ -414,6 +484,26 @@ const Sidebar: React.FC<{
                         onChange={html => updateNewsletter({footer_content: html})}
                     />
                 </Form>
+                <Separator />
+                <div className='my-5 flex w-full items-start'>
+                    <span>
+                        <Icon className='mr-2 mt-[-1px]' colorClass='text-red' name='heart'/>
+                    </span>
+                    <Form marginBottom={false}>
+                        <Toggle
+                            checked={newsletter.show_badge}
+                            direction='rtl'
+                            label={
+                                <div className='flex flex-col gap-0.5'>
+                                    <span className='text-sm md:text-base'>Promote independent publishing</span>
+                                    <span className='text-[11px] leading-tight text-grey-700 md:text-xs md:leading-tight'>Show you’re a part of the indie publishing movement with a small badge in the footer</span>
+                                </div>
+                            }
+                            labelStyle='value'
+                            onChange={e => updateNewsletter({show_badge: e.target.checked})}
+                        />
+                    </Form>
+                </div>
             </>
         }
     ];
@@ -432,31 +522,29 @@ const Sidebar: React.FC<{
 };
 
 const NewsletterDetailModalContent: React.FC<{newsletter: Newsletter; onlyOne: boolean;}> = ({newsletter, onlyOne}) => {
-    const modal = useModal();
-    const {siteData} = useGlobalData();
+    const {config} = useGlobalData();
     const {mutateAsync: editNewsletter} = useEditNewsletter();
     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) {
-                NiceModal.show(ConfirmationModal, {
-                    title: 'Confirm newsletter email address',
-                    prompt: <>
-                        We&lsquo;ve sent a confirmation email to <strong>{formState.sender_email}</strong>.
-                        Until the address has been verified newsletters will be sent from the
-                        {newsletters[0].sender_email ? ' previous' : ' default'} email address
-                        ({fullEmailAddress(newsletters[0].sender_email || 'noreply', siteData)}).
-                    </>,
-                    cancelLabel: '',
-                    onOk: (confirmModal) => {
-                        confirmModal?.remove();
-                        modal.remove();
-                        updateRoute('newsletters');
-                    }
+            const {meta: {sent_email_verification: [emailToVerify] = []} = {}} = await editNewsletter(formState); ``;
+            let toastMessage;
+
+            if (emailToVerify && emailToVerify === 'sender_email') {
+                toastMessage = <div>We&lsquo;ve sent a confirmation email to the new address.</div>;
+            } else if (emailToVerify && emailToVerify === 'sender_reply_to') {
+                toastMessage = <div>We&lsquo;ve sent a confirmation email to the new address.</div>;
+            }
+
+            if (toastMessage) {
+                showToast({
+                    icon: 'email',
+                    message: toastMessage,
+                    type: 'info'
                 });
             }
         },
@@ -465,11 +553,17 @@ const NewsletterDetailModalContent: React.FC<{newsletter: Newsletter; onlyOne: b
             const newErrors: Record<string, string> = {};
 
             if (!formState.name) {
-                newErrors.name = 'Please enter a name';
+                newErrors.name = 'A name is required for your newsletter';
             }
 
             if (formState.sender_email && !validator.isEmail(formState.sender_email)) {
-                newErrors.sender_email = 'Invalid email.';
+                newErrors.sender_email = 'Enter a valid email address';
+            } else if (formState.sender_email && hasSendingDomain(config) && formState.sender_email.split('@')[1] !== sendingDomain(config)) {
+                newErrors.sender_email = `Email address must end with @${sendingDomain(config)}`;
+            }
+
+            if (formState.sender_reply_to && !validator.isEmail(formState.sender_reply_to) && !['newsletter', 'support'].includes(formState.sender_reply_to)) {
+                newErrors.sender_reply_to = 'Enter a valid email address';
             }
 
             return newErrors;
@@ -489,12 +583,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,12 +597,7 @@ const NewsletterDetailModalContent: React.FC<{newsletter: Newsletter; onlyOne: b
         testId='newsletter-modal'
         title='Newsletter'
         onOk={async () => {
-            if (!(await handleSave())) {
-                showToast({
-                    type: 'pageError',
-                    message: 'Can\'t save newsletter, please double check that you\'ve filled all mandatory fields.'
-                });
-            }
+            await handleSave({fakeWhenUnchanged: true});
         }}
     />;
 };
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..f5679047243 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
@@ -1,16 +1,16 @@
 import NewsletterPreviewContent from './NewsletterPreviewContent';
 import React from 'react';
 import useFeatureFlag from '../../../../hooks/useFeatureFlag';
-import {Newsletter} from '../../../../api/newsletters';
-import {fullEmailAddress} from '../../../../api/site';
-import {getSettingValues} from '../../../../api/settings';
+import {Newsletter} from '@tryghost/admin-x-framework/api/newsletters';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {renderReplyToEmail, renderSenderEmail} from '../../../../utils/newsletterEmails';
 import {textColorForBackgroundColor} from '@tryghost/color-utils';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 const NewsletterPreview: React.FC<{newsletter: Newsletter}> = ({newsletter}) => {
     const hasEmailCustomization = useFeatureFlag('emailCustomization');
     const {currentUser, settings, siteData, config} = useGlobalData();
-    const [title, icon, commentsEnabled] = getSettingValues<string>(settings, ['title', 'icon', 'comments_enabled']);
+    const [title, icon, commentsEnabled, supportEmailAddress, defaultEmailAddress] = getSettingValues<string>(settings, ['title', 'icon', 'comments_enabled', 'support_email_address', 'default_email_address']);
 
     let headerTitle: string | null = null;
     if (newsletter.show_header_title) {
@@ -84,14 +84,15 @@ 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
     } : {};
 
     return <NewsletterPreviewContent
+        accentColor={siteData.accent_color}
         authorPlaceholder={currentUser.name || currentUser.email}
         backgroundColor={colors.backgroundColor || '#ffffff'}
         bodyFontCategory={newsletter.body_font_category}
@@ -100,10 +101,12 @@ const NewsletterPreview: React.FC<{newsletter: Newsletter}> = ({newsletter}) =>
         headerImage={newsletter.header_image}
         headerSubtitle={headerSubtitle}
         headerTitle={headerTitle}
-        senderEmail={fullEmailAddress(newsletter.sender_email || 'noreply', siteData)}
+        senderEmail={renderSenderEmail(newsletter, config, defaultEmailAddress)}
         senderName={newsletter.sender_name || title}
+        senderReplyTo={renderReplyToEmail(newsletter, config, supportEmailAddress, defaultEmailAddress)}
         showBadge={newsletter.show_badge}
         showCommentCta={showCommentCta}
+        showExcerpt={newsletter.show_excerpt}
         showFeatureImage={newsletter.show_feature_image}
         showFeedback={showFeedback}
         showLatestPosts={newsletter.show_latest_posts}
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..50dd5ea276d 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,20 +1,24 @@
 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 useFeatureFlag from '../../../../hooks/useFeatureFlag';
+import {GhostOrb, Icon} from '@tryghost/admin-x-design-system';
+import {isManagedEmail} from '@tryghost/admin-x-framework/api/config';
 import {textColorForBackgroundColor} from '@tryghost/color-utils';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 const NewsletterPreviewContent: React.FC<{
     senderName?: string;
-    senderEmail: string;
+    senderEmail: string | null;
+    senderReplyTo: string | null;
     headerImage?: string | null;
     headerIcon?: string;
     headerTitle?: string | null;
     headerSubtitle?: string | null;
     showPostTitleSection: boolean;
+    showExcerpt: boolean;
     titleAlignment?: string;
     titleFontCategory?: string;
     bodyFontCategory?: string;
@@ -33,17 +37,20 @@ const NewsletterPreviewContent: React.FC<{
     backgroundColor?: string;
     borderColor?: string;
     secondaryBorderColor?: string;
+    accentColor?: string;
     textColor?: string;
     secondaryTextColor?: string;
     titleColor?: string;
 }> = ({
     senderName,
     senderEmail,
+    senderReplyTo,
     headerImage,
     headerIcon,
     headerTitle,
     headerSubtitle,
     showPostTitleSection,
+    showExcerpt,
     titleAlignment,
     titleFontCategory,
     bodyFontCategory,
@@ -62,11 +69,14 @@ const NewsletterPreviewContent: React.FC<{
     backgroundColor,
     borderColor,
     secondaryBorderColor,
+    accentColor,
     textColor,
     secondaryTextColor,
     titleColor
 }) => {
     const showHeader = headerIcon || headerTitle;
+    const {config} = useGlobalData();
+    const hasNewEmailAddresses = useFeatureFlag('newEmailAddresses');
 
     const currentDate = new Date().toLocaleDateString('default', {
         year: 'numeric',
@@ -77,14 +87,45 @@ const NewsletterPreviewContent: React.FC<{
 
     const backgroundColorIsDark = backgroundColor && textColorForBackgroundColor(backgroundColor).hex().toLowerCase() === '#ffffff';
 
+    let emailHeader;
+
+    if ({hasNewEmailAddresses} || isManagedEmail(config)) {
+        emailHeader = <><p className="leading-normal"><span className="font-semibold text-grey-900">From: </span><span>{senderName} ({senderEmail})</span></p>
+            <p className="leading-normal">
+                <span className="font-semibold text-grey-900">Reply-to: </span>{senderReplyTo ? senderReplyTo : senderEmail}
+            </p>
+        </>;
+    } else {
+        emailHeader = <><p className="leading-normal"><span className="font-semibold text-grey-900">{senderName}</span><span> {senderEmail}</span></p>
+            <p className="leading-normal"><span className="font-semibold text-grey-900">To:</span> Jamie Larson jamie@example.com</p></>;
+    }
+
+    let excerptClasses = 'mb-5 text-pretty leading-[1.7] text-black';
+
+    if (titleFontCategory === 'serif' && bodyFontCategory === 'serif') {
+        excerptClasses = clsx(excerptClasses, 'mb-8 font-serif text-[2.0rem] leading-tight');
+    } else if (titleFontCategory !== 'serif' && bodyFontCategory === 'serif') {
+        excerptClasses = clsx(excerptClasses, 'mb-8 text-[1.7rem] leading-tight tracking-tight');
+    } else if (titleFontCategory === 'serif' && bodyFontCategory !== 'serif') {
+        excerptClasses = clsx(excerptClasses, 'mb-8 font-serif text-[2.0rem] leading-tight');
+    } else {
+        excerptClasses = clsx(excerptClasses, 'mb-8 text-[1.9rem] leading-tight tracking-tight');
+    }
+
+    if (titleAlignment === 'center') {
+        excerptClasses = clsx(
+            excerptClasses,
+            'text-center'
+        );
+    }
+
     return (
         <div className="relative flex grow flex-col">
             <div className="absolute inset-0 m-5 flex items-center justify-center">
                 <div className="mx-auto my-0 flex max-h-full w-full max-w-[700px] flex-col overflow-hidden rounded-[4px] text-black shadow-sm">
                     {/* Email header */}
                     <div className="flex-column flex min-h-[77px] justify-center rounded-t-sm border-b border-grey-200 bg-white px-6 text-sm text-grey-700">
-                        <p className="leading-normal"><span className="font-semibold text-grey-900">{senderName}</span><span> {senderEmail}</span></p>
-                        <p className="leading-normal"><span className="font-semibold text-grey-900">To:</span> Jamie Larson jamie@example.com</p>
+                        {emailHeader}
                     </div>
 
                     {/* Email content */}
@@ -92,39 +133,38 @@ const NewsletterPreviewContent: React.FC<{
                         <div className="border border-transparent px-16" style={{borderColor}}>
                             {headerImage && (
                                 <div>
-                                    <img alt="" className="mt-6 block" src={headerImage} />
+                                    <img alt="" className="mb-4 mt-6 block" src={headerImage} />
                                 </div>
                             )}
                             {showHeader && (
-                                <div className="border-b border-grey-200 py-12" style={{borderColor: secondaryBorderColor}}>
+                                <div className="py-3" style={{borderColor: secondaryBorderColor}}>
                                     {headerIcon && <img alt="" className="mx-auto mb-2 h-10 w-10" role="presentation" src={headerIcon} />}
                                     {headerTitle && <h4 className="mb-1 text-center text-[1.6rem] font-bold uppercase leading-tight tracking-tight text-grey-900" style={{color: textColor}}>{headerTitle}</h4>}
-                                    {headerSubtitle && <h5 className="mb-1 text-center text-[1.4rem] font-normal leading-tight text-grey-600" style={{color: secondaryTextColor}}>{headerSubtitle}</h5>}
+                                    {headerSubtitle && <h5 className="mb-1 text-center text-[1.3rem] font-normal text-grey-700" style={{color: secondaryTextColor}}>{headerSubtitle}</h5>}
                                 </div>
                             )}
                             {showPostTitleSection && (
-                                <div className={clsx('flex flex-col pb-10 pt-12', titleAlignment === 'center' ? 'items-center' : 'items-start')}>
+                                <div className={clsx('flex flex-col py-8', titleAlignment === 'center' ? 'items-center' : 'items-start')}>
                                     <h2 className={clsx(
-                                        'pb-4 text-5xl font-bold leading-supertight text-black',
+                                        'text-4xl font-bold leading-supertight text-black',
                                         titleFontCategory === 'serif' && 'font-serif',
-                                        titleAlignment === 'center' ? 'text-center' : 'text-left'
+                                        titleAlignment === 'center' ? 'text-center' : 'text-left',
+                                        showExcerpt ? 'mb-2' : 'mb-8'
                                     )} style={{color: titleColor}}>
                                         Your email newsletter
                                     </h2>
+                                    {showExcerpt && (
+                                        <p className={excerptClasses}>A subtitle to highlight key points and engage your readers</p>
+                                    )}
                                     <div className={clsx(
-                                        'flex w-full justify-between text-center text-sm leading-none tracking-[0.1px] text-grey-600',
-                                        titleAlignment === 'center' ? 'flex-col' : 'flex-row'
+                                        'flex w-full justify-between text-center text-md leading-none text-grey-700',
+                                        titleAlignment === 'center' ? 'flex-col gap-1' : 'flex-row'
                                     )}>
-                                        <p className="pb-2" style={{color: secondaryTextColor}}>
+                                        <p className="pb-1 text-[1.3rem]" style={{color: secondaryTextColor}}>
                                             By {authorPlaceholder}
                                             <span className="before:pl-0.5 before:pr-1 before:content-['•']">{currentDate}</span>
-                                            {showCommentCta && (
-                                                <span className="before:pl-0.5 before:pr-1 before:content-['•']">
-                                                    <Icon className="mt-[-2px] inline-block" colorClass="text-grey-600" name="comment" size="sm"/>
-                                                </span>
-                                            )}
                                         </p>
-                                        <p className="pb-2" style={{color: secondaryTextColor}}><span>View in browser</span></p>
+                                        <p className="pb-1 text-[1.3rem] underline" style={{color: secondaryTextColor}}><span>View in browser</span></p>
                                     </div>
                                 </div>
                             )}
@@ -132,16 +172,23 @@ const NewsletterPreviewContent: React.FC<{
                             {/* Feature image */}
                             {showFeatureImage && (
                                 <>
-                                    <div className="h-[300px] w-full max-w-[600px] bg-grey-200 bg-cover bg-no-repeat">
+                                    <div className={clsx(
+                                        'h-[300px] w-full max-w-[600px] bg-cover bg-no-repeat',
+                                        showPostTitleSection ? '' : 'pt-6'
+                                    )}>
                                         <img alt="Feature" className='min-h-full min-w-full shrink-0' src={CoverImage} />
                                     </div>
-                                    <div className="mt-1 w-full max-w-[600px] pb-[30px] text-center text-[1.3rem] text-grey-600" style={{color: secondaryTextColor}}>Feature image caption</div>
+                                    <div className="mt-1 w-full max-w-[600px] pb-8 text-center text-[1.3rem] text-grey-700" style={{color: secondaryTextColor}}>Feature image caption</div>
                                 </>
                             )}
 
-                            <div className={clsx('max-w-[600px] border-b border-grey-200 py-5 text-[1.6rem] leading-[1.7] text-black', bodyFontCategory === 'serif' && 'font-serif')} style={{borderColor: secondaryBorderColor}}>
+                            <div className={clsx(
+                                'max-w-[600px] border-b border-grey-200 pb-5 leading-[1.7] text-black',
+                                bodyFontCategory === 'serif' ? 'font-serif text-[1.8rem]' : 'text-[1.7rem] tracking-tight',
+                                (showFeatureImage || showPostTitleSection) ? '' : 'pt-8'
+                            )} style={{borderColor: secondaryBorderColor}}>
                                 <p className="mb-5" style={{color: 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 className="mb-5" style={{color: textColor}}>Over there on the left you&apos;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&apos;ve spent a long time optimising this one to make it work beautifully across devices, email clients and content types.</p>
+                                <p className="mb-5" style={{color: textColor}}>Over there on the right you&apos;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&apos;ve spent a long time optimising this one to make it work beautifully across devices, email clients and content types.</p>
                                 <p className="mb-5" style={{color: 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>
 
@@ -184,7 +231,7 @@ const NewsletterPreviewContent: React.FC<{
                                     <div className="flex justify-between gap-4 py-2">
                                         <div>
                                             <h4 className="mb-1 mt-0.5 text-[1.9rem]" style={{color: textColor}}>The three latest posts published on your site</h4>
-                                            <p className="m-0 text-base text-grey-600" style={{color: secondaryTextColor}}>Posts sent as an email only will never be shown here.</p>
+                                            <p className="m-0 text-base text-grey-700" style={{color: secondaryTextColor}}>Posts sent as an email only will never be shown here.</p>
                                         </div>
                                         <div className="aspect-square h-auto w-full max-w-[100px] bg-grey-200 bg-cover bg-no-repeat">
                                             <img alt="Latest post" src={LatestPosts1} />
@@ -193,7 +240,7 @@ const NewsletterPreviewContent: React.FC<{
                                     <div className="flex justify-between gap-4 py-2">
                                         <div>
                                             <h4 className="mb-1 mt-0.5 text-[1.9rem]" style={{color: textColor}}>Displayed at the bottom of each newsletter</h4>
-                                            <p className="m-0 text-base text-grey-600" style={{color: secondaryTextColor}}>Giving your readers one more place to discover your stories.</p>
+                                            <p className="m-0 text-base text-grey-700" style={{color: secondaryTextColor}}>Giving your readers one more place to discover your stories.</p>
                                         </div>
                                         <div className="aspect-square h-auto w-full max-w-[100px] bg-grey-200 bg-cover bg-no-repeat">
                                             <img alt="Latest post" src={LatestPosts2} />
@@ -202,7 +249,7 @@ const NewsletterPreviewContent: React.FC<{
                                     <div className="flex justify-between gap-4 py-2">
                                         <div>
                                             <h4 className="mb-1 mt-0.5 text-[1.9rem]" style={{color: textColor}}>To keep your work front and center</h4>
-                                            <p className="m-0 text-base text-grey-600" style={{color: secondaryTextColor}}>Making sure that your audience stays engaged.</p>
+                                            <p className="m-0 text-base text-grey-700" style={{color: secondaryTextColor}}>Making sure that your audience stays engaged.</p>
                                         </div>
                                         <div className="aspect-square h-auto w-full max-w-[100px] bg-grey-200 bg-cover bg-no-repeat">
                                             <img alt="Latest post" src={LatestPosts3} />
@@ -215,14 +262,14 @@ const NewsletterPreviewContent: React.FC<{
                             {showSubscriptionDetails && (
                                 <div className="border-b border-grey-200 py-8" style={{borderColor: secondaryBorderColor}}>
                                     <h4 className="mb-3 text-[1.2rem] uppercase tracking-wide" style={{color: titleColor}}>Subscription details</h4>
-                                    <p className="m-0 mb-4 text-base" style={{color: textColor}}>You are receiving this because you are a paid subscriber to The Local Host. Your subscription will renew on 17 Jul 2024.</p>
+                                    <p className="m-0 mb-4 text-base" style={{color: textColor}}>You are receiving this because you are a paid subscriber to {siteTitle}. Your subscription will renew on 17 Jul 2024.</p>
                                     <div className="flex">
                                         <div className="shrink-0 text-base">
                                             <p style={{color: textColor}}>Name: Jamie Larson</p>
                                             <p style={{color: textColor}}>Email: jamie@example.com</p>
                                             <p style={{color: textColor}}>Member since: 17 July 2023</p>
                                         </div>
-                                        <span className={clsx('w-full self-end whitespace-nowrap text-right text-base font-semibold', backgroundColorIsDark ? 'text-white underline' : 'text-pink')}>
+                                        <span className={clsx('w-full self-end whitespace-nowrap text-right text-base font-semibold', backgroundColorIsDark && 'text-white underline')} style={{color: accentColor}}>
                                             Manage subscription →
                                         </span>
                                     </div>
@@ -231,9 +278,9 @@ const NewsletterPreviewContent: React.FC<{
 
                             {/* Footer */}
                             <div className="flex flex-col items-center pt-10">
-                                <div dangerouslySetInnerHTML={{__html: footerContent || ''}} className="text break-words px-8 py-3 text-center text-[1.3rem] leading-base text-grey-600" style={{color: secondaryTextColor}} />
+                                <div dangerouslySetInnerHTML={{__html: footerContent || ''}} className="text break-words px-8 py-3 text-center text-[1.3rem] leading-base text-grey-700" style={{color: secondaryTextColor}} />
 
-                                <div className="px-8 pb-14 pt-3 text-center text-[1.3rem] text-grey-600">
+                                <div className="px-8 pb-14 pt-3 text-center text-[1.3rem] text-grey-700">
                                     <span style={{color: secondaryTextColor}}>{siteTitle} © {currentYear} &mdash; </span>
                                     <span className="pointer-events-none cursor-auto underline" style={{color: secondaryTextColor}}>Unsubscribe</span>
                                 </div>
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..9c51de900ef 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,17 +1,53 @@
-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 {Newsletter} from '../../../../api/newsletters';
+import {Button, DragIndicator, NoValueLabel, SortableItemContainerProps, SortableList, Table, TableCell, TableRow} from '@tryghost/admin-x-design-system';
+import {Newsletter} from '@tryghost/admin-x-framework/api/newsletters';
 import {numberWithCommas} from '../../../../utils/helpers';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface NewslettersListProps {
-    newsletters: Newsletter[]
+    newsletters: Newsletter[];
+    isLoading: boolean;
+    isSortable?: boolean;
+    onSort?: (activeId: string, overId?: string) => void;
 }
 
+const NewsletterItemContainer: React.FC<Partial<SortableItemContainerProps>> = ({
+    id,
+    setRef,
+    isDragging,
+    style,
+    children,
+    ...props
+}) => {
+    const {updateRoute} = useRouting();
+
+    const showDetails = () => {
+        updateRoute({route: `newsletters/${id}`});
+    };
+
+    const container = (
+        <TableRow
+            ref={setRef}
+            action={<Button color='green' label='Edit' link onClick={showDetails} />}
+            className={isDragging ? 'opacity-75' : ''}
+            style={style}
+            hideActions
+            onClick={showDetails}
+        >
+            {(props.dragHandleAttributes || isDragging) && <TableCell className='w-10 !align-middle' >
+                <DragIndicator className='h-10' isDragging={isDragging || false} {...props} />
+            </TableCell>}
+            {children}
+        </TableRow>
+    );
+
+    if (isDragging) {
+        return <Table>{container}</Table>;
+    } else {
+        return container;
+    }
+};
+
 const NewsletterItem: React.FC<{newsletter: Newsletter}> = ({newsletter}) => {
     const {updateRoute} = useRouting();
 
@@ -20,33 +56,47 @@ const NewsletterItem: React.FC<{newsletter: Newsletter}> = ({newsletter}) => {
     };
 
     return (
-        <TableRow action={<Button color='green' label='Edit' link onClick={showDetails} />} hideActions onClick={showDetails}>
-            <TableCell onClick={showDetails}>
+        <>
+            <TableCell className='w-full' onClick={showDetails}>
                 <div className={`flex grow flex-col`}>
                     <span className='font-medium'>{newsletter.name}</span>
                     <span className='mt-0.5 text-xs leading-tight text-grey-700'>{newsletter.description || 'No description'}</span>
                 </div>
             </TableCell>
-            <TableCell className='hidden md:!visible md:!table-cell' onClick={showDetails}>
+            <TableCell className='hidden md:!visible md:!table-cell md:min-w-[11rem]' onClick={showDetails}>
                 <div className={`flex grow flex-col`}>
                     <span>{numberWithCommas(newsletter.count?.active_members || 0) }</span>
                     <span className='mt-0.5 whitespace-nowrap text-xs leading-tight text-grey-700'>Subscribers</span>
                 </div>
             </TableCell>
-            <TableCell className='hidden md:!visible md:!table-cell' onClick={showDetails}>
+            <TableCell className='hidden md:!visible md:!table-cell md:min-w-[11rem]' onClick={showDetails}>
                 <div className={`flex grow flex-col`}>
                     <span>{numberWithCommas(newsletter.count?.posts || 0)}</span>
                     <span className='mt-0.5 whitespace-nowrap text-xs leading-tight text-grey-700'>Delivered</span>
                 </div>
             </TableCell>
-        </TableRow>
+        </>
     );
 };
 
-const NewslettersList: React.FC<NewslettersListProps> = ({newsletters}) => {
-    if (newsletters.length) {
+const NewslettersList: React.FC<NewslettersListProps> = ({newsletters, isLoading, isSortable, onSort}) => {
+    if (isLoading) {
+        return <Table isLoading />;
+    } else if (newsletters.length && isSortable) {
+        return <SortableList
+            container={props => <NewsletterItemContainer {...props} />}
+            items={newsletters}
+            renderItem={item => <NewsletterItem newsletter={item} />}
+            wrapper={Table}
+            onMove={(id, overId) => onSort?.(id, overId)}
+        />;
+    } else if (newsletters.length) {
         return <Table>
-            {newsletters.map(newsletter => <NewsletterItem key={newsletter.id} newsletter={newsletter} />)}
+            {newsletters.map(newsletter => (
+                <NewsletterItemContainer id={newsletter.id}>
+                    <NewsletterItem newsletter={newsletter} />
+                </NewsletterItemContainer>
+            ))}
         </Table>;
     } else {
         return <NoValueLabel icon='mail-block'>
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..8ee3e4af38a 100644
--- a/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx
@@ -1,12 +1,11 @@
-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 {Offer} from '../../../api/offers';
-import {Tier} from '../../../api/tiers';
-import {debounce} from '../../../utils/debounce';
+import {Label} from '@tryghost/admin-x-framework/api/labels';
+import {LoadMultiSelectOptions, MultiSelectOption, debounce} from '@tryghost/admin-x-design-system';
+import {Offer} from '@tryghost/admin-x-framework/api/offers';
+import {Tier} from '@tryghost/admin-x-framework/api/tiers';
 import {isObjectId} from '../../../utils/helpers';
 import {useEffect, useState} from 'react';
+import {useFilterableApi} from '@tryghost/admin-x-framework/hooks';
 
 const SIMPLE_SEGMENT_OPTIONS: MultiSelectOption[] = [{
     label: 'Free members',
@@ -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>[] = [
@@ -63,11 +62,11 @@ const useDefaultRecipientsOptions = (selectedOption: string, defaultEmailRecipie
 
     const initSelectedSegments = async () => {
         const filters = defaultEmailRecipientsFilter?.split(',') || [];
-        const tierIds: string[] = [], labelIds: string[] = [], offerIds: string[] = [];
+        const tierIds: string[] = [], labelSlugs: string[] = [], offerIds: string[] = [];
 
         for (const filter of filters) {
             if (filter.startsWith('label:')) {
-                labelIds.push(filter.replace('label:', ''));
+                labelSlugs.push(filter.replace('label:', ''));
             } else if (filter.startsWith('offer_redemptions:')) {
                 offerIds.push(filter.replace('offer_redemptions:', ''));
             } else if (isObjectId(filter)) {
@@ -76,9 +75,9 @@ const useDefaultRecipientsOptions = (selectedOption: string, defaultEmailRecipie
         }
 
         const options = await Promise.all([
-            tiers.loadInitialValues(tierIds).then(data => data.map(tierOption)),
-            labels.loadInitialValues(labelIds).then(data => data.map(labelOption)),
-            offers.loadInitialValues(offerIds).then(data => data.map(offerOption))
+            tiers.loadInitialValues(tierIds, 'id').then(data => data.map(tierOption)),
+            labels.loadInitialValues(labelSlugs, 'slug').then(data => data.map(labelOption)),
+            offers.loadInitialValues(offerIds, 'id').then(data => data.map(offerOption))
         ]).then(results => results.flat());
 
         setSelectedSegments(filters.map(filter => options.find(option => option.value === filter)!));
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..d3192318432 100644
--- a/apps/admin-x-settings/src/components/settings/general/About.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/About.tsx
@@ -1,14 +1,10 @@
-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 {RoutingModalProps} from '../../providers/RoutingProvider';
+import {GhostLogo, Icon, Modal, Separator} from '@tryghost/admin-x-design-system';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
 import {linkToGitHubReleases} from '../../../utils/linkToGithubReleases';
 import {showDatabaseWarning} from '../../../utils/showDatabaseWarning';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {useUpgradeStatus} from '../../providers/ServiceProvider';
+import {useUpgradeStatus} from '../../providers/SettingsAppProvider';
 
 const AboutModal = NiceModal.create<RoutingModalProps>(({}) => {
     const {updateRoute} = useRouting();
@@ -21,11 +17,12 @@ const AboutModal = NiceModal.create<RoutingModalProps>(({}) => {
         return date.getFullYear();
     }
 
-    function hasDeveloperExperiments():string {
+    function hasDeveloperExperiments():boolean {
         if (config.enableDeveloperExperiments) {
-            return 'Enabled';
+            return true;
+        } else {
+            return false;
         }
-        return 'Disabled';
     }
 
     function showSystemInfo() : boolean {
@@ -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"/>
@@ -77,7 +74,7 @@ const AboutModal = NiceModal.create<RoutingModalProps>(({}) => {
                     }
                     {
                         hasDeveloperExperiments() && (
-                            <div><strong>Developer experiments:</strong> {hasDeveloperExperiments()}</div>
+                            <div><strong>Developer experiments:</strong> Enabled</div>
                         )
                     }
 
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..bd0dbee0ed7 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,12 @@
-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 useHandleError from '../../../utils/api/handleError';
+import TopLevelGroup from '../../TopLevelGroup';
 import usePinturaEditor from '../../../hooks/usePinturaEditor';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {ReactComponent as FacebookLogo} from '../../../admin-x-ds/assets/images/facebook-logo.svg';
-import {getImageUrl, useUploadImage} from '../../../api/images';
-import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {APIError} from '@tryghost/admin-x-framework/errors';
+import {FacebookLogo, ImageUpload, SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -25,17 +22,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
@@ -54,7 +44,11 @@ const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
             const imageUrl = getImageUrl(await uploadImage({file}));
             updateSetting('og_image', imageUrl);
         } catch (e) {
-            handleError(e);
+            const error = e as APIError;
+            if (error.response!.status === 415) {
+                error.message = 'Unsupported file type';
+            }
+            handleError(error);
         }
     };
 
@@ -106,12 +100,14 @@ const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
                     <div className="flex flex-col gap-x-6 gap-y-7 px-4 pb-7">
                         <TextField
                             inputRef={focusRef}
+                            maxLength={300}
                             placeholder={siteTitle}
                             title="Facebook title"
                             value={facebookTitle}
                             onChange={handleTitleChange}
                         />
                         <TextField
+                            maxLength={300}
                             placeholder={siteDescription}
                             title="Facebook description"
                             value={facebookDescription}
@@ -124,7 +120,7 @@ const Facebook: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Customize structured data of your site'
             isEditing={isEditing}
             keywords={keywords}
@@ -138,7 +134,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..a782e37b962 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', 'social'],
+    facebook: ['general', 'facebook card', 'structured data', 'rich cards', 'social'],
+    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..e6e066fb4ac 100644
--- a/apps/admin-x-settings/src/components/settings/general/InviteUserModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/InviteUserModal.tsx
@@ -1,16 +1,14 @@
-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 {APIError} from '@tryghost/admin-x-framework/errors';
 import {HostLimitError, useLimiter} from '../../../hooks/useLimiter';
-import {showToast} from '../../../admin-x-ds/global/Toast';
-import {useAddInvite, useBrowseInvites} from '../../../api/invites';
-import {useBrowseRoles} from '../../../api/roles';
-import {useBrowseUsers} from '../../../api/users';
+import {Modal, Radio, TextField, showToast} from '@tryghost/admin-x-design-system';
+import {useAddInvite, useBrowseInvites} from '@tryghost/admin-x-framework/api/invites';
+import {useBrowseRoles} from '@tryghost/admin-x-framework/api/roles';
+import {useBrowseUsers} from '@tryghost/admin-x-framework/api/users';
 import {useEffect, useRef, useState} from 'react';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 type RoleType = 'administrator' | 'editor' | 'author' | 'contributor';
 
@@ -76,7 +74,7 @@ const InviteUserModal = NiceModal.create(() => {
     const roles = rolesQuery.data.roles;
     const assignableRoles = assignableRolesQuery.data.roles;
 
-    let okLabel = 'Send invitation now';
+    let okLabel = 'Send invitation';
     if (saveState === 'saving') {
         okLabel = 'Sending...';
     } else if (saveState === 'saved') {
@@ -125,17 +123,27 @@ const InviteUserModal = NiceModal.create(() => {
             setSaveState('saved');
 
             showToast({
-                message: `Invitation successfully sent to ${email}`,
+                title: `Invitation sent`,
+                message: `${email}`,
                 type: 'success'
             });
 
             modal.remove();
-            updateRoute('staff');
+            updateRoute('staff?tab=invited');
         } catch (e) {
             setSaveState('error');
-
+            let title = 'Failed to send invitation';
+            let message = (<span>If the problem persists, <a href="https://ghost.org/contact"><u>contact support</u>.</a>.</span>);
+            if (e instanceof APIError) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                let data = e.data as any; // we have unknown data types in the APIError/error classes
+                if (data?.errors?.[0]?.type === 'EmailError') {
+                    message = (<span>Check your Mailgun configuration.</span>);
+                }
+            }
             showToast({
-                message: `Failed to send invitation to ${email}`,
+                title,
+                message,
                 type: 'error'
             });
             handleError(e, {withToast: false});
@@ -172,16 +180,21 @@ const InviteUserModal = NiceModal.create(() => {
         });
     });
 
+    if (!!errors.email) {
+        okLabel = 'Retry';
+    }
+
     return (
         <Modal
             afterClose={() => {
                 updateRoute('staff');
             }}
             cancelLabel=''
+            okColor={saveState === 'error' || !!errors.email ? 'red' : 'black'}
             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..8fed4675454 100644
--- a/apps/admin-x-settings/src/components/settings/general/LockSite.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/LockSite.tsx
@@ -1,15 +1,12 @@
-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 {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {Hint, Icon, Separator, SettingGroupContent, TextField, Toggle, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useGlobalData} from '../../providers/GlobalDataProvider';
 
 const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
+    const {siteData} = useGlobalData();
     const {
         localSettings,
         isEditing,
@@ -24,7 +21,7 @@ const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
         onValidate: () => {
             if (passwordEnabled && !password) {
                 return {
-                    password: 'Password must be supplied'
+                    password: 'Enter a password'
                 };
             }
 
@@ -32,7 +29,7 @@ const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
         }
     });
 
-    const [passwordEnabled, password] = getSettingValues(localSettings, ['is_private', 'password']) as [boolean, string];
+    const [passwordEnabled, password, publicHash] = getSettingValues(localSettings, ['is_private', 'password', 'public_hash']) as [boolean, string, string];
 
     const handleToggleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         updateSetting('is_private', e.target.checked);
@@ -42,15 +39,30 @@ const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
         updateSetting('password', e.target.value);
     };
 
+    const privateRssUrl = `${siteData.url.replace(/\/$/, '')}/${publicHash}/rss`;
+    const hint = (
+        <>A private RSS feed is available at <a className='break-all text-green' href={privateRssUrl} rel="noopener noreferrer" target='_blank'>{privateRssUrl}</a></>
+    );
+
     const values = (
         <SettingGroupContent
             values={[
                 {
                     key: 'private',
                     value: passwordEnabled ? (
-                        <div className='flex items-center gap-1'>
-                            <Icon colorClass='text-yellow' name='lock-locked' size='sm' />
-                            <span>Your site is password protected</span>
+                        <div className='w-full'>
+                            <div className='flex items-center gap-1'>
+                                {/* <div className='rounded-full border border-yellow p-2'> */}
+                                <Icon colorClass='text-yellow' name='lock-locked' size='sm' />
+                                {/* </div> */}
+                                <div className='leading-supertight'>
+                                Your site is password protected
+                                </div>
+                            </div>
+                            {hint && <div className='mt-7 w-full'>
+                                <Separator />
+                                <Hint>{hint}</Hint>
+                            </div>}
                         </div>
                     ) : (
                         <div className='flex items-center gap-1 text-grey-900 dark:text-grey-400'>
@@ -63,10 +75,6 @@ const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
         />
     );
 
-    const hint = (
-        <>A private RSS feed is available at <Link className='break-all' href="http://localhost:2368/51aa059ba6eb50c24c14047d4255ac/rss">http://localhost:2368/51aa059ba6eb50c24c14047d4255ac/rss</Link></>
-    );
-
     const inputs = (
         <SettingGroupContent>
             <Toggle
@@ -79,7 +87,7 @@ const LockSite: React.FC<{ keywords: string[] }> = ({keywords}) => {
             {passwordEnabled &&
                 <TextField
                     error={!!errors.password}
-                    hint={errors.password || hint}
+                    hint={errors.password}
                     placeholder="Enter password"
                     title="Site password"
                     value={password}
@@ -92,7 +100,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 +113,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..383a681bd23 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 {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {GoogleLogo, Icon, SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 
 interface SearchEnginePreviewProps {
     title: string;
@@ -27,31 +22,35 @@ const SearchEnginePreview: React.FC<SearchEnginePreviewProps> = ({
 
     return (
         <div>
-            <Heading grey={true} level={6}>Search engine result preview</Heading>
-            <div className='mt-3 flex items-center'>
-                <div className='basis-'>
-                    <GoogleLogo className='mr-7 h-7' />
-                </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'}} />
+            <div className='-mx-5 -mb-5 overflow-hidden rounded-b-xl bg-grey-50 px-5 pt-5 dark:bg-grey-950 md:-mx-7 md:-mb-7 md:px-7 md:pt-7'>
+                <div className='rounded-t-sm bg-white px-5 py-3 shadow-lg dark:bg-grey-975'>
+                    <div className='mt-3 flex items-center'>
+                        <div className='basis-'>
+                            <GoogleLogo className='mr-7 h-7' />
+                        </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'>
+                                <Icon className='stroke-[2px] text-blue-600' name='magnifying-glass' size='sm' />
+                            </div>
+                        </div>
+                    </div>
+                    <div className='mt-4 flex items-center gap-2 border-t border-grey-200 pt-4 dark:border-grey-900'>
+                        <div className='flex h-7 w-7 items-center justify-center rounded-full bg-grey-200 dark:bg-grey-700' style={{
+                            backgroundImage: icon ? `url(${icon})` : 'none',
+                            backgroundSize: 'contain'
+                        }}>
+                        </div>
+                        <div className='flex flex-col text-sm'>
+                            <span>{siteDomain}</span>
+                            <span className='-mt-0.5 inline-block text-xs text-grey-600'>{siteUrl}</span>
+                        </div>
+                    </div>
+                    <div className='mt-1 flex flex-col'>
+                        <span className='text-lg text-[#1a0dab] dark:text-blue'>{title}</span>
+                        <span className='text-sm text-grey-900 dark:text-grey-700'>{description}</span>
                     </div>
                 </div>
             </div>
-            <div className='mt-4 flex items-center gap-2 border-t border-grey-200 pt-4 dark:border-grey-900'>
-                <div className='flex h-7 w-7 items-center justify-center rounded-full bg-grey-200 dark:bg-grey-700' style={{
-                    backgroundImage: icon ? `url(${icon})` : 'none'
-                }}>
-                </div>
-                <div className='flex flex-col text-sm'>
-                    <span>{siteDomain}</span>
-                    <span className='-mt-0.5 inline-block text-xs text-grey-600'>{siteUrl}</span>
-                </div>
-            </div>
-            <div className='mt-1 flex flex-col'>
-                <span className='text-lg text-[#1a0dab] dark:text-blue'>{title}</span>
-                <span className='text-sm text-grey-900 dark:text-grey-700'>{description}</span>
-            </div>
         </div>
     );
 };
@@ -84,6 +83,7 @@ const Metadata: React.FC<{ keywords: string[] }> = ({keywords}) => {
             <TextField
                 hint="Recommended: 70 characters"
                 inputRef={focusRef}
+                maxLength={300}
                 placeholder={siteTitle}
                 title="Meta title"
                 value={metaTitle}
@@ -91,6 +91,7 @@ const Metadata: React.FC<{ keywords: string[] }> = ({keywords}) => {
             />
             <TextField
                 hint="Recommended: 156 characters"
+                maxLength={500}
                 placeholder={siteDescription}
                 title="Meta description"
                 value={metaDescription}
@@ -100,7 +101,7 @@ const Metadata: React.FC<{ keywords: string[] }> = ({keywords}) => {
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description='Extra content for search engines'
             isEditing={isEditing}
             keywords={keywords}
@@ -112,7 +113,7 @@ const Metadata: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onEditingChange={handleEditingChange}
             onSave={handleSave}
         >
-            {isEditing &&
+            {!isEditing &&
             <>
                 <SearchEnginePreview
                     description={metaDescription ? metaDescription : siteDescription}
@@ -120,10 +121,14 @@ const Metadata: React.FC<{ keywords: string[] }> = ({keywords}) => {
                     title={metaTitle ? metaTitle : siteTitle}
                     url={siteData?.url}
                 />
+            </>
+            }
+            {isEditing &&
+            <>
                 {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..aca29daf850 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 {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 
 const PublicationLanguage: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -15,8 +13,20 @@ const PublicationLanguage: React.FC<{ keywords: string[] }> = ({keywords}) => {
         handleCancel,
         updateSetting,
         focusRef,
+        errors,
+        clearError,
         handleEditingChange
-    } = useSettingGroup();
+    } = useSettingGroup({
+        onValidate: () => {
+            if (!publicationLanguage) {
+                return {
+                    publicationLanguage: 'Enter a value'
+                };
+            }
+
+            return {};
+        }
+    });
 
     const [publicationLanguage] = getSettingValues(localSettings, ['locale']) as string[];
 
@@ -44,18 +54,20 @@ const PublicationLanguage: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const inputFields = (
         <SettingGroupContent columns={1}>
             <TextField
-                hint={hint}
+                error={!!errors.publicationLanguage}
+                hint={errors.publicationLanguage || hint}
                 inputRef={focusRef}
                 placeholder="Site language"
                 title='Site language'
                 value={publicationLanguage}
                 onChange={handleLanguageChange}
+                onKeyDown={() => clearError('password')}
             />
         </SettingGroupContent>
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             description="Set the language/locale which is used on your site"
             isEditing={isEditing}
             keywords={keywords}
@@ -68,7 +80,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..2516b3c7bba 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';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 
 const SocialAccounts: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -78,7 +76,7 @@ const SocialAccounts: React.FC<{ keywords: string[] }> = ({keywords}) => {
             <TextField
                 error={!!errors.twitter}
                 hint={errors.twitter}
-                placeholder="https://twitter.com/ghost"
+                placeholder="https://x.com/ghost"
                 title="URL of your X (formerly Twitter) profile"
                 value={twitterUrl}
                 onBlur={(e) => {
@@ -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..a1d79c91072 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';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 
 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..7cd79705081 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 {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {SettingGroupContent, TextField, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 
 const TitleAndDescription: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -51,6 +49,7 @@ const TitleAndDescription: React.FC<{ keywords: string[] }> = ({keywords}) => {
             <TextField
                 hint="The name of your site"
                 inputRef={focusRef}
+                maxLength={150}
                 placeholder="Site title"
                 title="Site title"
                 value={title}
@@ -58,6 +57,7 @@ const TitleAndDescription: React.FC<{ keywords: string[] }> = ({keywords}) => {
             />
             <TextField
                 hint="A short description, used in your theme, meta data and search results"
+                maxLength={200}
                 placeholder="Site description"
                 title="Site description"
                 value={description}
@@ -66,7 +66,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 +79,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..be40650c320 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,12 @@
-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 useHandleError from '../../../utils/api/handleError';
+import TopLevelGroup from '../../TopLevelGroup';
 import usePinturaEditor from '../../../hooks/usePinturaEditor';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {ReactComponent as TwitterLogo} from '../../../admin-x-ds/assets/images/x-logo.svg';
-import {getImageUrl, useUploadImage} from '../../../api/images';
-import {getSettingValues} from '../../../api/settings';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {APIError} from '@tryghost/admin-x-framework/errors';
+import {ImageUpload, SettingGroupContent, TextField, XLogo, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -26,15 +23,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
@@ -53,7 +42,11 @@ const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
             const imageUrl = getImageUrl(await uploadImage({file}));
             updateSetting('twitter_image', imageUrl);
         } catch (e) {
-            handleError(e);
+            const error = e as APIError;
+            if (error.response!.status === 415) {
+                error.message = 'Unsupported file type';
+            }
+            handleError(error);
         }
     };
 
@@ -68,7 +61,7 @@ const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const inputFields = (
         <div className="flex flex-col gap-3 md:flex-row">
             <div className="pt-1">
-                <TwitterLogo className='-mb-1 h-10 w-10' />
+                <XLogo className='-mb-1 h-10 w-10' />
             </div>
             <div className="w-full md:mr-[52px]">
                 <div className="mb-2">
@@ -103,12 +96,14 @@ const Twitter: React.FC<{ keywords: string[] }> = ({keywords}) => {
                     <div className="flex flex-col gap-x-6 gap-y-7 px-4 pb-7">
                         <TextField
                             inputRef={focusRef}
+                            maxLength={300}
                             placeholder={siteTitle}
                             title="X title"
                             value={twitterTitle}
                             onChange={handleTitleChange}
                         />
                         <TextField
+                            maxLength={300}
                             placeholder={siteDescription}
                             title="X description"
                             value={twitterDescription}
@@ -121,7 +116,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 +130,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..de573598a9d 100644
--- a/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx
@@ -1,42 +1,91 @@
 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 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 {APIError} from '@tryghost/admin-x-framework/errors';
+import {ConfirmationModal, Heading, Icon, ImageUpload, LimitModal, Menu, MenuItem, Modal, showToast} from '@tryghost/admin-x-design-system';
+import {ErrorMessages, useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
 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 {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {User, canAccessSettings, hasAdminAccess, isAdminUser, isAuthorOrContributor, isEditorUser, isOwnerUser, useDeleteUser, useEditUser, useMakeOwner} from '@tryghost/admin-x-framework/api/users';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
 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 = 'Name is required';
+        }
+
+        if (name && name.length > 191) {
+            error = 'Name is too long';
+        }
+
+        return error;
+    },
+    email: ({email}) => {
+        const valid = validator.isEmail(email || '');
+        return valid ? '' : 'Enter a valid email address';
+    },
+    url: ({url}) => {
+        const valid = !url || validator.isURL(url);
+        return valid ? '' : '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 ? '' : 'Enter 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;
 }
 
-const UserMenuTrigger = () => (
+const UserMenuTrigger = (
     <button className='flex h-8 cursor-pointer items-center justify-center rounded bg-[rgba(0,0,0,0.75)] px-3 opacity-80 hover:opacity-100' type='button'>
         <span className='sr-only'>Actions</span>
         <Icon colorClass='text-white' name='ellipsis' size='md' />
@@ -47,15 +96,35 @@ 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);
+        },
+        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 +133,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 +145,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 {
@@ -103,7 +153,8 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                 if (error instanceof HostLimitError) {
                     NiceModal.show(LimitModal, {
                         formSheet: true,
-                        prompt: error.message || `Your current plan doesn't support more users.`
+                        prompt: error.message || `Your current plan doesn't support more users.`,
+                        onOk: () => updateRoute({route: '/pro', isExternal: true})
                     });
                     return;
                 } else {
@@ -133,10 +184,10 @@ 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',
+                        title: _user.status === 'inactive' ? 'User un-suspended' : 'User suspended',
                         type: 'success'
                     });
                 } catch (e) {
@@ -162,8 +213,9 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                     await deleteUser(_user?.id);
                     modal?.remove();
                     mainModal?.remove();
+                    navigateOnClose();
                     showToast({
-                        message: 'User deleted',
+                        title: 'User deleted',
                         type: 'success'
                     });
                 } catch (e) {
@@ -184,7 +236,7 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                     await makeOwner(user.id);
                     modal?.remove();
                     showToast({
-                        message: 'Ownership transferred',
+                        title: 'Ownership transferred',
                         type: 'success'
                     });
                 } catch (e) {
@@ -200,30 +252,34 @@ 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;
             }
         } catch (e) {
-            handleError(e);
+            const error = e as APIError;
+            if (error.response!.status === 415) {
+                error.message = 'Unsupported file type';
+            }
+            handleError(error);
         }
     };
 
     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 +289,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 +297,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 +313,7 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
             id: 'suspend-user',
             label: suspendUserLabel,
             onClick: () => {
-                confirmSuspend(userData);
+                confirmSuspend(formState);
             }
         });
     }
@@ -267,18 +323,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,127 +341,34 @@ 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}
+            cancelLabel='Close'
             dirty={saveState === 'unsaved'}
-            okLabel={okLabel}
+            okColor={okProps.color}
+            okLabel={okProps.label || 'Save'}
             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) {
-                    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');
+                await (handleSave({fakeWhenUnchanged: true}));
             }}
         >
             <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>
                                 <ImageUpload
-                                    deleteButtonClassName='md:invisible absolute pr-3 -right-2 -top-2 flex h-8 w-16 cursor-pointer items-center justify-end rounded-full bg-[rgba(0,0,0,0.75)] text-white group-hover:!visible'
+                                    deleteButtonClassName='md:invisible absolute pr-3 -right-2 -top-2 flex h-8 w-10 cursor-pointer items-center justify-end rounded-full bg-[rgba(0,0,0,0.75)] text-white group-hover:!visible'
                                     deleteButtonContent={<Icon colorClass='text-white' name='trash' size='sm' />}
                                     editButtonClassName='md:invisible absolute right-[22px] -top-2 flex h-8 w-8 cursor-pointer items-center justify-center text-white group-hover:!visible z-20'
                                     fileUploadClassName='rounded-full bg-black flex items-center justify-center opacity-80 transition hover:opacity-100 -ml-2 cursor-pointer h-[80px] w-[80px]'
@@ -421,12 +376,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 ?? undefined}
                                     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 +414,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);
                                             }
@@ -480,19 +435,19 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => {
                                 }}
                             >Upload cover image</ImageUpload>
                             {showMenu && <div className="z-10">
-                                <Menu items={menuItems} position='right' trigger={<UserMenuTrigger />}></Menu>
+                                <Menu items={menuItems} position='end' trigger={UserMenuTrigger} />
                             </div>}
                         </div>
                     </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 +460,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..703ef6547e1 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,15 @@
-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 React, {useEffect, useState} from 'react';
+import TopLevelGroup from '../../TopLevelGroup';
 import clsx from 'clsx';
-import useHandleError from '../../../utils/api/handleError';
-import useRouting from '../../../hooks/useRouting';
+import useQueryParams from '../../../hooks/useQueryParams';
 import useStaffUsers from '../../../hooks/useStaffUsers';
-import {User, hasAdminAccess, isContributorUser, isEditorUser} from '../../../api/users';
-import {UserInvite, useAddInvite, useDeleteInvite} from '../../../api/invites';
+import {Avatar, Button, List, ListItem, NoValueLabel, TabView, showToast, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {User, hasAdminAccess, isContributorUser, isEditorUser} from '@tryghost/admin-x-framework/api/users';
+import {UserInvite, useAddInvite, useDeleteInvite} from '@tryghost/admin-x-framework/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';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface OwnerProps {
     user: User;
@@ -49,7 +43,7 @@ const Owner: React.FC<OwnerProps> = ({user}) => {
 
     return (
         <div className={clsx('group flex gap-3', hasAdminAccess(currentUser) && 'cursor-pointer')} data-testid='owner-user' onClick={showDetailModal}>
-            <Avatar bgColor={generateAvatarColor((user.name ? user.name : user.email))} image={user.profile_image} label={getInitials(user.name)} labelColor='white' size='lg' />
+            <Avatar bgColor={generateAvatarColor((user.name ? user.name : user.email))} image={user.profile_image ?? undefined} label={getInitials(user.name)} labelColor='white' size='lg' />
             <div className='flex flex-col'>
                 <span>{user.name} &mdash; <strong>Owner</strong> {hasAdminAccess(currentUser) && <button className='ml-2 inline-block text-sm font-bold text-green group-hover:visible md:invisible' type='button'>View profile</button>}</span>
                 <span className='text-xs text-grey-700'>{user.email}</span>
@@ -90,7 +84,7 @@ const UsersList: React.FC<UsersListProps> = ({users, groupname}) => {
                     <ListItem
                         key={user.id}
                         action={canEdit && <Button color='green' label='Edit' link={true} onClick={() => showDetailModal(user)}/>}
-                        avatar={(<Avatar bgColor={generateAvatarColor((user.name ? user.name : user.email))} image={user.profile_image} label={getInitials(user.name)} labelColor='white' />)}
+                        avatar={(<Avatar bgColor={generateAvatarColor((user.name ? user.name : user.email))} image={user.profile_image ?? undefined} label={getInitials(user.name)} labelColor='white' />)}
                         bgOnHover={canEdit}
                         className='min-h-[64px]'
                         detail={user.email}
@@ -133,7 +127,8 @@ const UserInviteActions: React.FC<{invite: UserInvite}> = ({invite}) => {
                         setRevokeState('progress');
                         await deleteInvite(invite.id);
                         showToast({
-                            message: `Invitation revoked (${invite.email})`,
+                            title: `Invitation revoked`,
+                            message: invite.email,
                             type: 'success'
                         });
                     } catch (e) {
@@ -157,7 +152,8 @@ const UserInviteActions: React.FC<{invite: UserInvite}> = ({invite}) => {
                             roleId: invite.role_id
                         });
                         showToast({
-                            message: `Invitation resent! (${invite.email})`,
+                            title: `Invitation resent`,
+                            message: invite.email,
                             type: 'success'
                         });
                     } catch (e) {
@@ -225,43 +221,61 @@ const Users: React.FC<{ keywords: string[], highlight?: boolean }> = ({keywords,
     };
 
     const buttons = (
-        <Button color='green' label='Invite people' link={true} linkWithPadding onClick={() => {
+        <Button className='mt-[-5px]' color='clear' label='Invite people' size='sm' linkWithPadding onClick={() => {
             showInviteModal();
         }} />
     );
 
-    const [selectedTab, setSelectedTab] = useState('users-admins');
+    const tabParam = useQueryParams().getParam('tab');
+    const defaultTab = tabParam || 'administrators';
+    const [selectedTab, setSelectedTab] = useState(defaultTab);
+
+    useEffect(() => {
+        if (tabParam) {
+            setSelectedTab(tabParam);
+        }
+    }, [tabParam]);
+
+    const updateSelectedTab = (newTab: string) => {
+        updateRoute(`staff?tab=${newTab}`);
+        setSelectedTab(newTab);
+    };
 
     const tabs = [
         {
-            id: 'users-admins',
+            id: 'administrators',
             title: 'Administrators',
-            contents: (<UsersList groupname='administrators' users={adminUsers} />)
+            contents: (<UsersList groupname='administrators' users={adminUsers} />),
+            counter: adminUsers.length ? adminUsers.length : undefined
         },
         {
-            id: 'users-editors',
+            id: 'editors',
             title: 'Editors',
-            contents: (<UsersList groupname='editors' users={editorUsers} />)
+            contents: (<UsersList groupname='editors' users={editorUsers} />),
+            counter: editorUsers.length ? editorUsers.length : undefined
         },
         {
-            id: 'users-authors',
+            id: 'authors',
             title: 'Authors',
-            contents: (<UsersList groupname='authors' users={authorUsers} />)
+            contents: (<UsersList groupname='authors' users={authorUsers} />),
+            counter: authorUsers.length ? authorUsers.length : undefined
         },
         {
-            id: 'users-contributors',
+            id: 'contributors',
             title: 'Contributors',
-            contents: (<UsersList groupname='contributors' users={contributorUsers} />)
+            contents: (<UsersList groupname='contributors' users={contributorUsers} />),
+            counter: contributorUsers.length ? contributorUsers.length : undefined
         },
         {
-            id: 'users-invited',
+            id: 'invited',
             title: 'Invited',
-            contents: (<InvitesUserList users={invites} />)
+            contents: (<InvitesUserList users={invites} />),
+            counter: invites.length ? invites.length : undefined
         }
     ];
 
     return (
-        <SettingGroup
+        <TopLevelGroup
             customButtons={buttons}
             highlightOnModalClose={highlight}
             keywords={keywords}
@@ -270,13 +284,14 @@ const Users: React.FC<{ keywords: string[], highlight?: boolean }> = ({keywords,
             title='Staff'
         >
             <Owner user={ownerUser} />
-            <TabView selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
+            {/* if there are no users besides the owner user, hide the tabs*/}
+            {(users.length > 1 || invites.length > 0) && <TabView selectedTab={selectedTab} tabs={tabs} testId='user-tabview' onTabChange={updateSelectedTab} />}
             {hasNextPage && <Button
                 label={`Load more (showing ${users.length}/${totalUsers} users)`}
                 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..c7570c87f29 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,13 +1,9 @@
-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 {User, useUpdatePassword} from '../../../../api/users';
-import {ValidationError} from '../../../../utils/errors';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
+import {Button, Heading, SettingGroup, TextField, showToast} from '@tryghost/admin-x-design-system';
+import {User, useUpdatePassword} from '@tryghost/admin-x-framework/api/users';
+import {ValidationError} from '@tryghost/admin-x-framework/errors';
 import {useEffect, useRef, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const BAD_PASSWORDS = [
     '1234567890',
@@ -222,8 +218,8 @@ const ChangePasswordForm: React.FC<{user: User}> = ({user}) => {
                     } catch (e) {
                         setSaveState('');
                         showToast({
-                            type: 'pageError',
-                            message: e instanceof ValidationError ? e.message : `Couldn't update password. Please try again.`
+                            type: 'error',
+                            title: e instanceof ValidationError ? e.message : `Couldn't update password. Please try again.`
                         });
                         handleError(e, {withToast: false});
                     }
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..336a6649ee5 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,13 +1,14 @@
 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 {User, hasAdminAccess} from '../../../../api/users';
+import {SettingGroup, SettingGroupContent, Toggle} from '@tryghost/admin-x-design-system';
+import {User, hasAdminAccess} from '@tryghost/admin-x-framework/api/users';
+import {checkStripeEnabled} from '@tryghost/admin-x-framework/api/settings';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 const EmailNotificationsInputs: React.FC<{ user: User; setUserData: (user: User) => void; }> = ({user, setUserData}) => {
+    const {config, settings} = useGlobalData();
     const hasWebmentions = useFeatureFlag('webmentions');
-    const hasRecommendations = useFeatureFlag('recommendations');
+    const hasStripeEnabled = checkStripeEnabled(settings || [], config || {});
 
     return (
         <SettingGroupContent>
@@ -30,7 +31,7 @@ const EmailNotificationsInputs: React.FC<{ user: User; setUserData: (user: User)
                         setUserData?.({...user, mention_notifications: e.target.checked});
                     }}
                 />}
-                {hasRecommendations && <Toggle
+                <Toggle
                     checked={user.recommendation_notifications}
                     direction='rtl'
                     hint='Every time another publisher recommends you to their audience'
@@ -38,7 +39,7 @@ const EmailNotificationsInputs: React.FC<{ user: User; setUserData: (user: User)
                     onChange={(e) => {
                         setUserData?.({...user, recommendation_notifications: e.target.checked});
                     }}
-                />}
+                />
                 <Toggle
                     checked={user.free_member_signup_notification}
                     direction='rtl'
@@ -75,6 +76,15 @@ const EmailNotificationsInputs: React.FC<{ user: User; setUserData: (user: User)
                         setUserData?.({...user, milestone_notifications: e.target.checked});
                     }}
                 />
+                {hasStripeEnabled && <Toggle
+                    checked={user.donation_notifications}
+                    direction='rtl'
+                    hint='Every time you receive a one-time payment'
+                    label='Tips & donations'
+                    onChange={(e) => {
+                        setUserData?.({...user, donation_notifications: e.target.checked});
+                    }}
+                />}
             </>}
         </SettingGroupContent>
     );
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..98864d1eded 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 {hasAdminAccess} from '@tryghost/admin-x-framework/api/users';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
-const BasicInputs: React.FC<UserDetailProps> = ({errors, validators, clearError, user, setUserData}) => {
+const BasicInputs: React.FC<UserDetailProps> = ({errors, clearError, user, setUserData}) => {
     const {currentUser} = useGlobalData();
 
     return (
@@ -15,11 +13,9 @@ const BasicInputs: React.FC<UserDetailProps> = ({errors, validators, clearError,
             <TextField
                 error={!!errors?.name}
                 hint={errors?.name || 'Use real name so people can recognize you'}
+                maxLength={191}
                 title="Full name"
                 value={user.name}
-                onBlur={(e) => {
-                    validators.name({name: e.target.value});
-                }}
                 onChange={(e) => {
                     setUserData({...user, name: e.target.value});
                 }}
@@ -28,18 +24,17 @@ const BasicInputs: React.FC<UserDetailProps> = ({errors, validators, clearError,
             <TextField
                 error={!!errors?.email}
                 hint={errors?.email || 'Used for notifications'}
+                maxLength={191}
                 title="Email"
                 value={user.email}
-                onBlur={(e) => {
-                    validators.email({email: e.target.value});
-                }}
                 onChange={(e) => {
                     setUserData({...user, email: e.target.value});
                 }}
                 onKeyDown={() => clearError('email')}
             />
             <TextField
-                hint="https://example.com/author"
+                hint={`https://example.com/author/${user.slug}`}
+                maxLength={191}
                 title="Slug"
                 value={user.slug}
                 onChange={(e) => {
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..df7a0d875b1 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,11 @@
 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) : '');
 
@@ -16,23 +14,22 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
             <TextField
                 error={!!errors?.location}
                 hint={errors?.location || 'Where in the world do you live?'}
+                maxLength={65535}
                 title="Location"
                 value={user.location || ''}
-                onBlur={(e) => {
-                    validators.location({location: e.target.value});
-                }}
                 onChange={(e) => {
                     setUserData({...user, location: e.target.value});
                 }}
                 onKeyDown={() => clearError('location')} />
             <TextField
-                error={!!errors?.url}
-                hint={errors?.url || 'Have a website or blog other than this one? Link it!'}
+                error={!!errors?.website}
+                hint={errors?.website || 'Have a website or blog other than this one? Link it!'}
+                maxLength={2000}
                 title="Website"
                 value={user.website || ''}
-                onBlur={(e) => {
-                    validators.url({url: e.target.value});
-                }}
+                // onBlur={(e) => {
+                //     validateField('url', e.target.value);
+                // }}
                 onChange={(e) => {
                     setUserData({...user, website: e.target.value});
                 }}
@@ -40,10 +37,11 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
             <TextField
                 error={!!errors?.facebook}
                 hint={errors?.facebook || 'URL of your personal Facebook Profile'}
+                maxLength={2000}
                 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)});
@@ -56,10 +54,11 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
             <TextField
                 error={!!errors?.twitter}
                 hint={errors?.twitter || 'URL of your X profile'}
+                maxLength={2000}
                 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)});
@@ -72,11 +71,9 @@ export const DetailsInputs: React.FC<UserDetailProps> = ({errors, clearError, va
             <TextArea
                 error={!!errors?.bio}
                 hint={errors?.bio || <>Recommended: 200 characters. You&lsquo;ve used <span className='font-bold'>{user.bio?.length || 0}</span></>}
+                maxLength={65535}
                 title="Bio"
                 value={user.bio || ''}
-                onBlur={(e) => {
-                    validators.bio({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..b185ebd78c9 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,8 +1,6 @@
-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 {User, isOwnerUser} from '../../../../api/users';
-import {useBrowseRoles} from '../../../../api/roles';
+import {Heading, Icon, Radio} from '@tryghost/admin-x-design-system';
+import {User, isOwnerUser} from '@tryghost/admin-x-framework/api/users';
+import {useBrowseRoles} from '@tryghost/admin-x-framework/api/roles';
 
 const RoleSelector: React.FC<{ user: User; setUserData: (user: User) => void; }> = ({user, setUserData}) => {
     const {data: {roles} = {}} = useBrowseRoles();
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..ff88c2f3ab8 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,10 +1,9 @@
 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 {genStaffToken, getStaffToken} from '../../../../api/staffToken';
+import {ConfirmationModal, Heading} from '@tryghost/admin-x-design-system';
+import {genStaffToken, getStaffToken} from '@tryghost/admin-x-framework/api/staffToken';
 import {useEffect, useState} from 'react';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const StaffToken: React.FC = () => {
     const {refetch: apiKey} = getStaffToken({
diff --git a/apps/admin-x-settings/src/components/settings/growth/GrowthSettings.tsx b/apps/admin-x-settings/src/components/settings/growth/GrowthSettings.tsx
new file mode 100644
index 00000000000..0ea251415a9
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/GrowthSettings.tsx
@@ -0,0 +1,31 @@
+import EmbedSignupForm from './embedSignup/EmbedSignupForm';
+import Offers from './Offers';
+import React from 'react';
+import Recommendations from './Recommendations';
+import SearchableSection from '../../SearchableSection';
+import TipsAndDonations from './TipsAndDonations';
+import {checkStripeEnabled} from '@tryghost/admin-x-framework/api/settings';
+import {useGlobalData} from '../../providers/GlobalDataProvider';
+
+export const searchKeywords = {
+    tips: ['growth', 'tips', 'donations', 'one time', 'payment'],
+    embedSignupForm: ['growth', 'embeddable signup form', 'embeddable form', 'embeddable sign up form', 'embeddable sign up'],
+    recommendations: ['growth', 'recommendations', 'recommend', 'blogroll'],
+    offers: ['growth', 'offers', 'discounts', 'coupons', 'promotions']
+};
+
+const GrowthSettings: React.FC = () => {
+    const {config, settings} = useGlobalData();
+    const hasStripeEnabled = checkStripeEnabled(settings || [], config || {});
+
+    return (
+        <SearchableSection keywords={Object.values(searchKeywords).flat()} title='Growth'>
+            <Recommendations keywords={searchKeywords.recommendations} />
+            <EmbedSignupForm keywords={searchKeywords.embedSignupForm} />
+            {hasStripeEnabled && <Offers keywords={searchKeywords.offers} />}
+            {hasStripeEnabled && <TipsAndDonations keywords={searchKeywords.tips} />}
+        </SearchableSection>
+    );
+};
+
+export default GrowthSettings;
diff --git a/apps/admin-x-settings/src/components/settings/growth/Offers.tsx b/apps/admin-x-settings/src/components/settings/growth/Offers.tsx
new file mode 100644
index 00000000000..75b07ffff64
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/Offers.tsx
@@ -0,0 +1,128 @@
+import React from 'react';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {CopyLinkButton, createRedemptionFilterUrl, getOfferDiscount} from './offers/OffersIndex';
+import {Offer, useBrowseOffers} from '@tryghost/admin-x-framework/api/offers';
+import {Tier, getPaidActiveTiers, useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers';
+import {checkStripeEnabled} from '@tryghost/admin-x-framework/api/settings';
+import {numberWithCommas} from '../../../utils/helpers';
+import {useGlobalData} from '../../providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+const OfferContainer: React.FC<{offerTitle: string, tier: Tier, cadence: string, redemptions: number, type: string, amount: number, currency: string, offerId: string, offerCode: string, goToOfferEdit: (offerId: string) => void}> = (
+    {offerTitle, tier, cadence, redemptions, type, amount, currency, offerId, offerCode, goToOfferEdit}) => {
+    const {discountOffer} = getOfferDiscount(type, amount, cadence, currency || 'USD', tier);
+    return <div className='group flex h-full cursor-pointer flex-col justify-between gap-4 break-words rounded-sm 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 min-[900px]:min-h-[187px]' onClick={() => goToOfferEdit(offerId)}>
+        <span className='text-[1.65rem] font-bold leading-tight tracking-tight text-black dark:text-white'>{offerTitle}</span>
+        <div className='flex flex-col'>
+            <span className={`text-sm font-semibold uppercase`}>{discountOffer}</span>
+            <div className='flex gap-1 text-xs'>
+                <span className='font-semibold'>{tier.name}</span>
+                <span className='text-grey-700'>{cadence === 'month' ? 'monthly' : 'yearly'}</span>
+            </div>
+            <div className='mt-2 flex items-end justify-between'>
+                <a className={`text-xs text-grey-700 hover:text-black ${redemptions === 0 ? 'pointer-events-none' : 'hover:underline'}`} data-test-offer={offerTitle} href={createRedemptionFilterUrl(offerId)}>{numberWithCommas(redemptions)} {redemptions === 1 ? 'redemption' : 'redemptions'}</a>
+                <CopyLinkButton offerCode={offerCode} />
+            </div>
+        </div>
+    </div>;
+};
+
+const Offers: React.FC<{ keywords: string[] }> = ({keywords}) => {
+    const {updateRoute} = useRouting();
+    const {settings, config} = useGlobalData();
+
+    const {data: {offers: allOffers = []} = {}} = useBrowseOffers();
+
+    const {data: {tiers: allTiers} = {}} = useBrowseTiers();
+    const paidActiveTiers = getPaidActiveTiers(allTiers || []);
+
+    const activeOffers = allOffers
+        .map(offer => ({...offer, tier: paidActiveTiers.find(tier => tier.id === offer.tier.id)}))
+        .filter((offer): offer is Offer & {tier: Tier} => offer.status === 'active' && !!offer.tier);
+
+    activeOffers.sort((a, b) => {
+        const dateA = a.created_at ? new Date(a.created_at) : new Date(0);
+        const dateB = b.created_at ? new Date(b.created_at) : new Date(0);
+        return dateB.getTime() - dateA.getTime();
+    });
+
+    const latestThree = activeOffers.slice(0, 3);
+
+    const openOfferListModal = () => {
+        updateRoute('offers/edit');
+    };
+
+    const openAddModal = () => {
+        updateRoute('offers/new');
+    };
+
+    const openTiers = () => {
+        updateRoute('/tiers');
+    };
+
+    const goToOfferEdit = (offerId: string) => {
+        sessionStorage.setItem('editOfferPageSource', 'offers');
+        updateRoute(`offers/edit/${offerId}`);
+    };
+
+    let offerButtonText = 'Manage offers';
+    let offerButtonLink = openOfferListModal;
+    let descriptionButtonText = 'Learn more';
+    if (allOffers.length > 0) {
+        offerButtonText = 'Manage offers';
+        offerButtonLink = openOfferListModal;
+    } else if (paidActiveTiers.length === 0 && allOffers.length === 0) {
+        offerButtonText = '';
+        offerButtonLink = openTiers;
+        descriptionButtonText = '';
+    } else if (paidActiveTiers.length > 0 && allOffers.length === 0) {
+        offerButtonText = 'Add offer';
+        offerButtonLink = openAddModal;
+    }
+
+    return (
+        <TopLevelGroup
+            customButtons={<Button className='mt-[-5px]' color='clear' disabled={!checkStripeEnabled(settings, config)} label={offerButtonText} size='sm' onClick={offerButtonLink}/>}
+            description={<>Create discounts & coupons to boost new subscriptions. {allOffers.length === 0 && <><a className='text-green' href="https://ghost.org/help/offers" rel="noopener noreferrer" target="_blank">{descriptionButtonText}</a></>}</>}
+            keywords={keywords}
+            navid='offers'
+            testId='offers'
+            title='Offers'
+        >
+            {latestThree.length > 0 ?
+                <div>
+                    <div className='grid grid-cols-1 gap-4 min-[900px]:grid-cols-3'>
+                        {latestThree.map(offer => (<OfferContainer
+                            key={offer.id}
+                            amount={offer.amount}
+                            cadence={offer.cadence}
+                            currency={offer.currency || 'USD'}
+                            goToOfferEdit={goToOfferEdit}
+                            offerCode={offer.code}
+                            offerId={offer.id}
+                            offerTitle={offer.name}
+                            redemptions={offer.redemption_count}
+                            tier={offer.tier}
+                            type={offer.type}
+                        />))}
+                    </div>
+                    {allOffers.length > 3 && <div className='mt-4 border-t border-t-grey-200 pt-2'>
+                        <span className='text-xs text-grey-700 dark:text-grey-600'>{allOffers.length} offers in total</span>
+                    </div>}
+                </div> :
+                null
+            }
+            {paidActiveTiers.length === 0 && allOffers.length === 0 ?
+                (<div>
+                    <span>You must have an active tier to create an offer.</span>
+                    {` `}
+                    <Button className='font-normal' color='green' label='Manage tiers' link linkWithPadding onClick={openTiers} />
+                </div>
+                ) : ''
+            }
+        </TopLevelGroup>
+    );
+};
+
+export default withErrorBoundary(Offers, 'Portal settings');
diff --git a/apps/admin-x-settings/src/components/settings/membership/Recommendations.tsx b/apps/admin-x-settings/src/components/settings/growth/Recommendations.tsx
similarity index 84%
rename from apps/admin-x-settings/src/components/settings/membership/Recommendations.tsx
rename to apps/admin-x-settings/src/components/settings/growth/Recommendations.tsx
index d46fa572ab0..1c0d7c36f9b 100644
--- a/apps/admin-x-settings/src/components/settings/membership/Recommendations.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/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 useRouting from '../../../hooks/useRouting';
+import TopLevelGroup from '../../TopLevelGroup';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {ShowMoreData} from '../../../admin-x-ds/global/Table';
-import {useBrowseIncomingRecommendations, useBrowseRecommendations} from '../../../api/recommendations';
-import {useReferrerHistory} from '../../../api/referrers';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {Button, ShowMoreData, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {useBrowseIncomingRecommendations, useBrowseRecommendations} from '@tryghost/admin-x-framework/api/recommendations';
+import {useReferrerHistory} from '@tryghost/admin-x-framework/api/referrers';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {
@@ -35,7 +32,7 @@ const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 return;
             }
 
-            const newPage = limit < 100 ? 1 : (page + 1);
+            const newPage = typeof limit === 'number' && limit < 100 ? 1 : (page + 1);
 
             return {
                 ...otherParams,
@@ -68,7 +65,7 @@ const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
                 return;
             }
 
-            const newPage = limit < 100 ? 1 : (page + 1);
+            const newPage = typeof limit === 'number' && limit < 100 ? 1 : (page + 1);
 
             return {
                 ...otherParams,
@@ -115,13 +112,14 @@ const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     const buttons = (
-        <Button className='hidden md:!visible md:!block' color='green' label='Add recommendation' link={true} onClick={() => {
+        <Button className='mt-[-5px] hidden md:!visible md:!block' color='clear' label='Add recommendation' size='sm' onClick={() => {
             openAddNewRecommendationModal();
         }} />
     );
 
     return (
-        <SettingGroup
+        <TopLevelGroup
+            beta={true}
             customButtons={buttons}
             description={groupDescription}
             keywords={keywords}
@@ -132,12 +130,12 @@ const Recommendations: React.FC<{ keywords: string[] }> = ({keywords}) => {
             onSave={handleSave}
         >
             <div className='flex justify-center rounded border border-green px-4 py-2 md:hidden'>
-                <Button color='green' label='Add recommendation' link onClick={() => {
+                <Button color='light-grey' label='Add recommendation' link onClick={() => {
                     openAddNewRecommendationModal();
                 }} />
             </div>
             <TabView selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
-        </SettingGroup>
+        </TopLevelGroup>
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/growth/TipsAndDonations.tsx b/apps/admin-x-settings/src/components/settings/growth/TipsAndDonations.tsx
new file mode 100644
index 00000000000..66453b7f1e9
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/TipsAndDonations.tsx
@@ -0,0 +1,155 @@
+import React, {useEffect, useState} from 'react';
+import TopLevelGroup from '../../TopLevelGroup';
+import useSettingGroup from '../../../hooks/useSettingGroup';
+import {Button, CurrencyField, Heading, Select, SettingGroupContent, confirmIfDirty, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {currencySelectGroups, getSymbol, validateCurrencyAmount} from '../../../utils/currency';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+
+// Stripe doesn't allow amounts over 10,000 as a preset amount
+const MAX_AMOUNT = 10_000;
+
+const TipsAndDonations: React.FC<{ keywords: string[] }> = ({keywords}) => {
+    const {
+        localSettings,
+        siteData,
+        updateSetting,
+        isEditing,
+        saveState,
+        handleSave,
+        handleCancel,
+        focusRef,
+        handleEditingChange,
+        errors,
+        validate,
+        clearError
+    } = useSettingGroup({
+        onValidate: () => {
+            return {
+                donationsSuggestedAmount: validateCurrencyAmount(suggestedAmountInCents, donationsCurrency, {maxAmount: MAX_AMOUNT})
+            };
+        }
+    });
+
+    const [donationsCurrency = 'USD', donationsSuggestedAmount = '500'] = getSettingValues<string>(
+        localSettings,
+        ['donations_currency', 'donations_suggested_amount']
+    );
+
+    const suggestedAmountInCents = parseInt(donationsSuggestedAmount);
+    const suggestedAmountInDollars = suggestedAmountInCents / 100;
+    const donateUrl = `${siteData?.url.replace(/\/$/, '')}/#/portal/support`;
+
+    useEffect(() => {
+        validate();
+    }, [donationsCurrency]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    const [copied, setCopied] = useState(false);
+
+    const copyDonateUrl = () => {
+        navigator.clipboard.writeText(donateUrl);
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2000);
+    };
+
+    const openPreview = () => {
+        confirmIfDirty(saveState === 'unsaved', () => window.open(donateUrl, '_blank'));
+    };
+
+    const values = (
+        <SettingGroupContent
+            columns={1}
+            values={[
+                {
+                    heading: 'Suggested amount',
+                    key: 'suggested-amount',
+                    value: `${getSymbol(donationsCurrency)}${suggestedAmountInDollars}`,
+                    'data-testid': 'suggested-amount'
+                },
+                {
+                    heading: '',
+                    key: 'shareable-link',
+                    value: (
+                        <div className='w-100'>
+                            <div className='flex items-center gap-2'>
+                                <Heading level={6}>Shareable link</Heading>
+                            </div>
+                            <div className='w-100 group relative mt-0 flex items-center justify-between overflow-hidden border-b border-transparent pb-2 pt-1 hover:border-grey-300 dark:hover:border-grey-600'>
+                                <span data-testid="donate-url">{donateUrl}</span>
+                                <div className='invisible flex gap-1 bg-white pl-1 group-hover:visible dark:bg-black'>
+                                    <Button color='clear' data-testid="preview-shareable-link" label={'Preview'} size='sm' onClick={openPreview} />
+                                    <Button color='light-grey' data-testid="copy-shareable-link" label={copied ? 'Copied' : 'Copy link'} size='sm' onClick={copyDonateUrl} />
+                                </div>
+                            </div>
+                        </div>
+                    )
+                }
+            ]}
+        />
+    );
+
+    const inputFields = (
+        <SettingGroupContent columns={1}>
+            <div className='flex max-w-[180px] items-end gap-[.6rem]'>
+                <CurrencyField
+                    error={!!errors.donationsSuggestedAmount}
+                    hint={errors.donationsSuggestedAmount}
+                    inputRef={focusRef}
+                    placeholder="5"
+                    rightPlaceholder={(
+                        <Select
+                            border={false}
+                            clearBg={true}
+                            containerClassName='w-14'
+                            fullWidth={false}
+                            options={currencySelectGroups()}
+                            selectedOption={currencySelectGroups().flatMap(group => group.options).find(option => option.value === donationsCurrency)}
+                            title='Currency'
+                            hideTitle
+                            isSearchable
+                            onSelect={option => updateSetting('donations_currency', option?.value || 'USD')}
+                        />
+                    )}
+                    title='Suggested amount'
+                    valueInCents={parseInt(donationsSuggestedAmount)}
+                    onBlur={validate}
+                    onChange={cents => updateSetting('donations_suggested_amount', cents.toString())}
+                    onKeyDown={() => clearError('donationsSuggestedAmount')}
+                />
+            </div>
+            <div className='w-100'>
+                <div className='flex items-center gap-2'>
+                    <Heading level={6}>Shareable link</Heading>
+                </div>
+                <div className='w-100 group relative mt-0 flex items-center justify-between overflow-hidden border-b border-transparent pb-2 pt-1 hover:border-grey-300 dark:hover:border-grey-600'>
+                    {donateUrl}
+                    <div className='invisible flex gap-1 bg-white pl-1 group-hover:visible dark:bg-black'>
+                        <Button color='clear' label={'Preview'} size='sm' onClick={openPreview} />
+                        <Button color='light-grey' label={copied ? 'Copied' : 'Copy link'} size='sm' onClick={copyDonateUrl} />
+                    </div>
+                </div>
+            </div>
+        </SettingGroupContent>
+    );
+
+    return (
+        <TopLevelGroup
+            description="Give your audience a simple way to support your work with one-time payments."
+            isEditing={isEditing}
+            keywords={keywords}
+            navid='tips-and-donations'
+            saveState={saveState}
+            testId='tips-and-donations'
+            title="Tips & donations"
+            onCancel={handleCancel}
+            onEditingChange={handleEditingChange}
+            onSave={handleSave}
+        >
+            {isEditing ? inputFields : values}
+            <div className='items-center-mt-1 flex text-sm'>
+                All tips and donations are subject to Stripe&apos;s <a className='ml-1 text-green' href="https://ghost.org/help/tips-donations/" rel="noopener noreferrer" target="_blank"> tipping policy</a>.
+            </div>
+        </TopLevelGroup>
+    );
+};
+
+export default withErrorBoundary(TipsAndDonations, 'Tips & donations');
diff --git a/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupForm.tsx b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupForm.tsx
new file mode 100644
index 00000000000..703a52c622c
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupForm.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import TopLevelGroup from '../../../TopLevelGroup';
+import {Button} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+const EmbedSignupForm: React.FC<{ keywords: string[] }> = ({keywords}) => {
+    const {updateRoute} = useRouting();
+    const openPreviewModal = () => {
+        updateRoute('embed-signup-form/show');
+    };
+
+    return (
+        <TopLevelGroup
+            customButtons={<Button className='mt-[-5px]' color='clear' label='Embed' size='sm' onClick={openPreviewModal}/>}
+            description="Grow your audience from anywhere on the web"
+            keywords={keywords}
+            navid='embed-signup-form'
+            testId='embed-signup-form'
+            title="Embeddable signup form"
+        />
+    );
+};
+
+export default EmbedSignupForm;
diff --git a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupFormModal.tsx b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupFormModal.tsx
similarity index 93%
rename from apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupFormModal.tsx
rename to apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupFormModal.tsx
index 3750f64163d..006b5fb60a9 100644
--- a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupFormModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupFormModal.tsx
@@ -1,15 +1,14 @@
 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';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 import {useEffect, useState} from 'react';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const EmbedSignupFormModal = NiceModal.create(() => {
     let i18nEnabled = false;
@@ -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/EmbedSignupPreview.tsx b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupPreview.tsx
similarity index 100%
rename from apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupPreview.tsx
rename to apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupPreview.tsx
diff --git a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupSidebar.tsx b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupSidebar.tsx
similarity index 86%
rename from apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupSidebar.tsx
rename to apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupSidebar.tsx
index 04754981930..2c9945f8894 100644
--- a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupSidebar.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/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 {Label} from '../../../../api/labels';
+import {Button, ColorIndicator, ColorPicker, Form, Heading, LoadMultiSelectOptions, MultiSelect, MultiSelectOption, Radio, StickyFooter, TextArea, debounce} from '@tryghost/admin-x-design-system';
+import {Label} from '@tryghost/admin-x-framework/api/labels';
 import {MultiValue} from 'react-select';
-import {debounce} from '../../../../utils/debounce';
+import {useFilterableApi} from '@tryghost/admin-x-framework/hooks';
 
 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})));
     };
@@ -138,7 +129,6 @@ const EmbedSignupSidebar: React.FC<SidebarProps> = ({selectedLayout,
                     />
                     <TextArea
                         className='text-grey-800'
-                        clearBg={false}
                         fontStyle='mono'
                         hint={`Paste this code onto any website where you'd like your signup to appear.`}
                         title='Embed code'
diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
new file mode 100644
index 00000000000..2a6be523ce5
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
@@ -0,0 +1,674 @@
+import PortalFrame from '../../membership/portal/PortalFrame';
+import toast from 'react-hot-toast';
+import {Button} from '@tryghost/admin-x-design-system';
+import {ErrorMessages, useForm} from '@tryghost/admin-x-framework/hooks';
+import {Form, Icon, PreviewModalContent, Select, SelectOption, TextArea, TextField, showToast} from '@tryghost/admin-x-design-system';
+import {JSONError} from '@tryghost/admin-x-framework/errors';
+import {getHomepageUrl} from '@tryghost/admin-x-framework/api/site';
+import {getOfferPortalPreviewUrl, offerPortalPreviewUrlTypes} from '../../../../utils/getOffersPortalPreviewUrl';
+import {getPaidActiveTiers, useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers';
+import {getTiersCadences} from '../../../../utils/getTiersCadences';
+import {useAddOffer} from '@tryghost/admin-x-framework/api/offers';
+import {useBrowseOffers} from '@tryghost/admin-x-framework/api/offers';
+import {useEffect, useMemo, useState} from 'react';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+// we should replace this with a library
+function slugify(text: string): string {
+    return text
+        .toString()
+        .toLowerCase()
+        .trim()
+        .replace(/\s+/g, '-')
+        .replace(/[^\w\-]+/g, '')
+        .replace(/\-\-+/g, '-');
+}
+
+interface OfferType {
+    title: string;
+    description: string;
+}
+
+const ButtonSelect: React.FC<{type: OfferType, checked: boolean, onClick: () => void}> = ({type, checked, onClick}) => {
+    const checkboxClass = checked ? 'bg-black text-white dark:bg-white dark:text-black' : 'border border-grey-300 dark:border-grey-800';
+
+    return (
+        <button className='text-left' type='button' onClick={onClick}>
+            <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-[7px] 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>
+    );
+};
+
+type formStateTypes = {
+    disableBackground?: boolean;
+    name: string;
+    code: {
+        isDirty: boolean;
+        value: string;
+    };
+    displayTitle: {
+        isDirty: boolean;
+        value: string;
+    };
+    displayDescription: string;
+    type: string;
+    cadence: string;
+    amount: number;
+    duration: string;
+    durationInMonths: number;
+    currency: string;
+    status: string;
+    tierId: string;
+    fixedAmount?: number;
+    trialAmount?: number;
+    percentAmount?: number;
+};
+
+const calculateAmount = (formState: formStateTypes): number => {
+    const {fixedAmount = 0, percentAmount = 0, trialAmount = 0, amount = 0} = formState;
+
+    switch (formState.type) {
+    case 'fixed':
+        return fixedAmount * 100;
+    case 'percent':
+        return percentAmount;
+    case 'trial':
+        return trialAmount;
+    default:
+        return amount;
+    }
+};
+
+type SidebarProps = {
+    tierOptions: SelectOption[];
+    handleTierChange: (tier: SelectOption) => void;
+    selectedTier: SelectOption;
+    overrides: formStateTypes;
+    // handleTextInput: (e: React.ChangeEvent<HTMLInputElement>, key: keyof offerPortalPreviewUrlTypes) => void;
+    amountOptions: SelectOption[];
+    typeOptions: OfferType[];
+    durationOptions: SelectOption[];
+    handleTypeChange: (type: string) => void;
+    handleDurationChange: (duration: string) => void;
+    handleAmountTypeChange: (amountType: string) => void;
+    handleNameInput: (e: React.ChangeEvent<HTMLInputElement>) => void;
+    handleTextAreaInput: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;
+    handleDisplayTitleInput: (e: React.ChangeEvent<HTMLInputElement>) => void;
+    handleAmountInput: (e: React.ChangeEvent<HTMLInputElement>) => void;
+    handleDurationInMonthsInput: (e: React.ChangeEvent<HTMLInputElement>) => void;
+    handleCodeInput: (e: React.ChangeEvent<HTMLInputElement>) => void;
+    validate: () => void;
+    clearError: (field: string) => void;
+    testId: string;
+    errors: ErrorMessages;
+    handleTrialAmountInput: (e: React.ChangeEvent<HTMLInputElement>) => void;
+};
+
+const Sidebar: React.FC<SidebarProps> = ({tierOptions,
+    handleTierChange,
+    selectedTier,
+    // handleTextInput,
+    typeOptions,
+    durationOptions,
+    handleTypeChange,
+    handleDurationChange,
+    overrides,
+    handleAmountTypeChange,
+    handleNameInput,
+    handleTextAreaInput,
+    handleDisplayTitleInput,
+    handleDurationInMonthsInput,
+    handleAmountInput,
+    handleCodeInput,
+    clearError,
+    errors,
+    testId,
+    handleTrialAmountInput,
+    amountOptions}) => {
+    // const handleError = useHandleError();
+    const getFilteredDurationOptions = () => {
+        // Check if the selected tier's cadence is 'yearly'
+        if (selectedTier?.label?.includes('Yearly')) {
+            // Filter out 'repeating' from duration options
+            return durationOptions.filter(option => option.value !== 'repeating');
+        }
+        return durationOptions;
+    };
+    const filteredDurationOptions = getFilteredDurationOptions();
+
+    const [nameLength, setNameLength] = useState(0);
+    const nameLengthColor = nameLength > 40 ? 'text-red' : 'text-green';
+
+    const {siteData} = useGlobalData();
+    const [isCopied, setIsCopied] = useState(false);
+    const homepageUrl = getHomepageUrl(siteData!);
+    const offerUrl = `${homepageUrl}${overrides.code.value}`;
+    const handleCopyClick = async () => {
+        await navigator.clipboard.writeText(offerUrl);
+        setIsCopied(true);
+        setTimeout(() => setIsCopied(false), 2000);
+    };
+
+    return (
+        <div className='pt-7' data-testId={testId}>
+            <Form>
+                <section>
+                    <h2 className='mb-4 text-lg'>General</h2>
+                    <div className='flex flex-col gap-6'>
+                        <TextField
+                            error={Boolean(errors.name)}
+                            hint={errors.name || <div className='flex justify-between'><span>Visible to members on Stripe Checkout page</span><strong><span className={`${nameLengthColor}`}>{nameLength}</span> / 40</strong></div>}
+                            maxLength={40}
+                            placeholder='Black Friday'
+                            title='Offer name'
+                            onChange={(e) => {
+                                handleNameInput(e);
+                                setNameLength(e.target.value.length);
+                            }}
+                            onKeyDown={() => clearError('name')}
+                        />
+                        <TextField
+                            error={Boolean(errors.displayTitle)}
+                            hint={errors.displayTitle}
+                            placeholder='Black Friday Special'
+                            title='Display title'
+                            value={overrides.displayTitle.value}
+                            onChange={(e) => {
+                                handleDisplayTitleInput(e);
+                            }}
+                            onKeyDown={() => clearError('displayTitle')}
+                        />
+                        <TextArea
+                            placeholder='Take advantage of this limited-time offer.'
+                            title='Display description'
+                            value={overrides.displayDescription}
+                            onChange={(e) => {
+                                handleTextAreaInput(e);
+                            }}
+                        />
+                    </div>
+                </section>
+                <section className='mt-4'>
+                    <h2 className='mb-4 text-lg'>Details</h2>
+                    <div className='flex flex-col gap-6'>
+                        <div className='flex flex-col gap-4 rounded-md border border-grey-200 p-4 dark:border-grey-800'>
+                            <ButtonSelect checked={overrides.type !== 'trial' ? true : false} type={typeOptions[0]} onClick={() => {
+                                handleTypeChange('percent');
+                            }} />
+                            <ButtonSelect checked={overrides.type === 'trial' ? true : false} type={typeOptions[1]} onClick={() => {
+                                handleTypeChange('trial');
+                            }} />
+                        </div>
+                        <Select
+                            options={tierOptions}
+                            selectedOption={selectedTier}
+                            testId='tier-cadence-select-offers'
+                            title='Tier — Cadence'
+                            onSelect={(e) => {
+                                if (e) {
+                                    handleTierChange(e);
+                                }
+                            }}
+                        />
+                        {
+                            overrides.type !== 'trial' && <> <div className='relative'>
+                                <TextField
+                                    error={Boolean(errors.amount)}
+                                    hint={errors.amount}
+                                    title='Amount off'
+                                    type='number'
+                                    value={
+                                        overrides.type === 'fixed'
+                                            ? (overrides.fixedAmount === 0 ? '' : overrides.fixedAmount?.toString())
+                                            : (overrides.percentAmount === 0 ? '' : overrides.percentAmount?.toString())
+                                    }
+                                    onChange={(e) => {
+                                        handleAmountInput(e);
+                                    }}
+                                    onKeyDown={() => clearError('amount')}
+                                />
+                                <div className='absolute right-1.5 top-6 z-10'>
+                                    <Select
+                                        clearBg={true}
+                                        controlClasses={{menu: 'w-20 right-0'}}
+                                        options={amountOptions}
+                                        selectedOption={overrides.type === 'percent' ? amountOptions[0] : amountOptions[1]}
+                                        testId='amount-type-select-offers'
+                                        onSelect={(e) => {
+                                            handleAmountTypeChange(e?.value || '');
+                                        }}
+                                    />
+                                </div>
+                            </div>
+                            <Select
+                                options={filteredDurationOptions}
+                                selectedOption={filteredDurationOptions.find(option => option.value === overrides.duration)}
+                                testId='duration-select-offers'
+                                title='Duration'
+                                onSelect={e => handleDurationChange(e?.value || '')}
+                            />
+
+                            {
+                                overrides.duration === 'repeating' && <TextField title='Duration in months' type='number' onChange={(e) => {
+                                    handleDurationInMonthsInput(e);
+                                }} />
+                            }
+                            </>
+                        }
+
+                        {
+                            overrides.type === 'trial' && <TextField
+                                error={Boolean(errors.amount)}
+                                hint={errors.amount}
+                                title='Trial duration'
+                                type='number'
+                                value={overrides.trialAmount?.toString()}
+                                onChange={(e) => {
+                                    handleTrialAmountInput(e);
+                                }}
+                                onKeyDown={() => clearError('amount')}/>
+
+                        }
+
+                        <TextField
+                            error={Boolean(errors.code)}
+                            hint={errors.code || (overrides.code.value !== '' ? <div className='flex items-center justify-between'><div>{homepageUrl}<span className='font-bold'>{overrides.code.value}</span></div><span></span><Button className='text-xs' color='green' label={`${isCopied ? 'Copied' : 'Copy'}`} size='sm' link onClick={handleCopyClick} /></div> : null)}
+                            placeholder='black-friday'
+                            title='Offer code'
+                            value={overrides.code.value}
+                            onChange={(e) => {
+                                handleCodeInput(e);
+                            }}
+                            onKeyDown={() => clearError('code')}
+                        />
+                    </div>
+                </section>
+            </Form>
+        </div>
+    );
+};
+
+const parseData = (input: string): { id: string; period: string; currency: string } => {
+    const [id, period, currency] = input.split('-');
+    if (!id || !period || !currency) {
+        throw new Error('Invalid input format. Expected format is: id-period-currency');
+    }
+    return {id, period, currency};
+};
+
+const AddOfferModal = () => {
+    const {siteData} = useGlobalData();
+    const typeOptions = [
+        {title: 'Discount', description: 'Offer a special reduced price', value: 'percent'},
+        {title: 'Free trial', description: 'Give free access for a limited time', value: 'trial'}
+    ];
+
+    const durationOptions = [
+        {value: 'once', label: 'First-payment'},
+        {value: 'repeating', label: 'Multiple-months'},
+        {value: 'forever', label: 'Forever'}
+    ];
+
+    const [href, setHref] = useState<string>('');
+    const {updateRoute} = useRouting();
+    const {data: {tiers} = {}} = useBrowseTiers();
+    const activeTiers = getPaidActiveTiers(tiers || []);
+    const tierCadenceOptions = getTiersCadences(activeTiers);
+    const {mutateAsync: addOffer} = useAddOffer();
+    const [selectedTier, setSelectedTier] = useState({
+        tier: tierCadenceOptions[0] || {},
+        dataset: {
+            id: tierCadenceOptions[0]?.value ? parseData(tierCadenceOptions[0]?.value).id : '',
+            period: tierCadenceOptions[0]?.value ? parseData(tierCadenceOptions[0]?.value).period : '',
+            currency: tierCadenceOptions[0]?.value ? parseData(tierCadenceOptions[0]?.value).currency : ''
+        }
+    });
+
+    const {data: {offers: allOffers = []} = {}} = useBrowseOffers();
+
+    const {formState, updateForm, handleSave, saveState, okProps, validate, errors, clearError} = useForm({
+        initialState: {
+            disableBackground: false,
+            name: '',
+            code: {
+                isDirty: false,
+                value: ''
+            },
+            displayTitle: {
+                isDirty: false,
+                value: ''
+            },
+            displayDescription: '',
+            type: 'percent',
+            cadence: selectedTier?.dataset?.period || '',
+            amount: 0,
+            duration: 'once',
+            durationInMonths: 0,
+            currency: selectedTier?.dataset?.currency || 'USD',
+            status: 'active',
+            tierId: selectedTier?.dataset?.id || '',
+            trialAmount: 7,
+            fixedAmount: 0,
+            percentAmount: 0
+        },
+        onSave: async () => {
+            const dataset = {
+                name: formState.name,
+                code: formState.code.value,
+                display_title: formState.displayTitle.value,
+                display_description: formState.displayDescription,
+                cadence: formState.cadence,
+                amount: calculateAmount(formState) || 0,
+                duration: formState.type === 'trial' ? 'trial' : formState.duration,
+                duration_in_months: Number(formState.durationInMonths),
+                currency: formState.currency,
+                status: formState.status,
+                tier: {
+                    id: formState.tierId
+                },
+                type: formState.type,
+                currency_restriction: false
+            };
+
+            const response = await addOffer(dataset);
+
+            if (response && response.offers && response.offers.length > 0) {
+                updateRoute(`offers/success/${response.offers[0].id}`);
+            }
+        },
+        onSaveError: () => {},
+        onValidate: () => {
+            const newErrors : Record<string, string> = {};
+
+            if (!formState.name && formState.name.length === 0) {
+                newErrors.name = 'Name is required';
+            }
+
+            if (!formState.code.value && formState.code.value.length === 0) {
+                newErrors.code = 'Code is required';
+            }
+
+            if (!formState.displayTitle.value && formState.displayTitle.value.length === 0) {
+                newErrors.displayTitle = 'Display title is required';
+            }
+
+            if (formState.type === 'percent' && formState.percentAmount === 0) {
+                newErrors.amount = 'Enter an amount greater than 0.';
+            }
+
+            if (formState.type === 'percent' && (formState.percentAmount < 0 || formState.percentAmount > 100)) {
+                newErrors.amount = 'Amount must be between 0 and 100%.';
+            }
+
+            if (formState.type === 'fixed' && formState.fixedAmount === 0 || formState.type === 'fixed' && formState.fixedAmount < 1) {
+                newErrors.amount = 'Enter an amount greater than 0.';
+            }
+
+            if (formState.type === 'trial' && formState.trialAmount === 0) {
+                newErrors.amount = 'Enter an amount greater than 0.';
+            }
+
+            if (formState.type === 'trial' && formState.trialAmount < 1) {
+                newErrors.amount = 'Free trial must be at least 1 day.';
+            }
+
+            return newErrors;
+        },
+        savingDelay: 500
+    });
+
+    const amountOptions = [
+        {value: 'percent', label: '%'},
+        {value: 'fixed', label: formState.currency}
+    ];
+
+    const handleTierChange = (tier: SelectOption) => {
+        setSelectedTier({
+            tier,
+            dataset: parseData(tier.value)
+        });
+        updateForm(state => ({
+            ...state,
+            cadence: parseData(tier.value).period,
+            currency: parseData(tier.value).currency,
+            tierId: parseData(tier.value).id
+        }));
+    };
+
+    const handleTypeChange = (type: string) => {
+        updateForm(state => ({
+            ...state,
+            type: type
+        }));
+    };
+
+    const handleAmountTypeChange = (amountType: string) => {
+        updateForm(state => ({
+            ...state,
+            type: amountType === 'percent' ? 'percent' : 'fixed' || state.type
+        }));
+    };
+
+    const handleAmountInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const target = e.target as HTMLInputElement;
+
+        if (formState.type === 'fixed') {
+            updateForm(state => ({
+                ...state,
+                fixedAmount: Number(target.value)
+            }));
+        } else if (formState.type === 'percent') {
+            updateForm(state => ({
+                ...state,
+                percentAmount: Number(target.value)
+            }));
+        } else {
+            updateForm(state => ({
+                ...state,
+                amount: Number(target.value)
+            }));
+        }
+    };
+
+    const handleDurationInMonthsInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const target = e.target as HTMLInputElement;
+        updateForm(state => ({
+            ...state,
+            durationInMonths: Number(target.value)
+        }));
+    };
+
+    const handleNameInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const newValue = e.target.value;
+        updateForm((prevOverrides) => {
+            let newOverrides = {...prevOverrides};
+            newOverrides.name = newValue;
+            if (!prevOverrides.code.isDirty) {
+                clearError('code');
+                newOverrides.code = {
+                    ...prevOverrides.code,
+                    value: slugify(newValue)
+                };
+            }
+            if (!prevOverrides.displayTitle.isDirty) {
+                clearError('displayTitle');
+                newOverrides.displayTitle = {
+                    ...prevOverrides.displayTitle,
+                    value: newValue
+                };
+            }
+            return newOverrides;
+        });
+    };
+
+    const handleDisplayTitleInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const target = e.target as HTMLInputElement;
+        updateForm(state => ({
+            ...state,
+            displayTitle: {
+                ...state.displayTitle,
+                isDirty: true,
+                value: target.value
+            }
+        }));
+    };
+
+    const handleTextAreaInput = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+        const target = e.target as HTMLTextAreaElement;
+        updateForm(state => ({
+            ...state,
+            displayDescription: target.value
+        }));
+    };
+
+    const handleTrialAmountInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const target = e.target as HTMLInputElement;
+        updateForm(state => ({
+            ...state,
+            trialAmount: Number(target.value)
+        }));
+    };
+
+    const handleDurationChange = (duration: string) => {
+        updateForm(state => ({
+            ...state,
+            duration: duration
+        }));
+    };
+
+    const handleCodeInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const target = e.target as HTMLInputElement;
+        updateForm(state => ({
+            ...state,
+            code: {
+                ...state.code,
+                isDirty: true,
+                value: target.value
+            }
+        }));
+    };
+
+    const cancelAddOffer = () => {
+        if (allOffers.length > 0) {
+            updateRoute('offers/edit');
+        } else {
+            updateRoute('offers');
+        }
+    };
+
+    const overrides : offerPortalPreviewUrlTypes = useMemo(() => {
+        return {
+            name: formState.name || '',
+            code: formState.code.value || '',
+            displayTitle: formState.displayTitle.value || '',
+            displayDescription: formState.displayDescription || '',
+            type: formState.type || 'percent',
+            cadence: formState.cadence || 'month',
+            amount: calculateAmount(formState) || 0,
+            duration: formState.type === 'trial' ? 'trial' : formState.duration || 'once',
+            durationInMonths: formState.durationInMonths || 0,
+            currency: formState.currency || 'USD',
+            status: formState.status || 'active',
+            tierId: formState.tierId || activeTiers[0]?.id
+        };
+    }, [formState, activeTiers]);
+
+    useEffect(() => {
+        const newHref = getOfferPortalPreviewUrl(overrides, siteData.url);
+        setHref(newHref);
+    }, [formState, siteData.url, formState.type, overrides]);
+
+    const sidebar = <Sidebar
+        amountOptions={amountOptions as SelectOption[]}
+        clearError={clearError}
+        durationOptions={durationOptions}
+        errors={errors}
+        handleAmountInput={handleAmountInput}
+        handleAmountTypeChange={handleAmountTypeChange}
+        handleCodeInput={handleCodeInput}
+        handleDisplayTitleInput={handleDisplayTitleInput}
+        handleDurationChange={handleDurationChange}
+        handleDurationInMonthsInput={handleDurationInMonthsInput}
+        handleNameInput={handleNameInput}
+        handleTextAreaInput={handleTextAreaInput}
+        handleTierChange={handleTierChange}
+        handleTrialAmountInput={handleTrialAmountInput}
+        handleTypeChange={handleTypeChange}
+        overrides={formState}
+        selectedTier={selectedTier.tier}
+        testId='add-offer-sidebar'
+        tierOptions={tierCadenceOptions}
+        typeOptions={typeOptions}
+        validate={validate}
+    />;
+
+    const iframe = <PortalFrame
+        href={href || ''}
+        portalParent='offers'
+    />;
+    return <PreviewModalContent
+        afterClose={() => {
+            updateRoute('offers');
+        }}
+        backDropClick={false}
+        cancelLabel='Close'
+        deviceSelector={false}
+        dirty={saveState === 'unsaved'}
+        height='full'
+        okColor={okProps.color}
+        okLabel='Publish'
+        preview={iframe}
+        previewToolbar={false}
+        sidebar={sidebar}
+        size='lg'
+        testId='add-offer-modal'
+        title='Offer'
+        width={1140}
+        onCancel={cancelAddOffer}
+        onOk={async () => {
+            validate();
+            const isErrorsEmpty = Object.values(errors).every(error => !error);
+            if (!isErrorsEmpty) {
+                toast.remove();
+                showToast({
+                    title: 'Can\'t save offer',
+                    type: 'info',
+                    message: 'Make sure you filled all required fields'
+                });
+                return;
+            }
+
+            try {
+                if (await handleSave({force: true})) {
+                    return;
+                }
+            } catch (e) {
+                let message;
+
+                if (e instanceof JSONError && e.data && e.data.errors[0]) {
+                    message = e.data.errors[0].context || e.data.errors[0].message;
+                }
+
+                toast.remove();
+                if (message) {
+                    showToast({
+                        title: 'Can\'t save offer',
+                        type: 'error',
+                        message: message || 'Please try again later'
+                    });
+                }
+            }
+        }}
+    />;
+};
+
+export default AddOfferModal;
diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/EditOfferModal.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/EditOfferModal.tsx
new file mode 100644
index 00000000000..1ea97c102bc
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/offers/EditOfferModal.tsx
@@ -0,0 +1,307 @@
+import NiceModal from '@ebay/nice-modal-react';
+import PortalFrame from '../../membership/portal/PortalFrame';
+import toast from 'react-hot-toast';
+import {Button, ConfirmationModal, Form, PreviewModalContent, TextArea, TextField, showToast} from '@tryghost/admin-x-design-system';
+import {ErrorMessages, useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {JSONError} from '@tryghost/admin-x-framework/errors';
+import {Offer, useBrowseOffersById, useEditOffer} from '@tryghost/admin-x-framework/api/offers';
+import {createRedemptionFilterUrl} from './OffersIndex';
+import {getHomepageUrl} from '@tryghost/admin-x-framework/api/site';
+import {getOfferPortalPreviewUrl, offerPortalPreviewUrlTypes} from '../../../../utils/getOffersPortalPreviewUrl';
+import {useEffect, useState} from 'react';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+function formatTimestamp(timestamp: string): string {
+    const date = new Date(timestamp);
+    return date.toLocaleDateString('default', {
+        year: 'numeric',
+        month: 'short',
+        day: '2-digit'
+    });
+}
+
+const Sidebar: React.FC<{
+        clearError: (field: string) => void,
+        errors: ErrorMessages,
+        offer: Offer,
+        updateOffer: (fields: Partial<Offer>) => void,
+        validate: () => void}> = ({clearError, errors, offer, updateOffer}) => {
+            const {siteData} = useGlobalData();
+            const [isCopied, setIsCopied] = useState(false);
+            const handleError = useHandleError();
+            const {mutateAsync: editOffer} = useEditOffer();
+
+            const [nameLength, setNameLength] = useState(offer?.name.length || 0);
+            const nameLengthColor = nameLength > 40 ? 'text-red' : 'text-green';
+
+            const {updateRoute} = useRouting();
+
+            useEffect(() => {
+                if (offer?.name) {
+                    setNameLength(offer?.name.length);
+                }
+            }, [offer?.name]);
+
+            const homepageUrl = getHomepageUrl(siteData!);
+            const offerUrl = `${homepageUrl}${offer?.code}`;
+            const handleCopyClick = async () => {
+                await navigator.clipboard.writeText(offerUrl);
+                setIsCopied(true);
+                setTimeout(() => setIsCopied(false), 2000);
+            };
+
+            const confirmStatusChange = async () => {
+                if (offer?.status === 'active') {
+                    NiceModal.show(ConfirmationModal, {
+                        title: 'Archive offer',
+                        prompt: <>
+                            <p>New members will no longer be able to subscribe using this offer.</p>
+                            <p>All members that previously redeemed <strong>{offer?.name}</strong> will remain unchanged.</p>
+                        </>,
+                        okLabel: 'Archive',
+                        okColor: 'red',
+                        onOk: async (modal) => {
+                            try {
+                                await editOffer({...offer, status: 'archived'});
+                                modal?.remove();
+                                showToast({
+                                    type: 'success',
+                                    title: 'Offer archived'
+                                });
+                                updateRoute('offers/edit');
+                            } catch (e) {
+                                handleError(e);
+                            }
+                        }
+                    });
+                } else {
+                    NiceModal.show(ConfirmationModal, {
+                        title: 'Reactivate offer',
+                        prompt: <>
+                            <p>Reactivating <strong>{offer?.name}</strong> will allow new members to subscribe using this offer. Existing members will remain unchanged.</p>
+                        </>,
+                        okLabel: 'Reactivate',
+                        onOk: async (modal) => {
+                            try {
+                                await editOffer({...offer, status: 'active'});
+                                modal?.remove();
+                                showToast({
+                                    type: 'success',
+                                    title: 'Offer reactivated'
+                                });
+                                updateRoute('offers/edit');
+                            } catch (e) {
+                                handleError(e);
+                            }
+                        }
+                    });
+                }
+            };
+
+            return (
+                <div className='flex grow flex-col pt-2'>
+                    <Form className=' grow'>
+                        <section>
+                            <div className='flex flex-col gap-5 rounded-md border border-grey-300 p-4 pb-3.5 dark:border-grey-800'>
+                                <div className='flex flex-col gap-1.5'>
+                                    <span className='text-xs font-semibold leading-none text-grey-700'>Created on</span>
+                                    <span>{formatTimestamp(offer?.created_at ? offer.created_at : '')}</span>
+                                </div>
+                                <div className='flex items-end justify-between'>
+                                    <div className='flex flex-col gap-5'>
+                                        <div className='flex flex-col gap-1.5'>
+                                            <span className='text-xs font-semibold leading-none text-grey-700'>Performance</span>
+                                            <span>{offer?.redemption_count} {offer?.redemption_count === 1 ? 'redemption' : 'redemptions'}</span>
+                                        </div>
+                                        {offer?.redemption_count > 0 && offer?.last_redeemed ?
+                                            <div className='flex flex-col gap-1.5'>
+                                                <span className='text-xs font-semibold leading-none text-grey-700'>Last redemption</span>
+                                                <span>{formatTimestamp(offer?.last_redeemed)}</span>
+                                            </div> :
+                                            null
+                                        }
+                                    </div>
+                                    {offer?.redemption_count > 0 ? <a className='font-semibold text-green' href={createRedemptionFilterUrl(offer?.id)}>See members →</a> : null}
+                                </div>
+                            </div>
+                        </section>
+                        <section className='mt-4'>
+                            <h2 className='mb-4 text-lg'>General</h2>
+                            <div className='flex flex-col gap-6'>
+                                <TextField
+                                    error={Boolean(errors.name)}
+                                    hint={errors.name || <div className='flex justify-between'><span>Visible to members on Stripe Checkout page</span><strong><span className={`${nameLengthColor}`}>{nameLength}</span> / 40</strong></div>}
+                                    maxLength={40}
+                                    placeholder='Black Friday'
+                                    title='Offer name'
+                                    value={offer?.name}
+                                    onChange={(e) => {
+                                        setNameLength(e.target.value.length);
+                                        updateOffer({name: e.target.value});
+                                    }}
+                                    onKeyDown={() => clearError('name')}
+                                />
+                                <TextField
+                                    error={Boolean(errors.displayTitle)}
+                                    hint={errors.displayTitle}
+                                    placeholder='Black Friday Special'
+                                    title='Display title'
+                                    value={offer?.display_title}
+                                    onChange={e => updateOffer({display_title: e.target.value})}
+                                    onKeyDown={() => clearError('displayTitle')}
+                                />
+                                <TextArea
+                                    placeholder='Take advantage of this limited-time offer.'
+                                    title='Display description'
+                                    value={offer?.display_description}
+                                    onChange={e => updateOffer({display_description: e.target.value})}
+                                />
+                                <TextField
+                                    error={Boolean(errors.code)}
+                                    hint={errors.code || (offer?.code !== '' ? <div className='flex items-center justify-between'><div>{homepageUrl}<span className='font-bold'>{offer?.code}</span></div><span></span><Button className='text-xs' color='green' label={`${isCopied ? 'Copied' : 'Copy'}`} size='sm' link onClick={handleCopyClick} /></div> : null)}
+                                    placeholder='black-friday'
+                                    title='Offer code'
+                                    value={offer?.code}
+                                    onChange={e => updateOffer({code: e.target.value})}
+                                    onKeyDown={() => clearError('code')}
+                                />
+                            </div>
+                        </section>
+                    </Form>
+                    <div className='mb-2'>
+                        {offer?.status === 'active' ? <Button color='red' label='Archive offer' link onClick={confirmStatusChange} /> : <Button color='green' label='Reactivate offer' link onClick={confirmStatusChange} />}
+                    </div>
+                </div>
+            );
+        };
+
+const EditOfferModal: React.FC<{id: string}> = ({id}) => {
+    const {siteData} = useGlobalData();
+    const {updateRoute} = useRouting();
+    const handleError = useHandleError();
+    const {mutateAsync: editOffer} = useEditOffer();
+
+    const [href, setHref] = useState<string>('');
+
+    const {data: {offers: offerById = []} = {}} = useBrowseOffersById(id ? 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 = 'Name is required';
+            }
+
+            if (!formState?.display_title) {
+                newErrors.displayTitle = 'Display title is required';
+            }
+
+            if (!formState?.code) {
+                newErrors.code = 'Please enter a code';
+            }
+
+            return newErrors;
+        }
+    });
+
+    useEffect(() => {
+        setFormState(() => offerById[0]);
+    }, [setFormState, offerById]);
+
+    const updateOffer = (fields: Partial<Offer>) => {
+        updateForm(state => ({...state, ...fields}));
+    };
+
+    const sidebar = <Sidebar
+        clearError={clearError}
+        errors={errors}
+        offer={formState}
+        updateOffer={updateOffer}
+        validate={validate}
+    />;
+
+    useEffect(() => {
+        const dataset : offerPortalPreviewUrlTypes = {
+            name: formState?.name || '',
+            code: formState?.code || '',
+            displayTitle: formState?.display_title || '',
+            displayDescription: formState?.display_description || '',
+            type: formState?.type || '',
+            cadence: formState?.cadence || '',
+            amount: formState?.amount,
+            duration: formState?.duration || '',
+            durationInMonths: formState?.duration_in_months || 0,
+            currency: formState?.currency || '',
+            status: formState?.status || '',
+            tierId: formState?.tier.id || ''
+        };
+
+        const newHref = getOfferPortalPreviewUrl(dataset, siteData.url);
+        setHref(newHref);
+    }, [formState, siteData]);
+
+    const iframe = <PortalFrame
+        href={href || ''}
+        portalParent='offers'
+    />;
+
+    return offerById ? <PreviewModalContent
+        afterClose={() => {
+            updateRoute('offers');
+        }}
+        backDropClick={false}
+        cancelLabel='Close'
+        deviceSelector={false}
+        dirty={saveState === 'unsaved'}
+        height='full'
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
+        preview={iframe}
+        previewToolbar={false}
+        sidebar={sidebar}
+        size='lg'
+        testId='offer-update-modal'
+        title='Offer'
+        width={1140}
+        onCancel={() => {
+            if (sessionStorage.getItem('editOfferPageSource') === 'offers') {
+                sessionStorage.removeItem('editOfferPageSource');
+                updateRoute('offers');
+            } else {
+                sessionStorage.removeItem('editOfferPageSource');
+                updateRoute('offers/edit');
+            }
+        }}
+        onOk={async () => {
+            try {
+                if (await handleSave({force: true})) {
+                    return;
+                }
+            } catch (e) {
+                let message;
+
+                if (e instanceof JSONError && e.data && e.data.errors[0]) {
+                    message = e.data.errors[0].context || e.data.errors[0].message;
+                }
+
+                toast.remove();
+                if (message) {
+                    showToast({
+                        title: 'Can\'t save offer',
+                        type: 'error',
+                        message: 'Please try again later'
+                    });
+                }
+            }
+        }} /> : null;
+};
+
+export default EditOfferModal;
diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/OfferSuccess.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/OfferSuccess.tsx
new file mode 100644
index 00000000000..507a96dd246
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/offers/OfferSuccess.tsx
@@ -0,0 +1,120 @@
+import {Breadcrumbs} from '@tryghost/admin-x-design-system';
+import {Button} from '@tryghost/admin-x-design-system';
+import {Icon} from '@tryghost/admin-x-design-system';
+import {Modal} from '@tryghost/admin-x-design-system';
+import {Offer, useBrowseOffersById} from '@tryghost/admin-x-framework/api/offers';
+import {TextField} from '@tryghost/admin-x-design-system';
+import {currencyToDecimal} from '../../../../utils/currency';
+import {getHomepageUrl} from '@tryghost/admin-x-framework/api/site';
+import {numberWithCommas} from '../../../../utils/helpers';
+import {useEffect, useState} from 'react';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+const OfferSuccess: React.FC<{id: string}> = ({id}) => {
+    const {updateRoute} = useRouting();
+    const {data: {offers: offerById = []} = {}} = useBrowseOffersById(id ? id : '');
+
+    const [offer, setOffer] = useState<Offer>();
+    const [offerLink, setOfferLink] = useState<string>('');
+
+    const {siteData} = useGlobalData();
+
+    useEffect(() => {
+        if (offerById.length > 0) {
+            const currentOffer = offerById[0];
+            const offerUrl = `${getHomepageUrl(siteData!)}${currentOffer?.code}`;
+            setOfferLink(offerUrl);
+            setOffer(currentOffer);
+        }
+    }, [offerById, siteData]);
+
+    const [isCopied, setIsCopied] = useState(false);
+
+    const getShareText = () => {
+        let discount = '';
+
+        switch (offer?.type) {
+        case 'percent':
+            discount = offer?.amount + '% discount';
+            break;
+        case 'fixed':
+            discount = numberWithCommas(currencyToDecimal(offer?.amount)) + ' ' + offer?.currency + ' discount';
+            break;
+        case 'trial':
+            discount = offer?.amount + ' days free trial';
+            break;
+        default:
+            break;
+        };
+
+        return `${encodeURIComponent(offer?.name || '')} — Check out ${encodeURIComponent(discount)} on:`;
+    };
+
+    const handleCopyClick = async () => {
+        await navigator.clipboard.writeText(offerLink);
+        setIsCopied(true);
+        setTimeout(() => setIsCopied(false), 2000);
+    };
+
+    const handleTwitter = () => {
+        window.open(`https://twitter.com/intent/tweet?url=${encodeURI(offerLink)}&text=${getShareText()}`, '_blank');
+    };
+
+    const handleFacebook = () => {
+        window.open(`https://www.facebook.com/sharer/sharer.php?u=${encodeURI(offerLink)}`, '_blank');
+    };
+
+    const handleLinkedIn = () => {
+        window.open(`http://www.linkedin.com/shareArticle?mini=true&url=${encodeURI(offerLink)}&title=${getShareText()}`, '_blank');
+    };
+
+    return <Modal
+        afterClose={() => {
+            updateRoute('offers');
+        }}
+        animate={false}
+        backDropClick={false}
+        footer={false}
+        height='full'
+        size='lg'
+        testId='offer-success-modal'
+        topRightContent='close'
+        width={1140}
+    >
+        <div className='-mt-6 flex h-full flex-col items-center justify-center text-center'>
+            <div className='absolute left-6 top-5'>
+                <Breadcrumbs
+                    activeItemClassName='hidden md:!block md:!visible'
+                    containerClassName='whitespace-nowrap'
+                    itemClassName='hidden md:!block md:!visible'
+                    items={[{label: 'Offers', onClick: () => {
+                        updateRoute('offers/edit');
+                    }}, {label: offer?.name || ''}]}
+                    separatorClassName='hidden md:!block md:!visible'
+                    backIcon
+                    onBack={() => {
+                        updateRoute('offers/edit');
+                    }}
+                />
+            </div>
+            <Icon colorClass='text-grey-700 -mt-4' name='tags-check' size='xl' />
+            <h1 className='mt-6 text-4xl'>Your new offer is live!</h1>
+            <p className='mt-3 max-w-[510px] text-[1.6rem]'>You can share the link anywhere. In your newsletter, social media, a podcast, or in-person. It all just works.</p>
+            <div className='mt-8 flex w-full max-w-md flex-col gap-8'>
+                <div className='flex flex-col-reverse gap-2'>
+                    <TextField name='offer-url' type='url' value={offerLink} disabled />
+                    <Button color='green' label={isCopied ? 'Copied!' : 'Copy link'} fullWidth onClick={handleCopyClick} />
+                </div>
+                <div className='flex items-center gap-4 text-xs font-medium before:h-px before:grow before:bg-grey-300 before:content-[""] after:h-px after:grow after:bg-grey-300 after:content-[""] dark:before:bg-grey-800 dark:after:bg-grey-800'>OR</div>
+                <div className='flex gap-2'>
+                    <Button className='h-8 border border-grey-300 dark:border-grey-800' icon='twitter-x' iconColorClass='w-[14px] h-[14px]' size='sm' fullWidth onClick={handleTwitter} />
+                    <Button className='h-8 border border-grey-300 dark:border-grey-800' icon='facebook' size='sm' fullWidth onClick={handleFacebook} />
+                    <Button className='h-8 border border-grey-300 dark:border-grey-800' icon='linkedin' size='sm' fullWidth onClick={handleLinkedIn} />
+                </div>
+            </div>
+        </div>
+    </Modal>;
+};
+
+export default OfferSuccess;
diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/OffersContainerModal.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/OffersContainerModal.tsx
new file mode 100644
index 00000000000..e5e6e046d14
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/offers/OffersContainerModal.tsx
@@ -0,0 +1,31 @@
+import AddOfferModal from './AddOfferModal';
+import EditOfferModal from './EditOfferModal';
+import NiceModal from '@ebay/nice-modal-react';
+import OfferSuccess from './OfferSuccess';
+import {OffersIndexModal} from './OffersIndex';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+
+type OffersRouteHandlerProps = {
+    route: string;
+};
+
+const OffersRouteHandler: React.FC<OffersRouteHandlerProps> = ({route}) => {
+    if (route === 'offers/new') {
+        return <AddOfferModal />;
+    } else if (route.startsWith('offers/edit/') && route.length > 'offers/edit/'.length) {
+        const offerId = route.split('/').pop();
+        return <EditOfferModal id={offerId ? offerId : ''} />;
+    } else if (route.startsWith('offers/success/') && route.length > 'offers/success/'.length) {
+        const offerId = route.split('/').pop();
+        return <OfferSuccess id={offerId ? offerId : ''} />;
+    } else if (route === 'offers/edit') {
+        return <OffersIndexModal />;
+    }
+};
+
+const OffersContainerModal = () => {
+    const {route} = useRouting();
+    return <OffersRouteHandler route={route} />;
+};
+
+export default NiceModal.create(OffersContainerModal);
diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/OffersIndex.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/OffersIndex.tsx
new file mode 100644
index 00000000000..1fa015391eb
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/offers/OffersIndex.tsx
@@ -0,0 +1,300 @@
+import {Button, Tab, TabView} from '@tryghost/admin-x-design-system';
+import {ButtonGroup, ButtonProps, showToast} from '@tryghost/admin-x-design-system';
+import {Icon} from '@tryghost/admin-x-design-system';
+import {Modal} from '@tryghost/admin-x-design-system';
+import {SortMenu} from '@tryghost/admin-x-design-system';
+import {Tier, getPaidActiveTiers, useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers';
+import {Tooltip} from '@tryghost/admin-x-design-system';
+import {currencyToDecimal, getSymbol} from '../../../../utils/currency';
+import {getHomepageUrl} from '@tryghost/admin-x-framework/api/site';
+import {numberWithCommas} from '../../../../utils/helpers';
+import {useBrowseOffers} from '@tryghost/admin-x-framework/api/offers';
+import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useModal} from '@ebay/nice-modal-react';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {useSortingState} from '../../../providers/SettingsAppProvider';
+import {useState} from 'react';
+
+export type OfferType = 'percent' | 'fixed' | 'trial';
+
+export const createRedemptionFilterUrl = (id: string): string => {
+    const baseHref = '/ghost/#/members';
+    const filterValue = `offer_redemptions:[${id}]`;
+    return `${baseHref}?filter=${encodeURIComponent(filterValue)}`;
+};
+
+export const getOfferCadence = (cadence: string): string => {
+    return cadence === 'month' ? 'monthly' : 'yearly';
+};
+
+export const getOfferDuration = (duration: string): string => {
+    return (duration === 'once' ? 'First payment' : duration === 'repeating' ? 'Repeating' : 'Forever');
+};
+
+export const getOfferDiscount = (type: string, amount: number, cadence: string, currency: string, tier: Tier | undefined): {discountColor: string, discountOffer: string, originalPriceWithCurrency: string, updatedPriceWithCurrency: string} => {
+    let discountColor = '';
+    let discountOffer = '';
+    const originalPrice = cadence === 'month' ? tier?.monthly_price ?? 0 : tier?.yearly_price ?? 0;
+    let updatedPrice = originalPrice;
+
+    const formatToTwoDecimals = (num: number): number => parseFloat(num.toFixed(2));
+
+    let originalPriceWithCurrency = getSymbol(currency) + numberWithCommas(formatToTwoDecimals(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(formatToTwoDecimals(currencyToDecimal(amount))) + ' ' + currency + ' off';
+        updatedPrice = originalPrice - amount;
+        break;
+    case 'trial':
+        discountColor = 'text-pink';
+        discountOffer = amount + ' days free';
+        originalPriceWithCurrency = '';
+        break;
+    default:
+        break;
+    };
+
+    if (updatedPrice < 0) {
+        updatedPrice = 0;
+    }
+
+    const updatedPriceWithCurrency = getSymbol(currency) + numberWithCommas(formatToTwoDecimals(currencyToDecimal(updatedPrice)));
+
+    return {
+        discountColor,
+        discountOffer,
+        originalPriceWithCurrency,
+        updatedPriceWithCurrency
+    };
+};
+
+export const CopyLinkButton: React.FC<{offerCode: string}> = ({offerCode}) => {
+    const [isCopied, setIsCopied] = useState(false);
+    const {siteData} = useGlobalData();
+
+    const handleCopyClick = (e?: React.MouseEvent<HTMLElement, MouseEvent>) => {
+        e?.stopPropagation();
+        const offerLink = `${getHomepageUrl(siteData!)}${offerCode}`;
+        navigator.clipboard.writeText(offerLink);
+        setIsCopied(true);
+        setTimeout(() => setIsCopied(false), 2000);
+    };
+
+    return <Tooltip containerClassName='group-hover:opacity-100 opacity-0 inline-flex items-center -mr-1 justify-center leading-none w-5 h-5' content={isCopied ? 'Copied' : 'Copy link'} size='sm'><Button color='clear' hideLabel={true} icon={isCopied ? 'check-circle' : 'hyperlink-circle'} iconColorClass={isCopied ? 'text-green w-[14px] h-[14px]' : 'w-[14px] h-[14px]'} label={isCopied ? 'Copied' : 'Copy'} unstyled={true} onClick={handleCopyClick} /></Tooltip>;
+};
+
+export const EmptyState: React.FC<{title?: string, description: string, buttonAction: () => void, buttonLabel: string}> = ({title = 'No offers found', description, buttonAction, buttonLabel}) => (
+    <div className='flex h-full grow flex-col items-center justify-center text-center'>
+        <Icon className='-mt-14' colorClass='text-grey-700 -mt-6' name='tags-block' size='xl' />
+        <h1 className='mt-6 text-2xl'>{title}</h1>
+        <p className='mt-3 max-w-[420px] text-[1.6rem]'>{description}</p>
+        <Button className="mt-8" color="grey" label={buttonLabel} onClick={buttonAction}></Button>
+    </div>
+);
+
+export const OffersIndexModal = () => {
+    const modal = useModal();
+    const {updateRoute} = useRouting();
+    const {data: {offers: allOffers = []} = {}, isFetching: isFetchingOffers} = useBrowseOffers({
+        searchParams: {
+            limit: 'all'
+        }
+    });
+    const {data: {tiers: allTiers} = {}} = useBrowseTiers();
+    const activeOffers = allOffers.filter((offer) => {
+        const offerTier = allTiers?.find(tier => tier.id === offer?.tier.id);
+        return (offer.status === 'active' && offerTier && offerTier.active === true);
+    });
+    const archivedOffers = allOffers.filter((offer) => {
+        const offerTier = allTiers?.find(tier => tier.id === offer?.tier.id);
+        return (offer.status === 'archived' || (offerTier && offerTier.active === false));
+    });
+
+    let offersTabs: Tab[] = [
+        {id: 'active', title: 'Active'},
+        {id: 'archived', title: 'Archived'}
+    ];
+
+    const {sortingState, setSortingState} = useSortingState();
+    const offersSorting = sortingState?.find(sorting => sorting.type === 'offers');
+
+    const [selectedTab, setSelectedTab] = useState('active');
+
+    const sortOption = offersSorting?.option || 'date-added';
+    const sortDirection = offersSorting?.direction || 'desc';
+
+    const handleOfferEdit = (id:string) => {
+        // TODO: implement
+        sessionStorage.setItem('editOfferPageSource', 'offersIndex');
+        updateRoute(`offers/edit/${id}`);
+    };
+
+    const sortedOffers = allOffers
+        .sort((offer1, offer2) => {
+            const multiplier = sortDirection === 'desc' ? -1 : 1;
+            switch (sortOption) {
+            case 'name':
+                return multiplier * offer1.name.localeCompare(offer2.name);
+            case 'redemptions':
+                return multiplier * (offer1.redemption_count - offer2.redemption_count);
+            default:
+                return multiplier * ((offer1.created_at ? new Date(offer1.created_at).getTime() : 0) - (offer2.created_at ? new Date(offer2.created_at).getTime() : 0));
+            }
+        });
+
+    const paidActiveTiers = getPaidActiveTiers(allTiers || []);
+
+    const listLayoutOutput = <div className='overflow-x-auto'>
+        <table className='m-0 w-full'>
+            {(selectedTab === 'active' && activeOffers.length > 0) || (selectedTab === 'archived' && archivedOffers.length > 0) ?
+                <tr className='border-b border-b-grey-300 dark:border-grey-800'>
+                    <th className='px-5 py-2.5 pl-0 text-xs font-normal text-grey-700'>{selectedTab === 'active' ? activeOffers.length : archivedOffers.length} {selectedTab === 'active' ? (activeOffers.length !== 1 ? 'offers' : 'offer') : (archivedOffers.length !== 1 ? 'offers' : 'offer')}</th>
+                    <th className='px-5 py-2.5 text-xs font-normal text-grey-700'>Terms</th>
+                    <th className='px-5 py-2.5 text-xs font-normal text-grey-700'>Price</th>
+                    <th className='px-5 py-2.5 text-xs font-normal text-grey-700'>Redemptions</th>
+                    <th className='min-w-[80px] px-5 py-2.5 pr-0 text-xs font-normal text-grey-700'></th>
+                </tr> :
+                null
+            }
+            {sortedOffers.filter((offer) => {
+                const offerTier = allTiers?.find(tier => tier.id === offer?.tier.id);
+                return (selectedTab === 'active' && (offer.status === 'active' && offerTier && offerTier.active === true)) ||
+                (selectedTab === 'archived' && (offer.status === 'archived' || (offerTier && offerTier.active === false)));
+            }).map((offer) => {
+                const offerTier = allTiers?.find(tier => tier.id === offer?.tier.id);
+
+                if (!offerTier) {
+                    return null;
+                }
+
+                const isTierArchived = offerTier?.active === false;
+
+                const {discountOffer, originalPriceWithCurrency, updatedPriceWithCurrency} = getOfferDiscount(offer.type, offer.amount, offer.cadence, offer.currency || 'USD', offerTier);
+
+                return (
+                    <tr className={`group relative scale-100 border-b border-b-grey-200 dark:border-grey-800`} data-testid="offer-item">
+                        <td className={`${isTierArchived ? 'opacity-50' : ''} p-0`}><a className={`block ${isTierArchived ? 'cursor-default select-none' : 'cursor-pointer'} p-5 pl-0`} onClick={!isTierArchived ? () => handleOfferEdit(offer?.id ? offer.id : '') : () => {}}><span className='font-semibold'>{offer?.name}</span><br /><span className='text-sm text-grey-700'>{offerTier.name} {getOfferCadence(offer.cadence)}</span></a></td>
+                        <td className={`${isTierArchived ? 'opacity-50' : ''} whitespace-nowrap p-0 text-sm`}><a className={`block ${isTierArchived ? 'cursor-default select-none' : 'cursor-pointer'} p-5`} onClick={!isTierArchived ? () => handleOfferEdit(offer?.id ? offer.id : '') : () => {}}><span className='text-[1.3rem] font-medium uppercase'>{discountOffer}</span><br /><span className='text-grey-700'>{offer.type !== 'trial' ? getOfferDuration(offer.duration) : 'Trial period'}</span></a></td>
+                        <td className={`${isTierArchived ? 'opacity-50' : ''} whitespace-nowrap p-0 text-sm`}><a className={`block ${isTierArchived ? 'cursor-default select-none' : 'cursor-pointer'} p-5`} onClick={!isTierArchived ? () => handleOfferEdit(offer?.id ? offer.id : '') : () => {}}><span className='font-medium'>{updatedPriceWithCurrency}</span> {offer.type !== 'trial' ? <span className='relative text-xs text-grey-700 before:absolute before:-inset-x-0.5 before:top-1/2 before:rotate-[-20deg] before:border-t before:content-[""]'>{originalPriceWithCurrency}</span> : null}</a></td>
+                        <td className={`${isTierArchived ? 'opacity-50' : ''} w-[120px] whitespace-nowrap p-0 text-sm`}><a className={`block ${isTierArchived ? 'cursor-default select-none' : 'cursor-pointer'} p-5 ${offer.redemption_count === 0 ? '' : 'hover:underline'}`} href={offer.redemption_count > 0 ? createRedemptionFilterUrl(offer.id ? offer.id : '') : undefined} onClick={offer.redemption_count === 0 ? !isTierArchived ? () => handleOfferEdit(offer?.id ? offer.id : '') : () => {} : () => {}}>{offer.redemption_count}</a></td>
+                        <td className={`${isTierArchived ? 'opacity-50' : ''} w-[120px] whitespace-nowrap p-5 pr-8 text-right text-sm leading-none`}>{!isTierArchived ? <CopyLinkButton offerCode={offer.code} /> : null}</td>
+                        {isTierArchived ?
+                            <div className='absolute right-0 top-[11px] whitespace-nowrap rounded-sm bg-black px-2 py-0.5 text-xs leading-normal text-white opacity-0 transition-all group-hover:opacity-100 dark:bg-grey-950'>This offer is disabled, because <br /> it is tied to an archived tier.</div> :
+                            null
+                        }
+                    </tr>
+                );
+            })}
+        </table>
+    </div>;
+
+    const buttons: ButtonProps[] = [
+        {
+            key: 'cancel-modal',
+            label: 'Close',
+            onClick: () => {
+                modal.remove();
+                updateRoute('offers');
+            }
+        },
+        {
+            key: 'new-offer',
+            icon: 'add',
+            label: 'New offer',
+            color: 'green',
+            onClick: () => {
+                if (paidActiveTiers.length === 0) {
+                    showToast({
+                        type: 'info',
+                        title: 'You must have an active tier to create an offer.'
+                    });
+                } else {
+                    updateRoute('offers/new');
+                }
+            }
+        }
+    ];
+
+    return <Modal
+        afterClose={() => {
+            updateRoute('offers');
+        }}
+        animate={false}
+        backDropClick={false}
+        cancelLabel=''
+        footer={false}
+        height='full'
+        size='lg'
+        testId='offers-modal'
+        title='Offers'
+        topRightContent={<ButtonGroup buttons={buttons} />}
+        width={1140}
+    >
+        <div className='flex h-full flex-col pt-8'>
+            <header>
+                <TabView
+                    selectedTab={selectedTab}
+                    tabs={offersTabs}
+                    topRightContent={
+                        (selectedTab === 'active' && activeOffers.length > 0) || (selectedTab === 'archived' && archivedOffers.length > 0) ?
+                            <div className='pt-1'>
+                                <SortMenu
+                                    direction={sortDirection as 'asc' | 'desc'}
+                                    items={[
+                                        {id: 'date-added', label: 'Date added', selected: sortOption === 'date-added', direction: sortDirection as 'asc' | 'desc'},
+                                        {id: 'name', label: 'Name', selected: sortOption === 'name', direction: sortDirection as 'asc' | 'desc'},
+                                        {id: 'redemptions', label: 'Redemptions', selected: sortOption === 'redemptions', direction: sortDirection as 'asc' | 'desc'}
+                                    ]}
+                                    position='end'
+                                    triggerButtonProps={{
+                                        link: true
+                                    }}
+                                    onDirectionChange={(selectedDirection) => {
+                                        const newDirection = selectedDirection === 'asc' ? 'desc' : 'asc';
+                                        setSortingState?.([{
+                                            type: 'offers',
+                                            option: sortOption,
+                                            direction: newDirection
+                                        }]);
+                                    }}
+                                    onSortChange={(selectedOption) => {
+                                        setSortingState?.([{
+                                            type: 'offers',
+                                            option: selectedOption,
+                                            direction: sortDirection
+                                        }]);
+                                    }}
+                                />
+                            </div> :
+                            null
+                    }
+                    onTabChange={setSelectedTab}
+                />
+            </header>
+            {selectedTab === 'active' && activeOffers.length === 0 && !isFetchingOffers ?
+                <EmptyState
+                    buttonAction={() => updateRoute('offers/new')}
+                    buttonLabel='Create an offer'
+                    description='Grow your audience with discounts or free trials.'
+                /> :
+                null
+            }
+            {selectedTab === 'archived' && archivedOffers.length === 0 && !isFetchingOffers ?
+                <EmptyState
+                    buttonAction={() => setSelectedTab('active')}
+                    buttonLabel='Back to active'
+                    description='All archived offers will be shown here.'
+                /> :
+                null
+            }
+            {listLayoutOutput}
+        </div>
+    </Modal>;
+};
diff --git a/apps/admin-x-settings/src/components/settings/growth/recommendations/AddRecommendationModal.tsx b/apps/admin-x-settings/src/components/settings/growth/recommendations/AddRecommendationModal.tsx
new file mode 100644
index 00000000000..ca06d45d762
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/recommendations/AddRecommendationModal.tsx
@@ -0,0 +1,227 @@
+import AddRecommendationModalConfirm from './AddRecommendationModalConfirm';
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import React, {useEffect, useState} from 'react';
+import {AlreadyExistsError} from '@tryghost/admin-x-framework/errors';
+import {EditOrAddRecommendation, useCheckRecommendation} from '@tryghost/admin-x-framework/api/recommendations';
+import {ErrorMessages, useForm} from '@tryghost/admin-x-framework/hooks';
+import {Form, LoadingIndicator, Modal, TextField, dismissAllToasts, formatUrl, showToast} from '@tryghost/admin-x-design-system';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+
+interface AddRecommendationModalProps {
+    recommendation?: EditOrAddRecommendation,
+    animate?: boolean
+}
+
+const doFormatUrl = (url: string) => {
+    return formatUrl(url).save || '';
+};
+
+const validateUrl = function (errors: ErrorMessages, url: string) {
+    try {
+        const u = new URL(url);
+
+        // Check domain includes a dot
+        if (!u.hostname.includes('.')) {
+            errors.url = 'Enter a valid URL';
+        } else {
+            delete errors.url;
+        }
+    } catch (e) {
+        errors.url = 'Enter a valid URL';
+    }
+    return errors;
+};
+
+const AddRecommendationModal: React.FC<RoutingModalProps & AddRecommendationModalProps> = ({searchParams, recommendation, animate}) => {
+    const [enterPressed, setEnterPressed] = useState(false);
+    const modal = useModal();
+    const {updateRoute} = useRouting();
+    const {mutateAsync: checkRecommendation} = useCheckRecommendation();
+
+    // Handle a URL that was passed via the URL
+    const initialUrl = recommendation ? '' : (searchParams?.get('url') ?? '');
+    const {save: initialUrlCleaned} = initialUrl ? formatUrl(initialUrl) : {save: ''};
+
+    // Show loading view when we had an initial URL
+    const didInitialSubmit = React.useRef(false);
+    const [showLoadingView, setShowLoadingView] = React.useState(!!initialUrlCleaned);
+
+    const {formState, updateForm, handleSave, errors, saveState, clearError} = useForm({
+        initialState: recommendation ?? {
+            title: '',
+            url: initialUrlCleaned || '',
+            description: '',
+            excerpt: null,
+            featured_image: null,
+            favicon: null,
+            one_click_subscribe: false
+        },
+        onSave: async () => {
+            let validatedUrl: URL;
+            validatedUrl = new URL(formState.url);
+
+            // Use the hostname as fallback title
+            const defaultTitle = validatedUrl.hostname.replace('www.', '');
+
+            const updatedRecommendation = {
+                ...formState,
+                url: validatedUrl.toString()
+            };
+
+            // 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)
+            modal.remove();
+
+            // todo: we should change the URL, but this also keeps adding a new modal -> infinite loop
+            // updateRoute('recommendations/add?url=' + encodeURIComponent(updatedRecommendation.url));
+
+            NiceModal.show(AddRecommendationModalConfirm, {
+                animate: false,
+                recommendation: updatedRecommendation
+            });
+        },
+        onValidate: () => {
+            const newErrors: Record<string, string> = {};
+
+            validateUrl(newErrors, formState.url);
+
+            // If we have errors: close direct submit view
+            if (showLoadingView) {
+                setShowLoadingView(Object.keys(newErrors).length === 0);
+            }
+
+            return newErrors;
+        }
+    });
+
+    const onOk = React.useCallback(async () => {
+        if (saveState === 'saving') {
+            // Already saving
+            return;
+        }
+
+        dismissAllToasts();
+        try {
+            if (await handleSave({force: true})) {
+                return;
+            }
+        } catch (e) {
+            const message = e instanceof AlreadyExistsError ? e.message : 'Something went wrong while checking this URL, please try again.';
+            showToast({
+                type: 'error',
+                title: message
+            });
+        }
+
+        // If we have errors: close direct submit view
+        if (showLoadingView) {
+            setShowLoadingView(false);
+        }
+    }, [handleSave, saveState, showLoadingView, setShowLoadingView]);
+
+    // Make sure we submit initially when opening in loading view state
+    React.useEffect(() => {
+        if (showLoadingView && !didInitialSubmit.current) {
+            didInitialSubmit.current = true;
+            onOk();
+        }
+    }, [showLoadingView, onOk]);
+
+    useEffect(() => {
+        if (enterPressed) {
+            onOk();
+            setEnterPressed(false); // Reset for future use
+        }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [formState]);
+
+    if (showLoadingView) {
+        return <Modal
+            afterClose={() => {
+                // Closed without saving: reset route
+                updateRoute('recommendations');
+            }}
+            animate={animate ?? true}
+            backDropClick={false}
+            footer={false}
+            header={false}
+            size='sm'
+        >
+            <div className="flex flex-col items-center justify-center p-8">
+                <LoadingIndicator />
+            </div>
+        </Modal>;
+    }
+
+    return <Modal
+        afterClose={() => {
+            // Closed without saving: reset route
+            updateRoute('recommendations');
+        }}
+        animate={animate ?? true}
+        backDropClick={false}
+        okColor='black'
+        okLabel={'Next'}
+        okLoading={saveState === 'saving'}
+        size='sm'
+        testId='add-recommendation-modal'
+        title='Add recommendation'
+        onOk={onOk}
+    >
+        <p className="mt-4">You can recommend <strong>any site</strong> your audience will find valuable, not just those published on Ghost.</p>
+        <Form
+            marginBottom={false}
+            marginTop
+        >
+            <TextField
+                autoFocus={true}
+                error={Boolean(errors.url)}
+                hint={errors.url || <>Need inspiration? <a className='text-green' href="https://www.ghost.org/explore" rel="noopener noreferrer" target='_blank'>Explore thousands of sites</a> to recommend</>}
+                maxLength={2000}
+                placeholder='https://www.example.com'
+                title='URL'
+                value={formState.url}
+                onBlur={() => {
+                    const url = doFormatUrl(formState.url);
+                    updateForm(state => ({...state, url: url}));
+                }}
+                onChange={(e) => {
+                    clearError?.('url');
+                    updateForm(state => ({...state, url: e.target.value}));
+                }}
+                onKeyDown={(e) => {
+                    if (e.key === 'Enter') {
+                        e.preventDefault();
+                        updateForm(state => ({...state, url: doFormatUrl(formState.url)}));
+                        setEnterPressed(true);
+                    }
+                }}
+            />
+        </Form>
+    </Modal>;
+};
+
+export default NiceModal.create(AddRecommendationModal);
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModalConfirm.tsx b/apps/admin-x-settings/src/components/settings/growth/recommendations/AddRecommendationModalConfirm.tsx
similarity index 78%
rename from apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModalConfirm.tsx
rename to apps/admin-x-settings/src/components/settings/growth/recommendations/AddRecommendationModalConfirm.tsx
index 42606d03f76..1300a3299d7 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModalConfirm.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/recommendations/AddRecommendationModalConfirm.tsx
@@ -1,14 +1,12 @@
 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';
-import trackEvent from '../../../../utils/plausible';
-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 trackEvent from '../../../../utils/analytics';
+import {EditOrAddRecommendation, useAddRecommendation} from '@tryghost/admin-x-framework/api/recommendations';
+import {Modal, dismissAllToasts, showToast} from '@tryghost/admin-x-design-system';
+import {useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface AddRecommendationModalProps {
     recommendation: EditOrAddRecommendation,
@@ -29,7 +27,7 @@ const AddRecommendationModalConfirm: React.FC<AddRecommendationModalProps> = ({r
             await addRecommendation(state);
             modal.remove();
             showToast({
-                message: 'Successfully added a recommendation',
+                title: 'Recommendation added',
                 type: 'success'
             });
             trackEvent('Recommendation Added', {
@@ -40,14 +38,6 @@ const AddRecommendationModalConfirm: React.FC<AddRecommendationModalProps> = ({r
         onSaveError: handleError,
         onValidate: (state) => {
             const newErrors = validateDescriptionForm(state);
-
-            if (Object.keys(newErrors).length !== 0) {
-                showToast({
-                    type: 'pageError',
-                    message: 'Can\'t add recommendation, please double check that you\'ve filled all mandatory fields correctly.'
-                });
-            }
-
             return newErrors;
         }
     });
@@ -121,8 +111,8 @@ const AddRecommendationModalConfirm: React.FC<AddRecommendationModalProps> = ({r
                 await handleSave({force: true});
             } catch (e) {
                 showToast({
-                    type: 'pageError',
-                    message: 'Something went wrong when adding this recommendation, please try again.'
+                    type: 'error',
+                    title: 'Something went wrong when adding this recommendation, please try again.'
                 });
             }
         }}
diff --git a/apps/admin-x-settings/src/components/settings/growth/recommendations/EditRecommendationModal.tsx b/apps/admin-x-settings/src/components/settings/growth/recommendations/EditRecommendationModal.tsx
new file mode 100644
index 00000000000..aa493250e18
--- /dev/null
+++ b/apps/admin-x-settings/src/components/settings/growth/recommendations/EditRecommendationModal.tsx
@@ -0,0 +1,100 @@
+import NiceModal, {useModal} from '@ebay/nice-modal-react';
+import React from 'react';
+import RecommendationDescriptionForm, {validateDescriptionForm} from './RecommendationDescriptionForm';
+import {ConfirmationModal, Modal, dismissAllToasts, showToast} from '@tryghost/admin-x-design-system';
+import {Recommendation, useDeleteRecommendation, useEditRecommendation} from '@tryghost/admin-x-framework/api/recommendations';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
+
+interface EditRecommendationModalProps {
+    recommendation: Recommendation,
+    animate?: boolean
+}
+
+const EditRecommendationModal: React.FC<RoutingModalProps & EditRecommendationModalProps> = ({recommendation, animate}) => {
+    const modal = useModal();
+    const {updateRoute} = useRouting();
+    const {mutateAsync: editRecommendation} = useEditRecommendation();
+    const {mutateAsync: deleteRecommendation} = useDeleteRecommendation();
+    const handleError = useHandleError();
+
+    const {formState, updateForm, handleSave, errors, clearError, setErrors, okProps} = useForm({
+        initialState: {
+            ...recommendation
+        },
+        savingDelay: 500,
+        savedDelay: 500,
+        onSave: async (state) => {
+            await editRecommendation(state);
+        },
+        onSaveError: handleError,
+        onValidate: (state) => {
+            const newErrors = validateDescriptionForm(state);
+            return newErrors;
+        }
+    });
+
+    let leftButtonProps = {
+        label: 'Delete',
+        link: true,
+        color: 'red' as const,
+        size: 'sm' as const,
+        onClick: () => {
+            modal.remove();
+            NiceModal.show(ConfirmationModal, {
+                title: 'Delete recommendation',
+                prompt: <>
+                    <p>Your recommendation <strong>{recommendation.title}</strong> will no longer be visible to your audience.</p>
+                </>,
+                okLabel: 'Delete',
+                onOk: async (deleteModal) => {
+                    try {
+                        await deleteRecommendation(recommendation);
+                        deleteModal?.remove();
+                    } catch (e) {
+                        showToast({
+                            title: 'Failed to delete the recommendation',
+                            message: 'Please try again later.',
+                            type: 'error'
+                        });
+                        handleError(e, {withToast: false});
+                    }
+                }
+            });
+        }
+    };
+
+    return <Modal
+        afterClose={() => {
+            // Closed without saving: reset route
+            updateRoute('recommendations');
+        }}
+        animate={animate ?? true}
+        backDropClick={false}
+        buttonsDisabled={okProps.disabled}
+        cancelLabel={'Close'}
+        leftButtonProps={leftButtonProps}
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
+        size='sm'
+        testId='edit-recommendation-modal'
+        title={'Edit recommendation'}
+        stickyFooter
+        onOk={async () => {
+            dismissAllToasts();
+            try {
+                await handleSave({force: true});
+            } catch (e) {
+                showToast({
+                    title: 'Something went wrong',
+                    type: 'error',
+                    message: 'Please try again later.'
+                });
+            }
+        }}
+    >
+        <RecommendationDescriptionForm clearError={clearError} errors={errors} formState={formState} setErrors={setErrors} showURL={true} updateForm={updateForm as any}/>
+    </Modal>;
+};
+
+export default NiceModal.create(EditRecommendationModal);
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/IncomingRecommendationList.tsx b/apps/admin-x-settings/src/components/settings/growth/recommendations/IncomingRecommendationList.tsx
similarity index 88%
rename from apps/admin-x-settings/src/components/settings/membership/recommendations/IncomingRecommendationList.tsx
rename to apps/admin-x-settings/src/components/settings/growth/recommendations/IncomingRecommendationList.tsx
index 946669e9e78..33c8d7b4ea2 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/IncomingRecommendationList.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/recommendations/IncomingRecommendationList.tsx
@@ -1,15 +1,10 @@
-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 {IncomingRecommendation} from '../../../../api/recommendations';
-import {PaginationData} from '../../../../hooks/usePagination';
-import {ReferrerHistoryItem} from '../../../../api/referrers';
+import {Button, NoValueLabel, PaginationData, ShowMoreData, Table, TableCell, TableRow} from '@tryghost/admin-x-design-system';
+import {IncomingRecommendation} from '@tryghost/admin-x-framework/api/recommendations';
+import {ReferrerHistoryItem} from '@tryghost/admin-x-framework/api/referrers';
 import {numberWithCommas} from '../../../../utils/helpers';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface IncomingRecommendationListProps {
     incomingRecommendations: IncomingRecommendation[],
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationDescriptionForm.tsx b/apps/admin-x-settings/src/components/settings/growth/recommendations/RecommendationDescriptionForm.tsx
similarity index 86%
rename from apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationDescriptionForm.tsx
rename to apps/admin-x-settings/src/components/settings/growth/recommendations/RecommendationDescriptionForm.tsx
index b7b44b68adf..65bce38713b 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationDescriptionForm.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/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 {EditOrAddRecommendation, Recommendation} from '@tryghost/admin-x-framework/api/recommendations';
+import {ErrorMessages} from '@tryghost/admin-x-framework/hooks';
+import {Form, Heading, Hint, TextArea, TextField, URLTextField} from '@tryghost/admin-x-design-system';
 
 interface Props<T extends EditOrAddRecommendation> {
     showURL?: boolean,
@@ -105,27 +100,21 @@ const RecommendationDescriptionForm: React.FC<Props<EditOrAddRecommendation | Re
             autoFocus={true}
             error={Boolean(errors.title)}
             hint={errors.title}
+            maxLength={2000}
             title="Title"
             value={formState.title ?? ''}
-            onBlur={() => setErrors(
-                validateDescriptionFormField(errors, 'title', formState.title)
-            )}
             onChange={(e) => {
                 clearError?.('title');
                 updateForm(state => ({...state, title: e.target.value}));
             }}
         />
         <TextArea
-            clearBg={true}
             error={Boolean(errors.description)}
             // Note: we don't show the error text here, because errors are related to the character count
             hint={<>Max: <strong>200</strong> characters. You&#8217;ve used <strong className={descriptionLengthColor}>{descriptionLength}</strong></>}
             rows={4}
             title="Short description"
             value={formState.description ?? ''}
-            onBlur={() => setErrors(
-                validateDescriptionFormField(errors, 'description', formState.description)
-            )}
             onChange={(e) => {
                 clearError?.('description');
                 setDescriptionLength(e.target.value.length);
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationIcon.tsx b/apps/admin-x-settings/src/components/settings/growth/recommendations/RecommendationIcon.tsx
similarity index 100%
rename from apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationIcon.tsx
rename to apps/admin-x-settings/src/components/settings/growth/recommendations/RecommendationIcon.tsx
diff --git a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationList.tsx b/apps/admin-x-settings/src/components/settings/growth/recommendations/RecommendationList.tsx
similarity index 88%
rename from apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationList.tsx
rename to apps/admin-x-settings/src/components/settings/growth/recommendations/RecommendationList.tsx
index d0eb8b4a368..872f490ed21 100644
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/RecommendationList.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/recommendations/RecommendationList.tsx
@@ -1,19 +1,12 @@
-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 {Recommendation} from '../../../../api/recommendations';
+import {Button, Link, NoValueLabel, PaginationData, ShowMoreData, Table, TableCell, TableRow, Tooltip} from '@tryghost/admin-x-design-system';
+import {Recommendation} from '@tryghost/admin-x-framework/api/recommendations';
 import {numberWithCommas} from '../../../../utils/helpers';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface RecommendationListProps {
     recommendations: Recommendation[],
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..5994c03109d 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';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers';
 
 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..9e763a1448d 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 {getSettingValues} from '../../../api/settings';
-import {usePostsExports} from '../../../api/posts';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {Button, SettingGroupContent, Toggle, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {usePostsExports} from '@tryghost/admin-x-framework/api/posts';
 
 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..0ab3ae8b27a 100644
--- a/apps/admin-x-settings/src/components/settings/membership/MembershipSettings.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/MembershipSettings.tsx
@@ -1,38 +1,25 @@
 import Access from './Access';
 import Analytics from './Analytics';
-import EmbedSignupForm from './embedSignup/EmbedSignupForm';
 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', 'support', 'email', 'address', 'support email address', 'support address'],
+    access: ['membership', 'default', 'access', 'subscription', 'post', 'membership', 'comments', 'commenting'],
+    tiers: ['membership', 'tiers', 'payment', 'paid', 'stripe'],
+    analytics: ['membership', 'analytics', 'tracking', 'privacy', 'membership']
 };
 
 const MembershipSettings: React.FC = () => {
-    const hasTipsAndDonations = useFeatureFlag('tipsAndDonations');
-    const hasRecommendations = useFeatureFlag('recommendations');
-
     return (
-        <SettingSection keywords={Object.values(searchKeywords).flat()} title='Membership'>
-            <Access keywords={searchKeywords.access} />
+        <SearchableSection keywords={Object.values(searchKeywords).flat()} title='Membership'>
             <Portal keywords={searchKeywords.portal} />
+            <Access keywords={searchKeywords.access} />
             <Tiers keywords={searchKeywords.tiers} />
-            {hasTipsAndDonations && <TipsOrDonations keywords={searchKeywords.tips} />}
-            <EmbedSignupForm keywords={searchKeywords.embedSignupForm} />
-            {hasRecommendations && <Recommendations keywords={searchKeywords.recommendations} />}
             <Analytics keywords={searchKeywords.analytics} />
-        </SettingSection>
+        </SearchableSection>
     );
 };
 
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..80337f0e5e8 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 useRouting from '../../../hooks/useRouting';
-import {getSettingValues} from '../../../api/settings';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const Portal: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -16,8 +15,8 @@ const Portal: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
-            customButtons={<Button color='green' disabled={membersSignupAccess === 'none'} label='Customize' link linkWithPadding onClick={openPreviewModal}/>}
+        <TopLevelGroup
+            customButtons={<Button className='mt-[-5px]' color='clear' disabled={membersSignupAccess === 'none'} label='Customize' size='sm' onClick={openPreviewModal}/>}
             description="Customize members modal signup flow"
             keywords={keywords}
             navid='portal'
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..dbedab5b42f 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 {Tier, getActiveTiers, getArchivedTiers, useBrowseTiers} from '../../../api/tiers';
-import {checkStripeEnabled} from '../../../api/settings';
+import {Button, StripeButton, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {Tier, getActiveTiers, getArchivedTiers, useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers';
+import {checkStripeEnabled} from '@tryghost/admin-x-framework/api/settings';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 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
deleted file mode 100644
index 57436f208f8..00000000000
--- a/apps/admin-x-settings/src/components/settings/membership/TipsOrDonations.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-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 useSettingGroup from '../../../hooks/useSettingGroup';
-import {confirmIfDirty} from '../../../utils/modals';
-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;
-
-const TipsOrDonations: React.FC<{ keywords: string[] }> = ({keywords}) => {
-    const {
-        localSettings,
-        siteData,
-        updateSetting,
-        isEditing,
-        saveState,
-        handleSave,
-        handleCancel,
-        focusRef,
-        handleEditingChange,
-        errors,
-        validate,
-        clearError
-    } = useSettingGroup({
-        onValidate: () => {
-            return {
-                donationsSuggestedAmount: validateCurrencyAmount(suggestedAmountInCents, donationsCurrency, {maxAmount: MAX_AMOUNT})
-            };
-        }
-    });
-
-    const [donationsCurrency = 'USD', donationsSuggestedAmount = '0'] = getSettingValues<string>(
-        localSettings,
-        ['donations_currency', 'donations_suggested_amount']
-    );
-
-    const suggestedAmountInCents = parseInt(donationsSuggestedAmount);
-    const suggestedAmountInDollars = suggestedAmountInCents / 100;
-    const donateUrl = `${siteData?.url.replace(/\/$/, '')}/#/portal/support`;
-
-    useEffect(() => {
-        validate();
-    }, [donationsCurrency]); // eslint-disable-line react-hooks/exhaustive-deps
-
-    const [copied, setCopied] = useState(false);
-
-    const copyDonateUrl = () => {
-        navigator.clipboard.writeText(donateUrl);
-        setCopied(true);
-        setTimeout(() => setCopied(false), 2000);
-    };
-
-    const openPreview = () => {
-        confirmIfDirty(saveState === 'unsaved', () => window.open(donateUrl, '_blank'));
-    };
-
-    const values = (
-        <SettingGroupContent
-            columns={2}
-            values={[
-                {
-                    heading: 'Suggested amount',
-                    key: 'suggested-amount',
-                    value: `${getSymbol(donationsCurrency)}${suggestedAmountInDollars}`
-                },
-                {
-                    heading: '',
-                    key: 'sharable-link',
-                    value: (
-                        <div className='w-100'>
-                            <div className='flex items-center gap-2'>
-                                <Heading level={6}>Shareable link &mdash;</Heading>
-                                <button className='text-xs tracking-wide text-green' type="button" onClick={openPreview}>Preview</button>
-                            </div>
-                            <div className='w-100 group relative -m-1 mt-0 overflow-hidden rounded p-1 hover:bg-grey-50 dark:hover:bg-grey-900'>
-                                {donateUrl}
-                                <div className='invisible absolute right-0 top-[50%] flex translate-y-[-50%] gap-1 bg-white pl-1 group-hover:visible dark:bg-black'>
-                                    <Button color='outline' label={copied ? 'Copied' : 'Copy'} size='sm' onClick={copyDonateUrl} />
-                                </div>
-                            </div>
-                        </div>
-                    )
-                }
-            ]}
-        />
-    );
-
-    const inputFields = (
-        <SettingGroupContent className='max-w-[180px]'>
-            <CurrencyField
-                error={!!errors.donationsSuggestedAmount}
-                hint={errors.donationsSuggestedAmount}
-                inputRef={focusRef}
-                placeholder="0"
-                rightPlaceholder={(
-                    <Select
-                        border={false}
-                        containerClassName='w-14'
-                        fullWidth={false}
-                        options={currencySelectGroups()}
-                        selectedOption={currencySelectGroups().flatMap(group => group.options).find(option => option.value === donationsCurrency)}
-                        title='Currency'
-                        hideTitle
-                        isSearchable
-                        onSelect={option => updateSetting('donations_currency', option?.value || 'USD')}
-                    />
-                )}
-                title='Suggested amount'
-                valueInCents={parseInt(donationsSuggestedAmount)}
-                onBlur={validate}
-                onChange={cents => updateSetting('donations_suggested_amount', cents.toString())}
-                onKeyDown={() => clearError('donationsSuggestedAmount')}
-            />
-        </SettingGroupContent>
-    );
-
-    return (
-        <SettingGroup
-            description="Give your audience a one-time way to support your work, no membership required."
-            isEditing={isEditing}
-            keywords={keywords}
-            navid='tips-or-donations'
-            saveState={saveState}
-            testId='tips-or-donations'
-            title="Tips or donations"
-            onCancel={handleCancel}
-            onEditingChange={handleEditingChange}
-            onSave={handleSave}
-        >
-            {isEditing ? inputFields : values}
-        </SettingGroup>
-    );
-};
-
-export default withErrorBoundary(TipsOrDonations, 'Tips or donations');
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
deleted file mode 100644
index 6673a61f0d1..00000000000
--- a/apps/admin-x-settings/src/components/settings/membership/embedSignup/EmbedSignupForm.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import Button from '../../../../admin-x-ds/global/Button';
-import React from 'react';
-import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup';
-import useRouting from '../../../../hooks/useRouting';
-
-const EmbedSignupForm: React.FC<{ keywords: string[] }> = ({keywords}) => {
-    const {updateRoute} = useRouting();
-    const openPreviewModal = () => {
-        updateRoute('embed-signup-form/show');
-    };
-
-    return (
-        <SettingGroup
-            customButtons={<Button color='green' label='Embed' link onClick={openPreviewModal}/>}
-            description="Grow your audience from anywhere on the web"
-            keywords={keywords}
-            navid='embed-signup-form'
-            testId='embed-signup-form'
-            title="Embeddable signup form"
-        />
-    );
-};
-
-export default EmbedSignupForm;
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..cd72dee9cfe 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,34 +1,51 @@
-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 {SettingValue, getSettingValues} from '../../../../api/settings';
-import {fullEmailAddress, getEmailDomain} from '../../../../api/site';
+import validator from 'validator';
+import {Form, TextField} from '@tryghost/admin-x-design-system';
+import {SettingValue, getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {fullEmailAddress, getEmailDomain} from '@tryghost/admin-x-framework/api/site';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 const AccountPage: React.FC<{
     updateSetting: (key: string, setting: SettingValue) => void
-}> = ({updateSetting}) => {
-    const {siteData, settings} = useGlobalData();
-    const [membersSupportAddress] = getSettingValues(settings, ['members_support_address']);
-    const emailDomain = getEmailDomain(siteData!);
-
-    const [value, setValue] = useState(fullEmailAddress(membersSupportAddress?.toString() || '', siteData!));
+    errors: Record<string, string | undefined>
+    setError: (key: string, error: string | undefined) => void
+}> = ({updateSetting, errors, setError}) => {
+    const {siteData, settings, config} = useGlobalData();
+    const [membersSupportAddress, supportEmailAddress] = getSettingValues(settings, ['members_support_address', 'support_email_address']);
+    const calculatedSupportAddress = supportEmailAddress?.toString() || fullEmailAddress(membersSupportAddress?.toString() || '', siteData!, config);
+    const emailDomain = getEmailDomain(siteData!, config);
+    const [value, setValue] = useState(calculatedSupportAddress);
 
     const updateSupportAddress: FocusEventHandler<HTMLInputElement> = (e) => {
         let supportAddress = e.target.value;
 
+        if (!supportAddress) {
+            setError('members_support_address', 'Enter an email address');
+        } else if (!validator.isEmail(supportAddress)) {
+            setError('members_support_address', 'Enter a valid email address');
+        } else {
+            setError('members_support_address', '');
+        }
+
         let settingValue = emailDomain && supportAddress === `noreply@${emailDomain}` ? 'noreply' : supportAddress;
 
         updateSetting('members_support_address', settingValue);
-        setValue(fullEmailAddress(settingValue, siteData!));
+        setValue(fullEmailAddress(settingValue, siteData!, config));
     };
 
     useEffect(() => {
-        setValue(fullEmailAddress(membersSupportAddress?.toString() || '', siteData!));
-    }, [membersSupportAddress, siteData]);
+        setValue(calculatedSupportAddress);
+    }, [calculatedSupportAddress]);
 
     return <div className='mt-7'><Form>
-        <TextField title='Support email address' value={value} onBlur={updateSupportAddress} onChange={e => setValue(e.target.value)} />
+        <TextField
+            error={!!errors.members_support_address}
+            hint={errors.members_support_address}
+            title='Support email address'
+            value={value}
+            onBlur={updateSupportAddress}
+            onChange={e => setValue(e.target.value)}
+        />
     </Form></div>;
 };
 
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..be030cc1992 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,20 +1,15 @@
-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 {APIError} from '@tryghost/admin-x-framework/errors';
+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';
 import {ReactComponent as PortalIcon4} from '../../../../assets/icons/portal-icon-4.svg';
 import {ReactComponent as PortalIcon5} from '../../../../assets/icons/portal-icon-5.svg';
-import {Setting, SettingValue, getSettingValues} from '../../../../api/settings';
-import {getImageUrl, useUploadImage} from '../../../../api/images';
+import {Setting, SettingValue, getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const defaultButtonIcons = [
     {
@@ -59,7 +54,11 @@ const LookAndFeel: React.FC<{
             updateSetting('portal_button_icon', imageUrl);
             setUploadedIcon(imageUrl);
         } catch (e) {
-            handleError(e);
+            const error = e as APIError;
+            if (error.response!.status === 415) {
+                error.message = 'Unsupported file type';
+            }
+            handleError(error);
         }
     };
 
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..41973343e3b 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,122 +1,80 @@
-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';
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import {LoadingIndicator} from '@tryghost/admin-x-design-system';
 
 type PortalFrameProps = {
-    settings: Setting[];
-    tiers: Tier[];
-    selectedTab: string;
+    href: string;
+    onDestroyed?: () => void;
+    selectedTab?: string;
+    portalParent?: 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 PortalFrame: React.FC<PortalFrameProps> = ({href, onDestroyed, selectedTab, portalParent}) => {
+    if (!selectedTab) {
+        selectedTab = 'signup';
     }
-
-    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()}`;
-}
-
-const PortalFrame: React.FC<PortalFrameProps> = ({settings, tiers, selectedTab}) => {
-    const {
-        siteData,
-        config
-    } = useGlobalData();
-
     const iframeRef = useRef<HTMLIFrameElement>(null);
-    const [portalReady, setPortalReady] = useState(false);
+    const [hasLoaded, setHasLoaded] = useState<boolean>(false);
+    const [isInvisible, setIsInvisible] = useState<boolean>(true);
 
-    let href = getPortalPreviewUrl({
-        settings,
-        config,
-        tiers,
-        siteData,
-        selectedTab
-    });
+    const makeVisible = useCallback(() => {
+        setTimeout(() => {
+            if (iframeRef.current) {
+                setIsInvisible(false);
+            }
+        }, 300);
+    }, [iframeRef]);
 
     useEffect(() => {
-        const messageListener = (event: MessageEvent<'portal-ready' | {type: string}>) => {
+        const messageListener = (event: MessageEvent) => {
             if (!href) {
                 return;
             }
-            const srcURL = new URL(href);
             const originURL = new URL(event.origin);
 
-            if (originURL.origin === srcURL.origin) {
-                if (event.data === 'portal-ready' || event.data.type === 'portal-ready') {
-                    setPortalReady(true);
+            if (originURL.origin === new URL(href).origin) {
+                if (event?.data?.type === 'portal-preview-ready') {
+                    makeVisible();
                 }
             }
         };
 
         window.addEventListener('message', messageListener, true);
-        return () => window.removeEventListener('message', messageListener, true);
-    }, [href]);
+
+        return () => {
+            window.removeEventListener('message', messageListener, true);
+            onDestroyed?.();
+        };
+    }, [href, onDestroyed, makeVisible, hasLoaded]);
 
     if (!href) {
         return null;
     }
 
+    let loaderClassNames = 'mt-[-7%] flex h-screen items-center justify-center';
+    let loaderVisibility = 'hidden';
+
+    if (portalParent === 'preview') {
+        loaderClassNames = 'absolute z-50 mt-[-7%] flex h-screen items-center justify-center';
+        loaderVisibility = 'invisible';
+    } else if (portalParent === 'offers') {
+        loaderClassNames = 'absolute z-50 flex w-full h-full items-center justify-center';
+        loaderVisibility = 'invisible';
+    }
+
     return (
-        <>
+        <>{isInvisible && <div className={loaderClassNames}><span><LoadingIndicator /></span></div>}
             <iframe
                 ref={iframeRef}
-                className={!portalReady ? 'hidden' : ''}
+                className={!isInvisible && hasLoaded ? '' : loaderVisibility}
                 data-testid="portal-preview"
                 height="100%"
                 src={href}
                 title="Portal Preview"
                 width="100%"
-            ></iframe>
+                onLoad={() => {
+                    setHasLoaded(true);
+                }}
+            />
         </>
     );
 };
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..e58695daafb 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,12 +1,7 @@
-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 {getHomepageUrl} from '../../../../api/site';
-import {getPaidActiveTiers, useBrowseTiers} from '../../../../api/tiers';
+import {Button, List, ListItem, ModalPage, Select, TextField} from '@tryghost/admin-x-design-system';
+import {getHomepageUrl} from '@tryghost/admin-x-framework/api/site';
+import {getPaidActiveTiers, useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 interface PortalLinkPrefs {
@@ -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>
     );
@@ -65,7 +59,7 @@ const PortalLinks: React.FC = () => {
     const homePageURL = getHomepageUrl(siteData!);
 
     return (
-        <ModalPage className='max-w-[920px] text-base text-black' heading='Links'>
+        <ModalPage className='max-w-[920px] text-base text-black dark:text-white' heading='Links'>
             <p className='-mt-6 mb-16'>Use these {isDataAttributes ? 'data attributes' : 'links'} in your theme to show pages of Portal.</p>
 
             <List actions={<Button color='green' label={isDataAttributes ? 'Links' : 'Data attributes'} link onClick={toggleIsDataAttributes}/>} title='Generic' titleSize='lg'>
@@ -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..03ef43776f6 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,21 +1,18 @@
 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 {Setting, SettingValue, getSettingValues, useEditSettings} from '../../../../api/settings';
-import {Tier, useBrowseTiers, useEditTier} from '../../../../api/tiers';
-import {fullEmailAddress} from '../../../../api/site';
+import {ConfirmationModal, PreviewModalContent, Tab, TabView} from '@tryghost/admin-x-design-system';
+import {Dirtyable, useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {Setting, SettingValue, getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
+import {Tier, useBrowseTiers, useEditTier} from '@tryghost/admin-x-framework/api/tiers';
+import {fullEmailAddress} from '@tryghost/admin-x-framework/api/site';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
-import {verifyEmailToken} from '../../../../api/emailVerification';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
+import {verifyEmailToken} from '@tryghost/admin-x-framework/api/emailVerification';
 
 const Sidebar: React.FC<{
     localSettings: Setting[]
@@ -48,7 +45,7 @@ const Sidebar: React.FC<{
         {
             id: 'accountPage',
             title: 'Account page',
-            contents: <AccountPage updateSetting={updateSetting} />
+            contents: <AccountPage errors={errors} setError={setError} updateSetting={updateSetting} />
         }
     ];
 
@@ -69,7 +66,7 @@ const PortalModal: React.FC = () => {
     const [selectedPreviewTab, setSelectedPreviewTab] = useState('signup');
 
     const handleError = useHandleError();
-    const {settings, siteData} = useGlobalData();
+    const {settings, siteData, config} = useGlobalData();
     const {mutateAsync: editSettings} = useEditSettings();
     const {data: {tiers: allTiers} = {}} = useBrowseTiers();
     // const tiers = getPaidActiveTiers(allTiers || []);
@@ -87,8 +84,8 @@ const PortalModal: React.FC = () => {
                 let {settings: verifiedSettings} = await verifyToken({token});
                 const [supportEmail] = getSettingValues<string>(verifiedSettings, ['members_support_address']);
                 NiceModal.show(ConfirmationModal, {
-                    title: 'Verifying email address',
-                    prompt: <>Success! The support email address has changed to <strong>{supportEmail}</strong></>,
+                    title: 'Support address verified',
+                    prompt: <>Your support email address has been changed to <strong>{supportEmail}</strong>.</>,
                     okLabel: 'Close',
                     cancelLabel: '',
                     onOk: confirmModal => confirmModal?.remove()
@@ -98,10 +95,10 @@ const PortalModal: React.FC = () => {
                 let prompt = 'There was an error verifying your email address. Please try again.';
 
                 if (e?.message === 'Token expired') {
-                    prompt = 'The verification link has expired. Please try again.';
+                    prompt = 'Verification link has expired.';
                 }
                 NiceModal.show(ConfirmationModal, {
-                    title: 'Error verifying email address',
+                    title: 'Error verifying support address',
                     prompt: prompt,
                     okLabel: 'Close',
                     cancelLabel: '',
@@ -115,12 +112,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}))}));
@@ -136,13 +135,14 @@ const PortalModal: React.FC = () => {
 
             if (meta?.sent_email_verification) {
                 const newEmail = formState.settings.find(setting => setting.key === 'members_support_address')?.value;
-                const currentEmail = currentSettings.find(setting => setting.key === 'members_support_address')?.value;
+                const currentEmail = currentSettings.find(setting => setting.key === 'support_email_address')?.value ||
+                    fullEmailAddress(currentSettings.find(setting => setting.key === 'members_support_address')?.value?.toString() || 'noreply', siteData!, config);
 
                 NiceModal.show(ConfirmationModal, {
                     title: 'Confirm email address',
                     prompt: <>
                         We&apos;ve sent a confirmation email to <strong>{newEmail}</strong>.
-                        Until verified, your support address will remain {fullEmailAddress(currentEmail?.toString() || 'noreply', siteData!)}.
+                        Until verified, your support email address will remain {currentEmail}.
                     </>,
                     okLabel: 'Close',
                     cancelLabel: '',
@@ -154,6 +154,12 @@ const PortalModal: React.FC = () => {
         onSaveError: handleError
     });
 
+    useEffect(() => {
+        if (!formState.tiers.length && allTiers?.length) {
+            setFormState(state => ({...state, tiers: allTiers}));
+        }
+    }, [allTiers, formState.tiers, setFormState]);
+
     const [errors, setErrors] = useState<Record<string, string | undefined>>({});
 
     const updateSetting = (key: string, value: SettingValue) => {
@@ -204,22 +210,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..f1425eb5d5d 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
@@ -1,8 +1,10 @@
 import PortalFrame from './PortalFrame';
 import PortalLinks from './PortalLinks';
 import React from 'react';
-import {Setting} from '../../../../api/settings';
-import {Tier} from '../../../../api/tiers';
+import {Setting} from '@tryghost/admin-x-framework/api/settings';
+import {Tier} from '@tryghost/admin-x-framework/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 || ''} portalParent='preview' selectedTab={selectedTab} />
             </>
         );
         break;
@@ -31,7 +46,7 @@ const PortalPreview: React.FC<PortalPreviewProps> = ({
     default:
         tabContents = (
             <>
-                <PortalFrame selectedTab={selectedTab} settings={localSettings} tiers={localTiers} />
+                <PortalFrame href={href || ''} portalParent='preview' 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..54fba10de39 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,11 +1,7 @@
-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 {Setting, SettingValue, checkStripeEnabled, getSettingValues} from '../../../../api/settings';
-import {Tier, getPaidActiveTiers} from '../../../../api/tiers';
+import {CheckboxGroup, CheckboxProps, Form, HtmlField, Select, SelectOption, Toggle} from '@tryghost/admin-x-design-system';
+import {Setting, SettingValue, checkStripeEnabled, getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {Tier, getPaidActiveTiers} from '@tryghost/admin-x-framework/api/tiers';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
 
 const SignupOptions: React.FC<{
@@ -17,9 +13,8 @@ const SignupOptions: React.FC<{
     setError: (key: string, error: string | undefined) => void
 }> = ({localSettings, updateSetting, localTiers, updateTier, errors, setError}) => {
     const {config} = useGlobalData();
-
-    const [membersSignupAccess, portalName, portalSignupTermsHtml, portalSignupCheckboxRequired, portalPlansJson] = getSettingValues(
-        localSettings, ['members_signup_access', 'portal_name', 'portal_signup_terms_html', 'portal_signup_checkbox_required', 'portal_plans']
+    const [membersSignupAccess, portalName, portalSignupTermsHtml, portalSignupCheckboxRequired, portalPlansJson, portalDefaultPlan] = getSettingValues(
+        localSettings, ['members_signup_access', 'portal_name', 'portal_signup_terms_html', 'portal_signup_checkbox_required', 'portal_plans', 'portal_default_plan']
     );
     const portalPlans = JSON.parse(portalPlansJson?.toString() || '[]') as string[];
 
@@ -53,6 +48,18 @@ const SignupOptions: React.FC<{
         }
 
         updateSetting('portal_plans', JSON.stringify(portalPlans));
+
+        // Check default plan is included
+        if (portalDefaultPlan === 'yearly') {
+            if (!portalPlans.includes('yearly') && portalPlans.includes('monthly')) {
+                updateSetting('portal_default_plan', 'monthly');
+            }
+        } else if (portalDefaultPlan === 'monthly') {
+            if (!portalPlans.includes('monthly')) {
+                // If both yearly and monthly are missing from plans, still set it to yearly
+                updateSetting('portal_default_plan', 'yearly');
+            }
+        }
     };
 
     // This is a bit unclear in current admin, maybe we should add a message if the settings are disabled?
@@ -64,11 +71,11 @@ const SignupOptions: React.FC<{
 
     if (localTiers) {
         localTiers.forEach((tier) => {
-            if (tier.name === 'Free') {
+            if (tier.type === 'free') {
                 tiersCheckboxes.push({
                     checked: (portalPlans.includes('free')),
                     disabled: isDisabled,
-                    label: 'Free',
+                    label: tier.name,
                     value: 'free',
                     onChange: (checked) => {
                         if (portalPlans.includes('free') && !checked) {
@@ -88,10 +95,15 @@ const SignupOptions: React.FC<{
         });
     }
 
-    const paidActiveTiersResult = getPaidActiveTiers(localTiers) || [];
+    const paidActiveTiers = getPaidActiveTiers(localTiers) || [];
 
-    if (paidActiveTiersResult.length > 0 && isStripeEnabled) {
-        paidActiveTiersResult.forEach((tier) => {
+    const defaultPlanOptions: SelectOption[] = [
+        {value: 'yearly', label: 'Yearly'},
+        {value: 'monthly', label: 'Monthly'}
+    ];
+
+    if (isStripeEnabled && paidActiveTiers.length > 0) {
+        paidActiveTiers.forEach((tier) => {
             tiersCheckboxes.push({
                 checked: (tier.visibility === 'public'),
                 label: tier.name,
@@ -101,6 +113,8 @@ const SignupOptions: React.FC<{
         });
     }
 
+    const arePaidTiersVisible = isStripeEnabled && paidActiveTiers.length > 0 && paidActiveTiers.some(tier => tier.visibility === 'public');
+
     return <div className='mt-7'><Form>
         <Toggle
             checked={Boolean(portalName)}
@@ -112,33 +126,45 @@ const SignupOptions: React.FC<{
 
         <CheckboxGroup
             checkboxes={tiersCheckboxes}
-            title='Tiers available at startup'
+            title='Tiers available at signup'
         />
 
-        {isStripeEnabled && localTiers.some(tier => tier.visibility === 'public') && (
-            <CheckboxGroup
-                checkboxes={[
-                    {
-                        checked: portalPlans.includes('monthly'),
-                        disabled: isDisabled,
-                        label: 'Monthly',
-                        value: 'monthly',
-                        onChange: () => {
-                            togglePlan('monthly');
+        {arePaidTiersVisible && (
+            <>
+                <CheckboxGroup
+                    checkboxes={[
+                        {
+                            checked: portalPlans.includes('monthly'),
+                            disabled: isDisabled,
+                            label: 'Monthly',
+                            value: 'monthly',
+                            onChange: () => {
+                                togglePlan('monthly');
+                            }
+                        },
+                        {
+                            checked: portalPlans.includes('yearly'),
+                            disabled: isDisabled,
+                            label: 'Yearly',
+                            value: 'yearly',
+                            onChange: () => {
+                                togglePlan('yearly');
+                            }
                         }
-                    },
-                    {
-                        checked: portalPlans.includes('yearly'),
-                        disabled: isDisabled,
-                        label: 'Yearly',
-                        value: 'yearly',
-                        onChange: () => {
-                            togglePlan('yearly');
-                        }
-                    }
-                ]}
-                title='Prices available at signup'
-            />
+                    ]}
+                    title='Prices available at signup'
+                />
+                {(portalPlans.includes('yearly') && portalPlans.includes('monthly')) &&
+                    <Select
+                        options={defaultPlanOptions}
+                        selectedOption={defaultPlanOptions.find(option => option.value === portalDefaultPlan)}
+                        title='Default price at signup'
+                        onSelect={(option) => {
+                            updateSetting('portal_default_plan', option?.value ?? 'yearly');
+                        }}
+                    />
+                }
+            </>
         )}
 
         <HtmlField
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
deleted file mode 100644
index 773a7e69958..00000000000
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/AddRecommendationModal.tsx
+++ /dev/null
@@ -1,255 +0,0 @@
-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 {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';
-
-interface AddRecommendationModalProps {
-    recommendation?: EditOrAddRecommendation,
-    animate?: boolean
-}
-
-const doFormatUrl = (url: string) => {
-    return formatUrl(url).save || '';
-};
-
-const validateUrl = function (errors: ErrorMessages, url: string) {
-    try {
-        const u = new URL(url);
-
-        // Check domain includes a dot
-        if (!u.hostname.includes('.')) {
-            errors.url = 'Please enter a valid URL.';
-        } else {
-            delete errors.url;
-        }
-    } catch (e) {
-        errors.url = 'Please enter a valid URL.';
-    }
-    return errors;
-};
-
-const AddRecommendationModal: React.FC<RoutingModalProps & AddRecommendationModalProps> = ({searchParams, recommendation, animate}) => {
-    const [enterPressed, setEnterPressed] = useState(false);
-    const modal = useModal();
-    const {updateRoute} = useRouting();
-    const {query: queryOembed} = useGetOembed();
-    const {query: queryExternalGhostSite} = useExternalGhostSite();
-    const {query: getRecommendationByUrl} = useGetRecommendationByUrl();
-
-    // Handle a URL that was passed via the URL
-    const initialUrl = recommendation ? '' : (searchParams?.get('url') ?? '');
-    const {save: initialUrlCleaned} = initialUrl ? formatUrl(initialUrl) : {save: ''};
-
-    // Show loading view when we had an initial URL
-    const didInitialSubmit = React.useRef(false);
-    const [showLoadingView, setShowLoadingView] = React.useState(!!initialUrlCleaned);
-
-    const {formState, updateForm, handleSave, errors, saveState, clearError} = useForm({
-        initialState: recommendation ?? {
-            title: '',
-            url: initialUrlCleaned || '',
-            description: '',
-            excerpt: null,
-            featured_image: null,
-            favicon: null,
-            one_click_subscribe: false
-        },
-        onSave: async () => {
-            let validatedUrl: URL;
-            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.', '');
-
-            const updatedRecommendation = {
-                ...formState,
-                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;
-            }
-            updatedRecommendation.description = updatedRecommendation.excerpt || null;
-
-            // Switch modal without changing the route (the second modal is not reachable by URL)
-            modal.remove();
-
-            // todo: we should change the URL, but this also keeps adding a new modal -> infinite loop
-            // updateRoute('recommendations/add?url=' + encodeURIComponent(updatedRecommendation.url));
-
-            NiceModal.show(AddRecommendationModalConfirm, {
-                animate: false,
-                recommendation: updatedRecommendation
-            });
-        },
-        onValidate: () => {
-            const newErrors: Record<string, string> = {};
-
-            validateUrl(newErrors, formState.url);
-
-            // If we have errors: close direct submit view
-            if (showLoadingView) {
-                setShowLoadingView(Object.keys(newErrors).length === 0);
-            }
-
-            return newErrors;
-        }
-    });
-
-    const onOk = React.useCallback(async () => {
-        if (saveState === 'saving') {
-            // Already saving
-            return;
-        }
-
-        dismissAllToasts();
-        try {
-            if (await handleSave({force: true})) {
-                return;
-            }
-        } catch (e) {
-            const message = e instanceof AlreadyExistsError ? e.message : 'Something went wrong while checking this URL, please try again.';
-            showToast({
-                type: 'pageError',
-                message
-            });
-        }
-
-        // If we have errors: close direct submit view
-        if (showLoadingView) {
-            setShowLoadingView(false);
-        }
-    }, [handleSave, saveState, showLoadingView, setShowLoadingView]);
-
-    // Make sure we submit initially when opening in loading view state
-    React.useEffect(() => {
-        if (showLoadingView && !didInitialSubmit.current) {
-            didInitialSubmit.current = true;
-            onOk();
-        }
-    }, [showLoadingView, onOk]);
-
-    useEffect(() => {
-        if (enterPressed) {
-            onOk();
-            setEnterPressed(false); // Reset for future use
-        }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [formState]);
-
-    if (showLoadingView) {
-        return <Modal
-            afterClose={() => {
-                // Closed without saving: reset route
-                updateRoute('recommendations');
-            }}
-            animate={animate ?? true}
-            backDropClick={false}
-            footer={false}
-            header={false}
-            size='sm'
-        >
-            <div className="flex flex-col items-center justify-center p-8">
-                <LoadingIndicator />
-            </div>
-        </Modal>;
-    }
-
-    return <Modal
-        afterClose={() => {
-            // Closed without saving: reset route
-            updateRoute('recommendations');
-        }}
-        animate={animate ?? true}
-        backDropClick={false}
-        okColor='black'
-        okLabel={'Next'}
-        okLoading={saveState === 'saving'}
-        size='sm'
-        testId='add-recommendation-modal'
-        title='Add recommendation'
-        onOk={onOk}
-    >
-        <p className="mt-4">You can recommend <strong>any site</strong> your audience will find valuable, not just those published on Ghost.</p>
-        <Form
-            marginBottom={false}
-            marginTop
-        >
-            <TextField
-                autoFocus={true}
-                error={Boolean(errors.url)}
-                hint={errors.url || <>Need inspiration? <a className='text-green' href="https://www.ghost.org/explore" rel="noopener noreferrer" target='_blank'>Explore thousands of sites</a> to recommend</>}
-                placeholder='https://www.example.com'
-                title='URL'
-                value={formState.url}
-                onBlur={() => {
-                    const url = doFormatUrl(formState.url);
-                    updateForm(state => ({...state, url: url}));
-                }}
-                onChange={(e) => {
-                    clearError?.('url');
-                    updateForm(state => ({...state, url: e.target.value}));
-                }}
-                onKeyDown={(e) => {
-                    if (e.key === 'Enter') {
-                        e.preventDefault();
-                        updateForm(state => ({...state, url: doFormatUrl(formState.url)}));
-                        setEnterPressed(true);
-                    }
-                }}
-            />
-        </Form>
-    </Modal>;
-};
-
-export default NiceModal.create(AddRecommendationModal);
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
deleted file mode 100644
index 4d5feb35973..00000000000
--- a/apps/admin-x-settings/src/components/settings/membership/recommendations/EditRecommendationModal.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-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 {Recommendation, useDeleteRecommendation, useEditRecommendation} from '../../../../api/recommendations';
-import {RoutingModalProps} from '../../../providers/RoutingProvider';
-import {dismissAllToasts, showToast} from '../../../../admin-x-ds/global/Toast';
-
-interface EditRecommendationModalProps {
-    recommendation: Recommendation,
-    animate?: boolean
-}
-
-const EditRecommendationModal: React.FC<RoutingModalProps & EditRecommendationModalProps> = ({recommendation, animate}) => {
-    const modal = useModal();
-    const {updateRoute} = useRouting();
-    const {mutateAsync: editRecommendation} = useEditRecommendation();
-    const {mutateAsync: deleteRecommendation} = useDeleteRecommendation();
-    const handleError = useHandleError();
-
-    const {formState, updateForm, handleSave, saveState, errors, clearError, setErrors} = useForm({
-        initialState: {
-            ...recommendation
-        },
-        onSave: async (state) => {
-            await editRecommendation(state);
-            modal.remove();
-            updateRoute('recommendations');
-        },
-        onSaveError: handleError,
-        onValidate: (state) => {
-            const newErrors = validateDescriptionForm(state);
-
-            if (Object.keys(newErrors).length !== 0) {
-                showToast({
-                    type: 'pageError',
-                    message: 'Can\'t edit recommendation, please double check that you\'ve filled all mandatory fields correctly.'
-                });
-            }
-
-            return newErrors;
-        }
-    });
-
-    let okLabel = 'Save';
-
-    if (saveState === 'saving') {
-        okLabel = 'Saving...';
-    } else if (saveState === 'saved') {
-        okLabel = 'Saved';
-    }
-
-    let leftButtonProps = {
-        label: 'Delete',
-        link: true,
-        color: 'red' as const,
-        size: 'sm' as const,
-        onClick: () => {
-            modal.remove();
-            NiceModal.show(ConfirmationModal, {
-                title: 'Delete recommendation',
-                prompt: <>
-                    <p>Your recommendation <strong>{recommendation.title}</strong> will no longer be visible to your audience.</p>
-                </>,
-                okLabel: 'Delete',
-                onOk: async (deleteModal) => {
-                    try {
-                        await deleteRecommendation(recommendation);
-                        deleteModal?.remove();
-                        showToast({
-                            message: 'Successfully deleted the recommendation',
-                            type: 'success'
-                        });
-                    } catch (e) {
-                        showToast({
-                            message: 'Failed to delete the recommendation. Please try again later.',
-                            type: 'error'
-                        });
-                        handleError(e, {withToast: false});
-                    }
-                }
-            });
-        }
-    };
-
-    return <Modal
-        afterClose={() => {
-            // Closed without saving: reset route
-            updateRoute('recommendations');
-        }}
-        animate={animate ?? true}
-        backDropClick={false}
-        cancelLabel={'Cancel'}
-        leftButtonProps={leftButtonProps}
-        okColor='black'
-        okLabel={okLabel}
-        size='sm'
-        testId='edit-recommendation-modal'
-        title={'Edit recommendation'}
-        stickyFooter
-        onOk={async () => {
-            if (saveState === 'saving') {
-                // Already saving
-                return;
-            }
-
-            dismissAllToasts();
-            try {
-                await handleSave({force: true});
-            } catch (e) {
-                showToast({
-                    type: 'pageError',
-                    message: 'One or more fields have errors, please double check that you\'ve filled all mandatory fields.'
-                });
-            }
-        }}
-    >
-        <RecommendationDescriptionForm clearError={clearError} errors={errors} formState={formState} setErrors={setErrors} showURL={true} updateForm={updateForm as any}/>
-    </Modal>;
-};
-
-export default NiceModal.create(EditRecommendationModal);
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..524aa4eb833 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,30 +1,21 @@
 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 {JSONError} from '../../../../utils/errors';
+import {Button, ConfirmationModal, Form, Heading, Modal, StripeButton, TextArea, TextField, Toggle, showToast} from '@tryghost/admin-x-design-system';
+import {JSONError} from '@tryghost/admin-x-framework/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 {checkStripeEnabled, getSettingValue, getSettingValues, useDeleteStripeSettings, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
+import {getGhostPaths} from '@tryghost/admin-x-framework/helpers';
 import {toast} from 'react-hot-toast';
-import {useBrowseMembers} from '../../../../api/members';
-import {useBrowseTiers, useEditTier} from '../../../../api/tiers';
+import {useBrowseMembers} from '@tryghost/admin-x-framework/api/members';
+import {useBrowseTiers, useEditTier} from '@tryghost/admin-x-framework/api/tiers';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const RETRY_PRODUCT_SAVE_POLL_LENGTH = 1000;
 const RETRY_PRODUCT_SAVE_MAX_POLL = 15 * RETRY_PRODUCT_SAVE_POLL_LENGTH;
@@ -145,7 +136,7 @@ const Connect: React.FC = () => {
             </div>
             <StripeButton href={stripeConnectUrl} tag='a' target='_blank' />
             <Heading className='mb-2 mt-8' level={6} grey>Step 2 — <span className='text-black dark:text-white'>Paste secure key</span></Heading>
-            <TextArea clearBg={false} error={Boolean(error)} hint={error || undefined} placeholder='Paste your secure key here' onChange={onTokenChange}></TextArea>
+            <TextArea error={Boolean(error)} hint={error || undefined} placeholder='Paste your secure key here' onChange={onTokenChange}></TextArea>
             {submitEnabled && <Button className='mt-5' color='green' label='Save Stripe settings' onClick={onSubmit} />}
         </div>
     );
@@ -171,8 +162,7 @@ const Connected: React.FC<{onClose?: () => void}> = ({onClose}) => {
         // this.ghostPaths.url.api('/members/') + '?filter=status:paid&limit=0';
         NiceModal.show(ConfirmationModal, {
             title: 'Disconnect Stripe',
-            prompt: (hasActiveStripeSubscriptions ? 'Cannot disconnect while there are members with active Stripe subscriptions.' : <>You&lsquo;re about to disconnect your Stripe account {stripeConnectAccountName}
-                from this site. This will automatically turn off paid memberships on this site.</>),
+            prompt: (hasActiveStripeSubscriptions ? 'Cannot disconnect while there are members with active Stripe subscriptions.' : <>You&lsquo;re about to disconnect your Stripe account {stripeConnectAccountName} from this site. This will automatically turn off paid memberships on this site.</>),
             okLabel: hasActiveStripeSubscriptions ? '' : 'Disconnect',
             onOk: async (modal) => {
                 try {
@@ -234,8 +224,9 @@ const Direct: React.FC<{onClose: () => void}> = ({onClose}) => {
         } catch (e) {
             if (e instanceof JSONError) {
                 showToast({
-                    type: 'pageError',
-                    message: 'Failed to save settings. Please check you copied both keys correctly.'
+                    title: 'Failed to save settings',
+                    type: 'error',
+                    message: 'Check you copied both keys correctly'
                 });
                 return;
             }
@@ -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..b6e55866458 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,29 +1,13 @@
-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 NiceModal from '@ebay/nice-modal-react';
+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 useHandleError from '../../../../utils/api/handleError';
-import useRouting from '../../../../hooks/useRouting';
 import useSettingGroup from '../../../../hooks/useSettingGroup';
-import useSortableIndexedList from '../../../../hooks/useSortableIndexedList';
-import {RoutingModalProps} from '../../../providers/RoutingProvider';
-import {Tier, useAddTier, useBrowseTiers, useEditTier} from '../../../../api/tiers';
+import {Button, ButtonProps, ConfirmationModal, CurrencyField, Form, Heading, Icon, Modal, Select, SortableList, TextField, Toggle, URLTextField, showToast, useSortableIndexedList} from '@tryghost/admin-x-design-system';
+import {ErrorMessages, useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
+import {Tier, useAddTier, useBrowseTiers, useEditTier} from '@tryghost/admin-x-framework/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';
+import {getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
 
 export type TierFormState = Partial<Omit<Tier, 'trial_days'>> & {
     trial_days: string;
@@ -32,23 +16,23 @@ export type TierFormState = Partial<Omit<Tier, 'trial_days'>> & {
 const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
     const isFreeTier = tier?.type === 'free';
 
-    const modal = useModal();
     const {updateRoute} = useRouting();
     const {mutateAsync: updateTier} = useEditTier();
     const {mutateAsync: createTier} = useAddTier();
+    const {mutateAsync: editSettings} = useEditSettings();
     const [hasFreeTrial, setHasFreeTrial] = React.useState(!!tier?.trial_days);
     const handleError = useHandleError();
     const {localSettings, siteData} = useSettingGroup();
-    const siteTitle = getSettingValues(localSettings, ['title']) as string[];
+    const [portalPlansJson] = getSettingValues(localSettings, ['portal_plans']) as string[];
+    const portalPlans = JSON.parse(portalPlansJson?.toString() || '[]') 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 : 'Enter a name for the tier'),
+        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, clearError, okProps} = useForm<TierFormState>({
         initialState: {
             ...(tier || {}),
             trial_days: tier?.trial_days?.toString() || '',
@@ -56,6 +40,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,18 +67,35 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
             } else {
                 await createTier(values);
             }
+            if (isFreeTier) {
+                // If we changed the visibility, we also need to update Portal settings in some situations
+                // Like the free tier is a special case, and should also be present/absent in portal_plans
+                const visible = formState.visibility === 'public';
+                let save = false;
 
-            modal.remove();
+                if (portalPlans.includes('free') && !visible) {
+                    portalPlans.splice(portalPlans.indexOf('free'), 1);
+                    save = true;
+                }
+
+                if (!portalPlans.includes('free') && visible) {
+                    portalPlans.push('free');
+                    save = true;
+                }
+
+                if (save) {
+                    await editSettings([
+                        {
+                            key: 'portal_plans',
+                            value: JSON.stringify(portalPlans)
+                        }
+                    ]);
+                }
+            }
         },
         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 benefits = useSortableIndexedList({
         items: formState.benefits || [],
         setItems: newBenefits => updateForm(state => ({...state, benefits: newBenefits})),
@@ -105,8 +117,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 +129,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>
@@ -134,7 +146,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                     confirmModal?.remove();
                     showToast({
                         type: 'success',
-                        message: `Tier ${tier.active ? 'archived' : 'reactivated'} successfully`
+                        title: `Tier ${tier.active ? 'archived' : 'reactivated'}`
                     });
                 }
             });
@@ -164,52 +176,40 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
         afterClose={() => {
             updateRoute('tiers');
         }}
+        buttonsDisabled={okProps.disabled}
+        cancelLabel='Close'
         dirty={saveState === 'unsaved'}
         leftButtonProps={leftButtonProps}
-        okLabel='Save & close'
+        okColor={okProps.color}
+        okLabel={okProps.label || 'Save'}
         size='lg'
         testId='tier-detail-modal'
         title={(tier ? (tier.active ? 'Edit tier' : 'Edit archived tier') : 'New tier')}
         stickyFooter
         onOk={async () => {
-            toast.remove();
-
-            if (Object.values(validators).filter(validator => validator()).length) {
-                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');
-            }
+            await handleSave({fakeWhenUnchanged: true});
         }}
     >
         <div className='-mb-8 mt-8 flex items-start gap-8'>
             <div className='flex grow flex-col gap-8'>
                 <Form marginBottom={false} title='Basic' grouped>
-                    {!isFreeTier && <TextField
+                    <TextField
                         autoComplete='off'
                         error={Boolean(errors.name)}
                         hint={errors.name}
-                        placeholder='Bronze'
+                        maxLength={191}
+                        placeholder={isFreeTier ? 'Free' : 'Bronze'}
                         title='Name'
                         value={formState.name || ''}
                         autoFocus
-                        onBlur={() => validators.name()}
                         onChange={e => updateForm(state => ({...state, name: e.target.value}))}
-                    />}
+                        onKeyDown={() => clearError('name')}
+                    />
                     <TextField
                         autoComplete='off'
                         autoFocus={isFreeTier}
-                        placeholder={isFreeTier ? `Free preview of ${siteTitle}` : 'Full access to premium content'}
+                        maxLength={191}
+                        placeholder={isFreeTier ? `Free preview` : 'Full access to premium content'}
                         title='Description'
                         value={formState.description || ''}
                         onChange={e => updateForm(state => ({...state, description: e.target.value}))}
@@ -238,24 +238,26 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                                     <CurrencyField
                                         error={Boolean(errors.monthly_price)}
                                         hint={errors.monthly_price}
-                                        placeholder='1'
+                                        placeholder='5'
                                         rightPlaceholder={`${formState.currency}/month`}
                                         title='Monthly price'
                                         valueInCents={formState.monthly_price || ''}
                                         hideTitle
-                                        onBlur={() => validators.monthly_price()}
+                                        onBlur={event => ((event.target.value === '') ? updateForm(state => ({...state, monthly_price: 0})) : null)}
                                         onChange={price => updateForm(state => ({...state, monthly_price: price}))}
+                                        onKeyDown={() => clearError('monthly_price')}
                                     />
                                     <CurrencyField
                                         error={Boolean(errors.yearly_price)}
                                         hint={errors.yearly_price}
-                                        placeholder='10'
+                                        placeholder='50'
                                         rightPlaceholder={`${formState.currency}/year`}
                                         title='Yearly price'
                                         valueInCents={formState.yearly_price || ''}
                                         hideTitle
-                                        onBlur={() => validators.yearly_price()}
+                                        onBlur={event => ((event.target.value === '') ? updateForm(state => ({...state, yearly_price: 0})) : null)}
                                         onChange={price => updateForm(state => ({...state, yearly_price: price}))}
+                                        onKeyDown={() => clearError('yearly_price')}
                                     />
                                 </div>
                             </div>
@@ -280,7 +282,8 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                     </>)}
                     <URLTextField
                         baseUrl={siteData?.url}
-                        hint='Redirect to this URL after signup for premium membership'
+                        hint={`Redirect to this URL after signup ${isFreeTier ? '' : ' for premium membership'}`}
+                        maxLength={2000}
                         placeholder={siteData?.url}
                         title='Welcome page'
                         value={formState.welcome_page_url || null}
@@ -296,13 +299,14 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                             items={benefits.items}
                             itemSeparator={false}
                             renderItem={({id, item}) => <div className='relative flex w-full items-center gap-5'>
-                                <div className='absolute left-[-32px] top-[7px] flex h-6 w-6 items-center justify-center bg-white group-hover:hidden'><Icon name='check' size='sm' /></div>
+                                <div className='absolute left-[-32px] top-[7px] flex h-6 w-6 items-center justify-center bg-white group-hover:hidden dark:bg-black'><Icon name='check' size='sm' /></div>
                                 <TextField
                                     // className='grow border-b border-grey-500 py-2 focus:border-grey-800 group-hover:border-grey-600'
+                                    maxLength={191}
                                     value={item}
                                     onChange={e => benefits.updateItem(id, e.target.value)}
                                 />
-                                <Button className='absolute right-1 top-1 z-10' icon='trash' iconColorClass='opacity-0 group-hover:opacity-100' size='sm' onClick={() => benefits.removeItem(id)} />
+                                <Button className='absolute right-1 top-1 z-10 opacity-0 group-hover:opacity-100' color='grey' icon='trash' size='sm' onClick={() => benefits.removeItem(id)} />
                             </div>}
                             onMove={benefits.moveItem}
                         />
@@ -312,6 +316,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                         <TextField
                             className='grow'
                             containerClassName='w-100'
+                            maxLength={191}
                             placeholder='Expert analysis'
                             title='New benefit'
                             value={benefits.newItem}
@@ -324,7 +329,7 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
                             }}
                         />
                         <Button
-                            className='absolute right-1 top-1 z-10'
+                            className='absolute right-[5px] top-[5px] z-10'
                             color='green'
                             icon='add'
                             iconColorClass='text-white'
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..ced9678a6d0 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,12 +1,8 @@
-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';
 import {numberWithCommas} from '../../../../utils/helpers';
 
 interface TierDetailPreviewProps {
@@ -26,8 +22,8 @@ export const TrialDaysLabel: React.FC<{size?: 'sm' | 'md'; trialDays: number;}>
 
     return (
         <span className={containerClassName}>
-            <span className="absolute inset-0 block rounded-full bg-pink opacity-20"></span>
-            <span className='dark:text-pink'>{trialDays} days free</span>
+            <span className="absolute inset-0 block rounded-full bg-accent opacity-20 dark:bg-pink"></span>
+            <span className="dark:text-pink">{trialDays} days free</span>
         </span>
     );
 };
@@ -72,8 +68,6 @@ const DiscountLabel: React.FC<{discount: number}> = ({discount}) => {
 
 const TierDetailPreview: React.FC<TierDetailPreviewProps> = ({tier, isFreeTier}) => {
     const [showingYearly, setShowingYearly] = useState(false);
-    const {localSettings} = useSettingGroup();
-    const siteTitle = getSettingValues(localSettings, ['title']) as string[];
 
     const name = tier?.name || '';
     const description = tier?.description || '';
@@ -82,8 +76,10 @@ const TierDetailPreview: React.FC<TierDetailPreviewProps> = ({tier, isFreeTier})
     const currencySymbol = currency ? getSymbol(currency) : '$';
     const benefits = tier?.benefits || [];
 
-    const monthlyPrice = currencyToDecimal(tier?.monthly_price || 0);
-    const yearlyPrice = currencyToDecimal(tier?.yearly_price || 0);
+    const defaultMonthlyPrice = isFreeTier ? 0 : 500;
+    const defaultYearlyPrice = isFreeTier ? 0 : 5000;
+    const monthlyPrice = currencyToDecimal(tier?.monthly_price ?? defaultMonthlyPrice);
+    const yearlyPrice = currencyToDecimal(tier?.yearly_price ?? defaultYearlyPrice);
     const yearlyDiscount = tier?.monthly_price && tier?.yearly_price
         ? Math.ceil(((monthlyPrice * 12 - yearlyPrice) / (monthlyPrice * 12)) * 100)
         : 0;
@@ -100,9 +96,9 @@ const TierDetailPreview: React.FC<TierDetailPreviewProps> = ({tier, isFreeTier})
             <div className='rounded-sm border border-grey-200 bg-white dark:border-transparent'>
                 <div className="flex-column relative flex min-h-[200px] w-full max-w-[420px] scale-90 items-start justify-stretch rounded bg-white p-4">
                     <div className="min-h-[56px] w-full">
-                        <h4 className={`-mt-1 mb-0 w-full break-words text-lg font-semibold leading-tight text-pink ${!name && 'opacity-30'}`}>{name || 'Bronze'}</h4>
+                        <h4 className={`-mt-1 mb-0 w-full break-words text-lg font-semibold leading-tight text-accent ${!name && 'opacity-30'}`}>{name || (isFreeTier ? 'Free' : 'Bronze')}</h4>
                         <div className="mt-4 flex w-full flex-row flex-wrap items-end justify-between gap-x-1 gap-y-[10px]">
-                            <div className={`flex flex-wrap text-black ${!yearlyPrice && !monthlyPrice && !isFreeTier && 'opacity-30'}`}>
+                            <div className={`flex flex-wrap text-black ${((showingYearly && tier?.yearly_price === undefined) || (!showingYearly && tier?.monthly_price === undefined)) && !isFreeTier ? 'opacity-30' : ''}`}>
                                 <span className="self-start text-[2.7rem] font-bold uppercase leading-[1.115]">{currencySymbol}</span>
                                 <span className="break-all text-[3.4rem] font-bold leading-none tracking-tight">{showingYearly ? numberWithCommas(yearlyPrice) : numberWithCommas(monthlyPrice)}</span>
                                 {!isFreeTier && <span className="ml-1 self-end text-[1.5rem] leading-snug text-grey-800">/{showingYearly ? 'year' : 'month'}</span>}
@@ -113,7 +109,7 @@ const TierDetailPreview: React.FC<TierDetailPreviewProps> = ({tier, isFreeTier})
                     </div>
                     <div className="flex-column flex w-full flex-1">
                         <div className="flex-1">
-                            <div className={`mt-4 w-full text-[1.55rem] font-semibold leading-snug text-grey-900 ${!description && 'opacity-30'}`}>{description || (isFreeTier ? `Free preview of ${siteTitle}` : 'Full access to premium content')}</div>
+                            <div className={`mt-4 w-full text-[1.55rem] font-semibold leading-snug text-grey-900 ${!description && 'opacity-30'}`}>{description || (isFreeTier ? `Free preview` : 'Full access to premium content')}</div>
                             <TierBenefits benefits={benefits} />
                         </div>
                     </div>
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..3aa1b36a08c 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,12 +1,11 @@
-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 {Tier} from '../../../../api/tiers';
+import {Icon, NoValueLabel} from '@tryghost/admin-x-design-system';
+import {Tier} from '@tryghost/admin-x-framework/api/tiers';
 import {TrialDaysLabel} from './TierDetailPreview';
 import {currencyToDecimal, getSymbol} from '../../../../utils/currency';
 import {numberWithCommas} from '../../../../utils/helpers';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface TiersListProps {
     tab?: 'active-tiers' | 'archive-tiers' | 'free-tier';
@@ -31,7 +30,7 @@ const TierCard: React.FC<TierCardProps> = ({tier}) => {
             <div className='w-full grow' onClick={() => {
                 updateRoute({route: `tiers/${tier.id}`});
             }}>
-                <div className='text-[1.65rem] font-bold leading-tight tracking-tight text-pink'>{tier.name}</div>
+                <div className='text-[1.65rem] font-bold leading-tight tracking-tight text-black dark:text-white'>{tier.name}</div>
                 <div className='mt-2 flex items-baseline'>
                     <span className="ml-1 translate-y-[-3px] text-md font-bold uppercase">{currencySymbol}</span>
                     <span className='text-xl font-bold tracking-tighter'>{numberWithCommas(currencyToDecimal(tier.monthly_price || 0))}</span>
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..d0ecb513c0d 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 useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const AnnouncementBar: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,8 +10,8 @@ const AnnouncementBar: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
-            customButtons={<Button color='green' label='Customize' link linkWithPadding onClick={openModal}/>}
+        <TopLevelGroup
+            customButtons={<Button className='mt-[-5px]' color='clear' label='Customize' size='sm' onClick={openModal}/>}
             description="Highlight important updates or offers"
             keywords={keywords}
             navid='announcement-bar'
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..d95236534d9 100644
--- a/apps/admin-x-settings/src/components/settings/site/AnnouncementBarModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/AnnouncementBarModal.tsx
@@ -1,19 +1,14 @@
 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 React, {useRef, useState} from 'react';
 import useSettingGroup from '../../../hooks/useSettingGroup';
-import {PreviewModalContent} from '../../../admin-x-ds/global/modal/PreviewModal';
-import {Tab} from '../../../admin-x-ds/global/TabView';
-import {getHomepageUrl} from '../../../api/site';
-import {getSettingValues} from '../../../api/settings';
-import {showToast} from '../../../admin-x-ds/global/Toast';
-import {useBrowsePosts} from '../../../api/posts';
+import {CheckboxGroup, ColorIndicator, Form, HtmlField, PreviewModalContent, Tab, showToast} from '@tryghost/admin-x-design-system';
+import {debounce} from '@tryghost/admin-x-design-system';
+import {getHomepageUrl} from '@tryghost/admin-x-framework/api/site';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useBrowsePosts} from '@tryghost/admin-x-framework/api/posts';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 type SidebarProps = {
     announcementContent?: string;
@@ -115,7 +110,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']);
@@ -124,7 +119,6 @@ const AnnouncementBarModal: React.FC = () => {
     const visibilitySettings = JSON.parse(announcementVisibility?.toString() || '[]') as string[];
     const {updateRoute} = useRouting();
     const [selectedPreviewTab, setSelectedPreviewTab] = useState('homepage');
-    const [announcementContentState, setAnnouncementContentState] = useState(announcementContent);
 
     const toggleColorSwatch = (e: string | null) => {
         updateSetting('announcement_background', e);
@@ -140,28 +134,24 @@ const AnnouncementBarModal: React.FC = () => {
         updateSetting('announcement_visibility', JSON.stringify(visibilitySettings));
     };
 
-    const announcementTextHandler = useCallback((e:string) => {
-        setAnnouncementContentState(e);
-    }, []);
+    const updateAnnouncementDebouncedRef = useRef(
+        debounce((value: string) => {
+            updateSetting('announcement_content', value);
+        }, 500)
+    );
 
     const sidebar = <Sidebar
         accentColor={accentColor}
         announcementBackgroundColor={announcementBackgroundColor}
         announcementContent={announcementContent}
         announcementTextHandler={(e) => {
-            announcementTextHandler(e);
+            updateAnnouncementDebouncedRef.current(e);
         }}
         paidMembersEnabled={paidMembersEnabled}
         toggleColorSwatch={toggleColorSwatch}
         toggleVisibility={toggleVisibility}
         visibility={announcementVisibility as string[]}
-        onBlur={() => {
-            if (announcementContentState) {
-                updateSetting('announcement_content', announcementContentState);
-            } else {
-                updateSetting('announcement_content', null);
-            }
-        }}
+        onBlur={() => {}}
     />;
 
     const {data: {posts: [latestPost]} = {posts: []}} = useBrowsePosts({
@@ -208,10 +198,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,10 +213,9 @@ const AnnouncementBarModal: React.FC = () => {
         title='Announcement'
         titleHeadingLevel={5}
         onOk={async () => {
-            if (!(await handleSave())) {
-                updateRoute('announcement-bar');
+            if (!(await handleSave({fakeWhenUnchanged: true}))) {
                 showToast({
-                    type: 'pageError',
+                    type: 'error',
                     message: 'An error occurred while saving your changes. Please try again.'
                 });
             }
diff --git a/apps/admin-x-settings/src/components/settings/site/DesignAndThemeModal.tsx b/apps/admin-x-settings/src/components/settings/site/DesignAndThemeModal.tsx
index 575bef29996..26be07aced6 100644
--- a/apps/admin-x-settings/src/components/settings/site/DesignAndThemeModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/DesignAndThemeModal.tsx
@@ -1,7 +1,7 @@
 import ChangeThemeModal from './ThemeModal';
 import DesignModal from './DesignModal';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
-import {RoutingModalProps} from '../../providers/RoutingProvider';
+import {RoutingModalProps} from '@tryghost/admin-x-framework/routing';
 
 const DesignAndThemeModal: React.FC<RoutingModalProps> = ({pathName}) => {
     const modal = useModal();
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..3449dc87aa5 100644
--- a/apps/admin-x-settings/src/components/settings/site/DesignModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/DesignModal.tsx
@@ -1,22 +1,17 @@
 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 {Setting, SettingValue, getSettingValues, useEditSettings} from '../../../api/settings';
-import {getHomepageUrl} from '../../../api/site';
-import {useBrowsePosts} from '../../../api/posts';
-import {useBrowseThemes} from '../../../api/themes';
+import useQueryParams from '../../../hooks/useQueryParams';
+import {CustomThemeSetting, useBrowseCustomThemeSettings, useEditCustomThemeSettings} from '@tryghost/admin-x-framework/api/customThemeSettings';
+import {Icon, PreviewModalContent, StickyFooter, Tab, TabView} from '@tryghost/admin-x-design-system';
+import {Setting, SettingValue, getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
+import {getHomepageUrl} from '@tryghost/admin-x-framework/api/site';
+import {useBrowsePosts} from '@tryghost/admin-x-framework/api/posts';
+import {useBrowseThemes} from '@tryghost/admin-x-framework/api/themes';
+import {useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
 import {useGlobalData} from '../../providers/GlobalDataProvider';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const Sidebar: React.FC<{
     brandSettings: BrandSettingValues
@@ -36,6 +31,7 @@ const Sidebar: React.FC<{
     const {updateRoute} = useRouting();
     const [selectedTab, setSelectedTab] = useState('brand');
     const {data: {themes} = {}} = useBrowseThemes();
+    const refParam = useQueryParams().getParam('ref');
 
     const activeTheme = themes?.find(theme => theme.active);
 
@@ -66,7 +62,11 @@ const Sidebar: React.FC<{
                 <div className='w-full px-7'>
                     <button className='group flex w-full items-center justify-between text-sm font-medium opacity-80 transition-all hover:opacity-100' data-testid='change-theme' type='button' onClick={async () => {
                         await handleSave();
-                        updateRoute('design/change-theme');
+                        if (refParam) {
+                            updateRoute(`design/change-theme?ref=${refParam}`);
+                        } else {
+                            updateRoute('design/change-theme');
+                        }
                     }}>
                         <div className='text-left'>
                             <div className='font-semibold'>Change theme</div>
@@ -97,26 +97,30 @@ const DesignModal: React.FC = () => {
     const [selectedPreviewTab, setSelectedPreviewTab] = useState('homepage');
     const {updateRoute} = useRouting();
 
+    const refParam = useQueryParams().getParam('ref');
+
     const {
         formState,
         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
@@ -213,14 +217,18 @@ const DesignModal: React.FC = () => {
 
     return <PreviewModalContent
         afterClose={() => {
-            updateRoute('design');
+            if (refParam === 'setup') {
+                window.location.hash = '/dashboard/';
+            } else {
+                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 +239,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..42e1fa0fd04 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 useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const DesignSetting: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,8 +10,8 @@ const DesignSetting: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
-            customButtons={<Button color='green' label='Customize' link linkWithPadding onClick={openPreviewModal}/>}
+        <TopLevelGroup
+            customButtons={<Button className='mt-[-5px]' color='clear' label='Customize' size='sm' onClick={openPreviewModal}/>}
             description="Customize the theme, colors, and layout of your site"
             keywords={keywords}
             navid='design'
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..d1978e2acf2 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 useRouting from '../../../hooks/useRouting';
-import {withErrorBoundary} from '../../../admin-x-ds/global/ErrorBoundary';
+import TopLevelGroup from '../../TopLevelGroup';
+import {Button, withErrorBoundary} from '@tryghost/admin-x-design-system';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 const Navigation: React.FC<{ keywords: string[] }> = ({keywords}) => {
     const {updateRoute} = useRouting();
@@ -11,8 +10,8 @@ const Navigation: React.FC<{ keywords: string[] }> = ({keywords}) => {
     };
 
     return (
-        <SettingGroup
-            customButtons={<Button color='green' label='Customize' link linkWithPadding onClick={openPreviewModal}/>}
+        <TopLevelGroup
+            customButtons={<Button className='mt-[-5px]' color='clear' label='Customize' size='sm' onClick={openPreviewModal}/>}
             description="Set up primary and secondary menus"
             keywords={keywords}
             navid='navigation'
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..cbeefc68c45 100644
--- a/apps/admin-x-settings/src/components/settings/site/NavigationModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/NavigationModal.tsx
@@ -1,11 +1,10 @@
-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 {getSettingValues} from '../../../api/settings';
+import {Modal, TabView} from '@tryghost/admin-x-design-system';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 import {useState} from 'react';
 
 const NavigationModal = NiceModal.create(() => {
@@ -44,7 +43,9 @@ const NavigationModal = NiceModal.create(() => {
                 updateRoute('navigation');
             }}
             buttonsDisabled={saveState === 'saving'}
+            cancelLabel='Close'
             dirty={localSettings.some(setting => setting.dirty)}
+            okLabel={saveState === 'saving' ? 'Saving...' : 'Save'}
             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..59bbe852290 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,18 @@
 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 InvalidThemeModal, {FatalErrors} from './theme/InvalidThemeModal';
 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 React, {useEffect, useState} from 'react';
 import ThemeInstalledModal from './theme/ThemeInstalledModal';
 import ThemePreview from './theme/ThemePreview';
-import useHandleError from '../../../utils/api/handleError';
-import useRouting from '../../../hooks/useRouting';
+import useQueryParams from '../../../hooks/useQueryParams';
+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';
+import {InstalledTheme, Theme, ThemesInstallResponseType, isDefaultOrLegacyTheme, useActivateTheme, useBrowseThemes, useInstallTheme, useUploadTheme} from '@tryghost/admin-x-framework/api/themes';
+import {JSONError} from '@tryghost/admin-x-framework/errors';
+import {OfficialTheme} from '../../providers/SettingsAppProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {useRouting} from '@tryghost/admin-x-framework/routing';
 
 interface ThemeToolbarProps {
     selectedTheme: OfficialTheme|null;
@@ -64,19 +58,12 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
     const {mutateAsync: uploadTheme} = useUploadTheme();
     const limiter = useLimiter();
     const handleError = useHandleError();
+    const refParam = useQueryParams().getParam('ref');
 
     const [uploadConfig, setUploadConfig] = useState<{enabled: boolean; error?: string}>();
 
     const [isUploading, setUploading] = useState(false);
 
-    const fileInputRef = useRef<HTMLInputElement>(null);
-
-    const handleRetry = () => {
-        if (fileInputRef?.current) {
-            fileInputRef.current.click();
-        }
-    };
-
     useEffect(() => {
         if (limiter) {
             // Sending a bad string to make sure it fails (empty string isn't valid)
@@ -93,13 +80,32 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
     }, [limiter]);
 
     const onClose = () => {
-        updateRoute('design/edit');
+        if (refParam) {
+            updateRoute(`design/edit?ref=${refParam}`);
+        } else {
+            updateRoute('design/edit');
+        }
     };
 
     const onThemeUpload = async (file: File) => {
         const themeFileName = file?.name.replace(/\.zip$/, '');
         const existingThemeNames = themes.map(t => t.name);
-        if (existingThemeNames.includes(themeFileName)) {
+        if (isDefaultOrLegacyTheme({name: themeFileName})) {
+            NiceModal.show(ConfirmationModal, {
+                title: 'Upload failed',
+                cancelLabel: 'Cancel',
+                okLabel: '',
+                prompt: (
+                    <>
+                        <p>The default <strong>{themeFileName}</strong> theme cannot be overwritten.</p>
+                        <p>Rename your zip file and try again.</p>
+                    </>
+                ),
+                onOk: async (confirmModal) => {
+                    confirmModal?.remove();
+                }
+            });
+        } else if (existingThemeNames.includes(themeFileName)) {
             NiceModal.show(ConfirmationModal, {
                 title: 'Overwrite theme',
                 prompt: (
@@ -140,7 +146,7 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
         onActivate?: () => void
     }) => {
         let data: ThemesInstallResponseType | undefined;
-        let fatalErrors = null;
+        let fatalErrors: FatalErrors | null = null;
 
         try {
             setUploading(true);
@@ -148,9 +154,11 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
             setUploading(false);
         } catch (e) {
             setUploading(false);
-            const errorsJson = await handleError(e) as {errors?: []};
-            if (errorsJson?.errors) {
-                fatalErrors = errorsJson.errors;
+
+            if (e instanceof JSONError && e.response?.status === 422 && e.data?.errors) {
+                fatalErrors = (e.data.errors as any) as FatalErrors;
+            } else {
+                handleError(e);
             }
         }
 
@@ -163,7 +171,7 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
                 fatalErrors,
                 onRetry: async (modal) => {
                     modal?.remove();
-                    handleRetry();
+                    handleUpload();
                 }
             });
         }
@@ -176,7 +184,7 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
 
         let title = 'Upload successful';
         let prompt = <>
-            <strong>{uploadedTheme.name}</strong> uploaded successfully.
+            <strong>{uploadedTheme.name}</strong> uploaded
         </>;
 
         if (!uploadedTheme.active) {
@@ -191,7 +199,7 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
 
             title = `Upload successful with ${hasErrors ? 'errors' : 'warnings'}`;
             prompt = <>
-                The theme <strong>&quot;{uploadedTheme.name}&quot;</strong> was installed successfully but we detected some {hasErrors ? 'errors' : 'warnings'}.
+                The theme <strong>&quot;{uploadedTheme.name}&quot;</strong> was installed but we detected some {hasErrors ? 'errors' : 'warnings'}.
             </>;
 
             if (!uploadedTheme.active) {
@@ -234,7 +242,8 @@ const ThemeToolbar: React.FC<ThemeToolbarProps> = ({
         } else {
             NiceModal.show(LimitModal, {
                 title: 'Upgrade to enable custom themes',
-                prompt: uploadConfig?.error || <>Your current plan only supports official themes. You can install them from the <a href="https://ghost.org/marketplace/">Ghost theme marketplace</a>.</>
+                prompt: uploadConfig?.error || <>Your current plan only supports official themes. You can install them from the <a href="https://ghost.org/marketplace/">Ghost theme marketplace</a>.</>,
+                onOk: () => updateRoute({route: '/pro', isExternal: true})
             });
         }
     };
@@ -305,6 +314,7 @@ const ChangeThemeModal: React.FC<ChangeThemeModalProps> = ({source, themeRef}) =
     const [isInstalling, setInstalling] = useState(false);
     const [installedFromMarketplace, setInstalledFromMarketplace] = useState(false);
     const {updateRoute} = useRouting();
+    const refParam = useQueryParams().getParam('ref');
 
     const modal = useModal();
     const {data: {themes} = {}} = useBrowseThemes();
@@ -356,12 +366,17 @@ const ChangeThemeModal: React.FC<ChangeThemeModalProps> = ({source, themeRef}) =
                         if (data?.themes[0]) {
                             await activateTheme(data.themes[0].name);
                             showToast({
+                                title: 'Theme activated',
                                 type: 'success',
-                                message: <div><span className='capitalize'>{data.themes[0].name}</span> is now your active theme.</div>
+                                message: <div><span className='capitalize'>{data.themes[0].name}</span> is now your active theme</div>
                             });
                         }
                         confirmModal?.remove();
-                        updateRoute('design/edit');
+                        if (refParam) {
+                            updateRoute(`design/edit?ref=${refParam}`);
+                        } else {
+                            updateRoute('design/edit');
+                        }
                     } catch (e) {
                         handleError(e);
                     }
@@ -371,7 +386,7 @@ const ChangeThemeModal: React.FC<ChangeThemeModalProps> = ({source, themeRef}) =
                 }
             });
         }
-    }, [themeRef, source, installTheme, handleError, activateTheme, updateRoute, themes, installedFromMarketplace]);
+    }, [themeRef, source, installTheme, handleError, activateTheme, updateRoute, themes, installedFromMarketplace, refParam]);
 
     if (!themes) {
         return;
@@ -442,7 +457,11 @@ const ChangeThemeModal: React.FC<ChangeThemeModalProps> = ({source, themeRef}) =
                 prompt,
                 installedTheme: installedTheme!,
                 onActivate: () => {
-                    updateRoute('design/edit');
+                    if (refParam) {
+                        updateRoute(`design/edit?ref=${refParam}`);
+                    } else {
+                        updateRoute('design/edit');
+                    }
                 }
             });
         };
@@ -451,7 +470,11 @@ const ChangeThemeModal: React.FC<ChangeThemeModalProps> = ({source, themeRef}) =
     return (
         <Modal
             afterClose={() => {
-                updateRoute('design/edit');
+                if (refParam) {
+                    updateRoute(`design/edit?ref=${refParam}`);
+                } else {
+                    updateRoute('design/edit');
+                }
             }}
             animate={false}
             cancelLabel=''
@@ -461,6 +484,10 @@ const ChangeThemeModal: React.FC<ChangeThemeModalProps> = ({source, themeRef}) =
             testId='theme-modal'
             title=''
             scrolling
+            onCancel={() => {
+                modal.remove();
+                updateRoute('');
+            }}
         >
             <div className='flex h-full justify-between'>
                 <div className='grow'>
diff --git a/apps/admin-x-settings/src/components/settings/site/announcementBar/AnnouncementBarPreview.tsx b/apps/admin-x-settings/src/components/settings/site/announcementBar/AnnouncementBarPreview.tsx
index 209504af9b5..d8b90310c3d 100644
--- a/apps/admin-x-settings/src/components/settings/site/announcementBar/AnnouncementBarPreview.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/announcementBar/AnnouncementBarPreview.tsx
@@ -36,10 +36,10 @@ const AnnouncementBarPreview: React.FC<AnnouncementBarSettings> = ({announcement
                     announcementContent,
                     visibilityMemo
                 ),
-                Accept: 'text/plain',
-                mode: 'cors',
-                credentials: 'include'
-            }
+                Accept: 'text/plain'
+            },
+            mode: 'cors',
+            credentials: 'include'
         })
             .then(response => response.text())
             .then((data) => {
@@ -71,7 +71,7 @@ const AnnouncementBarPreview: React.FC<AnnouncementBarSettings> = ({announcement
     return (
         <IframeBuffering
             addDelay={true}
-            className="absolute h-[110%] w-[110%] origin-top-left scale-[.90909] max-[1600px]:h-[130%] max-[1600px]:w-[130%] max-[1600px]:scale-[.76923]"
+            className="absolute h-[110%] w-[110%] origin-top-left scale-[.90909] bg-white max-[1600px]:h-[130%] max-[1600px]:w-[130%] max-[1600px]:scale-[.76923]"
             generateContent={injectContentIntoIframe}
             height='100%'
             parentClassName="relative h-full w-full"
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 5516f88ff0c..9b2346b7d62 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,18 +1,13 @@
-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 UnsplashSelector from '../../../selectors/UnsplashSelector';
 import usePinturaEditor from '../../../../hooks/usePinturaEditor';
-import {SettingValue, getSettingValues} from '../../../../api/settings';
-import {debounce} from '../../../../utils/debounce';
-import {getImageUrl, useUploadImage} from '../../../../api/images';
+import {APIError} from '@tryghost/admin-x-framework/errors';
+import {ColorPickerField, Heading, Hint, ImageUpload, SettingGroupContent, TextField, debounce} from '@tryghost/admin-x-design-system';
+import {SettingValue, getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
+import {useFramework} from '@tryghost/admin-x-framework';
 import {useGlobalData} from '../../../providers/GlobalDataProvider';
-import {useServices} from '../../../providers/ServiceProvider';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 export interface BrandSettingValues {
     description: string
@@ -27,10 +22,8 @@ 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 {unsplashConfig} = useFramework();
     const handleError = useHandleError();
 
     const updateDescriptionDebouncedRef = useRef(
@@ -39,20 +32,15 @@ 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'>
             <SettingGroupContent>
                 <TextField
                     key='site-description'
-                    clearBg={true}
                     hint='Used in your theme, meta data and search results'
+                    maxLength={200}
                     title='Site description'
                     value={siteDescription}
                     onChange={(event) => {
@@ -90,7 +78,11 @@ const BrandSettings: React.FC<{ values: BrandSettingValues, updateSetting: (key:
                                 try {
                                     updateSetting('icon', getImageUrl(await uploadImage({file})));
                                 } catch (e) {
-                                    handleError(e);
+                                    const error = e as APIError;
+                                    if (error.response!.status === 415) {
+                                        error.message = 'Unsupported file type';
+                                    }
+                                    handleError(error);
                                 }
                             }}
                         >
@@ -112,7 +104,11 @@ const BrandSettings: React.FC<{ values: BrandSettingValues, updateSetting: (key:
                             try {
                                 updateSetting('logo', getImageUrl(await uploadImage({file})));
                             } catch (e) {
-                                handleError(e);
+                                const error = e as APIError;
+                                if (error.response!.status === 415) {
+                                    error.message = 'Unsupported file type';
+                                }
+                                handleError(error);
                             }
                         }}
                     >
@@ -143,14 +139,18 @@ const BrandSettings: React.FC<{ values: BrandSettingValues, updateSetting: (key:
                                 })
                             }
                         }
-                        unsplashButtonClassName='!top-1 !right-1'
+                        unsplashButtonClassName='!top-1 !right-1 z-50'
                         unsplashEnabled={unsplashEnabled}
                         onDelete={() => updateSetting('cover_image', null)}
-                        onUpload={async (file) => {
+                        onUpload={async (file: any) => {
                             try {
                                 updateSetting('cover_image', getImageUrl(await uploadImage({file})));
                             } catch (e) {
-                                handleError(e);
+                                const error = e as APIError;
+                                if (error.response!.status === 415) {
+                                    error.message = 'Unsupported file type';
+                                }
+                                handleError(error);
                             }
                         }}
                     >
@@ -158,10 +158,8 @@ const BrandSettings: React.FC<{ values: BrandSettingValues, updateSetting: (key:
                     </ImageUpload>
                     {
                         showUnsplash && unsplashConfig && unsplashEnabled && (
-                            <UnsplashSearchModal
-                                unsplashConf={{
-                                    defaultHeaders: unsplashConfig
-                                }}
+                            <UnsplashSelector
+                                unsplashProviderConfig={unsplashConfig}
                                 onClose={() => {
                                     setShowUnsplash(false);
                                 }}
diff --git a/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemePreview.tsx b/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemePreview.tsx
index d747d337603..aafa37ebdd4 100644
--- a/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemePreview.tsx
+++ b/apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemePreview.tsx
@@ -1,6 +1,6 @@
 import IframeBuffering from '../../../../utils/IframeBuffering';
 import React, {useCallback} from 'react';
-import {CustomThemeSetting, hiddenCustomThemeSettingValue} from '../../../../api/customThemeSettings';
+import {CustomThemeSetting, hiddenCustomThemeSettingValue} from '@tryghost/admin-x-framework/api/customThemeSettings';
 import {isCustomThemeSettingVisible} from '../../../../utils/isCustomThemeSettingsVisible';
 
 type BrandSettings = {
@@ -69,10 +69,10 @@ const ThemePreview: React.FC<ThemePreviewProps> = ({settings,url}) => {
             headers: {
                 'Content-Type': 'text/html;charset=utf-8',
                 'x-ghost-preview': previewData,
-                Accept: 'text/plain',
-                mode: 'cors',
-                credentials: 'include'
-            }
+                Accept: 'text/plain'
+            },
+            mode: 'cors',
+            credentials: 'include'
         })
             .then(response => response.text())
             .then((data) => {
@@ -105,7 +105,7 @@ const ThemePreview: React.FC<ThemePreviewProps> = ({settings,url}) => {
     return (
         <IframeBuffering
             addDelay={false}
-            className="absolute h-[110%] w-[110%] origin-top-left scale-[.90909] max-[1600px]:h-[130%] max-[1600px]:w-[130%] max-[1600px]:scale-[.76923]"
+            className="absolute h-[110%] w-[110%] origin-top-left scale-[.90909] bg-white max-[1600px]:h-[130%] max-[1600px]:w-[130%] max-[1600px]:scale-[.76923]"
             generateContent={injectContentIntoIframe}
             height='100%'
             parentClassName="relative h-full w-full"
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..5f8f80a51d1 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,22 +1,30 @@
-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 {CustomThemeSetting} from '../../../../api/customThemeSettings';
-import {getImageUrl, useUploadImage} from '../../../../api/images';
-import {humanizeSettingKey} from '../../../../api/settings';
+import React, {useEffect, useState} from 'react';
+import {ColorPickerField, Heading, Hint, ImageUpload, Select, SettingGroupContent, TextField, Toggle} from '@tryghost/admin-x-design-system';
+import {CustomThemeSetting} from '@tryghost/admin-x-framework/api/customThemeSettings';
+import {getImageUrl, useUploadImage} from '@tryghost/admin-x-framework/api/images';
+import {humanizeSettingKey} from '@tryghost/admin-x-framework/api/settings';
 import {isCustomThemeSettingVisible} from '../../../../utils/isCustomThemeSettingsVisible';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 const ThemeSetting: React.FC<{
     setting: CustomThemeSetting,
     setSetting: <Setting extends CustomThemeSetting>(value: Setting['value']) => void
 }> = ({setting, setSetting}) => {
+    const [fieldValues, setFieldValues] = useState<{ [key: string]: string | null }>({});
+    useEffect(() => {
+        const valueAsString = setting.value === null ? '' : String(setting.value);
+        setFieldValues(values => ({...values, [setting.key]: valueAsString}));
+    }, [setting]);
+
+    const handleBlur = (key: string) => {
+        if (fieldValues[key] !== undefined) {
+            setSetting(fieldValues[key]);
+        }
+    };
+
+    const handleChange = (key: string, value: string) => {
+        setFieldValues(values => ({...values, [key]: value}));
+    };
     const {mutateAsync: uploadImage} = useUploadImage();
     const handleError = useHandleError();
 
@@ -35,8 +43,9 @@ const ThemeSetting: React.FC<{
             <TextField
                 hint={setting.description}
                 title={humanizeSettingKey(setting.key)}
-                value={setting.value || ''}
-                onChange={event => setSetting(event.target.value)}
+                value={fieldValues[setting.key] || ''}
+                onBlur={() => handleBlur(setting.key)}
+                onChange={event => handleChange(setting.key, event.target.value)}
             />
         );
     case 'boolean':
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..9c78f8e8a40 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,14 +1,11 @@
-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 InvalidThemeModal, {FatalErrors} from './InvalidThemeModal';
 import NiceModal from '@ebay/nice-modal-react';
 import React from 'react';
-import useHandleError from '../../../../utils/api/handleError';
-import {Theme, isActiveTheme, isDefaultTheme, isDeletableTheme, isLegacyTheme, useActivateTheme, useDeleteTheme} from '../../../../api/themes';
-import {downloadFile, getGhostPaths} from '../../../../utils/helpers';
+import {Button, ButtonProps, ConfirmationModal, List, ListItem, Menu, ModalPage, showToast} from '@tryghost/admin-x-design-system';
+import {JSONError} from '@tryghost/admin-x-framework/errors';
+import {Theme, isActiveTheme, isDefaultTheme, isDeletableTheme, isLegacyTheme, useActivateTheme, useDeleteTheme} from '@tryghost/admin-x-framework/api/themes';
+import {downloadFile, getGhostPaths} from '@tryghost/admin-x-framework/helpers';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 interface ThemeActionProps {
     theme: Theme;
@@ -56,8 +53,32 @@ const ThemeActions: React.FC<ThemeActionProps> = ({
     const handleActivate = async () => {
         try {
             await activateTheme(theme.name);
+            showToast({
+                title: 'Theme activated',
+                type: 'success',
+                message: <div><span className='capitalize'>{theme.name}</span> is now your active theme</div>
+            });
         } catch (e) {
-            handleError(e);
+            let fatalErrors: FatalErrors | null = null;
+            if (e instanceof JSONError && e.response?.status === 422 && e.data?.errors) {
+                fatalErrors = (e.data.errors as any) as FatalErrors;
+            } else {
+                handleError(e);
+            }
+            let title = 'Invalid Theme';
+            let prompt = <>This theme is invalid and cannot be activated. Fix the following errors and re-upload the theme</>;
+
+            if (fatalErrors) {
+                NiceModal.show(InvalidThemeModal, {
+                    title,
+                    prompt,
+                    fatalErrors,
+                    onRetry: async (modal) => {
+                        modal?.remove();
+                        handleActivate();
+                    }
+                });
+            }
         }
     };
 
@@ -130,13 +151,14 @@ const ThemeActions: React.FC<ThemeActionProps> = ({
     }
 
     const buttonProps: ButtonProps = {
+        iconColorClass: 'text-base',
         size: 'sm'
     };
 
     return (
         <div className='-mr-3 flex items-center gap-4'>
             {actions}
-            <Menu items={menuItems} position='left' triggerButtonProps={buttonProps} />
+            <Menu items={menuItems} position='start' triggerButtonProps={buttonProps} />
         </div>
     );
 };
@@ -151,7 +173,11 @@ const ThemeList:React.FC<ThemeSettingProps> = ({
             return 1; // b comes before a
         } else {
             // Both have the same active status, sort alphabetically
-            return a.name.localeCompare(b.name);
+            if (a.package?.name && b.package?.name) {
+                return a.package.name.localeCompare(b.package.name);
+            } else {
+                return a.name.localeCompare(b.name);
+            }
         }
     });
 
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..e827414145d 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,19 +1,15 @@
-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 {ThemeProblem} from '../../../../api/themes';
+import {Button, ConfirmationModalContent, Heading, List, ListItem} from '@tryghost/admin-x-design-system';
+import {ThemeProblem} from '@tryghost/admin-x-framework/api/themes';
 
 type FatalError = {
     details: {
       errors: ThemeProblem[];
-    };
+    }|string;
   };
 
-type FatalErrors = FatalError[];
+export type FatalErrors = FatalError[];
 
 export const ThemeProblemView = ({problem}:{problem: ThemeProblem}) => {
     const [isExpanded, setExpanded] = useState(false);
@@ -67,8 +63,15 @@ const InvalidThemeModal: React.FC<{
     if (fatalErrors) {
         warningPrompt = <div className="mt-10">
             <List title="Errors">
-                {fatalErrors?.map((error: any) => error?.details?.errors?.map((err: any) => <ThemeProblemView problem={err} />
-                ))}
+                {fatalErrors.map((error) => {
+                    if (typeof error.details === 'object' && error.details.errors && error.details.errors.length > 0) {
+                        return error.details.errors.map(err => <ThemeProblemView problem={err} />);
+                    } else if (typeof error.details === 'string') {
+                        return <ListItem title={error.details} />;
+                    } else {
+                        return null;
+                    }
+                })}
             </List>
         </div>;
     }
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..4d179d29c20 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,10 +1,10 @@
-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 {OfficialTheme, ThemeVariant, useOfficialThemes} from '../../../providers/ServiceProvider';
-import {getGhostPaths, resolveAsset} from '../../../../utils/helpers';
+import {Heading, ModalPage} from '@tryghost/admin-x-design-system';
+import {OfficialTheme, ThemeVariant, useOfficialThemes} from '../../../providers/SettingsAppProvider';
+import {getGhostPaths} from '@tryghost/admin-x-framework/helpers';
+import {resolveAsset} from '../../../../utils/helpers';
 
 const VARIANT_LOOP_INTERVAL = 3000;
 
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..c1cea32d195 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 {InstalledTheme, ThemeProblem, useActivateTheme} from '../../../../api/themes';
-import {showToast} from '../../../../admin-x-ds/global/Toast';
+import {Button, ConfirmationModalContent, Heading, List, ListItem, showToast} from '@tryghost/admin-x-design-system';
+import {InstalledTheme, ThemeProblem, useActivateTheme} from '@tryghost/admin-x-framework/api/themes';
+import {useHandleError} from '@tryghost/admin-x-framework/hooks';
 
 export const ThemeProblemView = ({problem}:{problem: ThemeProblem}) => {
     const [isExpanded, setExpanded] = useState(false);
@@ -50,7 +45,7 @@ const ThemeInstalledModal: React.FC<{
     const handleError = useHandleError();
 
     let errorPrompt = null;
-    if (installedTheme.gscan_errors) {
+    if (installedTheme && installedTheme.gscan_errors) {
         errorPrompt = <div className="mt-6">
             <List hint={<>Highly recommended to fix, functionality <strong>could</strong> be restricted</>} title="Errors">
                 {installedTheme.gscan_errors?.map(error => <ThemeProblemView problem={error} />)}
@@ -59,7 +54,7 @@ const ThemeInstalledModal: React.FC<{
     }
 
     let warningPrompt = null;
-    if (installedTheme.warnings) {
+    if (installedTheme && installedTheme.warnings) {
         warningPrompt = <div className="mt-10">
             <List title="Warnings">
                 {installedTheme.warnings?.map(warning => <ThemeProblemView problem={warning} />)}
@@ -92,6 +87,7 @@ const ThemeInstalledModal: React.FC<{
                     const updatedTheme = resData.themes[0];
 
                     showToast({
+                        title: 'Theme activated',
                         type: 'success',
                         message: <div><span className='capitalize'>{updatedTheme.name}</span> is now your active theme.</div>
                     });
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..e730263a730 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,15 +1,8 @@
-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 {OfficialTheme, ThemeVariant} from '../../../providers/ServiceProvider';
-import {Theme, isDefaultOrLegacyTheme} from '../../../../api/themes';
+import {Breadcrumbs, Button, ButtonGroup, ConfirmationModal, DesktopChrome, MobileChrome, PageHeader, Select, SelectOption} from '@tryghost/admin-x-design-system';
+import {OfficialTheme, ThemeVariant} from '../../../providers/SettingsAppProvider';
+import {Theme, isDefaultOrLegacyTheme} from '@tryghost/admin-x-framework/api/themes';
 
 const hasVariants = (theme: OfficialTheme) => theme.variants && theme.variants.length > 0;
 
diff --git a/apps/admin-x-settings/src/hooks/site/useNavigationEditor.tsx b/apps/admin-x-settings/src/hooks/site/useNavigationEditor.tsx
index 1605b38bbe9..28def713647 100644
--- a/apps/admin-x-settings/src/hooks/site/useNavigationEditor.tsx
+++ b/apps/admin-x-settings/src/hooks/site/useNavigationEditor.tsx
@@ -1,5 +1,5 @@
-import useSortableIndexedList from '../useSortableIndexedList';
 import validator from 'validator';
+import {useSortableIndexedList} from '@tryghost/admin-x-design-system';
 
 export type NavigationItem = {
     label: string;
@@ -31,7 +31,7 @@ const useNavigationEditor = ({items, setItems}: {
     const list = useSortableIndexedList<Omit<EditableItem, 'id'>>({
         items: items.map(item => ({...item, errors: {}})),
         setItems: newItems => setItems(newItems.map(({url, label}) => ({url, label}))),
-        blank: {label: '', url: '/', errors: {}},
+        blank: {url: '/',label: '', errors: {}},
         canAddNewItem: hasNewItem
     });
 
diff --git a/apps/admin-x-settings/src/hooks/useFilterableApi.ts b/apps/admin-x-settings/src/hooks/useFilterableApi.ts
deleted file mode 100644
index 7a5cfb558e0..00000000000
--- a/apps/admin-x-settings/src/hooks/useFilterableApi.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import {Meta, apiUrl, useFetchApi} from '../utils/api/hooks';
-import {useRef} from 'react';
-
-const escapeNqlString = (value: string) => {
-    return '\'' + value.replace(/'/g, '\\\'') + '\'';
-};
-
-const useFilterableApi = <
-    Data extends {id: string} & {[Key in FilterKey]: string},
-    ResponseKey extends string = string,
-    FilterKey extends string = string
->({path, filterKey, responseKey, limit = 20}: {
-    path: string
-    filterKey: FilterKey
-    responseKey: ResponseKey
-    limit?: number
-}) => {
-    const fetchApi = useFetchApi();
-
-    const result = useRef<{
-        data?: Data[];
-        allLoaded?: boolean;
-        lastInput?: string;
-    }>({});
-
-    const loadData = async (input: string) => {
-        if ((result.current.allLoaded || result.current.lastInput === input) && result.current.data) {
-            return result.current.data.filter(item => item[filterKey]?.toLowerCase().includes(input.toLowerCase()));
-        }
-
-        const response = await fetchApi<{meta?: Meta} & {[k in ResponseKey]: Data[]}>(apiUrl(path, {
-            filter: input ? `${filterKey}:~${escapeNqlString(input)}` : '',
-            limit: limit.toString()
-        }));
-
-        result.current.data = response[responseKey];
-        result.current.allLoaded = !input && !response.meta?.pagination.next;
-        result.current.lastInput = input;
-
-        return response[responseKey];
-    };
-
-    return {
-        loadData,
-
-        loadInitialValues: async (ids: string[]) => {
-            await loadData('');
-
-            const data = [...(result.current.data || [])];
-            const missingIds = ids.filter(id => !result.current.data?.find(({id: dataId}) => dataId === id));
-
-            if (missingIds.length) {
-                const additionalData = await fetchApi<{meta?: Meta} & {[k in ResponseKey]: Data[]}>(apiUrl(path, {
-                    filter: `id:[${missingIds.join(',')}]`,
-                    limit: 'all'
-                }));
-
-                data.push(...additionalData[responseKey]);
-            }
-
-            return ids.map(id => data.find(({id: dataId}) => dataId === id)!);
-        }
-    };
-};
-
-export default useFilterableApi;
diff --git a/apps/admin-x-settings/src/hooks/useForm.ts b/apps/admin-x-settings/src/hooks/useForm.ts
deleted file mode 100644
index a566dd3b5d4..00000000000
--- a/apps/admin-x-settings/src/hooks/useForm.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import {useCallback, useEffect, useState} from 'react';
-
-export type Dirtyable<Data> = Data & {
-    dirty?: boolean;
-}
-
-export type SaveState = 'unsaved' | 'saving' | 'saved' | 'error' | '';
-
-export type ErrorMessages = Record<string, string | undefined>
-
-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>;
-    /**
-     * Update the form state and mark the form as dirty. Should be used in input events
-     */
-    updateForm: (updater: (state: State) => State) => void;
-    /**
-     * Update the form state without marking the form as dirty. Should be used for updating initial state after API responses
-     */
-    setFormState: (updater: (state: State) => State) => void;
-    reset: () => void;
-
-    validate: () => boolean;
-    clearError: (field: string) => void;
-    isValid: boolean;
-    errors: ErrorMessages;
-    setErrors: (errors: ErrorMessages) => void;
-}
-
-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
-}): FormHook<State> => {
-    const [formState, setFormState] = useState(initialState);
-    const [saveState, setSaveState] = useState<SaveState>('');
-    const [errors, setErrors] = useState<ErrorMessages>({});
-
-    // Reset saved state after 2 seconds
-    useEffect(() => {
-        if (saveState === 'saved') {
-            setTimeout(() => {
-                setSaveState(state => (state === 'saved' ? '' : state));
-            }, 2000);
-        }
-    }, [saveState]);
-
-    const isValid = (errs: ErrorMessages) => Object.values(errs).filter(Boolean).length === 0;
-
-    const validate = useCallback(
-        () => {
-            if (!onValidate) {
-                return true;
-            }
-
-            const newErrors = onValidate(formState);
-            setErrors(newErrors);
-            return isValid(newErrors);
-        },
-        [formState, onValidate]
-    );
-
-    // function to save the changed settings via API
-    const handleSave = useCallback(
-        async (options: {force?: boolean} = {}) => {
-            if (!validate()) {
-                return false;
-            }
-
-            if (saveState !== 'unsaved' && !options.force) {
-                return true;
-            }
-
-            setSaveState('saving');
-            try {
-                await onSave(formState);
-                setSaveState('saved');
-                return true;
-            } catch (e) {
-                await onSaveError?.(e);
-                setSaveState('unsaved');
-                throw e;
-            }
-        },
-        [formState, saveState, onSave, onSaveError, validate]
-    );
-
-    const updateForm = useCallback((updater: (state: State) => State) => {
-        setFormState(updater);
-        setSaveState('unsaved');
-    }, []);
-
-    return {
-        formState,
-        saveState,
-        handleSave,
-        updateForm,
-        setFormState,
-        reset() {
-            setFormState(initialState);
-            setSaveState('');
-        },
-        validate,
-        isValid: isValid(errors),
-        clearError: (field: string) => {
-            setErrors(state => ({...state, [field]: ''}));
-        },
-        errors,
-        setErrors
-    };
-};
-
-export default useForm;
diff --git a/apps/admin-x-settings/src/hooks/useLimiter.tsx b/apps/admin-x-settings/src/hooks/useLimiter.tsx
index 847a07b290b..6631f727519 100644
--- a/apps/admin-x-settings/src/hooks/useLimiter.tsx
+++ b/apps/admin-x-settings/src/hooks/useLimiter.tsx
@@ -1,6 +1,6 @@
 import useStaffUsers from './useStaffUsers';
-import {useBrowseMembers} from '../api/members';
-import {useBrowseNewsletters} from '../api/newsletters';
+import {useBrowseMembers} from '@tryghost/admin-x-framework/api/members';
+import {useBrowseNewsletters} from '@tryghost/admin-x-framework/api/newsletters';
 import {useEffect, useMemo, useState} from 'react';
 import {useGlobalData} from '../components/providers/GlobalDataProvider';
 
diff --git a/apps/admin-x-settings/src/hooks/usePagination.tsx b/apps/admin-x-settings/src/hooks/usePagination.tsx
deleted file mode 100644
index 675db0d979a..00000000000
--- a/apps/admin-x-settings/src/hooks/usePagination.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import {Meta} from '../utils/api/hooks';
-import {useEffect, useState} from 'react';
-
-export interface PaginationData {
-    page: number;
-    pages: number | null;
-    total: number | null;
-    limit: number;
-    setPage: (page: number) => void;
-    nextPage: () => void;
-    prevPage: () => void;
-}
-
-export const usePage = () => {
-    const [page, setPage] = useState(1);
-    return {page, setPage};
-};
-
-export const usePagination = ({limit, meta, page, setPage}: {meta?: Meta, 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);
-
-    useEffect(() => {
-        if (meta) {
-            setPrevMeta(meta);
-
-            if (meta.pagination.pages > 0 && meta.pagination.pages < page) {
-                // We probably deleted an item when on the last page: go one page back automatically
-                setPage(meta.pagination.pages);
-            }
-        }
-    }, [meta, setPage, page]);
-
-    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)),
-        prevPage: () => setPage(Math.max(1, page - 1))
-    };
-};
diff --git a/apps/admin-x-settings/src/hooks/usePermissions.ts b/apps/admin-x-settings/src/hooks/usePermissions.ts
deleted file mode 100644
index ef1e33815c3..00000000000
--- a/apps/admin-x-settings/src/hooks/usePermissions.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {UserRoleType} from '../api/roles';
-import {useGlobalData} from '../components/providers/GlobalDataProvider';
-
-export const usePermission = (userRoles:string[]) => {
-    const {currentUser} = useGlobalData();
-    const currentUserRoles = currentUser?.roles.map(role => role.name);
-    if (!currentUserRoles) {
-        return false;
-    }
-    return userRoles.some((role => currentUserRoles.includes(role as UserRoleType)));
-};
diff --git a/apps/admin-x-settings/src/hooks/usePinturaEditor.ts b/apps/admin-x-settings/src/hooks/usePinturaEditor.ts
index 7441c499f85..3228290bc43 100644
--- a/apps/admin-x-settings/src/hooks/usePinturaEditor.ts
+++ b/apps/admin-x-settings/src/hooks/usePinturaEditor.ts
@@ -1,16 +1,10 @@
 import * as Sentry from '@sentry/react';
-import {Config} from '../api/config';
-import {Setting} from '../api/settings';
-import {getGhostPaths} from '../utils/helpers';
-import {getSettingValues} from '../api/settings';
+import {Config} from '@tryghost/admin-x-framework/api/config';
+import {Setting, getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {getGhostPaths} from '@tryghost/admin-x-framework/helpers';
 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 +44,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 +97,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 +135,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 +213,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 +229,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 +245,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/useRouting.tsx b/apps/admin-x-settings/src/hooks/useRouting.tsx
deleted file mode 100644
index 576406de263..00000000000
--- a/apps/admin-x-settings/src/hooks/useRouting.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import {RouteContext} from '../components/providers/RoutingProvider';
-import {useContext} from 'react';
-
-const useRouting = () => useContext(RouteContext);
-
-export default useRouting;
diff --git a/apps/admin-x-settings/src/hooks/useSaveButton.ts b/apps/admin-x-settings/src/hooks/useSaveButton.ts
new file mode 100644
index 00000000000..ac2bce71103
--- /dev/null
+++ b/apps/admin-x-settings/src/hooks/useSaveButton.ts
@@ -0,0 +1,32 @@
+import {SaveHandler} from '@tryghost/admin-x-framework/hooks';
+import {useState} from 'react';
+
+export const useSaveButton = (handleSave: SaveHandler, fakeWhenUnchanged?: boolean) => {
+    const [savingTitle, setSavingTitle] = useState('Save');
+    const [isSaving, setIsSaving] = useState(false);
+
+    const onSaveClick = async () => {
+        setIsSaving(true);
+        setSavingTitle('Saving');
+
+        // Execute the save operation
+        await handleSave({fakeWhenUnchanged});
+
+        // After a second, change the label to 'Saved'
+        setTimeout(() => {
+            setSavingTitle('Saved');
+
+            // After yet another second, reset to 'Save'
+            setTimeout(() => {
+                setSavingTitle('Save');
+                setIsSaving(false);
+            }, 1000);
+        }, 1000);
+    };
+
+    return {
+        savingTitle,
+        isSaving,
+        onSaveClick
+    };
+};
diff --git a/apps/admin-x-settings/src/hooks/useScrollSection.tsx b/apps/admin-x-settings/src/hooks/useScrollSection.tsx
index bd5b0dedf25..cf4eb60d5e0 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-scroller')!;
     const top = element.getBoundingClientRect().top + root.scrollTop;
 
     root.scrollTo({
@@ -31,7 +31,8 @@ const scrollToSection = (element: HTMLDivElement, doneInitialScroll: boolean) =>
 };
 
 const scrollSidebarNav = (navElement: HTMLLIElement, doneInitialScroll: boolean) => {
-    const sidebar = document.getElementById('admin-x-settings-sidebar')!;
+    // const sidebar = document.getElementById('admin-x-settings-sidebar')!;
+    const sidebar = document.getElementById('admin-x-settings-sidebar-scroller')!;
 
     const bounds = navElement.getBoundingClientRect();
 
diff --git a/apps/admin-x-settings/src/hooks/useSettingGroup.tsx b/apps/admin-x-settings/src/hooks/useSettingGroup.tsx
index 2e4dfc9ad10..8af1ca7cdd6 100644
--- a/apps/admin-x-settings/src/hooks/useSettingGroup.tsx
+++ b/apps/admin-x-settings/src/hooks/useSettingGroup.tsx
@@ -1,12 +1,9 @@
 import React, {useEffect, useRef, useState} from 'react';
-import useForm, {ErrorMessages, SaveState} from './useForm';
-import useGlobalDirtyState from './useGlobalDirtyState';
-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 {toast} from 'react-hot-toast';
+import {ErrorMessages, OkProps, SaveHandler, SaveState, useForm, useHandleError} from '@tryghost/admin-x-framework/hooks';
+import {Setting, SettingValue, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
+import {SiteData} from '@tryghost/admin-x-framework/api/site';
 import {useGlobalData} from '../components/providers/GlobalDataProvider';
+import {useGlobalDirtyState} from '@tryghost/admin-x-design-system';
 
 interface LocalSetting extends Setting {
     dirty?: boolean;
@@ -18,16 +15,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 +35,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 +60,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]);
@@ -107,15 +106,10 @@ const useSettingGroup = ({onValidate}: {onValidate?: () => ErrorMessages} = {}):
         focusRef,
         siteData,
         handleSave: async () => {
-            toast.remove();
             const result = await handleSave();
             if (result) {
                 setEditing(false);
             } else {
-                showToast({
-                    type: 'pageError',
-                    message: 'Can\'t save settings! One or more fields have errors, please double check that you\'ve filled all mandatory fields.'
-                });
             }
             return result;
         },
@@ -124,7 +118,8 @@ const useSettingGroup = ({onValidate}: {onValidate?: () => ErrorMessages} = {}):
         handleEditingChange,
         validate,
         errors,
-        clearError
+        clearError,
+        okProps
     };
 };
 
diff --git a/apps/admin-x-settings/src/hooks/useStaffUsers.tsx b/apps/admin-x-settings/src/hooks/useStaffUsers.tsx
index 97dfb74b40b..60e3d6f3127 100644
--- a/apps/admin-x-settings/src/hooks/useStaffUsers.tsx
+++ b/apps/admin-x-settings/src/hooks/useStaffUsers.tsx
@@ -1,6 +1,6 @@
-import {User, useBrowseUsers} from '../api/users';
-import {UserInvite, useBrowseInvites} from '../api/invites';
-import {useBrowseRoles} from '../api/roles';
+import {User, useBrowseUsers} from '@tryghost/admin-x-framework/api/users';
+import {UserInvite, useBrowseInvites} from '@tryghost/admin-x-framework/api/invites';
+import {useBrowseRoles} from '@tryghost/admin-x-framework/api/roles';
 import {useGlobalData} from '../components/providers/GlobalDataProvider';
 import {useMemo} from 'react';
 
diff --git a/apps/admin-x-settings/src/main.tsx b/apps/admin-x-settings/src/main.tsx
index abc3657d807..a99e69c9555 100644
--- a/apps/admin-x-settings/src/main.tsx
+++ b/apps/admin-x-settings/src/main.tsx
@@ -1,62 +1,46 @@
-import './styles/demo.css';
+import './styles/index.css';
 import App from './App.tsx';
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import {DefaultHeaderTypes} from './unsplash/UnsplashTypes.ts';
+import renderStandaloneApp from '@tryghost/admin-x-framework/test/render';
 
-ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
-    <React.StrictMode>
-        <App
-            externalNavigate={() => {}}
-            fetchKoenigLexical={() => {
-                return Promise.resolve();
-            }}
-            ghostVersion='5.x'
-            officialThemes={[{
-                name: 'Source',
-                category: 'News',
-                previewUrl: 'https://source.ghost.io/',
-                ref: 'default',
-                image: 'assets/img/themes/Source.png',
-                variants: [
-                    {
-                        category: 'Magazine',
-                        previewUrl: 'https://source-magazine.ghost.io/',
-                        image: 'assets/img/themes/Source-Magazine.png'
-                    },
-                    {
-                        category: 'Newsletter',
-                        previewUrl: 'https://source-newsletter.ghost.io/',
-                        image: 'assets/img/themes/Source-Newsletter.png'
-                    }
-                ]
-            }, {
-                name: 'Casper',
-                category: 'Blog',
-                previewUrl: 'https://demo.ghost.io/',
-                ref: 'default',
-                image: 'assets/img/themes/Casper.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: 'Edition',
+renderStandaloneApp(App, {
+    officialThemes: [{
+        name: 'Source',
+        category: 'News',
+        previewUrl: 'https://source.ghost.io/',
+        ref: 'default',
+        image: 'assets/img/themes/Source.png',
+        variants: [
+            {
+                category: 'Magazine',
+                previewUrl: 'https://source-magazine.ghost.io/',
+                image: 'assets/img/themes/Source-Magazine.png'
+            },
+            {
                 category: 'Newsletter',
-                url: 'https://github.com/TryGhost/Edition',
-                previewUrl: 'https://edition.ghost.io/',
-                ref: 'TryGhost/Edition',
-                image: 'assets/img/themes/Edition.png'
-            }]}
-            sentryDSN={null}
-            unsplashConfig={{} as DefaultHeaderTypes}
-            zapierTemplates={[]}
-            onDelete={() => {}}
-            onInvalidate={() => {}}
-            onUpdate={() => {}}
-        />
-    </React.StrictMode>
-);
+                previewUrl: 'https://source-newsletter.ghost.io/',
+                image: 'assets/img/themes/Source-Newsletter.png'
+            }
+        ]
+    }, {
+        name: 'Casper',
+        category: 'Blog',
+        previewUrl: 'https://demo.ghost.io/',
+        ref: 'default',
+        image: 'assets/img/themes/Casper.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: 'Edition',
+        category: 'Newsletter',
+        url: 'https://github.com/TryGhost/Edition',
+        previewUrl: 'https://edition.ghost.io/',
+        ref: 'TryGhost/Edition',
+        image: 'assets/img/themes/Edition.png'
+    }],
+    zapierTemplates: []
+});
diff --git a/apps/admin-x-settings/src/styles/demo.css b/apps/admin-x-settings/src/styles/demo.css
deleted file mode 100644
index 7b78e515c9f..00000000000
--- a/apps/admin-x-settings/src/styles/demo.css
+++ /dev/null
@@ -1,65 +0,0 @@
-@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;
-    -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;
-}
\ 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..033c218ffd9 100644
--- a/apps/admin-x-settings/src/styles/index.css
+++ b/apps/admin-x-settings/src/styles/index.css
@@ -1,97 +1,51 @@
-@import './preflight.css';
+@import '@tryghost/admin-x-design-system/styles.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;
-        }
-    }
+/* Only settings related overrides */
+.gh-update-banner ~ * #admin-x-settings-content {
+    top: 48px;
 }
 
-.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;
+.gh-update-banner ~ * #done-button-container {
+    top: 48px;
 }
 
 @media (max-width: 860px) {
-    .admin-x-base {
-        height: calc(100vh - 55px);
+    .gh-update-banner ~ * #admin-x-settings-sidebar-scroller {
+        position: fixed;
+        top: 48px;
     }
-}
 
-.admin-x-base.dark {
-    color: #FAFAFB;
-}
-
-.admin-x-base.dark .gh-loading-orb-container {
-    background-color: #000000;
+    .gh-update-banner ~ * #done-button-container {
+        top: 60px;
+    }
 }
 
-.admin-x-base.dark .gh-loading-orb {
-    filter: invert(100%);
-}
+@media (max-width: 600px) {
+    .gh-update-banner ~ * #admin-x-settings-sidebar-scroller {
+        position: fixed;
+        top: 72px;
+    }
 
-.admin-x-base .no-scrollbar::-webkit-scrollbar {
-    display: none; /* Chrome */
+    .gh-update-banner ~ * #done-button-container {
+        top: 84px;
+    }
 }
 
-.admin-x-base .no-scrollbar {
-    -ms-overflow-style: none;  /* IE and Edge */
-    scrollbar-width: none;  /* Firefox */
+.admin-x-base {
+    opacity: 1;
+    animation-name: openAnimation;
+    animation-iteration-count: 1;
+    animation-timing-function: ease;
+    animation-duration: 0.35s;
 }
 
-/* Prose classes are for formatting arbitrary HTML that comes from the API */
-.gh-prose-links a {
-    color: #30CF43;
+@keyframes openAnimation {
+    0% {
+        opacity: 0;
+        transform: translateY(20px) scale(0.95);
+    }
+    100% {
+        opacity: 1;
+        transform: translateY(0px) scale(1.0);
+    }
 }
\ No newline at end of file
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/unsplash/UnsplashSearchModal.tsx b/apps/admin-x-settings/src/unsplash/UnsplashSearchModal.tsx
deleted file mode 100644
index 86c00216c1a..00000000000
--- a/apps/admin-x-settings/src/unsplash/UnsplashSearchModal.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import MasonryService from './masonry/MasonryService';
-import Portal from './portal';
-import React, {useMemo, useRef, useState} from 'react';
-import UnsplashGallery from './ui/UnsplashGallery';
-import UnsplashSelector from './ui/UnsplashSelector';
-import {DefaultHeaderTypes, Photo} from './UnsplashTypes';
-import {PhotoUseCases} from './photo/PhotoUseCase';
-import {UnsplashProvider} from './api/UnsplashProvider';
-import {UnsplashService} from './UnsplashService';
-
-interface UnsplashModalProps {
-    onClose: () => void;
-    onImageInsert: (image: Photo) => void;
-    unsplashConf: {
-      defaultHeaders: DefaultHeaderTypes;
-    };
-  }
-
-const UnsplashSearchModal : React.FC<UnsplashModalProps> = ({onClose, onImageInsert, unsplashConf}) => {
-    const unsplashRepo = useMemo(() => new UnsplashProvider(unsplashConf.defaultHeaders), [unsplashConf.defaultHeaders]);
-    const photoUseCase = useMemo(() => new PhotoUseCases(unsplashRepo), [unsplashRepo]);
-    const masonryService = useMemo(() => new MasonryService(3), []);
-    const UnsplashLib = useMemo(() => new UnsplashService(photoUseCase, masonryService), [photoUseCase, masonryService]);
-    const galleryRef = useRef<HTMLDivElement | null>(null);
-    const [scrollPos, setScrollPos] = useState<number>(0);
-    const [lastScrollPos, setLastScrollPos] = useState<number>(0);
-    const [isLoading, setIsLoading] = useState<boolean>(UnsplashLib.searchIsRunning() || true);
-    const initLoadRef = useRef<boolean>(false);
-    const [searchTerm, setSearchTerm] = useState<string>('');
-    const [zoomedImg, setZoomedImg] = useState<Photo | null>(null);
-    const [dataset, setDataset] = useState<Photo[][] | []>([]);
-
-    React.useEffect(() => {
-        if (galleryRef.current && zoomedImg === null && lastScrollPos !== 0) {
-            galleryRef.current.scrollTop = lastScrollPos;
-            setLastScrollPos(0);
-        }
-    }, [zoomedImg, scrollPos, lastScrollPos]);
-
-    React.useEffect(() => {
-        const handleKeyDown = (e:KeyboardEvent) => {
-            if (e.key === 'Escape') {
-                onClose();
-            }
-        };
-        window.addEventListener('keydown', handleKeyDown);
-        return () => {
-            window.removeEventListener('keydown', handleKeyDown);
-        };
-    }, [onClose]);
-
-    React.useEffect(() => {
-        const ref = galleryRef.current;
-        if (!zoomedImg) {
-            if (ref) {
-                ref.addEventListener('scroll', () => {
-                    setScrollPos(ref.scrollTop);
-                });
-            }
-            // unmount
-            return () => {
-                if (ref) {
-                    ref.removeEventListener('scroll', () => {
-                        setScrollPos(ref.scrollTop);
-                    });
-                }
-            };
-        }
-    }, [galleryRef, zoomedImg]);
-
-    const loadInitPhotos = React.useCallback(async () => {
-        if (initLoadRef.current === false || searchTerm.length === 0) {
-            setDataset([]);
-            UnsplashLib.clearPhotos();
-            await UnsplashLib.loadNew();
-            const columns = UnsplashLib.getColumns();
-            setDataset(columns || []);
-            if (galleryRef.current && galleryRef.current.scrollTop !== 0) {
-                galleryRef.current.scrollTop = 0;
-            }
-            setIsLoading(false);
-        }
-    }, [UnsplashLib, searchTerm]);
-
-    const handleSearch = async (e: React.ChangeEvent<HTMLInputElement>) => {
-        const query = e.target.value;
-        if (query.length > 2) {
-            setZoomedImg(null);
-            setSearchTerm(query);
-        }
-        if (query.length === 0) {
-            setSearchTerm('');
-            initLoadRef.current = false;
-            await loadInitPhotos();
-        }
-    };
-
-    const search = React.useCallback(async () => {
-        if (searchTerm) {
-            setIsLoading(true);
-            setDataset([]);
-            UnsplashLib.clearPhotos();
-            await UnsplashLib.updateSearch(searchTerm);
-            const columns = UnsplashLib.getColumns();
-            if (columns) {
-                setDataset(columns);
-            }
-            if (galleryRef.current && galleryRef.current.scrollTop !== 0) {
-                galleryRef.current.scrollTop = 0;
-            }
-            setIsLoading(false);
-        }
-    }, [searchTerm, UnsplashLib]);
-
-    React.useEffect(() => {
-        const timeoutId = setTimeout(async () => {
-            if (searchTerm.length > 2) {
-                await search();
-            } else {
-                await loadInitPhotos();
-            }
-        }, 300);
-        return () => {
-            initLoadRef.current = true;
-            clearTimeout(timeoutId);
-        };
-    }, [searchTerm, search, loadInitPhotos]);
-
-    const loadMorePhotos = React.useCallback(async () => {
-        setIsLoading(true);
-        await UnsplashLib.loadNextPage();
-        const columns = UnsplashLib.getColumns();
-        setDataset(columns || []);
-        setIsLoading(false);
-    }, [UnsplashLib]);
-
-    React.useEffect(() => {
-        const ref = galleryRef.current;
-        if (ref) {
-            const handleScroll = async () => {
-                if (zoomedImg === null && ref.scrollTop + ref.clientHeight >= ref.scrollHeight - 1000) {
-                    await loadMorePhotos();
-                }
-            };
-            ref.addEventListener('scroll', handleScroll);
-            return () => {
-                ref.removeEventListener('scroll', handleScroll);
-            };
-        }
-    }, [galleryRef, loadMorePhotos, zoomedImg]);
-
-    const selectImg = (payload:Photo) => {
-        if (payload) {
-            setZoomedImg(payload);
-            setLastScrollPos(scrollPos);
-        }
-
-        if (payload === null) {
-            setZoomedImg(null);
-            if (galleryRef.current) {
-                galleryRef.current.scrollTop = lastScrollPos;
-            }
-        }
-    };
-
-    async function insertImage(image:Photo) {
-        if (image.src) {
-            UnsplashLib.triggerDownload(image);
-            onImageInsert(image);
-        }
-    }
-    return (
-        <Portal classNames='admin-x-settings'>
-            <UnsplashSelector
-                closeModal={onClose}
-                handleSearch={handleSearch}
-            >
-                <UnsplashGallery
-                    dataset={dataset}
-                    error={null}
-                    galleryRef={galleryRef}
-                    insertImage={insertImage}
-                    isLoading={isLoading}
-                    selectImg={selectImg}
-                    zoomed={zoomedImg}
-                />
-            </UnsplashSelector>
-        </Portal>
-    );
-};
-
-export default UnsplashSearchModal;
diff --git a/apps/admin-x-settings/src/unsplash/UnsplashService.ts b/apps/admin-x-settings/src/unsplash/UnsplashService.ts
deleted file mode 100644
index 2bc0941563b..00000000000
--- a/apps/admin-x-settings/src/unsplash/UnsplashService.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import MasonryService from './masonry/MasonryService';
-import {Photo} from './UnsplashTypes';
-import {PhotoUseCases} from './photo/PhotoUseCase';
-
-export interface IUnsplashService {
-    loadNew(): Promise<void>;
-    layoutPhotos(): void;
-    getColumns(): Photo[][] | [] | null;
-    updateSearch(term: string): Promise<void>;
-    loadNextPage(): Promise<void>;
-    clearPhotos(): void;
-    triggerDownload(photo: Photo): void;
-    photos: Photo[];
-    searchIsRunning(): boolean;
-}
-
-export class UnsplashService implements IUnsplashService {
-    private photoUseCases: PhotoUseCases;
-    private masonryService: MasonryService;
-    public photos: Photo[] = [];
-  
-    constructor(photoUseCases: PhotoUseCases, masonryService: MasonryService) {
-        this.photoUseCases = photoUseCases;
-        this.masonryService = masonryService;
-    }
-  
-    async loadNew() {
-        let images = await this.photoUseCases.fetchPhotos();
-        this.photos = images;
-        await this.layoutPhotos();
-    }
-  
-    async layoutPhotos() {
-        this.masonryService.reset();
-        this.photos.forEach((photo) => {
-            photo.ratio = photo.height / photo.width;
-            this.masonryService.addPhotoToColumns(photo);
-        });
-    }
-  
-    getColumns() {
-        return this.masonryService.getColumns();
-    }
-  
-    async updateSearch(term: string) {
-        let results = await this.photoUseCases.searchPhotos(term);
-        this.photos = results;
-        this.layoutPhotos();
-    }
-  
-    async loadNextPage() {
-        const newPhotos = await this.photoUseCases.fetchNextPage() || [];
-        this.photos = [...this.photos, ...newPhotos];
-        this.layoutPhotos();
-    }
-  
-    clearPhotos() {
-        this.photos = [];
-    }
-
-    triggerDownload(photo: Photo) {
-        this.photoUseCases.triggerDownload(photo);
-    }
-
-    searchIsRunning() {
-        return this.photoUseCases.searchIsRunning();
-    }
-}
diff --git a/apps/admin-x-settings/src/unsplash/UnsplashTypes.ts b/apps/admin-x-settings/src/unsplash/UnsplashTypes.ts
deleted file mode 100644
index 3c78aa223f9..00000000000
--- a/apps/admin-x-settings/src/unsplash/UnsplashTypes.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-export type URLS = {
-    raw: string;
-    full: string;
-    regular: string;
-    small: string;
-    thumb: string;
-  };
-  
-export type Links = {
-    self: string;
-    html: string;
-    download: string;
-    download_location: string;
-  };
-  
-export type ProfileImage = {
-    small: string;
-    medium: string;
-    large: string;
-  };
-  
-export type User = {
-    id: string;
-    updated_at: string;
-    username: string;
-    name: string;
-    first_name: string;
-    last_name: string;
-    twitter_username: string;
-    portfolio_url: string;
-    bio: string;
-    location: string;
-    links: Links;
-    profile_image: ProfileImage;
-    instagram_username: string;
-    total_collections: number;
-    total_likes: number;
-    total_photos: number;
-    accepted_tos: boolean;
-    for_hire: boolean;
-    social: {
-      instagram_username: string;
-      portfolio_url: string;
-      twitter_username: string;
-      paypal_email: null | string;
-    };
-  };
-  
-export type Photo = {
-    id: string;
-    slug: string;
-    created_at: string;
-    updated_at: string;
-    promoted_at: string | null; // Nullable
-    width: number;
-    height: number;
-    color: string;
-    blur_hash: string;
-    description: null | string; // Nullable
-    alt_description: string;
-    breadcrumbs: []; // You could make this more specific
-    urls: URLS;
-    links: Links;
-    likes: number;
-    liked_by_user: boolean;
-    current_user_collections: []; // You could make this more specific
-    sponsorship: null | []; // Nullable
-    topic_submissions: []; // You could make this more specific
-    user: User;
-    ratio: number;
-    src? : string;
-  };
-
-export type DefaultHeaderTypes = {
-    Authorization: string;
-    'Accept-Version': string;
-    'Content-Type': string;
-    'App-Pragma': string;
-    'X-Unsplash-Cache': boolean;
-};
diff --git a/apps/admin-x-settings/src/unsplash/api/InMemoryUnsplashProvider.ts b/apps/admin-x-settings/src/unsplash/api/InMemoryUnsplashProvider.ts
deleted file mode 100644
index c58b530539d..00000000000
--- a/apps/admin-x-settings/src/unsplash/api/InMemoryUnsplashProvider.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// for testing purposes
-import {Photo} from '../UnsplashTypes';
-import {fixturePhotos} from './unsplashFixtures';
-
-export class InMemoryUnsplashProvider {
-    photos: Photo[] = fixturePhotos;
-    PAGINATION: { [key: string]: string } = {};
-    REQUEST_IS_RUNNING: boolean = false;
-    SEARCH_IS_RUNNING: boolean = false;
-    LAST_REQUEST_URL: string = '';
-    ERROR: string | null = null;
-    IS_LOADING: boolean = false;
-    currentPage: number = 1;
-
-    public async fetchPhotos(): Promise<Photo[]> {
-        this.IS_LOADING = true;
-
-        const start = (this.currentPage - 1) * 30;
-        const end = this.currentPage * 30;
-        this.currentPage += 1;
-
-        this.IS_LOADING = false;
-
-        return this.photos.slice(start, end);
-    }
-
-    public async fetchNextPage(): Promise<Photo[] | null> {
-        if (this.REQUEST_IS_RUNNING || this.SEARCH_IS_RUNNING) {
-            return null;
-        }
-
-        const photos = await this.fetchPhotos();
-        return photos.length > 0 ? photos : null;
-    }
-
-    public async searchPhotos(term: string): Promise<Photo[]> {
-        this.SEARCH_IS_RUNNING = true;
-        const filteredPhotos = this.photos.filter(photo => photo.description?.includes(term) || photo.alt_description?.includes(term)
-        );
-        this.SEARCH_IS_RUNNING = false;
-
-        return filteredPhotos;
-    }
-
-    searchIsRunning(): boolean {
-        return this.SEARCH_IS_RUNNING;
-    }
-
-    triggerDownload(photo: Photo): void {
-        () => {
-            photo;
-        };
-    }
-}
diff --git a/apps/admin-x-settings/src/unsplash/api/UnsplashProvider.ts b/apps/admin-x-settings/src/unsplash/api/UnsplashProvider.ts
deleted file mode 100644
index 7050e629439..00000000000
--- a/apps/admin-x-settings/src/unsplash/api/UnsplashProvider.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import {DefaultHeaderTypes, Photo} from '../UnsplashTypes';
-
-export class UnsplashProvider {
-    API_URL: string = 'https://api.unsplash.com';
-    HEADERS: DefaultHeaderTypes;
-    ERROR: string | null = null;
-    PAGINATION: { [key: string]: string } = {};
-    REQUEST_IS_RUNNING: boolean = false;
-    SEARCH_IS_RUNNING: boolean = false;
-    LAST_REQUEST_URL: string = '';
-    IS_LOADING: boolean = false;
-
-    constructor(HEADERS: DefaultHeaderTypes) {
-        this.HEADERS = HEADERS;
-    }
-
-    private async makeRequest(url: string): Promise<Photo[] | {results: Photo[]} | null> {
-        if (this.REQUEST_IS_RUNNING) {
-            return null;
-        }
-    
-        this.LAST_REQUEST_URL = url;
-        const options = {
-            method: 'GET',
-            headers: this.HEADERS as unknown as HeadersInit
-        };
-    
-        try {
-            this.REQUEST_IS_RUNNING = true;
-            this.IS_LOADING = true;
-    
-            const response = await fetch(url, options);
-            const checkedResponse = await this.checkStatus(response);
-            this.extractPagination(checkedResponse);
-    
-            const jsonResponse = await checkedResponse.json();
-            
-            if ('results' in jsonResponse) {
-                return jsonResponse.results;
-            } else {
-                return jsonResponse;
-            }
-        } catch (error) {
-            this.ERROR = error as string;
-            return null;
-        } finally {
-            this.REQUEST_IS_RUNNING = false;
-            this.IS_LOADING = false;
-        }
-    }
-
-    private extractPagination(response: Response): Response {
-        let linkRegex = new RegExp('<(.*)>; rel="(.*)"');
-
-        let links = [];
-
-        let pagination : { [key: string]: string } = {};
-
-        for (let entry of response.headers.entries()) {
-            if (entry[0] === 'link') {
-                links.push(entry[1]);
-            }
-        }
-
-        if (links) {
-            links.toString().split(',').forEach((link) => {
-                if (link){
-                    let linkParts = linkRegex.exec(link);
-                    if (linkParts) {
-                        pagination[linkParts[2]] = linkParts[1];
-                    }
-                }
-            });
-        }
-
-        this.PAGINATION = pagination;
-
-        return response;
-    }
-
-    public async fetchPhotos(): Promise<Photo[]> {
-        const url = `${this.API_URL}/photos?per_page=30`;
-        const request = await this.makeRequest(url);
-        return request as Photo[];
-    }
-
-    public async fetchNextPage(): Promise<Photo[] | null> {
-        if (this.REQUEST_IS_RUNNING) {
-            return null;
-        }
-
-        if (this.SEARCH_IS_RUNNING) {
-            return null;
-        }
-
-        if (this.PAGINATION.next) {
-            const url = `${this.PAGINATION.next}`;
-            const response = await this.makeRequest(url);
-            if (response) {
-                return response as Photo[];
-            }
-        }
-
-        return null;
-    }
-
-    public async searchPhotos(term: string): Promise<Photo[]> {
-        const url = `${this.API_URL}/search/photos?query=${term}&per_page=30`;
-
-        const request = await this.makeRequest(url);
-        if (request) {
-            return request as Photo[];
-        }
-
-        return [];
-    }
-
-    public async triggerDownload(photo: Photo): Promise<void> {
-        if (photo.links.download_location) {
-            await this.makeRequest(photo.links.download_location);
-        }
-    }
-
-    private async checkStatus(response: Response): Promise<Response> {
-        if (response.status >= 200 && response.status < 300) {
-            return response;
-        }
-    
-        let errorText = '';
-        let responseTextPromise: Promise<string>; // or Promise<string> if you know the type
-    
-        const contentType = response.headers.get('content-type');
-        if (contentType === 'application/json') {
-            responseTextPromise = response.json().then(json => (json).errors[0]); // or cast to a specific type if you know it
-        } else if (contentType === 'text/xml') {
-            responseTextPromise = response.text();
-        } else {
-            throw new Error('Unsupported content type');
-        }
-    
-        return responseTextPromise.then((responseText: string) => { // you can type responseText based on what you expect
-            if (response.status === 403 && response.headers.get('x-ratelimit-remaining') === '0') {
-                // we've hit the rate limit on the API
-                errorText = 'Unsplash API rate limit reached, please try again later.';
-            }
-    
-            errorText = errorText || responseText || `Error ${response.status}: Uh-oh! Trouble reaching the Unsplash API`;
-    
-            // set error text for display in UI
-            this.ERROR = errorText;
-    
-            // throw error to prevent further processing
-            let error = new Error(errorText) as Error; // or create a custom Error class
-            throw error;
-        });
-    }
-
-    searchIsRunning(): boolean {
-        return this.SEARCH_IS_RUNNING;
-    }
-}
diff --git a/apps/admin-x-settings/src/unsplash/api/unsplashFixtures.ts b/apps/admin-x-settings/src/unsplash/api/unsplashFixtures.ts
deleted file mode 100644
index 3a56b8ed6bd..00000000000
--- a/apps/admin-x-settings/src/unsplash/api/unsplashFixtures.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import {Photo} from '../UnsplashTypes';
-
-export const fixturePhotos: Photo[] = [
-    {
-        id: '1',
-        slug: 'photo1',
-        created_at: '2021-01-01',
-        updated_at: '2021-01-02',
-        promoted_at: null,
-        width: 1080,
-        height: 720,
-        color: '#ffffff',
-        blur_hash: 'abc123',
-        description: 'A nice photo',
-        alt_description: 'alt1',
-        breadcrumbs: [],
-        urls: {
-            raw: 'http://example.com/raw1',
-            full: 'http://example.com/full1',
-            regular: 'http://example.com/regular1',
-            small: 'http://example.com/small1',
-            thumb: 'http://example.com/thumb1'
-        },
-        links: {
-            self: 'http://example.com/self1',
-            html: 'http://example.com/html1',
-            download: 'http://example.com/download1',
-            download_location: 'http://example.com/download_location1'
-        },
-        likes: 100,
-        liked_by_user: true,
-        current_user_collections: [],
-        sponsorship: null,
-        topic_submissions: [],
-        user: {
-            id: 'user1',
-            updated_at: '2021-01-01',
-            username: 'user1',
-            name: 'User One',
-            first_name: 'User',
-            last_name: 'One',
-            twitter_username: 'user1_twitter',
-            portfolio_url: 'http://portfolio1.com',
-            bio: 'Bio1',
-            location: 'Location1',
-            links: {
-                self: 'http://example.com/self1',
-                html: 'http://example.com/html1',
-                download: 'http://example.com/download1',
-                download_location: 'http://example.com/download_location1'
-            },
-            profile_image: {
-                small: 'http://small1.com',
-                medium: 'http://medium1.com',
-                large: 'http://large1.com'
-            },
-            instagram_username: 'insta1',
-            total_collections: 10,
-            total_likes: 100,
-            total_photos: 1000,
-            accepted_tos: true,
-            for_hire: false,
-            social: {
-                instagram_username: 'insta1',
-                portfolio_url: 'http://portfolio1.com',
-                twitter_username: 'user1_twitter',
-                paypal_email: null
-            }
-        },
-        ratio: 1.5,
-        src: 'http://src1.com'
-    },
-    {
-        id: '2',
-        slug: 'photo1',
-        created_at: '2021-01-01',
-        updated_at: '2021-01-02',
-        promoted_at: null,
-        width: 1080,
-        height: 720,
-        color: '#ffffff',
-        blur_hash: 'abc123',
-        description: 'hello world',
-        alt_description: 'alt1',
-        breadcrumbs: [],
-        urls: {
-            raw: 'http://example.com/raw1',
-            full: 'http://example.com/full1',
-            regular: 'http://example.com/regular1',
-            small: 'http://example.com/small1',
-            thumb: 'http://example.com/thumb1'
-        },
-        links: {
-            self: 'http://example.com/self1',
-            html: 'http://example.com/html1',
-            download: 'http://example.com/download1',
-            download_location: 'http://example.com/download_location1'
-        },
-        likes: 100,
-        liked_by_user: true,
-        current_user_collections: [],
-        sponsorship: null,
-        topic_submissions: [],
-        user: {
-            id: 'user1',
-            updated_at: '2021-01-01',
-            username: 'user1',
-            name: 'User One',
-            first_name: 'User',
-            last_name: 'One',
-            twitter_username: 'user1_twitter',
-            portfolio_url: 'http://portfolio1.com',
-            bio: 'Bio1',
-            location: 'Location1',
-            links: {
-                self: 'http://example.com/self1',
-                html: 'http://example.com/html1',
-                download: 'http://example.com/download1',
-                download_location: 'http://example.com/download_location1'
-            },
-            profile_image: {
-                small: 'http://small1.com',
-                medium: 'http://medium1.com',
-                large: 'http://large1.com'
-            },
-            instagram_username: 'insta1',
-            total_collections: 10,
-            total_likes: 100,
-            total_photos: 1000,
-            accepted_tos: true,
-            for_hire: false,
-            social: {
-                instagram_username: 'insta1',
-                portfolio_url: 'http://portfolio1.com',
-                twitter_username: 'user1_twitter',
-                paypal_email: null
-            }
-        },
-        ratio: 1.5,
-        src: 'http://src1.com'
-    }
-];
diff --git a/apps/admin-x-settings/src/unsplash/assets/kg-card-type-unsplash.svg b/apps/admin-x-settings/src/unsplash/assets/kg-card-type-unsplash.svg
deleted file mode 100644
index 805b50f3e5d..00000000000
--- a/apps/admin-x-settings/src/unsplash/assets/kg-card-type-unsplash.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.43 122.41">
-    <path d="M83.86 54.15v34.13H38.57V54.15H0v68.26h122.43V54.15H83.86zM38.57 0h45.3v34.13h-45.3z"/>
-</svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/unsplash/assets/kg-close.svg b/apps/admin-x-settings/src/unsplash/assets/kg-close.svg
deleted file mode 100644
index 30bce27c3b5..00000000000
--- a/apps/admin-x-settings/src/unsplash/assets/kg-close.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" stroke-width="1.5" viewBox="0 0 24 24">
-    <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M.75 23.249l22.5-22.5M23.25 23.249L.75.749"/>
-</svg>
\ No newline at end of file
diff --git a/apps/admin-x-settings/src/unsplash/assets/kg-download.svg b/apps/admin-x-settings/src/unsplash/assets/kg-download.svg
deleted file mode 100644
index 2d1c72bfa4c..00000000000
--- a/apps/admin-x-settings/src/unsplash/assets/kg-download.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path d="M20 5.5l-8 8-8-8m-3.5 13h23" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" fill="none"/>
-</svg>
diff --git a/apps/admin-x-settings/src/unsplash/assets/kg-search.svg b/apps/admin-x-settings/src/unsplash/assets/kg-search.svg
deleted file mode 100644
index dd56d96d426..00000000000
--- a/apps/admin-x-settings/src/unsplash/assets/kg-search.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" stroke-width="1.5" viewBox="0 0 24 24">
-    <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M1.472 13.357a9.063 9.063 0 1 0 16.682-7.09 9.063 9.063 0 1 0-16.682 7.09Zm14.749 2.863 7.029 7.03"/>
-</svg>
diff --git a/apps/admin-x-settings/src/unsplash/assets/kg-unsplash-heart.svg b/apps/admin-x-settings/src/unsplash/assets/kg-unsplash-heart.svg
deleted file mode 100644
index 1b31419ccb0..00000000000
--- a/apps/admin-x-settings/src/unsplash/assets/kg-unsplash-heart.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 32 32">
-  <path d="M17.4 29c-.8.8-2 .8-2.8 0L2.3 16.2C-.8 13.1-.8 8 2.3 4.8c3.1-3.1 8.2-3.1 11.3 0L16 7.6l2.3-2.8c3.1-3.1 8.2-3.1 11.3 0 3.1 3.1 3.1 8.2 0 11.4L17.4 29z"/>
-</svg>
diff --git a/apps/admin-x-settings/src/unsplash/masonry/MasonryService.ts b/apps/admin-x-settings/src/unsplash/masonry/MasonryService.ts
deleted file mode 100644
index 6a624cf9837..00000000000
--- a/apps/admin-x-settings/src/unsplash/masonry/MasonryService.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {Photo} from '../UnsplashTypes';
-
-export default class MasonryService {
-    public columnCount: number;
-    public columns: Photo[][] | [] = [];
-    public columnHeights: number[] | null;
-  
-    constructor(columnCount: number = 3) {
-        this.columnCount = columnCount;
-        this.columns = [[]];
-        this.columnHeights = null;
-    }
-  
-    reset(): void {
-        let columns: Photo[][] = [];
-        let columnHeights: number[] = [];
-
-        for (let i = 0; i < this.columnCount; i += 1) {
-            columns[i] = [];
-            columnHeights[i] = 0;
-        }
-        
-        this.columns = columns;
-        this.columnHeights = columnHeights;
-    }
-  
-    addColumns(): void {
-        for (let i = 0; i < this.columnCount; i++) {
-            (this.columns as Photo[][]).push([]);
-            this.columnHeights!.push(0);
-        }
-    }
-  
-    addPhotoToColumns(photo: Photo): void {
-        if (!this.columns) {
-            this.reset();
-        }
-        let min = Math.min(...this.columnHeights!);
-        let columnIndex = this.columnHeights!.indexOf(min);
-
-      this.columnHeights![columnIndex] += 300 * photo.ratio;
-      this.columns![columnIndex].push(photo);
-    }
-  
-    getColumns(): Photo[][] | null {
-        return this.columns;
-    }
-
-    changeColumnCount(newColumnCount: number): void {
-        if (newColumnCount !== this.columnCount) {
-            this.columnCount = newColumnCount;
-            this.reset();
-        }
-    }
-}
diff --git a/apps/admin-x-settings/src/unsplash/photo/PhotoUseCase.ts b/apps/admin-x-settings/src/unsplash/photo/PhotoUseCase.ts
deleted file mode 100644
index d46cd8e1319..00000000000
--- a/apps/admin-x-settings/src/unsplash/photo/PhotoUseCase.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {InMemoryUnsplashProvider} from '../api/InMemoryUnsplashProvider';
-import {Photo} from '../UnsplashTypes';
-import {UnsplashProvider} from '../api/UnsplashProvider';
-
-export class PhotoUseCases {
-    private _provider: UnsplashProvider | InMemoryUnsplashProvider; // InMemoryUnsplashProvider is for testing purposes
-
-    constructor(provider: UnsplashProvider | InMemoryUnsplashProvider) {
-        this._provider = provider;
-    }
-
-    async fetchPhotos(): Promise<Photo[]> {
-        return await this._provider.fetchPhotos();
-    }
-
-    async searchPhotos(term: string): Promise<Photo[]> {
-        return await this._provider.searchPhotos(term);
-    }
-
-    async triggerDownload(photo: Photo): Promise<void> {
-        this._provider.triggerDownload(photo);
-    }
-
-    async fetchNextPage(): Promise<Photo[] | null> {
-        let request = await this._provider.fetchNextPage();
-
-        if (request) {
-            return request;
-        }
-
-        return null;
-    }
-
-    searchIsRunning(): boolean {
-        return this._provider.searchIsRunning();
-    }
-}
diff --git a/apps/admin-x-settings/src/unsplash/ui/UnsplashButton.tsx b/apps/admin-x-settings/src/unsplash/ui/UnsplashButton.tsx
deleted file mode 100644
index 174e5df73c8..00000000000
--- a/apps/admin-x-settings/src/unsplash/ui/UnsplashButton.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, {HTMLProps} from 'react';
-import {ReactComponent as DownloadIcon} from '../assets/kg-download.svg';
-import {ReactComponent as UnsplashHeartIcon} from '../assets/kg-unsplash-heart.svg';
-
-// Define the available icon types
-type ButtonIconType = 'heart' | 'download';
-
-// Define the props type
-interface UnsplashButtonProps extends HTMLProps<HTMLAnchorElement> {
-    icon?: ButtonIconType;
-    label?: string;
-}
-
-const BUTTON_ICONS: Record<ButtonIconType, React.ComponentType<Partial<React.SVGProps<SVGSVGElement>>>> = {
-    heart: UnsplashHeartIcon,
-    download: DownloadIcon
-};
-
-const UnsplashButton: React.FC<UnsplashButtonProps> = ({icon, label, ...props}) => {
-    let Icon = null;
-    if (icon) {
-        Icon = BUTTON_ICONS[icon];
-    }
-
-    return (
-        <a
-            className="flex h-8 shrink-0 cursor-pointer items-center rounded-md bg-white px-3 py-2 font-sans text-sm font-medium leading-6 text-grey-700 opacity-90 transition-all ease-in-out first-of-type:mr-3 hover:opacity-100"
-            onClick={e => e.stopPropagation()}
-            {...props}
-        >
-            {icon && Icon && <Icon className={`h-4 w-4 fill-red stroke-[3px] ${label && 'mr-1'}`} />}
-            {label && <span>{label}</span>}
-        </a>
-    );
-};
-
-export default UnsplashButton;
diff --git a/apps/admin-x-settings/src/unsplash/ui/UnsplashGallery.tsx b/apps/admin-x-settings/src/unsplash/ui/UnsplashGallery.tsx
deleted file mode 100644
index e1623580946..00000000000
--- a/apps/admin-x-settings/src/unsplash/ui/UnsplashGallery.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import React, {ReactNode, RefObject} from 'react';
-import UnsplashImage from './UnsplashImage';
-import UnsplashZoomed from './UnsplashZoomed';
-import {Photo} from '../UnsplashTypes';
-
-interface MasonryColumnProps {
-    children: ReactNode;
-}
-
-interface UnsplashGalleryColumnsProps {
-    columns?: Photo[][] | [];
-    insertImage?: any;
-    selectImg?: any;
-    zoomed?: Photo | null;
-}
-
-interface GalleryLayoutProps {
-    children?: ReactNode;
-    galleryRef: RefObject<HTMLDivElement>;
-    isLoading?: boolean;
-    zoomed?: Photo | null;
-}
-
-interface UnsplashGalleryProps extends GalleryLayoutProps {
-    error?: string | null;
-    dataset?: Photo[][] | [];
-    selectImg?: any;
-    insertImage?: any;
-}
-
-const UnsplashGalleryLoading: React.FC = () => {
-    return (
-        <div className="absolute inset-y-0 left-0 flex w-full items-center justify-center overflow-hidden pb-[8vh]" data-kg-loader>
-            <div className="relative inline-block h-[50px] w-[50px] animate-spin rounded-full border border-black/10 before:z-10 before:mt-[7px] before:block before:h-[7px] before:w-[7px] before:rounded-full before:bg-grey-800"></div>
-        </div>
-    );
-};
-
-export const MasonryColumn: React.FC<MasonryColumnProps> = (props) => {
-    return (
-        <div className="mr-6 flex grow basis-0 flex-col justify-start last-of-type:mr-0">
-            {props.children}
-        </div>
-    );
-};
-
-const UnsplashGalleryColumns: React.FC<UnsplashGalleryColumnsProps> = (props) => {
-    if (!props?.columns) {
-        return null;
-    }
-
-    return (
-        props?.columns.map((array, index) => (
-            // eslint-disable-next-line react/no-array-index-key
-            <MasonryColumn key={index}>
-                {
-                    array.map((payload: Photo) => (
-                        <UnsplashImage
-                            key={payload.id}
-                            alt={payload.alt_description}
-                            height={payload.height}
-                            insertImage={props?.insertImage}
-                            likes={payload.likes}
-                            links={payload.links}
-                            payload={payload}
-                            selectImg={props?.selectImg}
-                            srcUrl={payload.urls.regular}
-                            urls={payload.urls}
-                            user={payload.user}
-                            width={payload.width}
-                            zoomed={props?.zoomed || null}
-                        />
-                    ))
-                }
-            </MasonryColumn>
-        ))
-    );
-};
-
-const GalleryLayout: React.FC<GalleryLayoutProps> = (props) => {
-    return (
-        <div className="relative h-full overflow-hidden" data-kg-unsplash-gallery>
-            <div ref={props.galleryRef} className={`flex h-full w-full justify-center overflow-auto px-20 ${props?.zoomed ? 'pb-10' : ''}`} data-kg-unsplash-gallery-scrollref>
-                {props.children}
-                {props?.isLoading && <UnsplashGalleryLoading />}
-            </div>
-        </div>
-    );
-};
-
-const UnsplashGallery: React.FC<UnsplashGalleryProps> = ({zoomed,
-    error,
-    galleryRef,
-    isLoading,
-    dataset,
-    selectImg,
-    insertImage}) => {
-    if (zoomed) {
-        return (
-            <GalleryLayout
-                galleryRef={galleryRef}
-                zoomed={zoomed}>
-                <UnsplashZoomed
-                    alt={zoomed.alt_description}
-                    height={zoomed.height}
-                    insertImage={insertImage}
-                    likes={zoomed.likes}
-                    links={zoomed.links}
-                    payload={zoomed}
-                    selectImg={selectImg}
-                    srcUrl={zoomed.urls.regular}
-                    urls={zoomed.urls}
-                    user={zoomed.user}
-                    width={zoomed.width}
-                    zoomed={zoomed}
-                />
-            </GalleryLayout>
-        );
-    }
-
-    if (error) {
-        return (
-            <GalleryLayout
-                galleryRef={galleryRef}
-                zoomed={zoomed}>
-                <div className="flex h-full flex-col items-center justify-center">
-                    <h1 className="mb-4 text-2xl font-bold">Error</h1>
-                    <p className="text-lg font-medium">{error}</p>
-                </div>
-            </GalleryLayout>
-        );
-    }
-
-    return (
-        <GalleryLayout
-            galleryRef={galleryRef}
-            isLoading={isLoading}
-            zoomed={zoomed}>
-            <UnsplashGalleryColumns
-                columns={dataset}
-                insertImage={insertImage}
-                selectImg={selectImg}
-                zoomed={zoomed}
-            />
-        </GalleryLayout>
-    );
-};
-
-export default UnsplashGallery;
diff --git a/apps/admin-x-settings/src/unsplash/ui/UnsplashImage.tsx b/apps/admin-x-settings/src/unsplash/ui/UnsplashImage.tsx
deleted file mode 100644
index f4c36bae1d1..00000000000
--- a/apps/admin-x-settings/src/unsplash/ui/UnsplashImage.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import UnsplashButton from './UnsplashButton';
-import {FC, MouseEvent} from 'react';
-import {Links, Photo, User} from '../UnsplashTypes';
-
-export interface UnsplashImageProps {
-    payload: Photo;
-    srcUrl: string;
-    links: Links;
-    likes: number;
-    user: User;
-    alt: string;
-    urls: { regular: string };
-    height: number;
-    width: number;
-    zoomed: Photo | null;
-    insertImage: (options: {
-        src: string,
-        caption: string,
-        height: number,
-        width: number,
-        alt: string,
-        links: Links
-    }) => void;
-    selectImg: (payload: Photo | null) => void;
-}
-
-const UnsplashImage: FC<UnsplashImageProps> = ({payload, srcUrl, links, likes, user, alt, urls, height, width, zoomed, insertImage, selectImg}) => {
-    const handleClick = (e: MouseEvent<HTMLDivElement>) => {
-        e.stopPropagation();
-        selectImg(zoomed ? null : payload);
-    };
-
-    return (
-        <div 
-            className={`relative mb-6 block bg-grey-100 ${zoomed ? 'h-full w-[max-content] cursor-zoom-out' : 'w-full cursor-zoom-in'}`}
-            data-kg-unsplash-gallery-item 
-            onClick={handleClick}>
-            <img
-                alt={alt}
-                className={`${zoomed ? 'h-full w-auto object-contain' : ''}`}
-                height={height}
-                loading='lazy'
-                src={srcUrl}
-                width={width}
-                data-kg-unsplash-gallery-img 
-            />
-            <div className="absolute inset-0 flex flex-col justify-between bg-gradient-to-b from-black/5 via-black/5 to-black/30 p-5 opacity-0 transition-all ease-in-out hover:opacity-100">
-                <div className="flex items-center justify-end">
-                    <UnsplashButton
-                        data-kg-button="unsplash-like"
-                        href={`${links.html}/?utm_source=ghost&amp;utm_medium=referral&amp;utm_campaign=api-credit`} 
-                        icon="heart" 
-                        label={likes.toString()} 
-                        rel="noopener noreferrer" 
-                        target="_blank" 
-                    />
-                    <UnsplashButton
-                        data-kg-button="unsplash-download"
-                        href={`${links.download}/?utm_source=ghost&amp;utm_medium=referral&amp;utm_campaign=api-credit&amp;force=true`} 
-                        icon="download" 
-                    />
-                </div>
-                <div className="flex items-center justify-between">
-                    <div className="flex items-center">
-                        <img alt="author" className="mr-2 h-8 w-8 rounded-full" src={user.profile_image.small} />
-                        <div className="mr-2 truncate font-sans text-sm font-medium text-white">{user.name}</div>
-                    </div>
-                    <UnsplashButton label="Insert image" data-kg-unsplash-insert-button onClick={(e) => {
-                        e.stopPropagation();
-                        insertImage({
-                            src: urls.regular.replace(/&w=1080/, '&w=2000'),
-                            caption: `<span>Photo by <a href="${user.links.html}">${user.name}</a> / <a href="https://unsplash.com/?utm_source=ghost&utm_medium=referral&utm_campaign=api-credit">Unsplash</a></span>`,
-                            height: height,
-                            width: width,
-                            alt: alt,
-                            links: links
-                        });
-                    }} />
-                </div>
-            </div>
-        </div>
-    );
-};
-
-export default UnsplashImage;
diff --git a/apps/admin-x-settings/src/unsplash/ui/UnsplashSelector.tsx b/apps/admin-x-settings/src/unsplash/ui/UnsplashSelector.tsx
deleted file mode 100644
index 668c91f099f..00000000000
--- a/apps/admin-x-settings/src/unsplash/ui/UnsplashSelector.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {ChangeEvent, FunctionComponent, ReactNode} from 'react';
-import {ReactComponent as CloseIcon} from '../assets/kg-close.svg';
-import {ReactComponent as SearchIcon} from '../assets/kg-search.svg';
-import {ReactComponent as UnsplashIcon} from '../assets/kg-card-type-unsplash.svg';
-
-interface UnsplashSelectorProps {
-    closeModal: () => void;
-    handleSearch: (e: ChangeEvent<HTMLInputElement>) => void;
-    children: ReactNode;
-}
-
-const UnsplashSelector: FunctionComponent<UnsplashSelectorProps> = ({closeModal, handleSearch, children}) => {
-    return (
-        <>
-            <div className="fixed inset-0 z-40 h-[100vh] bg-black opacity-60"></div>
-            <div className="not-kg-prose fixed inset-8 z-50 overflow-hidden rounded bg-white shadow-xl" data-kg-modal="unsplash">
-                <button className="absolute right-6 top-6 cursor-pointer" type="button">
-                    <CloseIcon
-                        className="h-4 w-4 stroke-2 text-grey-400"
-                        data-kg-modal-close-button
-                        onClick={() => closeModal()}
-                    />
-                </button>
-                <div className="flex h-full flex-col">
-                    <header className="flex shrink-0 items-center justify-between px-20 py-10">
-                        <h1 className="flex items-center gap-2 font-sans text-3xl font-bold text-black">
-                            <UnsplashIcon className="mb-1" />
-                            Unsplash
-                        </h1>
-                        <div className="relative w-full max-w-sm">
-                            <SearchIcon className="absolute left-4 top-1/2 h-4 w-4 -translate-y-2 text-grey-700" />
-                            <input className="h-10 w-full rounded-full border border-grey-300 pl-10 pr-8 font-sans text-md font-normal text-black focus:border-grey-400 focus-visible:outline-none" placeholder="Search free high-resolution photos" autoFocus data-kg-unsplash-search onChange={handleSearch} />
-                        </div>
-                    </header>
-                    {children}
-                </div>
-            </div>
-        </>
-    );
-};
-
-export default UnsplashSelector;
diff --git a/apps/admin-x-settings/src/unsplash/ui/UnsplashZoomed.tsx b/apps/admin-x-settings/src/unsplash/ui/UnsplashZoomed.tsx
deleted file mode 100644
index 88860d3b18a..00000000000
--- a/apps/admin-x-settings/src/unsplash/ui/UnsplashZoomed.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import UnsplashImage, {UnsplashImageProps} from './UnsplashImage';
-import {FC} from 'react';
-import {Photo} from '../UnsplashTypes';
-
-interface UnsplashZoomedProps extends Omit<UnsplashImageProps, 'zoomed'> {
-  zoomed: Photo | null;
-  selectImg: (photo: Photo | null) => void;
-}
-
-const UnsplashZoomed: FC<UnsplashZoomedProps> = ({payload, insertImage, selectImg, zoomed}) => {
-    return (
-        <div className="flex h-full grow basis-0 justify-center" data-kg-unsplash-zoomed onClick={() => selectImg(null)}>
-            <UnsplashImage 
-                alt={payload.alt_description}
-                height={payload.height}
-                insertImage={insertImage}
-                likes={payload.likes}
-                links={payload.links}
-                payload={payload}
-                selectImg={selectImg}
-                srcUrl={payload.urls.regular}
-                urls={payload.urls}
-                user={payload.user}
-                width={payload.width}
-                zoomed={zoomed}
-            />
-        </div>
-    );
-};
-
-export default UnsplashZoomed;
diff --git a/apps/admin-x-settings/src/utils/IframeBuffering.tsx b/apps/admin-x-settings/src/utils/IframeBuffering.tsx
index 9ca8b52ff44..1f694207e72 100644
--- a/apps/admin-x-settings/src/utils/IframeBuffering.tsx
+++ b/apps/admin-x-settings/src/utils/IframeBuffering.tsx
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/react';
 import React, {useEffect, useRef, useState} from 'react';
 
 type IframeBufferingProps = {
@@ -10,9 +11,23 @@ type IframeBufferingProps = {
   addDelay?: boolean;
 };
 
+function debounce(func: any, wait: number) { // eslint-disable-line
+    let timeout: NodeJS.Timeout;
+
+    return function executedFunction(...args: any) { // eslint-disable-line
+        const later = () => {
+            clearTimeout(timeout);
+            func(...args);
+        };
+        clearTimeout(timeout);
+        timeout = setTimeout(later, wait);
+    };
+}
+
 const IframeBuffering: React.FC<IframeBufferingProps> = ({generateContent, className, height, width, parentClassName, testId, addDelay = false}) => {
     const [visibleIframeIndex, setVisibleIframeIndex] = useState(0);
-    const iframes = [useRef<HTMLIFrameElement>(null), useRef<HTMLIFrameElement>(null)];
+    const iframes = [useRef<HTMLIFrameElement>(null), useRef<HTMLIFrameElement>(null)]; // eslint-disable-line
+    const [scrollPosition, setScrollPosition] = useState(0);
 
     useEffect(() => {
         const invisibleIframeIndex = visibleIframeIndex === 0 ? 1 : 0;
@@ -44,6 +59,36 @@ const IframeBuffering: React.FC<IframeBufferingProps> = ({generateContent, class
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [generateContent]);
 
+    useEffect(() => {
+        const iframe = iframes[visibleIframeIndex].current;
+
+        const onScroll = debounce(() => {
+            setScrollPosition(iframe?.contentWindow?.scrollY || 0);
+        }, 250);
+
+        iframe?.contentWindow?.addEventListener('scroll', onScroll);
+
+        return () => {
+            iframe?.contentWindow?.removeEventListener('scroll', onScroll);
+        };
+    }, [visibleIframeIndex, iframes]);
+
+    useEffect(() => {
+        const iframe = iframes[visibleIframeIndex].current;
+
+        if (iframe) {
+            // refs https://ghost-foundation.sentry.io/issues/5024564293/
+            // Customer reported that code they injected caused Settings to crash.
+            // According to Sentry this the line that caused the crash.
+            // We are adding a try catch block to attempt to catch the error for further investigation and prevent the crash.
+            try {
+                iframe.contentWindow?.scrollTo(0, scrollPosition);
+            } catch (e) {
+                Sentry.captureException(e);
+            }
+        }
+    }, [scrollPosition, visibleIframeIndex, iframes]);
+
     return (
         <div className={parentClassName} data-testid={testId}>
             <iframe
diff --git a/apps/admin-x-settings/src/utils/analytics.ts b/apps/admin-x-settings/src/utils/analytics.ts
new file mode 100644
index 00000000000..d80aa2bdc91
--- /dev/null
+++ b/apps/admin-x-settings/src/utils/analytics.ts
@@ -0,0 +1,22 @@
+// Wrapper function for Plausible event
+type AnalyticsPropertyValue = string|number|boolean
+
+declare global {
+    interface Window {
+        plausible?: ((eventName: string, options: {props: Record<string, AnalyticsPropertyValue>}) => void),
+        posthog?: {
+            capture: (eventName: string, props: Record<string, AnalyticsPropertyValue>) => void
+        }
+    }
+}
+
+export default function trackEvent(eventName: string, props: Record<string, AnalyticsPropertyValue> = {}) {
+    window.plausible = window.plausible || function () {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any, prefer-rest-params
+        ((window.plausible as any).q = (window.plausible as any).q || []).push(arguments as unknown);
+    };
+    window.plausible!(eventName, {props: props});
+    if (window.posthog) {
+        window.posthog.capture(eventName, props);
+    }
+}
diff --git a/apps/admin-x-settings/src/utils/api/handleError.ts b/apps/admin-x-settings/src/utils/api/handleError.ts
deleted file mode 100644
index 3139e323f34..00000000000
--- a/apps/admin-x-settings/src/utils/api/handleError.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-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 {useCallback} from 'react';
-import {useSentryDSN} from '../../components/providers/ServiceProvider';
-
-/**
- * Generic error handling for API calls. This is enabled by default for queries (can be disabled by
- * setting defaultErrorHandler:false when using the query) but should be called when mutations throw
- * errors in order to handle anything unexpected.
- */
-const useHandleError = () => {
-    const sentryDSN = useSentryDSN();
-
-    /**
-     * @param error Thrown error.
-     * @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; 
-    const handleError = useCallback((error: unknown, {withToast = true}: {withToast?: boolean} = {}) : HandleErrorReturnType => {
-        // eslint-disable-next-line no-console
-        console.error(error);
-
-        if (sentryDSN) {
-            Sentry.withScope((scope) => {
-                if (error instanceof APIError && error.response) {
-                    scope.setTag('api_url', error.response.url);
-                    scope.setTag('api_response_status', error.response.status);
-                }
-                Sentry.captureException(error);
-            });
-        }
-
-        if (!withToast) {
-            return;
-        }
-
-        toast.remove();
-
-        if (error instanceof JSONError && error.response?.status === 422) {
-            return error.data;
-        }
-
-        if (error instanceof APIError && error.response?.status === 418) {
-            // We use this status in tests to indicate the API request was not mocked -
-            // don't show a toast because it may block clicking things in the test
-        } else if (error instanceof ValidationError && error.data?.errors[0]) {
-            showToast({
-                message: error.data.errors[0].context || error.data.errors[0].message,
-                type: 'pageError'
-            });
-        } else if (error instanceof APIError) {
-            showToast({
-                message: error.message,
-                type: 'pageError'
-            });
-        } else {
-            showToast({
-                message: 'Something went wrong, please try again.',
-                type: 'pageError'
-            });
-        }
-    }, [sentryDSN]);
-
-    return handleError;
-};
-
-export default useHandleError;
diff --git a/apps/admin-x-settings/src/utils/api/hooks.ts b/apps/admin-x-settings/src/utils/api/hooks.ts
deleted file mode 100644
index a5b02b8994f..00000000000
--- a/apps/admin-x-settings/src/utils/api/hooks.ts
+++ /dev/null
@@ -1,336 +0,0 @@
-import * as Sentry from '@sentry/react';
-import handleResponse from './handleResponse';
-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 {usePermission} from '../../hooks/usePermissions';
-import {useSentryDSN, useServices} from '../../components/providers/ServiceProvider';
-
-export interface Meta {
-    pagination: {
-        page: number;
-        limit: number;
-        pages: number;
-        total: number;
-        next: number;
-        prev: number;
-    }
-}
-
-interface RequestOptions {
-    method?: string;
-    body?: string | FormData;
-    headers?: {
-        'Content-Type'?: string;
-    };
-    credentials?: 'include' | 'omit' | 'same-origin';
-    timeout?: number;
-    retry?: boolean;
-}
-
-export const useFetchApi = () => {
-    const {ghostVersion} = useServices();
-    const sentryDSN = useSentryDSN();
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return async <ResponseData = any>(endpoint: string | URL, options: RequestOptions = {}): Promise<ResponseData> => {
-        // By default, we set the Content-Type header to application/json
-        const defaultHeaders: Record<string, string> = {
-            'app-pragma': 'no-cache',
-            'x-ghost-version': ghostVersion
-        };
-        if (typeof options.body === 'string') {
-            defaultHeaders['content-type'] = 'application/json';
-        }
-        const headers = options?.headers || {};
-
-        const controller = new AbortController();
-        const {timeout} = options;
-
-        if (timeout) {
-            setTimeout(() => controller.abort(), timeout);
-        }
-
-        // attempt retries for 15 seconds in two situations:
-        // 1. Server Unreachable error from the browser (code 0 or TypeError), typically from short internet blips
-        // 2. Maintenance error from Ghost, upgrade in progress so API is temporarily unavailable
-        let attempts = 0;
-        let shouldRetry = options.retry === true || options.retry === undefined;
-        let retryingMs = 0;
-        const startTime = Date.now();
-        const maxRetryingMs = 15_000;
-        const retryPeriods = [500, 1000];
-        const retryableErrors = [ServerUnreachableError, MaintenanceError, TypeError];
-
-        const getErrorData = (error?: APIError, response?: Response) => {
-            const data: Record<string, unknown> = {
-                errorName: error?.name,
-                attempts,
-                totalSeconds: retryingMs / 1000,
-                endpoint: endpoint.toString()
-            };
-            if (endpoint.toString().includes('/ghost/api/')) {
-                data.server = response?.headers.get('server');
-            }
-            return data;
-        };
-
-        while (attempts === 0 || shouldRetry) {
-            try {
-                const response = await fetch(endpoint, {
-                    headers: {
-                        ...defaultHeaders,
-                        ...headers
-                    },
-                    method: 'GET',
-                    mode: 'cors',
-                    credentials: 'include',
-                    signal: controller.signal,
-                    ...options
-                });
-
-                if (attempts !== 0 && sentryDSN) {
-                    Sentry.captureMessage('Request took multiple attempts', {extra: getErrorData()});
-                }
-
-                return handleResponse(response) as ResponseData;
-            } catch (error) {
-                retryingMs = Date.now() - startTime;
-
-                if (shouldRetry && (import.meta.env.MODE !== 'development' && retryableErrors.some(errorClass => error instanceof errorClass) && retryingMs <= maxRetryingMs)) {
-                    await new Promise((resolve) => {
-                        setTimeout(resolve, retryPeriods[attempts] || retryPeriods[retryPeriods.length - 1]);
-                    });
-                    attempts += 1;
-                    continue;
-                }
-
-                if (attempts !== 0 && sentryDSN) {
-                    Sentry.captureMessage('Request failed after multiple attempts', {extra: getErrorData()});
-                }
-
-                if (error && typeof error === 'object' && 'name' in error && error.name === 'AbortError') {
-                    throw new TimeoutError();
-                }
-
-                let newError = error;
-
-                if (!(error instanceof APIError)) {
-                    newError = new ServerUnreachableError({cause: error});
-                }
-
-                throw newError;
-            };
-        }
-
-        // Used for type checking
-        // this can't happen, but TS isn't smart enough to undeerstand that the loop will never exit without an error or return
-        // because of shouldRetry + attemps usage combination
-        return undefined as never;
-    };
-};
-
-const {apiRoot} = getGhostPaths();
-
-export const apiUrl = (path: string, searchParams: Record<string, string> = {}) => {
-    const url = new URL(`${apiRoot}${path}`, window.location.origin);
-    url.search = new URLSearchParams(searchParams).toString();
-    return url.toString();
-};
-
-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);
-};
-
-interface QueryOptions<ResponseData> {
-    dataType: string
-    path: string
-    defaultSearchParams?: Record<string, string>;
-    permissions?: string[];
-    returnData?: (originalData: unknown) => ResponseData;
-}
-
-type QueryHookOptions<ResponseData> = UseQueryOptions<ResponseData> & {
-    searchParams?: Record<string, string>;
-    defaultErrorHandler?: boolean;
-};
-
-export const createQuery = <ResponseData>(options: QueryOptions<ResponseData>) => ({searchParams, ...query}: QueryHookOptions<ResponseData> = {}) => {
-    const url = apiUrl(options.path, searchParams || options.defaultSearchParams);
-    const fetchApi = useFetchApi();
-    const handleError = useHandleError();
-
-    const result = useQuery<ResponseData>({
-        enabled: options.permissions ? usePermission(options.permissions) : true,
-        queryKey: [options.dataType, url],
-        queryFn: () => fetchApi(url),
-        ...query
-    });
-
-    const data = useMemo(() => (
-        (result.data && options.returnData) ? options.returnData(result.data) : result.data)
-    , [result.data]);
-
-    useEffect(() => {
-        if (result.error && query.defaultErrorHandler !== false) {
-            handleError(result.error);
-        }
-    }, [handleError, result.error, query.defaultErrorHandler]);
-
-    return {
-        ...result,
-        data
-    };
-};
-
-export const createPaginatedQuery = <ResponseData extends {meta?: Meta}>(options: QueryOptions<ResponseData>) => ({searchParams, ...query}: QueryHookOptions<ResponseData> = {}) => {
-    const {page, setPage} = usePage();
-    const limit = (searchParams?.limit || options.defaultSearchParams?.limit) ? parseInt(searchParams?.limit || options.defaultSearchParams?.limit || '15') : 15;
-
-    const paginatedSearchParams = searchParams || options.defaultSearchParams || {};
-    paginatedSearchParams.page = page.toString();
-
-    const url = apiUrl(options.path, paginatedSearchParams);
-    const fetchApi = useFetchApi();
-    const handleError = useHandleError();
-
-    const result = useQuery<ResponseData>({
-        queryKey: [options.dataType, url],
-        queryFn: () => fetchApi(url),
-        ...query
-    });
-
-    const data = useMemo(() => (
-        (result.data && options.returnData) ? options.returnData(result.data) : result.data)
-    , [result]);
-
-    const pagination = usePagination({
-        page,
-        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
-    });
-
-    useEffect(() => {
-        if (result.error && query.defaultErrorHandler !== false) {
-            handleError(result.error);
-        }
-    }, [handleError, result.error, query.defaultErrorHandler]);
-
-    return {
-        ...result,
-        data,
-        pagination
-    };
-};
-
-type InfiniteQueryOptions<ResponseData> = Omit<QueryOptions<ResponseData>, 'returnData'> & {
-    returnData: NonNullable<QueryOptions<ResponseData>['returnData']>
-    defaultNextPageParams?: (data: ResponseData, params: Record<string, string>) => Record<string, string>;
-}
-
-type InfiniteQueryHookOptions<ResponseData> = UseInfiniteQueryOptions<ResponseData> & {
-    searchParams?: Record<string, string>;
-    defaultErrorHandler?: boolean;
-    getNextPageParams?: (data: ResponseData, params: Record<string, string>) => Record<string, string> | undefined;
-};
-
-export const createInfiniteQuery = <ResponseData>(options: InfiniteQueryOptions<ResponseData>) => ({searchParams, getNextPageParams, ...query}: InfiniteQueryHookOptions<ResponseData> = {}) => {
-    const fetchApi = useFetchApi();
-    const handleError = useHandleError();
-
-    const nextPageParams = getNextPageParams || options.defaultNextPageParams || (() => ({}));
-
-    const result = useInfiniteQuery<ResponseData>({
-        queryKey: [options.dataType, apiUrl(options.path, searchParams || options.defaultSearchParams)],
-        queryFn: ({pageParam}) => fetchApi(apiUrl(options.path, pageParam || searchParams || options.defaultSearchParams)),
-        getNextPageParam: data => nextPageParams(data, searchParams || options.defaultSearchParams || {}),
-        ...query
-    });
-
-    const data = useMemo(() => result.data && options.returnData(result.data), [result.data]);
-
-    useEffect(() => {
-        if (result.error && query.defaultErrorHandler !== false) {
-            handleError(result.error);
-        }
-    }, [handleError, result.error, query.defaultErrorHandler]);
-
-    return {
-        ...result,
-        data
-    };
-};
-
-export const createQueryWithId = <ResponseData>(options: QueryOptions<ResponseData>) => (id: string, {searchParams, ...query}: QueryHookOptions<ResponseData> = {}) => {
-    const queryHook = createQuery<ResponseData>({...options, path: parameterizedPath(options.path, id)});
-    return queryHook({searchParams: searchParams || options.defaultSearchParams, ...query});
-};
-
-interface MutationOptions<ResponseData, Payload> extends Omit<QueryOptions<ResponseData>, 'dataType' | 'path'>, Omit<RequestOptions, 'body'> {
-    path: (payload: Payload) => string;
-    body?: (payload: Payload) => FormData | object;
-    searchParams?: (payload: Payload) => { [key: string]: string; };
-    invalidateQueries?: { dataType: string; };
-    updateQueries?: { dataType: string; emberUpdateType: 'createOrUpdate' | 'delete' | 'skip'; update: (newData: ResponseData, currentData: unknown, payload: Payload) => unknown };
-}
-
-const mutate = <ResponseData, Payload>({fetchApi, path, payload, searchParams, options}: {
-    fetchApi: ReturnType<typeof useFetchApi>;
-    path: string;
-    payload?: Payload;
-    searchParams?: Record<string, string>;
-    options: MutationOptions<ResponseData, Payload>
-}) => {
-    const {defaultSearchParams, body, ...requestOptions} = options;
-    const url = apiUrl(path, searchParams || defaultSearchParams);
-    const generatedBody = payload && body?.(payload);
-
-    let requestBody: string | FormData | undefined = undefined;
-    if (generatedBody instanceof FormData) {
-        requestBody = generatedBody;
-    } else if (generatedBody) {
-        requestBody = JSON.stringify(generatedBody);
-    }
-
-    return fetchApi<ResponseData>(url, {
-        body: requestBody,
-        ...requestOptions
-    });
-};
-
-export const createMutation = <ResponseData, Payload>(options: MutationOptions<ResponseData, Payload>) => () => {
-    const fetchApi = useFetchApi();
-    const queryClient = useQueryClient();
-    const {onUpdate, onInvalidate, onDelete} = useServices();
-
-    const afterMutate = useCallback((newData: ResponseData, payload: Payload) => {
-        if (options.invalidateQueries) {
-            queryClient.invalidateQueries([options.invalidateQueries.dataType]);
-            onInvalidate(options.invalidateQueries.dataType);
-        }
-
-        if (options.updateQueries) {
-            queryClient.setQueriesData([options.updateQueries.dataType], (data: unknown) => options.updateQueries!.update(newData, data, payload));
-            if (options.updateQueries.emberUpdateType === 'createOrUpdate') {
-                onUpdate(options.updateQueries.dataType, newData);
-            } else if (options.updateQueries.emberUpdateType === 'delete') {
-                if (typeof payload !== 'string') {
-                    throw new Error('Expected delete mutation to have a string (ID) payload. Either change the payload or update the createMutation hook');
-                }
-
-                onDelete(options.updateQueries.dataType, payload);
-            }
-        }
-    }, [onInvalidate, onUpdate, onDelete, queryClient]);
-
-    return useMutation<ResponseData, unknown, Payload>({
-        mutationFn: payload => mutate({fetchApi, path: options.path(payload), payload, searchParams: options.searchParams?.(payload) || options.defaultSearchParams, options}),
-        onSuccess: afterMutate
-    });
-};
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/errors.ts b/apps/admin-x-settings/src/utils/errors.ts
deleted file mode 100644
index bfbafc71a26..00000000000
--- a/apps/admin-x-settings/src/utils/errors.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-// API errors
-
-export interface ErrorResponse {
-    errors: Array<{
-        code: string
-        context: string | null
-        details: string | null
-        ghostErrorCode: string | null
-        help: string
-        id: string
-        message: string
-        property: string | null
-        type: string
-    }>
-}
-
-export class APIError extends Error {
-    constructor(
-        public readonly response?: Response,
-        public readonly data?: unknown,
-        message?: string,
-        errorOptions?: ErrorOptions
-    ) {
-        if (!message && response && response.url.includes('/ghost/api/admin/')) {
-            message = `${response.statusText}, cannot fetch ${response.url.replace(/.+\/ghost\/api\/admin\//, '').replace(/\W.*/, '').replace('_', ' ')}`;
-        }
-
-        super(message || 'Unknown error', errorOptions);
-    }
-}
-
-export class JSONError extends APIError {
-    constructor(
-        response: Response,
-        public readonly data?: ErrorResponse,
-        message?: string,
-        errorOptions?: ErrorOptions
-    ) {
-        super(response, data, message, errorOptions);
-    }
-}
-
-export class VersionMismatchError extends JSONError {
-    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
-        super(response, data, 'API server is running a newer version of Ghost, please upgrade.', errorOptions);
-    }
-}
-
-export class ServerUnreachableError extends APIError {
-    constructor(errorOptions?: ErrorOptions) {
-        super(undefined, undefined, 'Server was unreachable', errorOptions);
-    }
-}
-
-export class TimeoutError extends APIError {
-    constructor(errorOptions?: ErrorOptions) {
-        super(undefined, undefined, 'Request timed out', errorOptions);
-    }
-}
-
-export class RequestEntityTooLargeError extends APIError {
-    constructor(response: Response, data: unknown, errorOptions?: ErrorOptions) {
-        super(response, data, 'Request is larger than the maximum file size the server allows', errorOptions);
-    }
-}
-
-export class UnsupportedMediaTypeError extends APIError {
-    constructor(response: Response, data: unknown, errorOptions?: ErrorOptions) {
-        super(response, data, 'Request contains an unknown or unsupported file type.', errorOptions);
-    }
-}
-
-export class MaintenanceError extends APIError {
-    constructor(response: Response, data: unknown, errorOptions?: ErrorOptions) {
-        super(response, data, 'Ghost is currently undergoing maintenance, please wait a moment then retry.', errorOptions);
-    }
-}
-
-export class ThemeValidationError extends JSONError {
-    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
-        super(response, data, 'Theme is not compatible or contains errors.', errorOptions);
-    }
-}
-
-export class HostLimitError extends JSONError {
-    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
-        super(response, data, 'A hosting plan limit was reached or exceeded.', errorOptions);
-    }
-}
-
-export class EmailError extends JSONError {
-    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
-        super(response, data, 'Please verify your email settings', errorOptions);
-    }
-}
-
-export class ValidationError extends JSONError {
-    constructor(response: Response, data: ErrorResponse, errorOptions?: ErrorOptions) {
-        super(response, data, data.errors[0].message, errorOptions);
-    }
-}
-
-export const errorsWithMessage = [ValidationError, ThemeValidationError, HostLimitError, EmailError];
-
-// Frontend errors
-
-export class AlreadyExistsError extends Error {
-    constructor(message?: string) {
-        super(message);
-    }
-}
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..c31f902f5c5
--- /dev/null
+++ b/apps/admin-x-settings/src/utils/getOffersPortalPreviewUrl.ts
@@ -0,0 +1,57 @@
+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;
+
+    baseUrl = baseUrl.replace(/\/$/, '');
+    const portalBase = '/?v=modal-portal-offer#/portal/preview/offer';
+    const settingsParam = new URLSearchParams();
+
+    settingsParam.append('disableBackground', 'false');
+    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..87d61431bf4
--- /dev/null
+++ b/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts
@@ -0,0 +1,66 @@
+import {Config} from '@tryghost/admin-x-framework/api/config';
+import {Setting, checkStripeEnabled, getSettingValue} from '@tryghost/admin-x-framework/api/settings';
+import {SiteData} from '@tryghost/admin-x-framework/api/site';
+import {Tier} from '@tryghost/admin-x-framework/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', portalTiers.join(',')); // assuming that it might be more than 1
+
+    const portalDefaultPlan = getSettingValue<string>(settings, 'portal_default_plan');
+    if (portalDefaultPlan) {
+        settingsParam.append('portalDefaultPlan', portalDefaultPlan);
+    }
+
+    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/src/utils/getTiersCadences.ts b/apps/admin-x-settings/src/utils/getTiersCadences.ts
new file mode 100644
index 00000000000..9bed7131122
--- /dev/null
+++ b/apps/admin-x-settings/src/utils/getTiersCadences.ts
@@ -0,0 +1,20 @@
+import {SelectOption} from '@tryghost/admin-x-design-system';
+import {Tier} from '@tryghost/admin-x-framework/api/tiers';
+
+export const getTiersCadences = (tiers: Tier[]): SelectOption[] => {
+    const cadences: SelectOption[] = [];
+
+    tiers.forEach((tier: Tier) => {
+        cadences.push({
+            label: `${tier.name} - Monthly`,
+            value: `${tier.id}-month-${tier.currency}`
+        });
+
+        cadences.push({
+            label: `${tier.name} - Yearly`,
+            value: `${tier.id}-year-${tier.currency}`
+        });
+    });
+
+    return cadences;
+};
diff --git a/apps/admin-x-settings/src/utils/globalTypes.ts b/apps/admin-x-settings/src/utils/globalTypes.ts
deleted file mode 100644
index b6e0beffef2..00000000000
--- a/apps/admin-x-settings/src/utils/globalTypes.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// a rather miscellaneous collection of types - will remove in future
-
-export type UpgradeStatusType = {
-    isRequired: boolean;
-    message: string;
-}
diff --git a/apps/admin-x-settings/src/utils/helpers.ts b/apps/admin-x-settings/src/utils/helpers.ts
index 2622e5c031d..e850bcdc6e2 100644
--- a/apps/admin-x-settings/src/utils/helpers.ts
+++ b/apps/admin-x-settings/src/utils/helpers.ts
@@ -1,19 +1,3 @@
-export interface IGhostPaths {
-    subdir: string;
-    adminRoot: string;
-    assetRoot: string;
-    apiRoot: string;
-}
-
-export function getGhostPaths(): IGhostPaths {
-    let path = window.location.pathname;
-    let subdir = path.substr(0, path.search('/ghost/'));
-    let adminRoot = `${subdir}/ghost/`;
-    let assetRoot = `${subdir}/ghost/assets/`;
-    let apiRoot = `${subdir}/ghost/api/admin`;
-    return {subdir, adminRoot, assetRoot, apiRoot};
-}
-
 export function resolveAsset(assetPath: string, relativeTo: string) {
     if (assetPath.match(/^(?:[a-z]+:)?\/\//i)) {
         return assetPath;
@@ -59,23 +43,6 @@ export function generateAvatarColor(name: string) {
     return 'hsl(' + h + ', ' + s + '%, ' + l + '%)';
 }
 
-export function downloadFile(url: string) {
-    let iframe = document.getElementById('iframeDownload');
-
-    if (!iframe) {
-        iframe = document.createElement('iframe');
-        iframe.id = 'iframeDownload';
-        iframe.style.display = 'none';
-        document.body.append(iframe);
-    }
-
-    iframe.setAttribute('src', url);
-}
-
-export function downloadFromEndpoint(path: string) {
-    downloadFile(`${getGhostPaths().apiRoot}${path}`);
-}
-
 export function numberWithCommas(x: number) {
     return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
 }
diff --git a/apps/admin-x-settings/src/utils/isCustomThemeSettingsVisible.ts b/apps/admin-x-settings/src/utils/isCustomThemeSettingsVisible.ts
index 717f7cf170d..0107fb2375c 100644
--- a/apps/admin-x-settings/src/utils/isCustomThemeSettingsVisible.ts
+++ b/apps/admin-x-settings/src/utils/isCustomThemeSettingsVisible.ts
@@ -1,5 +1,5 @@
 import nql from '@tryghost/nql';
-import {CustomThemeSetting} from '../api/customThemeSettings';
+import {CustomThemeSetting} from '@tryghost/admin-x-framework/api/customThemeSettings';
 
 export function isCustomThemeSettingVisible(setting: CustomThemeSetting, settingsKeyValueObj: Record<string, string>) {
     if (!setting.visibility) {
diff --git a/apps/admin-x-settings/src/utils/modals.tsx b/apps/admin-x-settings/src/utils/modals.tsx
deleted file mode 100644
index fe904faf220..00000000000
--- a/apps/admin-x-settings/src/utils/modals.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import ConfirmationModal, {ConfirmationModalProps} from '../admin-x-ds/global/modal/ConfirmationModal';
-import NiceModal from '@ebay/nice-modal-react';
-
-export function confirmIfDirty(dirty: boolean, action: () => void, options: Partial<ConfirmationModalProps> = {}) {
-    if (!dirty) {
-        action();
-    } else {
-        NiceModal.show(ConfirmationModal, {
-            title: 'Are you sure you want to leave this page?',
-            prompt: (
-                <>
-                    <p>{`Hey there! It looks like you didn't save the changes you made.`}</p>
-                    <p>Save before you go!</p>
-                </>
-            ),
-            okLabel: 'Leave',
-            cancelLabel: 'Stay',
-            okColor: 'red',
-            onOk: (confirmationModal) => {
-                action();
-                confirmationModal?.remove();
-            },
-            ...options
-        });
-    }
-}
diff --git a/apps/admin-x-settings/src/utils/newsletterEmails.ts b/apps/admin-x-settings/src/utils/newsletterEmails.ts
new file mode 100644
index 00000000000..febad178ed6
--- /dev/null
+++ b/apps/admin-x-settings/src/utils/newsletterEmails.ts
@@ -0,0 +1,28 @@
+import {Config, hasSendingDomain, isManagedEmail} from '@tryghost/admin-x-framework/api/config';
+import {Newsletter} from '@tryghost/admin-x-framework/api/newsletters';
+
+export const renderSenderEmail = (newsletter: Newsletter, config: Config, defaultEmailAddress: string|undefined) => {
+    if (isManagedEmail(config) && !hasSendingDomain(config) && defaultEmailAddress) {
+        // Not changeable: sender_email is ignored
+        return defaultEmailAddress;
+    }
+
+    return newsletter.sender_email || defaultEmailAddress || '';
+};
+
+export const renderReplyToEmail = (newsletter: Newsletter, config: Config, supportEmailAddress: string|undefined, defaultEmailAddress: string|undefined) => {
+    if (newsletter.sender_reply_to === 'newsletter') {
+        if (isManagedEmail(config) || !!config.labs.newEmailAddresses) {
+            // No reply-to set
+            // sender_reply_to currently doesn't allow empty values, we need to set it to 'newsletter'
+            return '';
+        }
+        return renderSenderEmail(newsletter, config, defaultEmailAddress);
+    }
+
+    if (newsletter.sender_reply_to === 'support') {
+        return supportEmailAddress || defaultEmailAddress || '';
+    }
+
+    return newsletter.sender_reply_to;
+};
diff --git a/apps/admin-x-settings/src/utils/plausible.ts b/apps/admin-x-settings/src/utils/plausible.ts
deleted file mode 100644
index cd6d882838b..00000000000
--- a/apps/admin-x-settings/src/utils/plausible.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Wrapper function for Plausible event
-type PlausiblePropertyValue = string|number|boolean
-
-declare global {
-    interface Window {
-        plausible?: ((eventName: string, options: {props: Record<string, PlausiblePropertyValue>}) => void)
-    }
-}
-
-export default function trackEvent(eventName: string, props: Record<string, PlausiblePropertyValue> = {}) {
-    window.plausible = window.plausible || function () {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, prefer-rest-params
-        ((window.plausible as any).q = (window.plausible as any).q || []).push(arguments as unknown);
-    };
-    window.plausible!(eventName, {props: props});
-}
diff --git a/apps/admin-x-settings/src/unsplash/portal.tsx b/apps/admin-x-settings/src/utils/portal.tsx
similarity index 100%
rename from apps/admin-x-settings/src/unsplash/portal.tsx
rename to apps/admin-x-settings/src/utils/portal.tsx
diff --git a/apps/admin-x-settings/src/utils/search.tsx b/apps/admin-x-settings/src/utils/search.tsx
index 9e59b544734..d17fb1e5d95 100644
--- a/apps/admin-x-settings/src/utils/search.tsx
+++ b/apps/admin-x-settings/src/utils/search.tsx
@@ -5,10 +5,13 @@ export interface SearchService {
     setFilter: (value: string) => void;
     checkVisible: (keywords: string[]) => boolean;
     highlightKeywords: (text: ReactNode) => ReactNode;
+    noResult: boolean;
+    setNoResult: (value: boolean) => void;
 }
 
 const useSearchService = () => {
     const [filter, setFilter] = useState('');
+    const [noResult, setNoResult] = useState(false);
 
     const checkVisible = (keywords: string[]) => {
         if (!keywords.length) {
@@ -47,7 +50,9 @@ const useSearchService = () => {
         filter,
         setFilter,
         checkVisible,
-        highlightKeywords
+        highlightKeywords,
+        noResult,
+        setNoResult
     };
 };
 
diff --git a/apps/admin-x-settings/src/utils/socialUrls.ts b/apps/admin-x-settings/src/utils/socialUrls.ts
index ed68729cd4e..bb76cbd4069 100644
--- a/apps/admin-x-settings/src/utils/socialUrls.ts
+++ b/apps/admin-x-settings/src/utils/socialUrls.ts
@@ -30,11 +30,11 @@ export function validateTwitterUrl(newUrl: string) {
     if (!newUrl) {
         return '';
     }
-    if (newUrl.match(/(?:twitter\.com\/)(\S+)/) || newUrl.match(/([a-z\d.]+)/i)) {
+    if (newUrl.match(/(?:x\.com\/)(\S+)/) || newUrl.match(/([a-z\d.]+)/i)) {
         let username = [];
 
-        if (newUrl.match(/(?:twitter\.com\/)(\S+)/)) {
-            [, username] = newUrl.match(/(?:twitter\.com\/)(\S+)/);
+        if (newUrl.match(/(?:x\.com\/)(\S+)/)) {
+            [, username] = newUrl.match(/(?:x\.com\/)(\S+)/);
         } else {
             [username] = newUrl.match(/([^/]+)\/?$/mi);
         }
@@ -47,21 +47,21 @@ export function validateTwitterUrl(newUrl: string) {
         if (username.match(/^(http|www)|(\/)/) || !username.match(/^[a-z\d._]{1,15}$/mi)) {
             const message = !username.match(/^[a-z\d._]{1,15}$/mi)
                 ? 'Your Username is not a valid Twitter Username'
-                : 'The URL must be in a format like https://twitter.com/yourUsername';
+                : 'The URL must be in a format like https://x.com/yourUsername';
             throw new Error(message);
         }
-        return `https://twitter.com/${username}`;
+        return `https://x.com/${username}`;
     } else {
-        const message = 'The URL must be in a format like https://twitter.com/yourUsername';
+        const message = 'The URL must be in a format like https://x.com/yourUsername';
         throw new Error(message);
     }
 }
 
 export const facebookHandleToUrl = (handle: string) => `https://www.facebook.com/${handle}`;
-export const twitterHandleToUrl = (handle: string) => `https://twitter.com/${handle.replace('@', '')}`;
+export const twitterHandleToUrl = (handle: string) => `https://x.com/${handle.replace('@', '')}`;
 
 export const facebookUrlToHandle = (url: string) => url.match(/(?:https:\/\/)(?:www\.)(?:facebook\.com)\/(?:#!\/)?(\w+\/?\S+)/mi)?.[1] || null;
 export const twitterUrlToHandle = (url: string) => {
-    const handle = url.match(/(?:https:\/\/)(?:twitter\.com)\/(?:#!\/)?@?([^/]*)/)?.[1];
+    const handle = url.match(/(?:https:\/\/)(?:x\.com)\/(?:#!\/)?@?([^/]*)/)?.[1];
     return handle ? `@${handle}` : null;
 };
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/advanced/codeInjection.test.ts b/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts
index 5f0fba842c9..1397fb83a1e 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 // CodeMirror takes some time to load in Playwright meaning the first few characters typed don't always
 // show up in the input. Since that lag is not consistent, this workaround ensures we type enough
@@ -20,23 +21,24 @@ test.describe('Code injection settings', async () => {
 
         const section = page.getByTestId('code-injection');
 
-        await section.getByRole('button', {name: 'Edit'}).click();
+        await section.getByRole('button', {name: 'Open'}).click();
+
+        const modal = page.getByTestId('modal-code-injection');
         // Click on the CodeMirror content to make sure it's loaded
-        await section.getByTestId('header-code').locator('.cm-content').click();
+        await modal.getByTestId('header-code').locator('.cm-content').click();
 
         for (const character of (PADDING + 'testhead').split('')) {
             await page.keyboard.press(character);
         }
 
-        await section.getByRole('tab', {name: 'Site footer'}).click();
-        await section.getByTestId('footer-code').locator('.cm-content').click();
+        await modal.getByRole('tab', {name: 'Site footer'}).click();
+        await modal.getByTestId('footer-code').locator('.cm-content').click();
 
         for (const character of (PADDING + 'testfoot').split('')) {
             await page.keyboard.press(character);
         }
 
-        await section.getByRole('button', {name: 'Save'}).click();
-        await expect(section.getByRole('button', {name: 'Save'})).toBeHidden();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
         expect(lastApiRequests.editSettings?.body).toMatchObject({
             settings: [
@@ -45,50 +47,4 @@ test.describe('Code injection settings', async () => {
             ]
         });
     });
-
-    test('Supports continuing editing in fullscreen', async ({page}) => {
-        const {lastApiRequests} = await mockApi({page, requests: {
-            ...globalDataRequests,
-            editSettings: {method: 'PUT', path: '/settings/', response: updatedSettingsResponse([
-                {key: 'codeinjection_head', value: '<1 /><2 /><3 />'}
-            ])}
-        }});
-
-        await page.goto('/');
-
-        const section = page.getByTestId('code-injection');
-
-        await section.getByRole('button', {name: 'Edit'}).click();
-
-        for (const character of PADDING.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        for (const character of '<1>'.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        await section.getByRole('button', {name: 'Fullscreen'}).click();
-
-        await page.keyboard.press('End');
-        for (const character of '<2>'.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        await page.getByTestId('modal-code').getByRole('button', {name: 'Done'}).click();
-
-        await page.keyboard.press('End');
-        for (const character of '<3>'.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        await section.getByRole('button', {name: 'Save'}).click();
-        await expect(section.getByRole('button', {name: 'Save'})).toBeHidden();
-
-        expect(lastApiRequests.editSettings?.body).toMatchObject({
-            settings: [
-                {key: 'codeinjection_head', value: /<1><2><3>$/}
-            ]
-        });
-    });
 });
diff --git a/apps/admin-x-settings/test/acceptance/advanced/dangerzone.test.ts b/apps/admin-x-settings/test/acceptance/advanced/dangerzone.test.ts
new file mode 100644
index 00000000000..6543926a918
--- /dev/null
+++ b/apps/admin-x-settings/test/acceptance/advanced/dangerzone.test.ts
@@ -0,0 +1,24 @@
+import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('DangerZone', async () => {
+    test('Delete all content', async ({page}) => {
+        const {lastApiRequests} = await mockApi({page, requests: {
+            ...globalDataRequests,
+            deleteAllContent: {method: 'DELETE', path: '/db/', response: {}}
+        }});
+
+        await page.goto('/');
+
+        const dangeZoneSection = page.getByTestId('dangerzone');
+
+        await dangeZoneSection.getByRole('button', {name: 'Delete all content'}).click();
+
+        await page.getByTestId('confirmation-modal').getByRole('button', {name: 'Delete'}).click();
+
+        await expect(page.getByTestId('toast-success')).toContainText('All content deleted');
+
+        expect(lastApiRequests.deleteAllContent).toBeTruthy();
+    });
+});
diff --git a/apps/admin-x-settings/test/acceptance/advanced/history.test.ts b/apps/admin-x-settings/test/acceptance/advanced/history.test.ts
index d327d620a6d..bb76a2ef96c 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/history.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/history.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('History', async () => {
     test('Browsing history', async ({page}) => {
@@ -31,14 +32,18 @@ test.describe('History', async () => {
 
         await historyModal.getByRole('button', {name: 'Filter'}).click();
 
-        await page.getByTestId('popover-content').getByLabel('Posts').uncheck();
+        const popoverContent = historyModal.getByTestId('popover-content');
+
+        await popoverContent.getByLabel('Posts').click();
+        await expect(popoverContent.getByLabel('Posts')).toHaveAttribute('data-state', 'unchecked');
 
         await expect(historyModal).not.toHaveText(/Page edited/);
         await expect(historyModal).toHaveText(/Settings edited/);
 
         expect(lastApiRequests.browseActionsFiltered?.url).toEqual('http://localhost:5173/ghost/api/admin/actions/?include=actor%2Cresource&limit=200&filter=resource_type%3A-%5Blabel%2Cpost%5D');
 
-        await page.getByTestId('popover-content').getByLabel('Deleted').uncheck();
+        await popoverContent.getByLabel('Deleted').click();
+        await expect(popoverContent.getByLabel('Deleted')).toHaveAttribute('data-state', 'unchecked');
 
         expect(lastApiRequests.browseActionsFiltered?.url).toEqual('http://localhost:5173/ghost/api/admin/actions/?include=actor%2Cresource&limit=200&filter=event%3A-%5Bdeleted%5D%2Bresource_type%3A-%5Blabel%2Cpost%5D');
     });
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/amp.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/amp.test.ts
index 695f7b8a3f4..354baa046d1 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/integrations/amp.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/amp.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, responseFixtures, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('AMP integration', async () => {
     test('Supports toggling and filling in AMP integration', async ({page}) => {
@@ -50,7 +51,7 @@ test.describe('AMP integration', async () => {
         const ampToggle = ampModal.getByRole('switch');
         await ampToggle.click();
 
-        await ampModal.getByRole('button', {name: 'Cancel'}).click();
+        await ampModal.getByRole('button', {name: 'Close'}).click();
 
         await expect(page.getByTestId('confirmation-modal')).toHaveText(/leave/i);
 
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/custom.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/custom.test.ts
index 38a25d15a9c..42b71fe7752 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/integrations/custom.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/custom.test.ts
@@ -1,7 +1,8 @@
-import {Integration, IntegrationsResponseType} from '../../../../src/api/integrations';
-import {Webhook, WebhooksResponseType} from '../../../../src/api/webhooks';
-import {chooseOptionInSelect, globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/acceptance';
+import {Integration, IntegrationsResponseType} from '@tryghost/admin-x-framework/api/integrations';
+import {Webhook, WebhooksResponseType} from '@tryghost/admin-x-framework/api/webhooks';
+import {chooseOptionInSelect, limitRequests, mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../../utils/acceptance';
 
 test.describe('Custom integrations', async () => {
     test('Supports creating an integration and adding webhooks', async ({page}) => {
@@ -126,7 +127,7 @@ test.describe('Custom integrations', async () => {
         // Validation
 
         await createModal.getByRole('button', {name: 'Add'}).click();
-        await expect(createModal).toHaveText(/Please enter a name/);
+        await expect(createModal).toHaveText(/Name is required/);
 
         // Successful creation
 
@@ -139,7 +140,7 @@ test.describe('Custom integrations', async () => {
 
         await modal.getByLabel('Description').fill('Test description');
 
-        await modal.getByRole('button', {name: 'Cancel'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(page.getByTestId('confirmation-modal')).toHaveText(/leave/i);
 
@@ -189,7 +190,8 @@ test.describe('Custom integrations', async () => {
         // Edit integration
 
         await modal.getByLabel('Description').fill('Test description');
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(integrationsSection).toHaveText(/Test description/);
 
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/firstPromoter.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/firstPromoter.test.ts
index 4840aace6fc..4f6b9c45cd0 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/integrations/firstPromoter.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/firstPromoter.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, responseFixtures, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('First Promoter integration', async () => {
     test('Supports toggling and filling in First Promoter integration', async ({page}) => {
@@ -50,7 +51,7 @@ test.describe('First Promoter integration', async () => {
         const fpToggle = fpModal.getByRole('switch');
         await fpToggle.click();
 
-        await fpModal.getByRole('button', {name: 'Cancel'}).click();
+        await fpModal.getByRole('button', {name: 'Close'}).click();
 
         await expect(page.getByTestId('confirmation-modal')).toHaveText(/leave/i);
 
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/integrationsList.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/integrationsList.test.ts
new file mode 100644
index 00000000000..f1f00742241
--- /dev/null
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/integrationsList.test.ts
@@ -0,0 +1,37 @@
+import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('Integrations List', async () => {
+    // This is a test for the integrations list, which is a list of integrations that can be toggled on and off
+    // To ensure the app logic shows the correct initial state, all integrations are disabled by default, except for Unsplash 
+    test('Only Unsplash Shows Active on initial new setup', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            getSettingValue: {method: 'GET', path: '/settings/', response: responseFixtures.settings}
+        }});
+        await page.goto('/');
+        const section = page.getByTestId('integrations');
+        // const zapierElement = await section.getByText('Zapier').last();
+        const zapierElement = section.getByTestId('zapier-integration');
+        const slackElement = section.getByTestId('slack-integration');
+        const ampElement = section.getByTestId('amp-integration');
+        const unsplashElement = section.getByTestId('unsplash-integration');
+        const firstPromoterElement = section.getByTestId('firstpromoter-integration');
+        const pinturaElement = section.getByTestId('pintura-integration');
+
+        const zapierStatus = await zapierElement.getByText('Active');
+        const slackStatus = await slackElement.getByText('Active');
+        const ampStatus = await ampElement.getByText('Active');
+        const unsplashStatus = await unsplashElement.getByText('Active');
+        const firstPromoterStatus = await firstPromoterElement.getByText('Active');
+        const pinturaStatus = await pinturaElement.getByText('Active');
+
+        expect(await zapierStatus.isVisible()).toBe(false);
+        expect(await slackStatus.isVisible()).toBe(false);
+        expect(await ampStatus.isVisible()).toBe(false);
+        expect(await unsplashStatus.isVisible()).toBe(true); // Unsplash is the only active integration
+        expect(await firstPromoterStatus.isVisible()).toBe(false);
+        expect(await pinturaStatus.isVisible()).toBe(false);
+    });
+});
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/pintura.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/pintura.test.ts
index d7976987782..7bfd4293845 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/integrations/pintura.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/pintura.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Pintura integration', async () => {
     test('Can toggle Pintura', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/slack.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/slack.test.ts
index 4b7e4fc285e..470cb8b6715 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/integrations/slack.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/slack.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, responseFixtures, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Slack integration', async () => {
     test('Supports updating Slack settings', async ({page}) => {
@@ -22,14 +23,15 @@ test.describe('Slack integration', async () => {
         // Failing validation
 
         await slackModal.getByLabel('Webhook URL').fill('badurl');
-        await slackModal.getByRole('button', {name: 'Save & close'}).click();
+        await slackModal.getByRole('button', {name: 'Save'}).click();
         await expect(slackModal).toContainText('The URL must be in a format like https://hooks.slack.com/services/<your personal key>');
 
         // Successful save
 
         await slackModal.getByLabel('Webhook URL').fill('https://hooks.slack.com/services/123456789/123456789/123456789');
         await slackModal.getByLabel('Username').fill('My site');
-        await slackModal.getByRole('button', {name: 'Save & close'}).click();
+        await slackModal.getByRole('button', {name: 'Save'}).click();
+        await slackModal.getByRole('button', {name: 'Close'}).click();
 
         await expect(slackModal).toHaveCount(0);
 
@@ -58,7 +60,7 @@ test.describe('Slack integration', async () => {
 
         await slackModal.getByLabel('Webhook URL').fill('https://hooks.slack.com/services/123456789/123456789/123456789');
 
-        await slackModal.getByRole('button', {name: 'Cancel'}).click();
+        await slackModal.getByRole('button', {name: 'Close'}).click();
 
         await expect(page.getByTestId('confirmation-modal')).toHaveText(/leave/i);
 
@@ -89,7 +91,7 @@ test.describe('Slack integration', async () => {
         // Doesn't send the request when validation fails
 
         await slackModal.getByLabel('Webhook URL').fill('badurl');
-        await slackModal.getByRole('button', {name: 'Save & close'}).click();
+        await slackModal.getByRole('button', {name: 'Save'}).click();
         await expect(slackModal).toContainText('The URL must be in a format like https://hooks.slack.com/services/<your personal key>');
         expect(lastApiRequests.testSlack).toBeUndefined();
 
@@ -99,7 +101,7 @@ test.describe('Slack integration', async () => {
         await slackModal.getByLabel('Username').fill('My site');
         await slackModal.getByRole('button', {name: 'Send test notification'}).click();
 
-        await expect(page.getByTestId('toast-neutral')).toHaveText(/Check your Slack channel for the test message/);
+        await expect(page.getByTestId('toast-info')).toHaveText(/Check your Slack channel for the test message/);
 
         expect(lastApiRequests.editSettings?.body).toEqual({
             settings: [
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/unsplash.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/unsplash.test.ts
index 0ee1bcee0f1..786ba01b39b 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/integrations/unsplash.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/unsplash.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Unsplash integration', async () => {
     test('Supports toggling unsplash integration', async ({page}) => {
@@ -20,6 +21,8 @@ test.describe('Unsplash integration', async () => {
         const unsplashToggle = unsplashModal.getByRole('switch');
         await unsplashToggle.click();
 
+        await unsplashModal.getByRole('button', {name: 'Save'}).click();
+
         expect(lastApiRequests.editSettings?.body).toEqual({
             settings: [
                 {key: 'unsplash', value: false}
diff --git a/apps/admin-x-settings/test/acceptance/advanced/integrations/zapier.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/zapier.test.ts
index 5185b558f25..d4215389b35 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/integrations/zapier.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/zapier.test.ts
@@ -1,6 +1,7 @@
-import {Integration, IntegrationsResponseType} from '../../../../src/api/integrations';
+import {Integration, IntegrationsResponseType} from '@tryghost/admin-x-framework/api/integrations';
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Zapier integration settings', async () => {
     test('Showing and regenerating API keys', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts b/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts
index fc24fb50033..f7641d95606 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts
@@ -1,27 +1,8 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Labs', async () => {
-    test('Delete all content', async ({page}) => {
-        const {lastApiRequests} = await mockApi({page, requests: {
-            ...globalDataRequests,
-            deleteAllContent: {method: 'DELETE', path: '/db/', response: {}}
-        }});
-
-        await page.goto('/');
-
-        const labsSection = page.getByTestId('labs');
-
-        await labsSection.getByRole('button', {name: 'Open'}).click();
-        await labsSection.getByRole('button', {name: 'Delete'}).click();
-
-        await page.getByTestId('confirmation-modal').getByRole('button', {name: 'Delete'}).click();
-
-        await expect(page.getByTestId('toast-success')).toContainText('All content deleted');
-
-        expect(lastApiRequests.deleteAllContent).toBeTruthy();
-    });
-
     test('Uploading/downloading redirects', async ({page}) => {
         const {lastApiRequests} = await mockApi({page, requests: {
             ...globalDataRequests,
@@ -43,7 +24,7 @@ test.describe('Labs', async () => {
         const fileChooser = await fileChooserPromise;
         await fileChooser.setFiles(`${__dirname}/../../utils/files/redirects.yml`);
 
-        await expect(page.getByTestId('toast-success')).toContainText('Redirects uploaded successfully');
+        await expect(page.getByTestId('toast-success')).toContainText('Redirects uploaded');
 
         expect(lastApiRequests.uploadRedirects).toBeTruthy();
 
@@ -75,7 +56,7 @@ test.describe('Labs', async () => {
         const fileChooser = await fileChooserPromise;
         await fileChooser.setFiles(`${__dirname}/../../utils/files/routes.yml`);
 
-        await expect(page.getByTestId('toast-success')).toContainText('Routes uploaded successfully');
+        await expect(page.getByTestId('toast-success')).toContainText('Routes uploaded');
 
         expect(lastApiRequests.uploadRoutes).toBeTruthy();
 
diff --git a/apps/admin-x-settings/test/acceptance/advanced/migrationTools.test.ts b/apps/admin-x-settings/test/acceptance/advanced/migrationTools.test.ts
new file mode 100644
index 00000000000..2601214fdd6
--- /dev/null
+++ b/apps/admin-x-settings/test/acceptance/advanced/migrationTools.test.ts
@@ -0,0 +1,80 @@
+import {expect, test} from '@playwright/test';
+import {expectExternalNavigate, mockApi} from '@tryghost/admin-x-framework/test/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+
+test.describe('Migration tools', async () => {
+    test('Built-in migrators', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests
+        }});
+
+        await page.goto('/');
+
+        const migrationSection = page.getByTestId('migrationtools');
+
+        await migrationSection.getByRole('button', {name: 'Substack'}).click();
+        await expectExternalNavigate(page, {route: '/migrate/substack'});
+
+        await page.goto('/');
+
+        await migrationSection.getByRole('button', {name: 'Medium'}).click();
+        await expectExternalNavigate(page, {route: '/migrate/medium'});
+
+        await page.goto('/');
+
+        await migrationSection.getByRole('button', {name: 'Mailchimp'}).click();
+        await expectExternalNavigate(page, {route: '/migrate/mailchimp'});
+    });
+
+    test('Universal import', async ({page}) => {
+        const {lastApiRequests} = await mockApi({page, requests: {
+            ...globalDataRequests,
+            importContent: {path: '/db/', method: 'POST', response: {}}
+        }});
+
+        await page.goto('/');
+
+        const migrationSection = page.getByTestId('migrationtools');
+
+        await migrationSection.getByRole('button', {name: 'Universal import'}).click();
+
+        const universalImportModal = page.getByTestId('universal-import-modal');
+
+        const fileChooserPromise = page.waitForEvent('filechooser');
+
+        universalImportModal.getByText(/JSON or zip file/).click();
+
+        const fileChooser = await fileChooserPromise;
+        await fileChooser.setFiles(`${__dirname}/../../utils/files/upload.zip`);
+
+        const confirmationModal = page.getByTestId('confirmation-modal');
+
+        await expect(confirmationModal).toContainText('Import in progress');
+
+        await confirmationModal.getByRole('button', {name: 'Got it'}).click();
+
+        await expect(universalImportModal).not.toBeVisible();
+        await expect(confirmationModal).not.toBeVisible();
+
+        expect(lastApiRequests.importContent).toBeTruthy();
+    });
+
+    test('Content export', async ({page}) => {
+        const {lastApiRequests} = await mockApi({page, requests: {
+            ...globalDataRequests,
+            downloadAllContent: {path: '/db/', method: 'GET', response: {}}
+        }});
+
+        await page.goto('/');
+
+        const migrationSection = page.getByTestId('migrationtools');
+
+        await migrationSection.getByRole('tab', {name: 'Export'}).click();
+
+        await migrationSection.getByRole('button', {name: 'Export content'}).click();
+
+        await expect(page.locator('iframe#iframeDownload')).toHaveAttribute('src', /\/db\/$/);
+
+        expect(lastApiRequests.downloadAllContent).toBeTruthy();
+    });
+});
diff --git a/apps/admin-x-settings/test/acceptance/email/defaultRecipients.test.ts b/apps/admin-x-settings/test/acceptance/email/defaultRecipients.test.ts
index ad5afe4c4a6..565c3dd9d8b 100644
--- a/apps/admin-x-settings/test/acceptance/email/defaultRecipients.test.ts
+++ b/apps/admin-x-settings/test/acceptance/email/defaultRecipients.test.ts
@@ -1,5 +1,6 @@
-import {chooseOptionInSelect, globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance';
+import {chooseOptionInSelect, mockApi, responseFixtures, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
 
 test.describe('Default recipient settings', async () => {
     test('Supports editing default recipients', async ({page}) => {
@@ -103,4 +104,33 @@ test.describe('Default recipient settings', async () => {
             ]
         });
     });
+
+    test('renders existing default recipients filters correctly', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseTiers: {method: 'GET', path: '/tiers/?filter=&limit=20', response: responseFixtures.tiers},
+            browseLabels: {method: 'GET', path: '/labels/?filter=&limit=20', response: responseFixtures.labels},
+            browseOffers: {method: 'GET', path: '/offers/?filter=&limit=20', response: responseFixtures.offers},
+            browseSettings: {...globalDataRequests.browseSettings, response: updatedSettingsResponse([
+                {
+                    key: 'editor_default_email_recipients',
+                    value: 'filter'
+                },
+                {
+                    key: 'editor_default_email_recipients_filter',
+                    value: '645453f4d254799990dd0e22,label:first-label,offer_redemptions:6487ea6464fca78ec2fff5fe'
+                }
+            ])}
+        }});
+
+        await page.goto('/');
+
+        const section = page.getByTestId('default-recipients');
+        await section.getByRole('button', {name: 'Edit'}).click();
+
+        await expect(section.getByText('Specific people')).toHaveCount(1);
+        await expect(section.getByText('Basic Supporter')).toHaveCount(1);
+        await expect(section.getByText('first-label')).toHaveCount(1);
+        await expect(section.getByText('First offer')).toHaveCount(1);
+    });
 });
diff --git a/apps/admin-x-settings/test/acceptance/email/mailgun.test.ts b/apps/admin-x-settings/test/acceptance/email/mailgun.test.ts
index a58cf55fb08..a34024cfdf4 100644
--- a/apps/admin-x-settings/test/acceptance/email/mailgun.test.ts
+++ b/apps/admin-x-settings/test/acceptance/email/mailgun.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Mailgun settings', async () => {
     test('Supports setting up mailgun', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts b/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts
index 4265e4e19ff..57868eaeeef 100644
--- a/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts
+++ b/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts
@@ -1,6 +1,6 @@
-import {NewslettersResponseType} from '../../../src/api/newsletters';
-import {chooseOptionInSelect, globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../utils/acceptance';
+import {chooseOptionInSelect, limitRequests, mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
 
 test.describe('Newsletter settings', async () => {
     test('Supports creating a new newsletter', async ({page}) => {
@@ -27,8 +27,7 @@ test.describe('Newsletter settings', async () => {
         const modal = page.getByTestId('add-newsletter-modal');
         await modal.getByRole('button', {name: 'Create'}).click();
 
-        await expect(page.getByTestId('toast-error')).toHaveText(/Can't save newsletter/);
-        await expect(modal).toHaveText(/Please enter a name/);
+        await expect(modal).toHaveText(/A name is required for your newsletter/);
 
         // Shouldn't be necessary, but without these Playwright doesn't click Create the second time for some reason
         await modal.getByRole('button', {name: 'Cancel'}).click();
@@ -70,8 +69,7 @@ test.describe('Newsletter settings', async () => {
         await modal.getByPlaceholder('Weekly Roundup').fill('');
         await modal.getByRole('button', {name: 'Save'}).click();
 
-        await expect(page.getByTestId('toast-error')).toHaveText(/Can't save newsletter/);
-        await expect(modal).toHaveText(/Please enter a name/);
+        await expect(modal).toHaveText(/A name is required for your newsletter/);
 
         await modal.getByPlaceholder('Weekly Roundup').fill('Updated newsletter');
 
@@ -91,80 +89,209 @@ test.describe('Newsletter settings', async () => {
         });
     });
 
-    test('Displays a prompt when email verification is required', async ({page}) => {
-        await mockApi({page, requests: {
-            ...globalDataRequests,
-            browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
-            editNewsletter: {method: 'PUT', path: `/newsletters/${responseFixtures.newsletters.newsletters[0].id}/?include=count.active_members%2Ccount.posts`, response: {
-                newsletters: [responseFixtures.newsletters.newsletters[0]],
-                meta: {
-                    sent_email_verification: ['sender_email']
-                }
-            }}
-        }});
+    test.describe('Email addresses', async () => {
+        test.describe('For self-hosters', async () => {
+            test('Displays a prompt when email verification is required', async ({page}) => {
+                await mockApi({page, requests: {
+                    ...globalDataRequests,
+                    browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
+                    editNewsletter: {method: 'PUT', path: `/newsletters/${responseFixtures.newsletters.newsletters[0].id}/?include=count.active_members%2Ccount.posts`, response: {
+                        newsletters: [responseFixtures.newsletters.newsletters[0]],
+                        meta: {
+                            sent_email_verification: ['sender_email']
+                        }
+                    }}
+                }});
 
-        await page.goto('/');
+                await page.goto('/');
 
-        const section = page.getByTestId('newsletters');
+                const section = page.getByTestId('newsletters');
 
-        await section.getByText('Awesome newsletter').click();
+                await section.getByText('Awesome newsletter').click();
 
-        const modal = page.getByTestId('newsletter-modal');
+                const modal = page.getByTestId('newsletter-modal');
 
-        await modal.getByLabel('Sender email').fill('not-an-email');
-        await modal.getByRole('button', {name: 'Save'}).click();
+                await modal.getByLabel('Sender email').fill('not-an-email');
+                await modal.getByRole('button', {name: 'Save'}).click();
 
-        await expect(page.getByTestId('toast-error')).toHaveText(/Can't save newsletter/);
-        await expect(modal).toHaveText(/Invalid email/);
+                await expect(modal).toHaveText(/Enter a valid email address/);
 
-        await modal.getByLabel('Sender email').fill('test@test.com');
-        await modal.getByRole('button', {name: 'Save'}).click();
+                await modal.getByLabel('Sender email').fill('test@test.com');
+                await modal.getByRole('button', {name: 'Save'}).click();
 
-        await expect(page.getByTestId('confirmation-modal')).toHaveCount(1);
-        await expect(page.getByTestId('confirmation-modal')).toHaveText(/Confirm newsletter email address/);
-        await expect(page.getByTestId('confirmation-modal')).toHaveText(/default email address \(noreply@test.com\)/);
-    });
-
-    test('Displays the current email when changing sender address', async ({page}) => {
-        const response = {
-            ...responseFixtures.newsletters,
-            newsletters: [{
-                ...responseFixtures.newsletters.newsletters[0],
-                sender_email: 'current@test.com'
-            }]
-        } satisfies NewslettersResponseType;
-
-        await mockApi({page, requests: {
-            ...globalDataRequests,
-            browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response},
-            editNewsletter: {method: 'PUT', path: `/newsletters/${responseFixtures.newsletters.newsletters[0].id}/?include=count.active_members%2Ccount.posts`, response: {
-                newsletters: response.newsletters,
-                meta: {
-                    sent_email_verification: ['sender_email']
-                }
-            }}
-        }});
-
-        await page.goto('/');
+                await expect(page.getByTestId('toast-info')).toHaveCount(1);
+                await expect(page.getByTestId('toast-info')).toHaveText(/sent a confirmation email to the new address/);
+            });
+        });
 
-        const section = page.getByTestId('newsletters');
+        test.describe('For Ghost (Pro) users without custom domain', () => {
+            test('Does not allow the Sender email address to be edited', async ({page}) => {
+                await mockApi({page, requests: {
+                    ...globalDataRequests,
+                    browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
+                    browseConfig: {
+                        ...globalDataRequests.browseConfig,
+                        response: {
+                            config: {
+                                ...responseFixtures.config.config,
+                                hostSettings: {
+                                    managedEmail: {
+                                        enabled: true
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }});
+
+                await page.goto('/');
+                const section = page.getByTestId('newsletters');
+                await section.getByText('Awesome newsletter').click();
+                const modal = page.getByTestId('newsletter-modal');
+                const senderEmailField = modal.getByLabel('Sender email');
+
+                // Test that there is no input field near "Sender email"
+                const parentElementLocator = senderEmailField.locator('xpath=..');
+                const inputElementsNearby = await parentElementLocator.locator('input').count();
+
+                expect(inputElementsNearby).toBe(0);
+            });
+
+            test('Allow full customisation of the reply-to address', async ({page}) => {
+                await mockApi({page, requests: {
+                    ...globalDataRequests,
+                    browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
+                    editNewsletter: {method: 'PUT', path: `/newsletters/${responseFixtures.newsletters.newsletters[0].id}/?include=count.active_members%2Ccount.posts`, response: {
+                        newsletters: [responseFixtures.newsletters.newsletters[0]],
+                        meta: {
+                            sent_email_verification: ['sender_reply_to']
+                        }
+                    }},
+                    browseConfig: {
+                        ...globalDataRequests.browseConfig,
+                        response: {
+                            config: {
+                                ...responseFixtures.config.config,
+                                hostSettings: {
+                                    managedEmail: {
+                                        enabled: true
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }});
 
-        await section.getByText('Awesome newsletter').click();
+                await page.goto('/');
+                const section = page.getByTestId('newsletters');
+                await section.getByText('Awesome newsletter').click();
+                const modal = page.getByTestId('newsletter-modal');
+                const replyToEmail = modal.getByLabel('Reply-to email');
 
-        const modal = page.getByTestId('newsletter-modal');
+                await replyToEmail.fill('not-an-email');
+                await modal.getByRole('button', {name: 'Save'}).click();
 
-        await modal.getByLabel('Sender email').fill('not-an-email');
-        await modal.getByRole('button', {name: 'Save'}).click();
+                await expect(modal).toHaveText(/Enter a valid email address/);
 
-        await expect(page.getByTestId('toast-error')).toHaveText(/Can't save newsletter/);
-        await expect(modal).toHaveText(/Invalid email/);
+                await replyToEmail.fill('test@test.com');
+                await modal.getByRole('button', {name: 'Save'}).click();
 
-        await modal.getByLabel('Sender email').fill('test@test.com');
-        await modal.getByRole('button', {name: 'Save'}).click();
+                await expect(page.getByTestId('toast-info')).toHaveCount(1);
+                await expect(page.getByTestId('toast-info')).toHaveText(/sent a confirmation email to the new address/);
+            });
+        });
 
-        await expect(page.getByTestId('confirmation-modal')).toHaveCount(1);
-        await expect(page.getByTestId('confirmation-modal')).toHaveText(/Confirm newsletter email address/);
-        await expect(page.getByTestId('confirmation-modal')).toHaveText(/previous email address \(current@test.com\)/);
+        test.describe('For Ghost (Pro) users with custom sending domain', () => {
+            test('The sender email address can be changed partially (username but not domain name)', async ({page}) => {
+                await mockApi({page, requests: {
+                    ...globalDataRequests,
+                    browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
+                    editNewsletter: {method: 'PUT', path: `/newsletters/${responseFixtures.newsletters.newsletters[0].id}/?include=count.active_members%2Ccount.posts`, response: {
+                        newsletters: [responseFixtures.newsletters.newsletters[0]],
+                        meta: {
+                            sent_email_verification: []
+                        }
+                    }},
+                    browseConfig: {
+                        ...globalDataRequests.browseConfig,
+                        response: {
+                            config: {
+                                ...responseFixtures.config.config,
+                                hostSettings: {
+                                    managedEmail: {
+                                        enabled: true,
+                                        sendingDomain: 'customdomain.com'
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }});
+
+                await page.goto('/');
+                const section = page.getByTestId('newsletters');
+                await section.getByText('Awesome newsletter').click();
+                const modal = page.getByTestId('newsletter-modal');
+                const senderEmail = modal.getByLabel('Sender email');
+
+                // Error case #1: add invalid email address
+                await senderEmail.fill('Harry Potter');
+                await modal.getByRole('button', {name: 'Save'}).click();
+                await expect(modal).toHaveText(/Enter a valid email address/);
+
+                // Error case #2: the sender email address doesn't match the custom sending domain
+                await senderEmail.fill('harry@potter.com');
+                await modal.getByRole('button', {name: 'Save'}).click();
+                await expect(modal).toHaveText(/Email address must end with @customdomain.com/);
+
+                // But can have any address on the same domain, without verification
+                await senderEmail.fill('harry@customdomain.com');
+                await modal.getByRole('button', {name: 'Save'}).click();
+                await expect(page.getByTestId('confirmation-modal')).toHaveCount(0);
+            });
+
+            test('Allow full customisation of the reply-to address, with verification', async ({page}) => {
+                await mockApi({page, requests: {
+                    ...globalDataRequests,
+                    browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
+                    editNewsletter: {method: 'PUT', path: `/newsletters/${responseFixtures.newsletters.newsletters[0].id}/?include=count.active_members%2Ccount.posts`, response: {
+                        newsletters: [responseFixtures.newsletters.newsletters[0]],
+                        meta: {
+                            sent_email_verification: ['sender_reply_to']
+                        }
+                    }},
+                    browseConfig: {
+                        ...globalDataRequests.browseConfig,
+                        response: {
+                            config: {
+                                ...responseFixtures.config.config,
+                                hostSettings: {
+                                    managedEmail: {
+                                        enabled: true,
+                                        sendingDomain: 'customdomain.com'
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }});
+
+                await page.goto('/');
+                const section = page.getByTestId('newsletters');
+                await section.getByText('Awesome newsletter').click();
+                const modal = page.getByTestId('newsletter-modal');
+                const replyToEmail = modal.getByLabel('Reply-to email');
+
+                // Full flexibility for the reply-to address
+                await replyToEmail.fill('hermione@granger.com');
+                expect(await replyToEmail.inputValue()).toBe('hermione@granger.com');
+
+                // There is a verification popup for the new reply-to address
+                await modal.getByRole('button', {name: 'Save'}).click();
+                await expect(page.getByTestId('toast-info')).toHaveCount(1);
+                await expect(page.getByTestId('toast-info')).toHaveText(/sent a confirmation email to the new address/);
+            });
+        });
     });
 
     test('Supports archiving newsletters', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/facebook.test.ts b/apps/admin-x-settings/test/acceptance/general/facebook.test.ts
index 7673afde94c..e60283bbb01 100644
--- a/apps/admin-x-settings/test/acceptance/general/facebook.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/facebook.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Facebook settings', async () => {
     test('Supports editing the facebook card', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/lockSite.test.ts b/apps/admin-x-settings/test/acceptance/general/lockSite.test.ts
index c198bf65329..0523a313742 100644
--- a/apps/admin-x-settings/test/acceptance/general/lockSite.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/lockSite.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Site password settings', async () => {
     test('Supports locking and unlocking the site', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/metadata.test.ts b/apps/admin-x-settings/test/acceptance/general/metadata.test.ts
index 9307c7c2697..4240f3a83c8 100644
--- a/apps/admin-x-settings/test/acceptance/general/metadata.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/metadata.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Metadata settings', async () => {
     test('Supports editing metadata', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/publicationLanguage.test.ts b/apps/admin-x-settings/test/acceptance/general/publicationLanguage.test.ts
index bdea09f147f..16e0e89fc81 100644
--- a/apps/admin-x-settings/test/acceptance/general/publicationLanguage.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/publicationLanguage.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Publication language settings', async () => {
     test('Supports editing the locale', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/socialAccounts.test.ts b/apps/admin-x-settings/test/acceptance/general/socialAccounts.test.ts
index 1ec12c3793a..a211dcad8c5 100644
--- a/apps/admin-x-settings/test/acceptance/general/socialAccounts.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/socialAccounts.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, testUrlValidation, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, testUrlValidation, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Social account settings', async () => {
     test('Supports editing social URLs', async ({page}) => {
@@ -16,19 +17,19 @@ test.describe('Social account settings', async () => {
         const section = page.getByTestId('social-accounts');
 
         await expect(section.getByText('https://www.facebook.com/ghost')).toHaveCount(1);
-        await expect(section.getByText('https://twitter.com/ghost')).toHaveCount(1);
+        await expect(section.getByText('https://x.com/ghost')).toHaveCount(1);
 
         await section.getByRole('button', {name: 'Edit'}).click();
 
         await section.getByLabel(`URL of your publication's Facebook Page`).fill('https://www.facebook.com/fb');
-        await section.getByLabel('URL of your X (formerly Twitter) profile').fill('https://twitter.com/tw');
+        await section.getByLabel('URL of your X (formerly Twitter) profile').fill('https://x.com/tw');
 
         await section.getByRole('button', {name: 'Save'}).click();
 
         await expect(section.getByLabel('URL of your X (formerly Twitter) profile')).toHaveCount(0);
 
         await expect(section.getByText('https://www.facebook.com/fb')).toHaveCount(1);
-        await expect(section.getByText('https://twitter.com/tw')).toHaveCount(1);
+        await expect(section.getByText('https://x.com/tw')).toHaveCount(1);
 
         expect(lastApiRequests.editSettings?.body).toEqual({
             settings: [
@@ -111,26 +112,26 @@ test.describe('Social account settings', async () => {
         await testUrlValidation(
             twitterInput,
             'twitter.com/username',
-            'https://twitter.com/username'
+            'https://x.com/username'
         );
 
         await testUrlValidation(
             twitterInput,
             'testuser',
-            'https://twitter.com/testuser'
+            'https://x.com/testuser'
         );
 
         await testUrlValidation(
             twitterInput,
             'http://github.com/username',
-            'https://twitter.com/username'
+            'https://x.com/username'
         );
 
         await testUrlValidation(
             twitterInput,
             '*(&*(%%))',
             '*(&*(%%))',
-            'The URL must be in a format like https://twitter.com/yourUsername'
+            'The URL must be in a format like https://x.com/yourUsername'
         );
 
         await testUrlValidation(
diff --git a/apps/admin-x-settings/test/acceptance/general/timeZone.test.ts b/apps/admin-x-settings/test/acceptance/general/timeZone.test.ts
index 0776eb46f9c..23212b4f680 100644
--- a/apps/admin-x-settings/test/acceptance/general/timeZone.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/timeZone.test.ts
@@ -1,5 +1,6 @@
-import {chooseOptionInSelect, globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {chooseOptionInSelect, mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
 
 test.describe('Time zone settings', async () => {
     test('Supports editing the time zone', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/titleAndDescription.test.ts b/apps/admin-x-settings/test/acceptance/general/titleAndDescription.test.ts
index c07a7bf1b25..9dcd118d8d3 100644
--- a/apps/admin-x-settings/test/acceptance/general/titleAndDescription.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/titleAndDescription.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Title and description settings', async () => {
     test('Supports editing the title and description', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/twitter.test.ts b/apps/admin-x-settings/test/acceptance/general/twitter.test.ts
index b4425726d28..cc0e3caef9e 100644
--- a/apps/admin-x-settings/test/acceptance/general/twitter.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/twitter.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Twitter settings', async () => {
     test('Supports editing the twitter card', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/users/actions.test.ts b/apps/admin-x-settings/test/acceptance/general/users/actions.test.ts
index 933df5a927a..1bb5e1d0bd5 100644
--- a/apps/admin-x-settings/test/acceptance/general/users/actions.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/users/actions.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {limitRequests, mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('User actions', async () => {
     test('Supports suspending a user', async ({page}) => {
@@ -127,7 +128,7 @@ test.describe('User actions', async () => {
         await confirmation.getByRole('button', {name: 'Delete user'}).click();
 
         await expect(page.getByTestId('toast-success')).toHaveText(/User deleted/);
-        await expect(activeTab.getByTestId('user-list-item')).toHaveCount(0);
+        await expect(activeTab.getByTestId('user-tabview')).toHaveCount(0);
 
         expect(lastApiRequests.deleteUser?.url).toMatch(new RegExp(`/users/${authorUser.id}`));
     });
@@ -172,7 +173,7 @@ test.describe('User actions', async () => {
 
         await modal.getByRole('button', {name: 'Actions'}).click();
         await expect(page.getByTestId('popover-content').getByRole('button', {name: 'Make owner'})).toHaveCount(0);
-        await page.getByTestId('popover-overlay').click();
+        await modal.getByRole('button', {name: 'Actions'}).click();
 
         await modal.getByRole('button', {name: 'Close'}).click();
 
diff --git a/apps/admin-x-settings/test/acceptance/general/users/invite.test.ts b/apps/admin-x-settings/test/acceptance/general/users/invite.test.ts
index 9169d599544..b526c8b7214 100644
--- a/apps/admin-x-settings/test/acceptance/general/users/invite.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/users/invite.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {limitRequests, mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('User invitations', async () => {
     test('Supports inviting a user', async ({page}) => {
@@ -37,7 +38,7 @@ test.describe('User invitations', async () => {
 
         // Validation failures
 
-        await modal.getByRole('button', {name: 'Send invitation now'}).click();
+        await modal.getByRole('button', {name: 'Send invitation'}).click();
         await expect(modal).toContainText('Please enter a valid email address');
 
         // Reset error with keydown event
@@ -46,24 +47,24 @@ test.describe('User invitations', async () => {
 
         await modal.getByLabel('Email address').fill('test');
         await expect(modal).not.toContainText('Please enter a valid email address');
-        await modal.getByRole('button', {name: 'Send invitation now'}).click();
+        await modal.getByRole('button', {name: 'Send invitation'}).click();
         await expect(modal).toContainText('Please enter a valid email address');
 
         await modal.getByLabel('Email address').fill('author@test.com');
-        await modal.getByRole('button', {name: 'Send invitation now'}).click();
+        await modal.getByRole('button', {name: 'Retry'}).click();
         await expect(modal).toContainText('A user with that email address already exists.');
 
         await modal.getByLabel('Email address').fill('invitee@test.com');
-        await modal.getByRole('button', {name: 'Send invitation now'}).click();
+        await modal.getByRole('button', {name: 'Retry'}).click();
         await expect(modal).toContainText('A user with that email address was already invited.');
 
         // Successful invitation
 
         await modal.getByLabel('Email address').fill('newuser@test.com');
-        await modal.locator('input[value=author]').check();
-        await modal.getByRole('button', {name: 'Send invitation now'}).click();
+        await modal.locator('button[value=author]').click();
+        await modal.getByRole('button', {name: 'Retry'}).click();
 
-        await expect(page.getByTestId('toast-success')).toHaveText(/Invitation successfully sent to newuser@test\.com/);
+        await expect(page.getByTestId('toast-success')).toHaveText(/Invitation sent/);
 
         await section.getByRole('tab', {name: 'Invited'}).click();
 
@@ -102,7 +103,7 @@ test.describe('User invitations', async () => {
 
         await listItem.getByRole('button', {name: 'Resend'}).click();
 
-        await expect(page.getByTestId('toast-success')).toHaveText(/Invitation resent! \(invitee@test\.com\)/);
+        await expect(page.getByTestId('toast-success')).toHaveText(/Invitation resent/);
 
         // Resending works by deleting and re-adding the invite
 
@@ -137,7 +138,7 @@ test.describe('User invitations', async () => {
 
         await listItem.getByRole('button', {name: 'Revoke'}).click();
 
-        await expect(page.getByTestId('toast-success')).toHaveText(/Invitation revoked \(invitee@test\.com\)/);
+        await expect(page.getByTestId('toast-success')).toHaveText(/Invitation revoked/);
 
         expect(lastApiRequests.deleteInvite?.url).toMatch(new RegExp(`/invites/${responseFixtures.invites.invites[0].id}`));
     });
@@ -173,11 +174,11 @@ test.describe('User invitations', async () => {
 
         const modal = page.getByTestId('invite-user-modal');
 
-        await modal.locator('input[value=author]').check();
+        await modal.locator('button[value=author]').click();
 
         await expect(modal).toHaveText(/Your plan does not support more staff/);
 
-        await modal.locator('input[value=contributor]').check();
+        await modal.locator('button[value=contributor]').click();
 
         await expect(modal).not.toHaveText(/Your plan does not support more staff/);
     });
diff --git a/apps/admin-x-settings/test/acceptance/general/users/password.test.ts b/apps/admin-x-settings/test/acceptance/general/users/password.test.ts
index 6361573039b..0f42790fe0f 100644
--- a/apps/admin-x-settings/test/acceptance/general/users/password.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/users/password.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('User passwords', async () => {
     test('Supports changing password', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/general/users/profile.test.ts b/apps/admin-x-settings/test/acceptance/general/users/profile.test.ts
index 79a0809e91b..1a92ddab13c 100644
--- a/apps/admin-x-settings/test/acceptance/general/users/profile.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/users/profile.test.ts
@@ -1,6 +1,7 @@
-import {StaffTokenResponseType} from '../../../../src/api/staffToken';
+import {StaffTokenResponseType} from '@tryghost/admin-x-framework/api/staffToken';
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures, testUrlValidation} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {mockApi, responseFixtures, settingsWithStripe, testUrlValidation} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('User profile', async () => {
     test('Supports editing user profiles', async ({page}) => {
@@ -34,28 +35,24 @@ test.describe('User profile', async () => {
         // Validation failures
 
         await modal.getByLabel('Full name').fill('');
-        await modal.getByRole('button', {name: 'Save & close'}).click();
-        await expect(modal).toContainText('Please enter a name');
-
-        await modal.getByLabel('Full name').fill(new Array(195).join('a'));
-        await modal.getByRole('button', {name: 'Save & close'}).click();
-        await expect(modal).toContainText('Name is too long');
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await expect(modal).toContainText('Name is required');
 
         await modal.getByLabel('Email').fill('test');
-        await modal.getByRole('button', {name: 'Save & close'}).click();
-        await expect(modal).toContainText('Please enter a valid email address');
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await expect(modal).toContainText('Enter a valid email address');
 
         await modal.getByLabel('Location').fill(new Array(195).join('a'));
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
         await expect(modal).toContainText('Location is too long');
 
         await modal.getByLabel('Bio').fill(new Array(210).join('a'));
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
         await expect(modal).toContainText('Bio is too long');
 
         await modal.getByLabel('Website').fill('not-a-website');
-        await modal.getByLabel('Website').blur();
-        await expect(modal).toContainText('Please enter a valid URL');
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await expect(modal).toContainText('Enter a valid URL');
 
         const facebookInput = modal.getByLabel('Facebook profile');
 
@@ -119,27 +116,27 @@ test.describe('User profile', async () => {
 
         await testUrlValidation(
             twitterInput,
-            'twitter.com/username',
-            'https://twitter.com/username'
+            'x.com/username',
+            'https://x.com/username'
         );
 
         await testUrlValidation(
             twitterInput,
             'testuser',
-            'https://twitter.com/testuser'
+            'https://x.com/testuser'
         );
 
         await testUrlValidation(
             twitterInput,
             'http://github.com/username',
-            'https://twitter.com/username'
+            'https://x.com/username'
         );
 
         await testUrlValidation(
             twitterInput,
             '*(&*(%%))',
             '*(&*(%%))',
-            'The URL must be in a format like https://twitter.com/yourUsername'
+            'The URL must be in a format like https://x.com/yourUsername'
         );
 
         await testUrlValidation(
@@ -154,6 +151,7 @@ test.describe('User profile', async () => {
         await modal.getByLabel('Full name').fill('New Admin');
         await modal.getByLabel('Email').fill('newadmin@test.com');
         await modal.getByLabel('Slug').fill('newadmin');
+        await expect(modal.getByText('https://example.com/author/newadmin')).toBeVisible();
         await modal.getByLabel('Location').fill('some location');
         await modal.getByLabel('Website').fill('https://example.com');
         await modal.getByLabel('Facebook profile').fill('fb');
@@ -168,9 +166,10 @@ test.describe('User profile', async () => {
         await modal.getByLabel(/Paid member cancellations/).check();
         await modal.getByLabel(/Milestones/).uncheck();
 
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
         await expect(modal.getByRole('button', {name: 'Saved'})).toBeVisible();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(listItem.getByText('New Admin')).toBeVisible();
         await expect(listItem.getByText('newadmin@test.com')).toBeVisible();
@@ -292,6 +291,71 @@ test.describe('User profile', async () => {
         await expect(modal.getByLabel(/Milestones/)).toBeHidden();
     });
 
+    test('Shows donation notification option when Stripe enabled', async ({page}) => {
+        const userToEdit = responseFixtures.users.users.find(user => user.email === 'administrator@test.com')!;
+
+        const {lastApiRequests} = await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseUsers: {method: 'GET', path: '/users/?limit=100&include=roles', response: responseFixtures.users},
+            editUser: {method: 'PUT', path: `/users/${userToEdit.id}/?include=roles`, response: {
+                users: [{
+                    ...userToEdit
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+
+        const section = page.getByTestId('users');
+        const activeTab = section.locator('[role=tabpanel]:not(.hidden)');
+
+        await section.getByRole('tab', {name: 'Administrators'}).click();
+
+        const listItem = activeTab.getByTestId('user-list-item').last();
+        await listItem.hover();
+        await listItem.getByRole('button', {name: 'Edit'}).click();
+
+        const modal = page.getByTestId('user-detail-modal');
+
+        await expect(modal.getByLabel(/Tips & donations/)).toBeVisible();
+        await expect(modal.getByLabel(/Tips & donations/)).toHaveAttribute('aria-checked', 'true');
+
+        await modal.getByLabel(/Tips & donations/).uncheck();
+
+        await expect(modal.getByLabel(/Tips & donations/)).toHaveAttribute('aria-checked', 'false');
+
+        await modal.getByRole('button', {name: 'Save'}).click();
+
+        expect(lastApiRequests.editUser?.body).toMatchObject({
+            users: [{
+                donation_notifications: false
+            }]
+        });
+    });
+
+    test('Hides donation notification option when Stripe disabled', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseUsers: {method: 'GET', path: '/users/?limit=100&include=roles', response: responseFixtures.users}
+        }});
+
+        await page.goto('/');
+
+        const section = page.getByTestId('users');
+        const activeTab = section.locator('[role=tabpanel]:not(.hidden)');
+
+        await section.getByRole('tab', {name: 'Administrators'}).click();
+
+        const listItem = activeTab.getByTestId('user-list-item').last();
+        await listItem.hover();
+        await listItem.getByRole('button', {name: 'Edit'}).click();
+
+        const modal = page.getByTestId('user-detail-modal');
+
+        await expect(modal.getByLabel(/Tips & donations/)).not.toBeVisible();
+    });
+
     test('Warns when leaving without saving', async ({page}) => {
         const userToEdit = responseFixtures.users.users.find(user => user.email === 'administrator@test.com')!;
 
@@ -316,7 +380,7 @@ test.describe('User profile', async () => {
 
         await modal.getByLabel('Full name').fill('Updated');
 
-        await modal.getByRole('button', {name: 'Cancel'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(page.getByTestId('confirmation-modal')).toHaveText(/leave/i);
 
@@ -376,7 +440,7 @@ test.describe('User profile', async () => {
         await listItem.getByRole('button', {name: 'Edit'}).click();
 
         await expect(modal.getByTestId('api-keys')).toBeHidden();
-        await modal.getByRole('button', {name: 'Cancel'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         // Can see and regenerate your own staff token
 
diff --git a/apps/admin-x-settings/test/acceptance/general/users/roles.test.ts b/apps/admin-x-settings/test/acceptance/general/users/roles.test.ts
index 050710aa304..b8ec699ed76 100644
--- a/apps/admin-x-settings/test/acceptance/general/users/roles.test.ts
+++ b/apps/admin-x-settings/test/acceptance/general/users/roles.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, meWithRole, mockApi, responseFixtures} from '../../../utils/acceptance';
+import {globalDataRequests} from '../../../utils/acceptance';
+import {meWithRole, mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('User roles', async () => {
     test('Shows users under their role', async ({page}) => {
@@ -15,10 +16,10 @@ test.describe('User roles', async () => {
         await expect(section.getByTestId('owner-user')).toHaveText(/owner@test\.com/);
 
         await expect(section.getByRole('tab')).toHaveText([
-            'Administrators',
-            'Editors',
-            'Authors',
-            'Contributors',
+            'Administrators1',
+            'Editors1',
+            'Authors1',
+            'Contributors1',
             'Invited'
         ]);
 
@@ -56,7 +57,7 @@ test.describe('User roles', async () => {
         await page.goto('/');
 
         const section = page.getByTestId('users');
-        const activeTab = section.locator('[role=tabpanel]:not(.hidden)');
+        const activeTab = section.locator('[role=tabpanel]:not([hidden])');
 
         await section.getByRole('tab', {name: 'Authors'}).click();
 
@@ -66,12 +67,14 @@ test.describe('User roles', async () => {
 
         const modal = page.getByTestId('user-detail-modal');
 
-        await modal.locator('input[value=editor]').check();
+        await modal.locator('button[value=editor]').click();
 
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
         await expect(modal.getByRole('button', {name: 'Saved'})).toBeVisible();
 
+        await modal.getByRole('button', {name: 'Close'}).click();
+
         await expect(activeTab).toHaveText(/No authors found./);
 
         await section.getByRole('tab', {name: 'Editors'}).click();
@@ -145,6 +148,7 @@ test.describe('User roles', async () => {
 
         await modal.getByLabel('Full name').fill('New name');
         await modal.getByRole('button', {name: 'Save'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(modal).toBeHidden();
     });
diff --git a/apps/admin-x-settings/test/acceptance/growth/tips-and-donations.test.ts b/apps/admin-x-settings/test/acceptance/growth/tips-and-donations.test.ts
new file mode 100644
index 00000000000..0314472c195
--- /dev/null
+++ b/apps/admin-x-settings/test/acceptance/growth/tips-and-donations.test.ts
@@ -0,0 +1,36 @@
+import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, settingsWithStripe} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('Tips and donations', () => {
+    test('Is not shown when Stripe is disabled', async ({page}) => {
+        await mockApi({page, requests: {...globalDataRequests}});
+        await page.goto('/');
+
+        await expect(page.locator('[data-setting-nav-item] #tips-and-donations')).not.toBeVisible();
+        await expect(page.getByTestId('tips-and-donations')).not.toBeVisible();
+    });
+
+    test('Shows suggested amount and shareable link when Stripe is enabled', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe}
+        }});
+        await page.goto('/');
+
+        const section = page.getByTestId('tips-and-donations');
+
+        await expect(page.locator('[data-setting-nav-item] #tips-and-donations')).toBeVisible();
+        await expect(section).toBeVisible();
+
+        await expect(section.getByTestId('suggested-amount')).toHaveText(/\$5/);
+        await expect(section.getByTestId('donate-url')).toHaveText('http://test.com/#/portal/support');
+        await expect(section.getByTestId('preview-shareable-link')).not.toBeVisible();
+        await expect(section.getByTestId('copy-shareable-link')).not.toBeVisible();
+
+        await section.getByTestId('donate-url').hover();
+
+        await expect(section.getByTestId('preview-shareable-link')).toBeVisible();
+        await expect(section.getByTestId('copy-shareable-link')).toBeVisible();
+    });
+});
diff --git a/apps/admin-x-settings/test/acceptance/layout.test.ts b/apps/admin-x-settings/test/acceptance/layout.test.ts
index 968b639bb2e..0f5d7ea59c9 100644
--- a/apps/admin-x-settings/test/acceptance/layout.test.ts
+++ b/apps/admin-x-settings/test/acceptance/layout.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi} from '../utils/acceptance';
+import {globalDataRequests} from '../utils/acceptance';
+import {mockApi} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Layout', async () => {
     test('Confirms when leaving if a section is dirty', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/membership/access.test.ts b/apps/admin-x-settings/test/acceptance/membership/access.test.ts
index a43c3ac240b..7d53b508cd2 100644
--- a/apps/admin-x-settings/test/acceptance/membership/access.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/access.test.ts
@@ -1,5 +1,6 @@
-import {chooseOptionInSelect, globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance';
+import {chooseOptionInSelect, mockApi, responseFixtures, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
 
 test.describe('Access settings', async () => {
     test('Supports editing access', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/membership/analytics.test.ts b/apps/admin-x-settings/test/acceptance/membership/analytics.test.ts
index 29c6e38abfc..a334ccdad32 100644
--- a/apps/admin-x-settings/test/acceptance/membership/analytics.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/analytics.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Analytics settings', async () => {
     test('Supports toggling analytics settings', async ({page}) => {
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..c279be2d9be
--- /dev/null
+++ b/apps/admin-x-settings/test/acceptance/membership/offers.test.ts
@@ -0,0 +1,257 @@
+import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, responseFixtures, settingsWithStripe} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('Offers Modal', () => {
+    test('Offers Modal is available', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers}
+        }});
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Add offer'}).click();
+        const addModal = page.getByTestId('add-offer-modal');
+        await expect(addModal).toBeVisible();
+    });
+
+    test('Offers Add Modal is available', async ({page}) => {
+        await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
+            addOffer: {method: 'POST', path: '/offers/', response: {
+                offers: [{
+                    id: 'new-offer',
+                    name: 'New offer',
+                    code: 'new-offer'
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await modal.getByRole('button', {name: 'New offer'}).click();
+        const addModal = page.getByTestId('add-offer-modal');
+        await expect(addModal).toBeVisible();
+    });
+
+    test('Can add a new offer', async ({page}) => {
+        const {lastApiRequests} = await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
+            addOffer: {method: 'POST', path: `/offers/`, response: {
+                offers: [{
+                    name: 'Coffee Tuesdays',
+                    id: '6487ea6464fca78ec2fff5fe',
+                    code: 'coffee-tuesdays',
+                    amount: 5
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await modal.getByRole('button', {name: 'New offer'}).click();
+        const addModal = page.getByTestId('add-offer-modal');
+        expect(addModal).toBeVisible();
+        const sidebar = addModal.getByTestId('add-offer-sidebar');
+        expect(sidebar).toBeVisible();
+        await sidebar.getByPlaceholder(/^Black Friday$/).fill('Coffee Tuesdays');
+        await sidebar.getByLabel('Amount off').fill('5');
+
+        await addModal.getByRole('button', {name: 'Publish'}).click();
+        expect(lastApiRequests.addOffer?.body).toMatchObject({
+            offers: [{
+                name: 'Coffee Tuesdays',
+                code: 'coffee-tuesdays'
+            }]
+        });
+        const successModal = page.getByTestId('offer-success-modal');
+        await expect(successModal).toBeVisible();
+    });
+
+    test('Errors if required fields are missing', async ({page}) => {
+        await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
+            addOffer: {method: 'POST', path: `/offers/`, response: {
+                offers: [{
+                    name: 'Coffee Tuesdays',
+                    id: '6487ea6464fca78ec2fff5fe',
+                    code: 'coffee-tuesdays',
+                    amount: 5
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await modal.getByRole('button', {name: 'New offer'}).click();
+        const addModal = page.getByTestId('add-offer-modal');
+        await addModal.getByRole('button', {name: 'Publish'}).click();
+        const sidebar = addModal.getByTestId('add-offer-sidebar');
+        await expect(sidebar).toContainText(/Name is required/);
+        await expect(sidebar).toContainText(/Code is required/);
+        await expect(sidebar).toContainText(/Enter an amount greater than 0./);
+        await expect(sidebar).toContainText(/Display title is required/);
+    });
+
+    test('Errors if the offer code is already taken', async ({page}) => {
+        await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
+            addOffer: {method: 'POST', path: `/offers/`, responseStatus: 400, responseHeaders: {'content-type': 'json'}, response: {
+                errors: [{
+                    message: 'Validation error, cannot edit offer.',
+                    context: 'Offer `code` must be unique. Please change and try again.'
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await modal.getByRole('button', {name: 'New offer'}).click();
+        const addModal = page.getByTestId('add-offer-modal');
+        expect(addModal).toBeVisible();
+        const sidebar = addModal.getByTestId('add-offer-sidebar');
+        expect(sidebar).toBeVisible();
+        await sidebar.getByPlaceholder(/^Black Friday$/).fill('Coffee Tuesdays');
+        await sidebar.getByLabel('Amount off').fill('10');
+        await addModal.getByRole('button', {name: 'Publish'}).click();
+
+        await expect(page.getByTestId('toast-error')).toContainText(/Offer `code` must be unique. Please change and try again./);
+    });
+
+    test('Shows validation hints', async ({page}) => {
+        await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
+            browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
+            addOffer: {method: 'POST', path: `/offers/`, response: {
+                offers: [{
+                    name: 'Coffee Tuesdays',
+                    id: '6487ea6464fca78ec2fff5fe',
+                    code: 'coffee-tuesdays',
+                    amount: 5
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+        const section = page.getByTestId('offers');
+        await section.getByRole('button', {name: 'Manage offers'}).click();
+        const modal = page.getByTestId('offers-modal');
+        await modal.getByRole('button', {name: 'New offer'}).click();
+        const addModal = page.getByTestId('add-offer-modal');
+        await addModal.getByRole('button', {name: 'Publish'}).click();
+        const sidebar = addModal.getByTestId('add-offer-sidebar');
+        await expect(sidebar).toContainText(/Name is required/);
+        await expect(sidebar).toContainText(/Code is required/);
+        await expect(sidebar).toContainText(/Enter an amount greater than 0./);
+        await expect(sidebar).toContainText(/Display title is required/);
+    });
+
+    test('Can view active offers', async ({page}) => {
+        await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseAllOffers: {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.getByText('Active')).toHaveAttribute('aria-selected', 'true');
+        await expect(modal).toContainText('First offer');
+        await expect(modal).toContainText('Second offer');
+    });
+
+    test('Can view archived offers', async ({page}) => {
+        await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseAllOffers: {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.getByText('Archived')).toHaveAttribute('aria-selected', 'true');
+        await expect(modal).toContainText('Third offer');
+    });
+
+    test('Supports updating an offer', async ({page}) => {
+        const {lastApiRequests} = await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
+            ...globalDataRequests,
+            browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
+            browseAllOffers: {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.getByText('Active')).toHaveAttribute('aria-selected', 'true');
+        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(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/portal.test.ts b/apps/admin-x-settings/test/acceptance/membership/portal.test.ts
index b4015e382fe..08d35b233bb 100644
--- a/apps/admin-x-settings/test/acceptance/membership/portal.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/portal.test.ts
@@ -1,6 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, mockSitePreview} from '../../utils/acceptance';
-import {responseFixtures} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, mockSitePreview, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Portal Settings', async () => {
     test('Loads Portal Preview Modal', async ({page}) => {
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..35971f8648f 100644
--- a/apps/admin-x-settings/test/acceptance/membership/recommendations.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/recommendations.test.ts
@@ -1,11 +1,8 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures, toggleLabsFlag} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Recommendations', async () => {
-    test.beforeEach(async () => {
-        toggleLabsFlag('recommendations', true);
-    });
-
     test('can view recommendations', async ({page}) => {
         await mockApi({page, requests: {
             ...globalDataRequests,
@@ -29,7 +26,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: {}}
         }});
 
@@ -46,7 +43,7 @@ test.describe('Recommendations', async () => {
         // Validate errors
         url.fill('not a real url');
         await modal.getByRole('button', {name: 'Next'}).click();
-        await expect(modal).toContainText('Please enter a valid URL.');
+        await expect(modal).toContainText('Enter a valid URL');
 
         // Validate success
         modal.getByRole('textbox').fill('https://example.com/a-cool-website');
@@ -58,8 +55,6 @@ test.describe('Recommendations', async () => {
 
         // Validate errors
         await title.fill('');
-        await title.blur();
-        await expect(modal).toContainText('Title is required');
 
         await description.fill('This is a long description with more than 200 characters: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl.');
         await expect(modal).toContainText('Max: 200 characters. You’ve used 510');
@@ -74,7 +69,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 +80,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('/');
@@ -126,8 +121,6 @@ test.describe('Recommendations', async () => {
 
         // Validate errors
         await title.fill('');
-        await title.blur();
-        await expect(modal).toContainText('Title is required');
 
         await description.fill('This is a long description with more than 200 characters: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl. Donec auctor, nisl eget aliquam aliquet, nisl nunc aliquam nunc, quis aliquam nisl nunc eget nisl.');
         await expect(modal).toContainText('Max: 200 characters. You’ve used 510');
diff --git a/apps/admin-x-settings/test/acceptance/membership/signupEmbed.test.ts b/apps/admin-x-settings/test/acceptance/membership/signupEmbed.test.ts
index 9b73617523c..4deb5250d07 100644
--- a/apps/admin-x-settings/test/acceptance/membership/signupEmbed.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/signupEmbed.test.ts
@@ -1,5 +1,5 @@
 import {test} from '@playwright/test';
-// import {globalDataRequests, mockApi, responseFixtures} from '../../utils/e2e';
+// import {globalDataRequests} from '../../utils/acceptance';
 
 test.describe('Signup Embed', async () => {
     // TODO - currently having difficulty rendering the iframe in the test
diff --git a/apps/admin-x-settings/test/acceptance/membership/stripe.test.ts b/apps/admin-x-settings/test/acceptance/membership/stripe.test.ts
index 4d7f281f767..7f0f26ef91d 100644
--- a/apps/admin-x-settings/test/acceptance/membership/stripe.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/stripe.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, responseFixtures, updatedSettingsResponse} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Stripe settings', async () => {
     test('Supports the Stripe Connect flow', async ({page}) => {
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..8a5ecd02b2b 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,6 @@
 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} from '../../utils/acceptance';
+import {mockApi, responseFixtures, settingsWithStripe} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Tier settings', async () => {
     test('Supports creating a new tier', async ({page}) => {
@@ -24,10 +18,9 @@ test.describe('Tier settings', async () => {
 
         const modal = page.getByTestId('tier-detail-modal');
 
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
-        await expect(page.getByTestId('toast-error')).toHaveText(/Can't save tier/);
-        await expect(modal).toHaveText(/You must specify a name/);
+        await expect(modal).toHaveText(/Enter a name for the tier/);
         await expect(modal).toHaveText(/Amount must be at least \$1/);
 
         await modal.getByLabel('Name').fill('Plus tier');
@@ -58,9 +51,8 @@ test.describe('Tier settings', async () => {
             browseTiers: {method: 'GET', path: '/tiers/', response: {tiers: [...responseFixtures.tiers.tiers, newTier]}}
         }});
 
-        await modal.getByRole('button', {name: 'Save & close'}).click();
-
-        await page.pause();
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         // await expect(section.getByTestId('tier-card').filter({hasText: /Plus/})).toHaveText(/Plus tier/);
         // await expect(section.getByTestId('tier-card').filter({hasText: /Plus/})).toHaveText(/\$8\/month/);
@@ -112,10 +104,9 @@ test.describe('Tier settings', async () => {
         // Failing validations
 
         await modal.getByLabel('Name').fill('');
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
-        await expect(page.getByTestId('toast-error')).toHaveText(/Can't save tier/);
-        await expect(modal).toHaveText(/You must specify a name/);
+        await expect(modal).toHaveText(/Enter a name for the tier/);
 
         // Valid values
 
@@ -142,7 +133,8 @@ test.describe('Tier settings', async () => {
 
         // Save changes
 
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(section.getByTestId('tier-card').filter({hasText: /Supporter/})).toHaveText(/Supporter updated/);
         await expect(section.getByTestId('tier-card').filter({hasText: /Supporter/})).toHaveText(/Supporter description/);
@@ -195,7 +187,8 @@ test.describe('Tier settings', async () => {
         await modal.getByRole('button', {name: 'Add'}).click();
         await modal.getByLabel('New benefit').fill('Second benefit');
 
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(section.getByTestId('tier-card').filter({hasText: /Free/})).toHaveText(/Free tier description/);
 
diff --git a/apps/admin-x-settings/test/acceptance/permissions.test.ts b/apps/admin-x-settings/test/acceptance/permissions.test.ts
index c9330028012..d2f4a91a4e2 100644
--- a/apps/admin-x-settings/test/acceptance/permissions.test.ts
+++ b/apps/admin-x-settings/test/acceptance/permissions.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, meWithRole, mockApi, responseFixtures} from '../utils/acceptance';
+import {globalDataRequests} from '../utils/acceptance';
+import {meWithRole, mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('User permissions', async () => {
     test('Editors can only see users', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/routing.test.ts b/apps/admin-x-settings/test/acceptance/routing.test.ts
new file mode 100644
index 00000000000..c332d117a7a
--- /dev/null
+++ b/apps/admin-x-settings/test/acceptance/routing.test.ts
@@ -0,0 +1,24 @@
+import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../utils/acceptance';
+import {mockApi} from '@tryghost/admin-x-framework/test/acceptance';
+
+test.describe('Routing', async () => {
+    test('Reopens the opened modal when refreshing the page', async ({page}) => {
+        await mockApi({page, requests: globalDataRequests});
+
+        await page.goto('/');
+
+        const section = page.getByTestId('portal');
+        await section.getByRole('button', {name: 'Customize'}).click();
+
+        await page.waitForSelector('[data-testid="portal-modal"]');
+
+        expect(page.url()).toMatch(/\/portal\/edit$/);
+
+        await page.reload();
+
+        await page.waitForSelector('[data-testid="portal-modal"]');
+
+        expect(page.url()).toMatch(/\/portal\/edit$/);
+    });
+});
diff --git a/apps/admin-x-settings/test/acceptance/search.test.ts b/apps/admin-x-settings/test/acceptance/search.test.ts
index fbb7239421e..1b0f0ac1b28 100644
--- a/apps/admin-x-settings/test/acceptance/search.test.ts
+++ b/apps/admin-x-settings/test/acceptance/search.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi} from '../utils/acceptance';
+import {globalDataRequests} from '../utils/acceptance';
+import {mockApi} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Search', async () => {
     test('Hiding and showing groups based on the search term', async ({page}) => {
diff --git a/apps/admin-x-settings/test/acceptance/site/announcementbar.test.ts b/apps/admin-x-settings/test/acceptance/site/announcementbar.test.ts
index 1f62140fe8b..5ea3dd5473f 100644
--- a/apps/admin-x-settings/test/acceptance/site/announcementbar.test.ts
+++ b/apps/admin-x-settings/test/acceptance/site/announcementbar.test.ts
@@ -1,5 +1,6 @@
-import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, mockSitePreview, responseFixtures} from '../../utils/acceptance';
+import {ElementHandle, expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, mockSitePreview, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Announcement Bar', async () => {
     test('Working with the announcement bar preview', async ({page}) => {
@@ -26,7 +27,7 @@ test.describe('Announcement Bar', async () => {
 
         await page.waitForSelector('[data-testid="announcement-bar-preview-iframe"]');
 
-        const checkTextInIframes = async (iframesHandles, textToSearch) => {
+        const checkTextInIframes = async (iframesHandles: ElementHandle[], textToSearch: string) => {
             let textExists = false;
             for (const iframeHandle of iframesHandles) {
                 const frame = await iframeHandle.contentFrame();
@@ -147,7 +148,7 @@ test.describe('Announcement Bar', async () => {
 
         // get checkbox input with value of free_members
 
-        const checkbox = await page.$('input[value="free_members"]');
+        const checkbox = await page.$('button[value="free_members"]');
 
         expect(checkbox).not.toBeNull();
 
diff --git a/apps/admin-x-settings/test/acceptance/site/design.test.ts b/apps/admin-x-settings/test/acceptance/site/design.test.ts
index bcb4fb15ed8..7d8d9287bab 100644
--- a/apps/admin-x-settings/test/acceptance/site/design.test.ts
+++ b/apps/admin-x-settings/test/acceptance/site/design.test.ts
@@ -1,5 +1,6 @@
-import {chooseOptionInSelect, globalDataRequests, mockApi, mockSitePreview, responseFixtures} from '../../utils/acceptance';
+import {chooseOptionInSelect, mockApi, mockSitePreview, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 import {expect, test} from '@playwright/test';
+import {globalDataRequests} from '../../utils/acceptance';
 
 test.describe('Design settings', async () => {
     test('Working with the preview', async ({page}) => {
@@ -128,6 +129,7 @@ test.describe('Design settings', async () => {
         await expect(modal.frameLocator('[data-testid="theme-preview"] iframe[data-visible=true]').getByText('homepage preview')).toHaveCount(1);
 
         await modal.getByLabel('Site description').fill('new description');
+        await expect(modal.getByTestId('toggle-unsplash-button')).toBeVisible();
         // set timeout of 500ms to wait for the debounce
         await page.waitForTimeout(1000);
         await modal.getByRole('button', {name: 'Save'}).click();
diff --git a/apps/admin-x-settings/test/acceptance/site/navigation.test.ts b/apps/admin-x-settings/test/acceptance/site/navigation.test.ts
index 0ce620ff6f8..3fd83387a51 100644
--- a/apps/admin-x-settings/test/acceptance/site/navigation.test.ts
+++ b/apps/admin-x-settings/test/acceptance/site/navigation.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Navigation settings', async () => {
     test('Editing primary and secondary navigation', async ({page}) => {
@@ -38,7 +39,7 @@ test.describe('Navigation settings', async () => {
         await secondaryNavigationTab.getByTestId('new-navigation-item').getByLabel('URL').fill('https://google.com');
         await secondaryNavigationTab.getByTestId('new-navigation-item').getByLabel('URL').blur();
 
-        await modal.getByRole('button', {name: 'OK'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
         await expect(modal).not.toBeVisible();
 
@@ -67,7 +68,7 @@ test.describe('Navigation settings', async () => {
         await primaryItem.getByLabel('URL').press('Backspace');
         await primaryItem.getByLabel('URL').fill('google.com');
 
-        await modal.getByRole('button', {name: 'OK'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
         await expect(primaryItem.getByText('You must specify a label')).toHaveCount(1);
         await expect(primaryItem.getByText('You must specify a valid URL or relative path')).toHaveCount(1);
@@ -148,7 +149,7 @@ test.describe('Navigation settings', async () => {
 
         await newItem.getByTestId('add-button').click();
 
-        await modal.getByRole('button', {name: 'Cancel'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
 
         await expect(page.getByTestId('confirmation-modal')).toHaveText(/leave/i);
 
diff --git a/apps/admin-x-settings/test/acceptance/site/theme.test.ts b/apps/admin-x-settings/test/acceptance/site/theme.test.ts
index 4aeade9f0c9..2dfdfc53f60 100644
--- a/apps/admin-x-settings/test/acceptance/site/theme.test.ts
+++ b/apps/admin-x-settings/test/acceptance/site/theme.test.ts
@@ -1,5 +1,6 @@
 import {expect, test} from '@playwright/test';
-import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../utils/acceptance';
+import {globalDataRequests} from '../../utils/acceptance';
+import {limitRequests, mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 test.describe('Theme settings', async () => {
     test('Browsing and installing default themes', async ({page}) => {
@@ -52,7 +53,7 @@ test.describe('Theme settings', async () => {
 
         await modal.getByRole('button', {name: 'Install Headline'}).click();
 
-        await expect(page.getByTestId('confirmation-modal')).toHaveText(/successfully installed/);
+        await expect(page.getByTestId('confirmation-modal')).toHaveText(/installed/);
 
         await page.getByRole('button', {name: 'Activate'}).click();
 
@@ -167,7 +168,7 @@ test.describe('Theme settings', async () => {
         expect(lastApiRequests.uploadTheme).toBeTruthy();
     });
 
-    test('Limits uploading new themes', async ({page}) => {
+    test('Limits uploading new themes and redirect to /pro', async ({page}) => {
         await mockApi({page, requests: {
             ...globalDataRequests,
             ...limitRequests,
@@ -205,5 +206,55 @@ test.describe('Theme settings', async () => {
         await modal.getByRole('button', {name: 'Upload theme'}).click();
 
         await expect(page.getByTestId('limit-modal')).toHaveText(/Upgrade to enable custom themes/);
+
+        const limitModal = page.getByTestId('limit-modal');
+
+        await limitModal.getByRole('button', {name: 'Upgrade'}).click();
+
+        // The route should be updated
+        const newPageUrl = page.url();
+        const newPageUrlObject = new URL(newPageUrl);
+        const decodedUrl = decodeURIComponent(newPageUrlObject.pathname);
+
+        // expect the route to be updated to /pro
+        await expect(decodedUrl).toMatch(/\/\{\"route\":\"\/pro\",\"isExternal\":true\}$/);
+    });
+
+    test('Prevents overwriting the default theme', async ({page}) => {
+        await mockApi({page, requests: {
+            ...globalDataRequests,
+            browseThemes: {method: 'GET', path: '/themes/', response: responseFixtures.themes},
+            uploadTheme: {method: 'POST', path: '/themes/upload/', response: {
+                themes: [{
+                    name: 'mytheme',
+                    package: {},
+                    active: false,
+                    templates: []
+                }]
+            }}
+        }});
+
+        await page.goto('/');
+
+        const designSection = page.getByTestId('design');
+
+        await designSection.getByRole('button', {name: 'Customize'}).click();
+
+        const designModal = page.getByTestId('design-modal');
+
+        await designModal.getByTestId('change-theme').click();
+
+        const modal = page.getByTestId('theme-modal');
+
+        await modal.getByRole('button', {name: 'Upload theme'}).click();
+
+        const fileChooserPromise = page.waitForEvent('filechooser');
+
+        await page.getByTestId('confirmation-modal').locator('label[for=theme-upload]').click();
+
+        const fileChooser = await fileChooserPromise;
+        await fileChooser.setFiles(`${__dirname}/../../utils/responses/source.zip`);
+
+        await expect(page.getByTestId('confirmation-modal')).toHaveText(/Upload failed/);
     });
 });
diff --git a/apps/admin-x-settings/test/unit/api/customThemeSettings.ts b/apps/admin-x-settings/test/unit/api/customThemeSettings.ts
index abcb21c6549..2529dbf3c2f 100644
--- a/apps/admin-x-settings/test/unit/api/customThemeSettings.ts
+++ b/apps/admin-x-settings/test/unit/api/customThemeSettings.ts
@@ -1,5 +1,5 @@
 import * as assert from 'assert/strict';
-import {CustomThemeSetting} from '../../../src/api/customThemeSettings';
+import {CustomThemeSetting} from '@tryghost/admin-x-framework/api/customThemeSettings';
 import {isCustomThemeSettingVisible} from '../../../src/utils/isCustomThemeSettingsVisible';
 
 describe('isCustomThemeSettingVisible', function () {
diff --git a/apps/admin-x-settings/test/unit/unsplash/Masonry.test.ts b/apps/admin-x-settings/test/unit/unsplash/Masonry.test.ts
deleted file mode 100644
index e42ecafe941..00000000000
--- a/apps/admin-x-settings/test/unit/unsplash/Masonry.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import MasonryService from '../../../src/unsplash/masonry/MasonryService';
-import {Photo} from '../../../src/unsplash/UnsplashTypes';
-import {fixturePhotos} from '../../../src/unsplash/api/unsplashFixtures';
-
-describe('MasonryService', () => {
-    let service: MasonryService;
-    let mockPhotos: Photo[];
-
-    beforeEach(() => {
-        service = new MasonryService(3);
-        mockPhotos = fixturePhotos;
-    });
-
-    it('should initialize with default column count', () => {
-        expect(service.columnCount).toEqual(3);
-    });
-
-    describe('reset', () => {
-        it('should reset columns and columnHeights', () => {
-            service.reset();
-            expect(service.columns.length).toEqual(3);
-            expect(service.columnHeights!.length).toEqual(3);
-        });
-    });
-
-    describe('addPhotoToColumns', () => {
-        it('should add photo to columns with the minimum height)', () => {
-            service.reset();
-            service.addPhotoToColumns(mockPhotos[0]);
-            expect(service.columns![0]).toContain(mockPhotos[0]);
-        });
-    });
-
-    describe('getColumns', () => {
-        it('should return the columns', () => {
-            service.reset();
-            const columns = service.getColumns();
-            expect(columns).toEqual(service.columns);
-        });
-    });
-
-    describe('changeColumnCount', () => {
-        it('should change the column count and reset', () => {
-            service.changeColumnCount(4);
-            expect(service.columnCount).toEqual(4);
-            expect(service.columns.length).toEqual(4);
-            expect(service.columnHeights!.length).toEqual(4);
-        });
-
-        it('should not reset if the column count is not changed', () => {
-            const prevColumns = service.getColumns();
-            service.changeColumnCount(3);
-            expect(service.getColumns()).toEqual(prevColumns);
-        });
-    });
-});
diff --git a/apps/admin-x-settings/test/unit/unsplash/UnsplashService.test.ts b/apps/admin-x-settings/test/unit/unsplash/UnsplashService.test.ts
deleted file mode 100644
index 35ae2598275..00000000000
--- a/apps/admin-x-settings/test/unit/unsplash/UnsplashService.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import MasonryService from '../../../src/unsplash/masonry/MasonryService';
-import {IUnsplashService, UnsplashService} from '../../../src/unsplash/UnsplashService';
-import {InMemoryUnsplashProvider} from '../../../src/unsplash/api/InMemoryUnsplashProvider';
-import {PhotoUseCases} from '../../../src/unsplash/photo/PhotoUseCase';
-import {fixturePhotos} from '../../../src/unsplash/api/unsplashFixtures';
-
-describe('UnsplashService', () => {
-    let unsplashService: IUnsplashService;
-    let UnsplashProvider: InMemoryUnsplashProvider;
-    let masonryService: MasonryService;
-    let photoUseCases: PhotoUseCases;
-
-    beforeEach(() => {
-        UnsplashProvider = new InMemoryUnsplashProvider();
-        masonryService = new MasonryService(3);
-        photoUseCases = new PhotoUseCases(UnsplashProvider);
-        unsplashService = new UnsplashService(photoUseCases, masonryService);
-    });
-
-    it('can load new photos', async function () {
-        await unsplashService.loadNew();
-        const photos = unsplashService.photos;
-        expect(photos).toEqual(fixturePhotos);
-    });
-
-    it('set up new columns of 3', async function () {
-        await unsplashService.loadNew();
-        const columns = unsplashService.getColumns();
-        if (columns) {
-            expect(columns.length).toBe(3);
-        }
-    });
-
-    it('can search for photos', async function () {
-        await unsplashService.updateSearch('cat');
-        const photos = unsplashService.photos;
-        expect(photos.length).toBe(0);
-        await unsplashService.updateSearch('photo');
-        const photos2 = unsplashService.photos;
-        expect(photos2.length).toBe(1);
-    });
-
-    it('can check if search is running', async function () {
-        const isRunning = unsplashService.searchIsRunning();
-        expect(isRunning).toBe(false);
-    });
-
-    it('can load next page', async function () {
-        await unsplashService.loadNextPage();
-        const photos = unsplashService.photos;
-        expect(photos.length).toBe(2);
-    });
-});
diff --git a/apps/admin-x-settings/test/unit/utils/analytics.test.ts b/apps/admin-x-settings/test/unit/utils/analytics.test.ts
new file mode 100644
index 00000000000..7432baa9490
--- /dev/null
+++ b/apps/admin-x-settings/test/unit/utils/analytics.test.ts
@@ -0,0 +1,38 @@
+import * as assert from 'assert/strict';
+import trackEvent from '../../../src/utils/analytics';
+
+describe('trackEvent', function () {
+    it('calls posthog.capture with the correct event name and properties', function () {
+        const testEventName = 'Recommendation Added';
+        const testProps = {
+            oneClickSubscribe: true
+        };
+
+        window.posthog = {
+            capture: (eventName, props) => {
+                assert.equal(eventName, 'Recommendation Added');
+                assert.deepEqual(props, {
+                    oneClickSubscribe: true
+                });
+            }
+        };
+
+        trackEvent(testEventName, testProps);
+    });
+
+    it('calls plausible with the correct event name and properties', function () {
+        const testEventName = 'Recommendation Added';
+        const testProps = {
+            oneClickSubscribe: true
+        };
+
+        window.plausible = (eventName, {props}) => {
+            assert.equal(eventName, 'Recommendation Added');
+            assert.deepEqual(props, {
+                oneClickSubscribe: true
+            });
+        };
+
+        trackEvent(testEventName, testProps);
+    });
+});
diff --git a/apps/admin-x-settings/test/utils/acceptance.ts b/apps/admin-x-settings/test/utils/acceptance.ts
index 42041a2059f..2a2a168a4b4 100644
--- a/apps/admin-x-settings/test/utils/acceptance.ts
+++ b/apps/admin-x-settings/test/utils/acceptance.ts
@@ -1,119 +1,4 @@
-import {ActionsResponseType} from '../../src/api/actions';
-import {ConfigResponseType} from '../../src/api/config';
-import {CustomThemeSettingsResponseType} from '../../src/api/customThemeSettings';
-import {InvitesResponseType} from '../../src/api/invites';
-import {LabelsResponseType} from '../../src/api/labels';
-import {Locator, Page, expect} from '@playwright/test';
-import {NewslettersResponseType} from '../../src/api/newsletters';
-import {OffersResponseType} from '../../src/api/offers';
-import {RecommendationResponseType} from '../../src/api/recommendations';
-import {RolesResponseType} from '../../src/api/roles';
-import {SettingsResponseType} from '../../src/api/settings';
-import {SiteResponseType} from '../../src/api/site';
-import {ThemesResponseType} from '../../src/api/themes';
-import {TiersResponseType} from '../../src/api/tiers';
-import {UsersResponseType} from '../../src/api/users';
-import {readFileSync} from 'fs';
-
-interface MockRequestConfig {
-    method: string;
-    path: string | RegExp;
-    response: unknown;
-    responseStatus?: number;
-}
-
-interface RequestRecord {
-    url?: string
-    body?: object | null
-    headers?: {[key: string]: string}
-}
-
-const siteFixture = JSON.parse(readFileSync(`${__dirname}/responses/site.json`).toString()) as SiteResponseType;
-
-export const responseFixtures = {
-    settings: JSON.parse(readFileSync(`${__dirname}/responses/settings.json`).toString()) as SettingsResponseType,
-    recommendations: JSON.parse(readFileSync(`${__dirname}/responses/recommendations.json`).toString()) as RecommendationResponseType,
-    incomingRecommendations: JSON.parse(readFileSync(`${__dirname}/responses/incoming_recommendations.json`).toString()) as RecommendationResponseType,
-    config: JSON.parse(readFileSync(`${__dirname}/responses/config.json`).toString()) as ConfigResponseType,
-    users: JSON.parse(readFileSync(`${__dirname}/responses/users.json`).toString()) as UsersResponseType,
-    me: JSON.parse(readFileSync(`${__dirname}/responses/me.json`).toString()) as UsersResponseType,
-    roles: JSON.parse(readFileSync(`${__dirname}/responses/roles.json`).toString()) as RolesResponseType,
-    site: siteFixture,
-    invites: JSON.parse(readFileSync(`${__dirname}/responses/invites.json`).toString()) as InvitesResponseType,
-    customThemeSettings: JSON.parse(readFileSync(`${__dirname}/responses/custom_theme_settings.json`).toString()) as CustomThemeSettingsResponseType,
-    tiers: JSON.parse(readFileSync(`${__dirname}/responses/tiers.json`).toString()) as TiersResponseType,
-    labels: JSON.parse(readFileSync(`${__dirname}/responses/labels.json`).toString()) as LabelsResponseType,
-    offers: JSON.parse(readFileSync(`${__dirname}/responses/offers.json`).toString()) as OffersResponseType,
-    themes: JSON.parse(readFileSync(`${__dirname}/responses/themes.json`).toString()) as ThemesResponseType,
-    newsletters: JSON.parse(readFileSync(`${__dirname}/responses/newsletters.json`).toString()) as NewslettersResponseType,
-    actions: JSON.parse(readFileSync(`${__dirname}/responses/actions.json`).toString()) as ActionsResponseType,
-    latestPost: {posts: [{id: '1', url: `${siteFixture.site.url}/test-post/`}]}
-};
-
-let defaultLabFlags = {
-    audienceFeedback: false,
-    collections: false,
-    themeErrorsNotification: false,
-    outboundLinkTagging: false,
-    announcementBar: false,
-    signupForm: false,
-    members: false
-};
-
-// Inject defaultLabFlags into responseFixtures.settings and config
-let labsSetting = responseFixtures.settings.settings.find(s => s.key === 'labs');
-let configSettings = responseFixtures.config.config;
-
-if (configSettings) {
-    configSettings.labs = defaultLabFlags;
-}
-
-if (!labsSetting) {
-    // If 'labs' key doesn't exist, create it
-    responseFixtures.settings.settings.push({
-        key: 'labs',
-        value: JSON.stringify(defaultLabFlags)
-    });
-} else {
-    // If 'labs' key exists, update its value
-    labsSetting.value = JSON.stringify(defaultLabFlags);
-}
-
-interface LabsSettings {
-    [key: string]: boolean;
-}
-
-export function toggleLabsFlag(flag: string, value: boolean) {
-    // Update responseFixtures.settings
-    labsSetting = responseFixtures.settings.settings.find(s => s.key === 'labs');
-
-    if (!labsSetting) {
-        throw new Error('Labs settings not found');
-    }
-
-    if (typeof labsSetting.value !== 'string') {
-        throw new Error('Labs settings value is not a string');
-    }
-
-    let labs: LabsSettings;
-    try {
-        labs = JSON.parse(labsSetting.value);
-    } catch (e) {
-        throw new Error('Failed to parse labs settings');
-    }
-
-    labs[flag] = value;
-    labsSetting.value = JSON.stringify(labs);
-
-    // Update responseFixtures.config
-    configSettings = responseFixtures.config.config;
-
-    if (configSettings && configSettings.labs) {
-        configSettings.labs[flag] = value;
-    } else {
-        throw new Error('Config settings or labs settings in config not found');
-    }
-}
+import {responseFixtures} from '@tryghost/admin-x-framework/test/acceptance';
 
 export const globalDataRequests = {
     browseSettings: {method: 'GET', path: /^\/settings\/\?group=/, response: responseFixtures.settings},
@@ -121,124 +6,3 @@ export const globalDataRequests = {
     browseSite: {method: 'GET', path: '/site/', response: responseFixtures.site},
     browseMe: {method: 'GET', path: '/users/me/?include=roles', response: responseFixtures.me}
 };
-
-export const limitRequests = {
-    browseUsers: {method: 'GET', path: '/users/?limit=100&include=roles', response: responseFixtures.users},
-    browseInvites: {method: 'GET', path: '/invites/', response: responseFixtures.invites},
-    browseRoles: {method: 'GET', path: '/roles/?limit=all', response: responseFixtures.roles},
-    browseNewslettersLimit: {method: 'GET', path: '/newsletters/?filter=status%3Aactive&limit=1', response: responseFixtures.newsletters}
-};
-
-export async function mockApi<Requests extends Record<string, MockRequestConfig>>({page, requests}: {page: Page, requests: Requests}) {
-    const lastApiRequests: {[key in keyof Requests]?: RequestRecord} = {};
-
-    const namedRequests = Object.entries(requests).reduce(
-        (array, [key, value]) => array.concat({name: key, ...value}),
-        [] as Array<MockRequestConfig & {name: keyof Requests}>
-    );
-
-    await page.route(/\/ghost\/api\/admin\//, async (route) => {
-        const apiPath = route.request().url().replace(/^.*\/ghost\/api\/admin/, '');
-
-        const matchingMock = namedRequests.find((request) => {
-            if (request.method !== route.request().method()) {
-                return false;
-            }
-
-            if (typeof request.path === 'string') {
-                return request.path === apiPath;
-            }
-
-            return request.path.test(apiPath);
-        });
-
-        if (!matchingMock) {
-            return route.fulfill({
-                status: 418,
-                body: [
-                    'No matching mock found. If this request is needed for the test, add it to your mockApi call',
-                    '',
-                    'Currently mocked:',
-                    ...namedRequests.map(({method, path}) => `${method} ${path}`)
-                ].join('\n')
-            });
-        }
-
-        const requestBody = JSON.parse(route.request().postData() || 'null');
-
-        lastApiRequests[matchingMock.name] = {
-            body: requestBody,
-            url: route.request().url(),
-            headers: route.request().headers()
-        };
-
-        await route.fulfill({
-            status: matchingMock.responseStatus || 200,
-            body: typeof matchingMock.response === 'string' ? matchingMock.response : JSON.stringify(matchingMock.response)
-        });
-    });
-
-    return {lastApiRequests};
-}
-
-export function updatedSettingsResponse(newSettings: Array<{ key: string, value: string | boolean | null }>) {
-    return {
-        ...responseFixtures.settings,
-        settings: responseFixtures.settings.settings.map((setting) => {
-            const newSetting = newSettings.find(({key}) => key === setting.key);
-
-            return {key: setting.key, value: newSetting?.value || setting.value};
-        })
-    };
-}
-
-export function meWithRole(name: string) {
-    const role = responseFixtures.roles.roles.find(r => r.name === name);
-
-    return {
-        ...responseFixtures.me,
-        users: [{
-            ...responseFixtures.me.users[0],
-            roles: [role]
-        }]
-    };
-};
-
-export async function mockSitePreview({page, url, response}: {page: Page, url: string, response: string}) {
-    let lastRequest: {previewHeader?: string} = {};
-
-    await page.route(url, async (route) => {
-        if (route.request().method() !== 'POST') {
-            return route.continue();
-        }
-
-        if (!route.request().headers()['x-ghost-preview']) {
-            return route.continue();
-        }
-
-        lastRequest.previewHeader = route.request().headers()['x-ghost-preview'];
-
-        await route.fulfill({
-            status: 200,
-            body: response
-        });
-    });
-
-    return lastRequest;
-}
-
-export async function chooseOptionInSelect(select: Locator, optionText: string | RegExp) {
-    await select.click();
-    await select.page().locator('[data-testid="select-option"]', {hasText: optionText}).click();
-}
-
-export async function testUrlValidation(input: Locator, textToEnter: string, expectedResult: string, expectedError?: string) {
-    await input.fill(textToEnter);
-    await input.blur();
-
-    expect(input).toHaveValue(expectedResult);
-
-    if (expectedError) {
-        await expect(input.locator('xpath=../..')).toContainText(expectedError);
-    }
-};
diff --git a/apps/admin-x-settings/test/utils/files/upload.zip b/apps/admin-x-settings/test/utils/files/upload.zip
new file mode 100644
index 00000000000..8fde66b6966
Binary files /dev/null and b/apps/admin-x-settings/test/utils/files/upload.zip differ
diff --git a/apps/admin-x-settings/test/utils/responses/offers.json b/apps/admin-x-settings/test/utils/responses/offers.json
deleted file mode 100644
index 0974e8027c7..00000000000
--- a/apps/admin-x-settings/test/utils/responses/offers.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "offers": [
-        {
-            "id": "6487ea6464fca78ec2fff5fe",
-            "name": "First offer",
-            "code": "first-offer",
-            "display_title": "First offer",
-            "display_description": "",
-            "type": "percent",
-            "cadence": "month",
-            "amount": 10,
-            "duration": "once",
-            "duration_in_months": null,
-            "currency_restriction": false,
-            "currency": null,
-            "status": "active",
-            "redemption_count": 0,
-            "tier": {
-                "id": "645453f4d254799990dd0e22",
-                "name": "Supporter"
-            }
-        },
-        {
-            "id": "6487f0c364fca78ec2fff600",
-            "name": "Second offer",
-            "code": "second-offer",
-            "display_title": "Second offer",
-            "display_description": "",
-            "type": "percent",
-            "cadence": "month",
-            "amount": 12,
-            "duration": "repeating",
-            "duration_in_months": 3,
-            "currency_restriction": false,
-            "currency": null,
-            "status": "active",
-            "redemption_count": 0,
-            "tier": {
-                "id": "645453f4d254799990dd0e22",
-                "name": "Supporter"
-            }
-        }
-    ]
-}
diff --git a/apps/admin-x-settings/test/utils/responses/source.zip b/apps/admin-x-settings/test/utils/responses/source.zip
new file mode 100644
index 00000000000..8fde66b6966
Binary files /dev/null and b/apps/admin-x-settings/test/utils/responses/source.zip differ
diff --git a/apps/admin-x-settings/tsconfig.json b/apps/admin-x-settings/tsconfig.json
index c81ef9f3822..621d5ec558b 100644
--- a/apps/admin-x-settings/tsconfig.json
+++ b/apps/admin-x-settings/tsconfig.json
@@ -19,6 +19,5 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "include": ["src", "test"]
 }
diff --git a/apps/admin-x-settings/vite.config.mjs b/apps/admin-x-settings/vite.config.mjs
new file mode 100644
index 00000000000..79df33d790b
--- /dev/null
+++ b/apps/admin-x-settings/vite.config.mjs
@@ -0,0 +1,29 @@
+import adminXViteConfig from '@tryghost/admin-x-framework/vite';
+import pkg from './package.json';
+import {resolve} from 'path';
+
+// https://vitejs.dev/config/
+export default (function viteConfig() {
+    return adminXViteConfig({
+        packageName: pkg.name,
+        entry: resolve(__dirname, 'src/index.tsx'),
+        overrides: {
+            define: {
+                'process.env.DEBUG': false // Shim env var utilized by the @tryghost/nql package
+            },
+            resolve: {
+                // Shim node modules utilized by the @tryghost/nql package
+                alias: {
+                    fs: 'node-shim.cjs',
+                    path: 'node-shim.cjs',
+                    util: 'node-shim.cjs',
+                    // @TODO: Remove this when @tryghost/nql is updated
+                    mingo: resolve(__dirname, '../../node_modules/mingo/dist/mingo.js')
+                }
+            },
+            optimizeDeps: {
+                include: ['@tryghost/kg-unsplash-selector']
+            }
+        }
+    });
+});
diff --git a/apps/admin-x-settings/vite.config.ts b/apps/admin-x-settings/vite.config.ts
deleted file mode 100644
index f8c81afd14f..00000000000
--- a/apps/admin-x-settings/vite.config.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
-import pkg from './package.json';
-import react from '@vitejs/plugin-react';
-import svgr from 'vite-plugin-svgr';
-import {PluginOption} from 'vite';
-import {defineConfig} from 'vitest/config';
-import {resolve} from 'path';
-
-const outputFileName = pkg.name[0] === '@' ? pkg.name.slice(pkg.name.indexOf('/') + 1) : pkg.name;
-
-const externalPlugin = ({externals}: { externals: Record<string, string> }): PluginOption => {
-    return {
-        name: 'external-globals',
-        apply: 'build',
-        enforce: 'pre',
-        resolveId(id) {
-            if (Object.keys(externals).includes(id)) {
-                // Naming convention for IDs that will be resolved by a plugin
-                return `\0${id}`;
-            }
-        },
-        async load(id) {
-            const [originalId, externalName] = Object.entries(externals).find(([key]) => id === `\0${key}`) || [];
-
-            if (originalId) {
-                const module = await import(originalId);
-
-                return Object.keys(module).map(key => (key === 'default' ? `export default ${externalName};` : `export const ${key} = ${externalName}.${key};`)).join('\n');
-            }
-        }
-    };
-};
-
-// https://vitejs.dev/config/
-export default (function viteConfig() {
-    return defineConfig({
-        plugins: [
-            svgr(),
-            react(),
-            externalPlugin({
-                externals: {
-                    react: 'React',
-                    'react-dom': 'ReactDOM'
-                }
-            }),
-            cssInjectedByJsPlugin()
-        ],
-        define: {
-            'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
-            'process.env.VITEST_SEGFAULT_RETRY': 3,
-            'process.env.DEBUG': false // Shim env var utilized by the @tryghost/nql package
-        },
-        preview: {
-            port: 4174
-        },
-        build: {
-            minify: true,
-            sourcemap: true,
-            lib: {
-                formats: ['es'],
-                entry: resolve(__dirname, 'src/index.tsx'),
-                name: pkg.name,
-                fileName(format) {
-                    if (format === 'umd') {
-                        return `${outputFileName}.umd.js`;
-                    }
-
-                    return `${outputFileName}.js`;
-                }
-            },
-            commonjsOptions: {
-                include: [/packages/, /node_modules/]
-            }
-        },
-        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
-            })
-        },
-        resolve: {
-            // Shim node modules utilized by the @tryghost/nql package
-            alias: {
-                fs: 'node-shim.cjs',
-                path: 'node-shim.cjs',
-                util: 'node-shim.cjs',
-                // @TODO: Remove this when @tryghost/nql is updated
-                mingo: resolve(__dirname, '../../node_modules/mingo/dist/mingo.js')
-            }
-        }
-    });
-});
diff --git a/apps/announcement-bar/package.json b/apps/announcement-bar/package.json
index 417d292974f..85dc2e4ad71 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.21",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },
@@ -79,8 +79,9 @@
     ]
   },
   "devDependencies": {
-    "@vitejs/plugin-react": "4.1.0",
-    "vite": "4.5.0",
+    "@vitejs/plugin-react": "4.2.1",
+    "jsdom": "24.1.3",
+    "vite": "4.5.3",
     "vite-plugin-svgr": "3.3.0",
     "vitest": "0.34.3"
   }
diff --git a/apps/announcement-bar/vite.config.js b/apps/announcement-bar/vite.config.js
index 06154d8b6dd..c3a360fa43a 100644
--- a/apps/announcement-bar/vite.config.js
+++ b/apps/announcement-bar/vite.config.js
@@ -11,6 +11,7 @@ export default defineConfig((config) => {
     const outputFileName = pkg.name[0] === '@' ? pkg.name.slice(pkg.name.indexOf('/') + 1) : pkg.name;
 
     return {
+        logLevel: process.env.CI ? 'info' : 'warn',
         clearScreen: false,
         define: {
             'process.env.NODE_ENV': JSON.stringify(config.mode)
@@ -45,6 +46,7 @@ export default defineConfig((config) => {
         build: {
             outDir: resolve(__dirname, 'umd'),
             emptyOutDir: true,
+            reportCompressedSize: false,
             minify: true,
             sourcemap: true,
             cssCodeSplit: true,
diff --git a/apps/comments-ui/README.md b/apps/comments-ui/README.md
index 447a6558d7d..68280e3a99b 100644
--- a/apps/comments-ui/README.md
+++ b/apps/comments-ui/README.md
@@ -12,6 +12,22 @@ Comments widget that is embedded at the bottom of posts in Ghost.
 
 You can automatically start the comments dev server when developing Ghost by running Ghost (in root folder) via `yarn dev --all` or `yarn dev --comments`. This will host the comments JavaScript files, and makes sure that Ghost uses these locally hosted assets instead of the ones from the CDN.
 
-# Copyright & License 
+## Release
 
-Copyright (c) 2013-2023 Ghost Foundation - Released under the [MIT license](LICENSE).
+A patch release can be rolled out instantly in production, whereas a minor/major release requires the Ghost monorepo to be updated and released. In either case, you need sufficient permissions to release `@tryghost` packages on NPM.
+
+### Patch release
+
+1. Run `yarn ship` and select a patch version when prompted
+2. (Optional) Clear JsDelivr cache to get the new version out instantly ([docs](https://www.notion.so/ghost/How-to-clear-jsDelivr-CDN-cache-2930bdbac02946eca07ac23ab3199bfa?pvs=4)). Typically, you'll need to open `https://purge.jsdelivr.net/ghost/comments-ui@~${COMMENTS_UI_VERSION}/umd/comments-ui.min.js` and
+`https://purge.jsdelivr.net/ghost/comments-ui@~${COMMENTS_UI_VERSION}/umd/main.css` in your browser, where `COMMENTS_UI_VERSION` is the latest minor version in `ghost/core/core/shared/config/defaults.json` ([code](https://github.com/TryGhost/Ghost/blob/0aef3d3beeebcd79a4bfd3ad27e0ac67554b5744/ghost/core/core/shared/config/defaults.json#L198))
+
+### Minor / major release
+
+1. Run `yarn ship` and select a minor or major version when prompted
+2. Update the Comments UI version in `ghost/core/core/shared/config/defaults.json` to the new minor or major version ([code](https://github.com/TryGhost/Ghost/blob/0aef3d3beeebcd79a4bfd3ad27e0ac67554b5744/ghost/core/core/shared/config/defaults.json#L198))
+3. Wait until a new version of Ghost is released
+
+# Copyright & License
+
+Copyright (c) 2013-2024 Ghost Foundation - Released under the [MIT license](LICENSE).
diff --git a/apps/comments-ui/package.json b/apps/comments-ui/package.json
index 32776d6e034..60b2b4d39e0 100644
--- a/apps/comments-ui/package.json
+++ b/apps/comments-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/comments-ui",
-  "version": "0.13.1",
+  "version": "0.17.3",
   "license": "MIT",
   "repository": "git@github.com:TryGhost/comments-ui.git",
   "author": "Ghost Foundation",
@@ -43,17 +43,17 @@
     ]
   },
   "dependencies": {
-    "@headlessui/react": "1.7.17",
-    "@tiptap/core": "2.1.12",
-    "@tiptap/extension-blockquote": "2.1.12",
-    "@tiptap/extension-document": "2.1.12",
-    "@tiptap/extension-hard-break": "2.1.12",
-    "@tiptap/extension-link": "2.1.12",
-    "@tiptap/extension-paragraph": "2.1.12",
-    "@tiptap/extension-placeholder": "2.1.12",
-    "@tiptap/extension-text": "2.1.12",
-    "@tiptap/pm": "2.1.12",
-    "@tiptap/react": "2.1.12",
+    "@headlessui/react": "1.7.19",
+    "@tiptap/core": "2.6.0",
+    "@tiptap/extension-blockquote": "2.6.0",
+    "@tiptap/extension-document": "2.6.1",
+    "@tiptap/extension-hard-break": "2.6.0",
+    "@tiptap/extension-link": "2.6.0",
+    "@tiptap/extension-paragraph": "2.6.0",
+    "@tiptap/extension-placeholder": "2.6.1",
+    "@tiptap/extension-text": "2.6.0",
+    "@tiptap/pm": "2.6.0",
+    "@tiptap/react": "2.6.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-string-replace": "1.1.1"
@@ -62,21 +62,21 @@
     "@playwright/test": "1.38.1",
     "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "12.1.5",
-    "@testing-library/user-event": "14.4.3",
+    "@testing-library/user-event": "14.5.2",
     "@tryghost/i18n": "0.0.0",
-    "@vitejs/plugin-react": "4.1.0",
+    "@vitejs/plugin-react": "4.2.1",
     "@vitest/coverage-v8": "0.34.3",
-    "autoprefixer": "10.4.16",
+    "autoprefixer": "10.4.19",
     "bson-objectid": "2.0.4",
     "concurrently": "8.2.2",
     "eslint-plugin-i18next": "6.0.3",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-react-refresh": "0.4.3",
     "eslint-plugin-tailwindcss": "3.13.0",
-    "jsdom": "22.1.0",
-    "postcss": "8.4.31",
-    "tailwindcss": "3.3.5",
-    "vite": "4.5.0",
+    "jsdom": "24.1.3",
+    "postcss": "8.4.39",
+    "tailwindcss": "3.4.10",
+    "vite": "4.5.3",
     "vite-plugin-css-injected-by-js": "3.3.0",
     "vite-plugin-svgr": "3.3.0",
     "vitest": "0.34.3"
diff --git a/apps/comments-ui/src/App.tsx b/apps/comments-ui/src/App.tsx
index 74635aa6183..0f42eeb9675 100644
--- a/apps/comments-ui/src/App.tsx
+++ b/apps/comments-ui/src/App.tsx
@@ -29,6 +29,8 @@ const App: React.FC<AppProps> = ({scriptTag}) => {
         popup: null
     });
 
+    const iframeRef = React.createRef<HTMLIFrameElement>();
+
     const api = React.useMemo(() => {
         return setupGhostApi({
             siteUrl: options.siteUrl,
@@ -129,7 +131,7 @@ const App: React.FC<AppProps> = ({scriptTag}) => {
         };
     };
 
-    /** Initialize comments setup on load, fetch data and setup state*/
+    /** Initialize comments setup once in viewport, fetch data and setup state*/
     const initSetup = async () => {
         try {
             // Fetch data from API, links, preview, dev sources
@@ -155,18 +157,42 @@ const App: React.FC<AppProps> = ({scriptTag}) => {
         }
     };
 
+    /** Delay initialization until comments block is in viewport */
     useEffect(() => {
-        initSetup();
-    }, []);
+        const observer = new IntersectionObserver((entries) => {
+            entries.forEach((entry) => {
+                if (entry.isIntersecting) {
+                    initSetup();
+                    if (iframeRef.current) {
+                        observer.unobserve(iframeRef.current);
+                    }
+                }
+            });
+        }, {
+            root: null,
+            rootMargin: '0px',
+            threshold: 0.1
+        });
+
+        if (iframeRef.current) {
+            observer.observe(iframeRef.current);
+        }
+
+        return () => {
+            if (iframeRef.current) {
+                observer.unobserve(iframeRef.current);
+            }
+        };
+    }, [iframeRef.current]);
 
     const done = state.initStatus === 'success';
 
     return (
         <AppContext.Provider value={context}>
-            <CommentsFrame>
+            <CommentsFrame ref={iframeRef}>
                 <ContentBox done={done} />
             </CommentsFrame>
-            <AuthFrame adminUrl={options.adminUrl} onLoad={initAdminAuth}/>
+            {state.comments.length > 0 ? <AuthFrame adminUrl={options.adminUrl} onLoad={initAdminAuth}/> : null}
             <PopupBox />
         </AppContext.Provider>
     );
diff --git a/apps/comments-ui/src/components/ContentBox.tsx b/apps/comments-ui/src/components/ContentBox.tsx
index bdafe8c1c10..34eaeeed0b3 100644
--- a/apps/comments-ui/src/components/ContentBox.tsx
+++ b/apps/comments-ui/src/components/ContentBox.tsx
@@ -54,7 +54,7 @@ const ContentBox: React.FC<Props> = ({done}) => {
     };
 
     return (
-        <section className={'ghost-display ' + containerClass} data-testid="content-box" style={style}>
+        <section className={'ghost-display ' + containerClass} data-loaded={done} data-testid="content-box" style={style}>
             {done ? <Content /> : <Loading />}
         </section>
     );
diff --git a/apps/comments-ui/src/components/Frame.tsx b/apps/comments-ui/src/components/Frame.tsx
index cb692c37d68..64c898d6028 100644
--- a/apps/comments-ui/src/components/Frame.tsx
+++ b/apps/comments-ui/src/components/Frame.tsx
@@ -15,7 +15,7 @@ type TailwindFrameProps = FrameProps & {
 /**
  * Loads all the CSS styles inside an iFrame. Only shows the visible content as soon as the CSS file with the tailwind classes has loaded.
  */
-const TailwindFrame: React.FC<TailwindFrameProps> = ({children, onResize, style, title}) => {
+const TailwindFrame = React.forwardRef<HTMLIFrameElement, React.PropsWithChildren<TailwindFrameProps>>(function TailwindFrame({children, onResize, style, title}, ref: React.ForwardedRef<HTMLIFrameElement>) {
     const head = (
         <>
             <style dangerouslySetInnerHTML={{__html: styles}} />
@@ -25,11 +25,11 @@ const TailwindFrame: React.FC<TailwindFrameProps> = ({children, onResize, style,
 
     // For now we're using <NewFrame> because using a functional component with portal caused some weird issues with modals
     return (
-        <IFrame head={head} style={style} title={title} onResize={onResize}>
+        <IFrame ref={ref} head={head} style={style} title={title} onResize={onResize}>
             {children}
         </IFrame>
     );
-};
+});
 
 type ResizableFrameProps = FrameProps & {
     style: React.CSSProperties,
@@ -39,7 +39,7 @@ type ResizableFrameProps = FrameProps & {
 /**
  * This iframe has the same height as it contents and mimics a shadow DOM component
  */
-const ResizableFrame: React.FC<ResizableFrameProps> = ({children, style, title}) => {
+const ResizableFrame = React.forwardRef<HTMLIFrameElement, React.PropsWithChildren<ResizableFrameProps>>(function ResizableFrame({children, style, title}, ref: React.ForwardedRef<HTMLIFrameElement>) {
     const [iframeStyle, setIframeStyle] = useState(style);
     const onResize = useCallback((iframeRoot) => {
         setIframeStyle((current) => {
@@ -51,23 +51,25 @@ const ResizableFrame: React.FC<ResizableFrameProps> = ({children, style, title})
     }, []);
 
     return (
-        <TailwindFrame style={iframeStyle} title={title} onResize={onResize}>
+        <TailwindFrame ref={ref} style={iframeStyle} title={title} onResize={onResize}>
             {children}
         </TailwindFrame>
     );
-};
+});
 
-export const CommentsFrame: React.FC<FrameProps> = ({children}) => {
+type CommentsFrameProps = Record<never, any>;
+
+export const CommentsFrame = React.forwardRef<HTMLIFrameElement, React.PropsWithChildren<CommentsFrameProps>>(function CommentsFrame({children}, ref: React.ForwardedRef<HTMLIFrameElement>) {
     const style = {
         width: '100%',
         height: '400px'
     };
     return (
-        <ResizableFrame style={style} title="comments-frame">
+        <ResizableFrame ref={ref} style={style} title="comments-frame">
             {children}
         </ResizableFrame>
     );
-};
+});
 
 type PopupFrameProps = FrameProps & {
     title: string
diff --git a/apps/comments-ui/src/components/IFrame.tsx b/apps/comments-ui/src/components/IFrame.tsx
index 3dc5e8de0c1..09660ec3f63 100644
--- a/apps/comments-ui/src/components/IFrame.tsx
+++ b/apps/comments-ui/src/components/IFrame.tsx
@@ -1,10 +1,10 @@
-import {Component} from 'react';
+import {Component, forwardRef} from 'react';
 import {createPortal} from 'react-dom';
 
 /**
  * This is still a class component because it causes issues with the behaviour (DOM recreation and layout glitches) if we switch to a functional component. Feel free to refactor.
  */
-export default class IFrame extends Component<any> {
+class IFrame extends Component<any> {
     node: any;
     iframeHtml: any;
     iframeHead: any;
@@ -59,6 +59,9 @@ export default class IFrame extends Component<any> {
 
     setNode(node: any) {
         this.node = node;
+        if (this.props.innerRef) {
+            this.props.innerRef.current = node;
+        }
     }
 
     render() {
@@ -71,3 +74,9 @@ export default class IFrame extends Component<any> {
         );
     }
 }
+
+const IFrameFC = forwardRef<HTMLIFrameElement, any>(function IFrameFC(props, ref) {
+    return <IFrame {...props} innerRef={ref} />;
+});
+
+export default IFrameFC;
diff --git a/apps/comments-ui/src/components/content/CTABox.tsx b/apps/comments-ui/src/components/content/CTABox.tsx
index 395693fa856..51dc5f12389 100644
--- a/apps/comments-ui/src/components/content/CTABox.tsx
+++ b/apps/comments-ui/src/components/content/CTABox.tsx
@@ -6,7 +6,7 @@ type Props = {
     isPaid: boolean
 };
 const CTABox: React.FC<Props> = ({isFirst, isPaid}) => {
-    const {accentColor, publication, member, t} = useAppContext();
+    const {accentColor, commentCount, publication, member, t} = useAppContext();
 
     const buttonStyle = {
         backgroundColor: accentColor
@@ -31,11 +31,11 @@ const CTABox: React.FC<Props> = ({isFirst, isPaid}) => {
     ));
 
     return (
-        <section className={`flex flex-col items-center pt-[40px] ${member ? 'pb-[32px]' : 'pb-[48px]'} ${!isFirst && 'mt-4'} border-y border-[rgba(0,0,0,0.075)] dark:border-[rgba(255,255,255,0.1)] sm:px-8`} data-testid="cta-box">
+        <section className={`flex flex-col items-center pt-[40px] ${member ? 'pb-[32px]' : 'pb-[48px]'} ${!isFirst && 'mt-4'} ${!member && commentCount ? 'border-t' : 'border-none'} border-[rgba(0,0,0,0.075)] sm:px-8 dark:border-[rgba(255,255,255,0.1)]`} data-testid="cta-box">
             <h1 className={`mb-[8px] text-center font-sans text-[24px] tracking-tight  text-black dark:text-[rgba(255,255,255,0.85)] ${isFirst ? 'font-semibold' : 'font-bold'}`}>
                 {titleText}
             </h1>
-            <p className="mb-[28px] w-full px-0 text-center font-sans text-[16px] leading-normal text-neutral-600 dark:text-[rgba(255,255,255,0.85)] sm:max-w-screen-sm sm:px-8">
+            <p className="mb-[28px] w-full px-0 text-center font-sans text-[16px] leading-normal text-neutral-600 sm:max-w-screen-sm sm:px-8 dark:text-[rgba(255,255,255,0.85)]">
                 {text}
             </p>
             <button className="font-san mb-[12px] inline-block rounded px-5 py-[14px] font-medium leading-none text-white transition-all hover:opacity-90" data-testid="signup-button" style={buttonStyle} type="button" onClick={handleSignUpClick}>
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/comments-ui/src/components/content/Loading.tsx b/apps/comments-ui/src/components/content/Loading.tsx
index e8fa1512a39..94f39975f7b 100644
--- a/apps/comments-ui/src/components/content/Loading.tsx
+++ b/apps/comments-ui/src/components/content/Loading.tsx
@@ -2,7 +2,7 @@ import {ReactComponent as SpinnerIcon} from '../../images/icons/spinner.svg';
 
 function Loading() {
     return (
-        <div className="flex h-32 w-full items-center justify-center">
+        <div className="flex h-32 w-full items-center justify-center" data-testid="loading">
             <SpinnerIcon className="mb-6 h-12 w-12 fill-[rgb(225,225,225,0.9)] dark:fill-[rgba(255,255,255,0.6)]" />
         </div>
     );
diff --git a/apps/comments-ui/src/components/content/RepliesPagination.tsx b/apps/comments-ui/src/components/content/RepliesPagination.tsx
index eef3c942d0d..12abe164014 100644
--- a/apps/comments-ui/src/components/content/RepliesPagination.tsx
+++ b/apps/comments-ui/src/components/content/RepliesPagination.tsx
@@ -13,7 +13,7 @@ const RepliesPagination: React.FC<Props> = ({loadMore, count}) => {
 
     return (
         <div className="flex w-full items-center justify-start">
-            <button className="text-md group mb-10 ml-[48px] flex w-auto items-center px-0 pb-2 pt-0 text-left font-sans font-semibold text-neutral-700 dark:text-white sm:mb-12 " data-testid="reply-pagination-button" type="button" onClick={loadMore}>
+            <button className="text-md group mb-10 ml-[48px] flex w-auto items-center px-0 pb-2 pt-0 text-left font-sans font-semibold text-neutral-700 sm:mb-12 dark:text-white " data-testid="reply-pagination-button" type="button" onClick={loadMore}>
                 <span className="flex h-[39px] w-auto items-center justify-center whitespace-nowrap rounded-[6px] bg-[rgba(0,0,0,0.05)] px-4 py-2 text-center font-sans text-sm font-semibold text-neutral-700 outline-0 transition-[opacity,background] duration-150 hover:bg-[rgba(0,0,0,0.1)] dark:bg-[rgba(255,255,255,0.08)] dark:text-neutral-100 dark:hover:bg-[rgba(255,255,255,0.1)]">↓ <span className="ml-1 hidden sm:inline">{longText}</span><span className="ml-1 inline sm:hidden">{shortText}</span>
                 </span>
             </button>
diff --git a/apps/comments-ui/src/components/content/context-menus/CommentContextMenu.tsx b/apps/comments-ui/src/components/content/context-menus/CommentContextMenu.tsx
index 716945b6877..5d56755674e 100644
--- a/apps/comments-ui/src/components/content/context-menus/CommentContextMenu.tsx
+++ b/apps/comments-ui/src/components/content/context-menus/CommentContextMenu.tsx
@@ -77,7 +77,7 @@ const CommentContextMenu: React.FC<Props> = ({comment, close, toggleEdit}) => {
 
     return (
         <div ref={element} onClick={stopPropagation}>
-            <div className="absolute z-10 min-w-min whitespace-nowrap rounded bg-white py-3 pl-4 pr-8 font-sans text-sm shadow-lg outline-0 dark:bg-zinc-900 dark:text-white sm:min-w-[150px]">
+            <div className="absolute z-10 min-w-min whitespace-nowrap rounded bg-white py-3 pl-4 pr-8 font-sans text-sm shadow-lg outline-0 sm:min-w-[150px] dark:bg-zinc-900 dark:text-white">
                 {contextMenu}
             </div>
         </div>
diff --git a/apps/comments-ui/src/components/content/forms/Form.tsx b/apps/comments-ui/src/components/content/forms/Form.tsx
index 5dcd4f15ac6..6e5f22fafe5 100644
--- a/apps/comments-ui/src/components/content/forms/Form.tsx
+++ b/apps/comments-ui/src/components/content/forms/Form.tsx
@@ -8,7 +8,7 @@ import {Transition} from '@headlessui/react';
 import {useCallback, useEffect, useRef, useState} from 'react';
 import {usePopupOpen} from '../../../utils/hooks';
 
-type Progress = 'default' | 'sending' | 'sent' | 'error'
+type Progress = 'default' | 'sending' | 'sent' | 'error';
 export type SubmitSize = 'small' | 'medium' | 'large';
 type FormEditorProps = {
     submit: (data: {html: string}) => Promise<void>;
@@ -159,7 +159,8 @@ const FormHeader: React.FC<FormHeaderProps> = ({show, name, expertise, editName,
             </div>
             <div className="flex items-baseline justify-start">
                 <button
-                    className={`group flex max-w-[80%] items-center justify-start whitespace-nowrap text-left font-sans text-[14px] tracking-tight text-[rgba(0,0,0,0.5)] transition duration-150 hover:text-[rgba(0,0,0,0.75)] dark:text-[rgba(255,255,255,0.5)] dark:hover:text-[rgba(255,255,255,0.4)] sm:max-w-[90%] ${!expertise && 'text-[rgba(0,0,0,0.3)] hover:text-[rgba(0,0,0,0.5)] dark:text-[rgba(255,255,255,0.3)]'}`}
+                    className={`group flex max-w-[80%] items-center justify-start whitespace-nowrap text-left font-sans text-[14px] tracking-tight text-[rgba(0,0,0,0.5)] transition duration-150 hover:text-[rgba(0,0,0,0.75)] sm:max-w-[90%] dark:text-[rgba(255,255,255,0.5)] dark:hover:text-[rgba(255,255,255,0.4)] ${!expertise && 'text-[rgba(0,0,0,0.3)] hover:text-[rgba(0,0,0,0.5)] dark:text-[rgba(255,255,255,0.3)]'}`}
+                    data-testid="expertise-button"
                     type="button"
                     onClick={editExpertise}
                 >
diff --git a/apps/comments-ui/src/components/content/forms/SecundaryForm.tsx b/apps/comments-ui/src/components/content/forms/SecundaryForm.tsx
index 6a5cb29bf7d..3f3453b8f86 100644
--- a/apps/comments-ui/src/components/content/forms/SecundaryForm.tsx
+++ b/apps/comments-ui/src/components/content/forms/SecundaryForm.tsx
@@ -11,7 +11,7 @@ type Props = {
     close: () => void;
     closeIfNotChanged: () => void;
     submitText: JSX.Element;
-    submitSize: SubmitSize
+    submitSize: SubmitSize;
 };
 const SecundaryForm: React.FC<Props> = ({editor, submit, close, closeIfNotChanged, submitText, submitSize}) => {
     const {dispatchAction, secundaryFormCount} = useAppContext();
@@ -19,7 +19,6 @@ const SecundaryForm: React.FC<Props> = ({editor, submit, close, closeIfNotChange
     // Keep track of the amount of open forms
     useEffect(() => {
         dispatchAction('increaseSecundaryFormCount', {});
-
         return () => {
             dispatchAction('decreaseSecundaryFormCount', {});
         };
@@ -33,7 +32,7 @@ const SecundaryForm: React.FC<Props> = ({editor, submit, close, closeIfNotChange
 
         if (secundaryFormCount > 1) {
             closeIfNotChanged();
-        }
+        };
     }, [secundaryFormCount]);
 
     const reduced = isMobile();
diff --git a/apps/comments-ui/src/components/popups/AddDetailsPopup.tsx b/apps/comments-ui/src/components/popups/AddDetailsPopup.tsx
index 31de9077ff3..10c5e70abc2 100644
--- a/apps/comments-ui/src/components/popups/AddDetailsPopup.tsx
+++ b/apps/comments-ui/src/components/popups/AddDetailsPopup.tsx
@@ -116,16 +116,14 @@ const AddDetailsPopup = (props: Props) => {
     });
 
     return (
-        <div className="shadow-modal relative h-screen w-screen overflow-hidden rounded-none bg-white p-[28px] text-center sm:h-auto sm:w-[720px] sm:rounded-xl sm:p-0" onMouseDown={stopPropagation}>
+        <div className="shadow-modal relative h-screen w-screen overflow-hidden rounded-none bg-white p-[28px] text-center sm:h-auto sm:w-[720px] sm:rounded-xl sm:p-0" data-testid="profile-modal" onMouseDown={stopPropagation}>
             <div className="flex">
-                {!isMobile() &&
-                    <div className={`flex w-[40%] flex-col items-center justify-center bg-[#1C1C1C]`}>
-                        <div className="mt-[-1px] flex flex-col gap-9">
-                            {renderExampleProfiles()}
-                        </div>
+                <div className={`hidden w-[50%] flex-col items-center justify-center bg-[#1C1C1C] sm:block sm:p-8`}>
+                    <div className="mt-[-1px] flex flex-col gap-9 text-left">
+                        {renderExampleProfiles()}
                     </div>
-                }
-                <div className={`${isMobile() ? 'w-full' : 'w-[60%]'} p-0 sm:p-8`}>
+                </div>
+                <div className={`p-0 sm:p-8`}>
                     <h1 className="mb-1 text-center font-sans text-[24px] font-bold tracking-tight text-black sm:text-left">{t('Complete your profile')}<span className="hidden sm:inline">.</span></h1>
                     <p className="pr-0 text-center font-sans text-base leading-9 text-neutral-500 sm:pr-10 sm:text-left">{t('Add context to your comment, share your name and expertise to foster a healthy discussion.')}</p>
                     <section className="mt-8 text-left">
@@ -146,6 +144,7 @@ const AddDetailsPopup = (props: Props) => {
                         <input
                             ref={inputNameRef}
                             className={`flex h-[42px] w-full items-center rounded border border-neutral-200 px-3 font-sans text-[16px] outline-0 transition-[border-color] duration-200 focus:border-neutral-300 ${error.name && 'border-red-500 focus:border-red-500'}`}
+                            data-testid="name-input"
                             id="comments-name"
                             maxLength={64}
                             name="name"
@@ -170,6 +169,7 @@ const AddDetailsPopup = (props: Props) => {
                         <input
                             ref={inputExpertiseRef}
                             className={`flex h-[42px] w-full items-center rounded border border-neutral-200 px-3 font-sans text-[16px] outline-0 transition-[border-color] duration-200 focus:border-neutral-300 ${(expertiseCharsLeft === 0) && 'border-red-500 focus:border-red-500'}`}
+                            data-testid="expertise-input"
                             id="comments-expertise"
                             maxLength={maxExpertiseChars}
                             name="expertise"
@@ -191,6 +191,7 @@ const AddDetailsPopup = (props: Props) => {
                         />
                         <button
                             className={`mt-10 flex h-[42px] w-full items-center justify-center rounded-md px-8 font-sans text-[15px] font-semibold text-white opacity-100 transition-opacity duration-200 ease-linear hover:opacity-90`}
+                            data-testid="save-button"
                             style={{backgroundColor: accentColor ?? '#000000'}}
                             type="button"
                             onClick={() => {
diff --git a/apps/comments-ui/src/utils/adminApi.ts b/apps/comments-ui/src/utils/adminApi.ts
index 813a0ddd1e8..fc33ebbe7bd 100644
--- a/apps/comments-ui/src/utils/adminApi.ts
+++ b/apps/comments-ui/src/utils/adminApi.ts
@@ -14,9 +14,6 @@ export function setupAdminAPI({adminUrl}: {adminUrl: string}) {
         try {
             data = JSON.parse(event.data);
         } catch (err) {
-            /* eslint-disable no-console */
-            console.error('Error parsing event data', err);
-            /* eslint-enable no-console */
             return;
         }
 
diff --git a/apps/comments-ui/src/utils/api.ts b/apps/comments-ui/src/utils/api.ts
index 38a0d9a718c..1d839be01cc 100644
--- a/apps/comments-ui/src/utils/api.ts
+++ b/apps/comments-ui/src/utils/api.ts
@@ -28,7 +28,7 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}: {site
     }
 
     // To fix pagination when we create new comments (or people post comments after you loaded the page, we need to only load comments creatd AFTER the page load)
-    let firstCommentsLoadedAt: null | string = null;
+    let firstCommentCreatedAt: null | string = null;
 
     const api = {
         site: {
@@ -122,13 +122,20 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}: {site
                 return json;
             },
             browse({page, postId}: {page: number, postId: string}) {
-                firstCommentsLoadedAt = firstCommentsLoadedAt ?? new Date().toISOString();
+                let filter = null;
+                if (firstCommentCreatedAt) {
+                    filter = `created_at:<=${firstCommentCreatedAt}`;
+                }
 
-                const filter = encodeURIComponent(`post_id:${postId}+created_at:<=${firstCommentsLoadedAt}`);
-                const order = encodeURIComponent('created_at DESC, id DESC');
+                const params = new URLSearchParams();
 
-                const url = endpointFor({type: 'members', resource: 'comments', params: `?limit=5&order=${order}&filter=${filter}&page=${page}`});
-                return makeRequest({
+                params.set('limit', '20');
+                if (filter) {
+                    params.set('filter', filter);
+                }
+                params.set('page', page.toString());
+                const url = endpointFor({type: 'members', resource: `comments/post/${postId}`, params: `?${params.toString()}`});
+                const response = makeRequest({
                     url,
                     method: 'GET',
                     headers: {
@@ -142,12 +149,22 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}: {site
                         throw new Error('Failed to fetch comments');
                     }
                 });
+
+                if (!firstCommentCreatedAt) {
+                    response.then((body) => {
+                        const firstComment = body.comments[0];
+                        if (firstComment) {
+                            firstCommentCreatedAt = firstComment.created_at;
+                        }
+                    });
+                }
+
+                return response;
             },
             async replies({commentId, afterReplyId, limit}: {commentId: string; afterReplyId: string; limit?: number | 'all'}) {
-                const filter = encodeURIComponent(`id:>${afterReplyId}`);
-                const order = encodeURIComponent('created_at ASC, id ASC');
+                const filter = encodeURIComponent(`id:>'${afterReplyId}'`);
 
-                const url = endpointFor({type: 'members', resource: `comments/${commentId}/replies`, params: `?limit=${limit ?? 5}&order=${order}&filter=${filter}`});
+                const url = endpointFor({type: 'members', resource: `comments/${commentId}/replies`, params: `?limit=${limit ?? 5}&filter=${filter}`});
                 const res = await makeRequest({
                     url,
                     method: 'GET',
diff --git a/apps/comments-ui/test/e2e/actions.test.ts b/apps/comments-ui/test/e2e/actions.test.ts
index 15d02de20a0..f2e7b8a635d 100644
--- a/apps/comments-ui/test/e2e/actions.test.ts
+++ b/apps/comments-ui/test/e2e/actions.test.ts
@@ -90,9 +90,6 @@ test.describe('Actions', async () => {
         await replyButton.click();
         const editor = frame.getByTestId('form-editor');
         await expect(editor).toBeVisible();
-
-        await page.pause();
-
         // Wait for focused
         await waitEditorFocused(editor);
 
@@ -108,5 +105,46 @@ test.describe('Actions', async () => {
         await expect(frame.getByTestId('comment-component')).toHaveCount(4);
         await expect(frame.getByText('This is a reply 123')).toHaveCount(1);
     });
+
+    test('Can add expertise', async ({page}) => {
+        const mockedApi = new MockedApi({});
+        mockedApi.setMember({name: 'John Doe', expertise: null});
+
+        mockedApi.addComment({
+            html: '<p>This is comment 1</p>'
+        });
+
+        const {frame} = await initialize({
+            mockedApi,
+            page,
+            publication: 'Publisher Weekly'
+        });
+
+        const editor = frame.getByTestId('form-editor');
+        await editor.click({force: true});
+        await waitEditorFocused(editor);
+
+        const expertiseButton = frame.getByTestId('expertise-button');
+        await expect(expertiseButton).toBeVisible();
+        await expect(expertiseButton).toHaveText('Add your expertise');
+        await expertiseButton.click();
+
+        const detailsFrame = page.frameLocator('iframe[title="addDetailsPopup"]');
+        const profileModal = detailsFrame.getByTestId('profile-modal');
+        await expect(profileModal).toBeVisible();
+
+        await expect(detailsFrame.getByTestId('name-input')).toHaveValue('John Doe');
+        await expect(detailsFrame.getByTestId('expertise-input')).toHaveValue('');
+
+        await detailsFrame.getByTestId('name-input').fill('Testy McTest');
+        await detailsFrame.getByTestId('expertise-input').fill('Software development');
+
+        await detailsFrame.getByTestId('save-button').click();
+
+        await expect(profileModal).not.toBeVisible();
+
+        await expect(frame.getByTestId('member-name')).toHaveText('Testy McTest');
+        await expect(frame.getByTestId('expertise-button')).toHaveText('Software development');
+    });
 });
 
diff --git a/apps/comments-ui/test/e2e/auth-frame.test.ts b/apps/comments-ui/test/e2e/auth-frame.test.ts
index eac13927b49..7882524820b 100644
--- a/apps/comments-ui/test/e2e/auth-frame.test.ts
+++ b/apps/comments-ui/test/e2e/auth-frame.test.ts
@@ -1,10 +1,10 @@
-import {MOCKED_SITE_URL, MockedApi, initialize, mockAdminAuthFrame} from '../utils/e2e';
+import {MOCKED_SITE_URL, MockedApi, initialize, mockAdminAuthFrame, mockAdminAuthFrame204} from '../utils/e2e';
 import {expect, test} from '@playwright/test';
 
 const admin = MOCKED_SITE_URL + '/ghost/';
 
 test.describe('Auth Frame', async () => {
-    test('renders the auth frame', async ({page}) => {
+    test('skips rendering the auth frame with no comments', async ({page}) => {
         const mockedApi = new MockedApi({});
         await initialize({
             mockedApi,
@@ -13,12 +13,32 @@ test.describe('Auth Frame', async () => {
             admin
         });
 
+        const iframeElement = await page.locator('iframe[data-frame="admin-auth"]');
+        await expect(iframeElement).toHaveCount(0);
+    });
+
+    test('renders the auth frame when there are comments', async ({page}) => {
+        const mockedApi = new MockedApi({});
+        mockedApi.addComment({
+            html: '<p>This is comment 1</p>'
+        });
+
+        await initialize({
+            mockedApi,
+            page,
+            publication: 'Publisher Weekly',
+            admin
+        });
+
         const iframeElement = await page.locator('iframe[data-frame="admin-auth"]');
         await expect(iframeElement).toHaveCount(1);
     });
 
-    test('has no admin options', async ({page}) => {
+    test('has no admin options when not signed in to Ghost admin', async ({page}) => {
+        await mockAdminAuthFrame204({page, admin});
+
         const mockedApi = new MockedApi({});
+
         mockedApi.addComment({
             html: '<p>This is comment 1</p>'
         });
@@ -45,7 +65,7 @@ test.describe('Auth Frame', async () => {
         const iframeElement = await page.locator('iframe[data-frame="admin-auth"]');
         await expect(iframeElement).toHaveCount(1);
 
-        const comments =  await frame.getByTestId('comment-component');
+        const comments = await frame.getByTestId('comment-component');
         await expect(comments).toHaveCount(5);
 
         const moreButtons = await frame.getByTestId('more-button');
@@ -86,7 +106,7 @@ test.describe('Auth Frame', async () => {
         await expect(iframeElement).toHaveCount(1);
 
         // Check if more actions button is visible on each comment
-        const comments =  await frame.getByTestId('comment-component');
+        const comments = await frame.getByTestId('comment-component');
         await expect(comments).toHaveCount(5);
 
         const moreButtons = await frame.getByTestId('more-button');
@@ -99,12 +119,12 @@ test.describe('Auth Frame', async () => {
         // Check comment2 is replaced with a hidden message
         const secondComment = comments.nth(1);
         await expect(secondComment).toHaveText('This comment has been hidden.');
-        await expect(secondComment).not.toContainText('This is comment 4');
+        await expect(secondComment).not.toContainText('This is comment 2');
 
         // Check can show it again
         await moreButtons.nth(1).click();
         await moreButtons.nth(1).getByText('Show comment').click();
-        await expect(secondComment).toContainText('This is comment 4');
+        await expect(secondComment).toContainText('This is comment 2');
     });
 
     test('has admin options when signed in to Ghost admin and as a member', async ({page}) => {
@@ -143,7 +163,7 @@ test.describe('Auth Frame', async () => {
         await expect(iframeElement).toHaveCount(1);
 
         // Check if more actions button is visible on each comment
-        const comments =  await frame.getByTestId('comment-component');
+        const comments = await frame.getByTestId('comment-component');
         await expect(comments).toHaveCount(5);
 
         const moreButtons = await frame.getByTestId('more-button');
@@ -156,12 +176,12 @@ test.describe('Auth Frame', async () => {
         // Check comment2 is replaced with a hidden message
         const secondComment = comments.nth(1);
         await expect(secondComment).toHaveText('This comment has been hidden.');
-        await expect(secondComment).not.toContainText('This is comment 4');
+        await expect(secondComment).not.toContainText('This is comment 2');
 
         // Check can show it again
         await moreButtons.nth(1).click();
         await moreButtons.nth(1).getByText('Show comment').click();
-        await expect(secondComment).toContainText('This is comment 4');
+        await expect(secondComment).toContainText('This is comment 2');
     });
 });
 
diff --git a/apps/comments-ui/test/e2e/lazy-loading.test.ts b/apps/comments-ui/test/e2e/lazy-loading.test.ts
new file mode 100644
index 00000000000..7e71143abd0
--- /dev/null
+++ b/apps/comments-ui/test/e2e/lazy-loading.test.ts
@@ -0,0 +1,70 @@
+import {E2E_PORT} from '../../playwright.config';
+import {MOCKED_SITE_URL, MockedApi} from '../utils/e2e';
+import {expect, test} from '@playwright/test';
+
+test.describe('Lazy loading', async () => {
+    test('delays loading of content until scrolled into view', async ({page}) => {
+        const mockedApi = new MockedApi({});
+        mockedApi.setMember({});
+
+        mockedApi.addComment({
+            html: '<p>This is comment 1</p>'
+        });
+
+        const sitePath = MOCKED_SITE_URL;
+        await page.route(sitePath, async (route) => {
+            await route.fulfill({
+                status: 200,
+                // include a div at the top of the body that's 1.5x viewport height
+                // to force the need to scroll to see the comments
+                body: `<html><head><meta charset="UTF-8" /></head><body><div style="width: 100%; height: 1500px;"></div></body></html>`
+            });
+        });
+
+        const url = `http://localhost:${E2E_PORT}/comments-ui.min.js`;
+        await page.setViewportSize({width: 1000, height: 1000});
+
+        await page.goto(sitePath);
+        await mockedApi.listen({page, path: sitePath});
+
+        const options = {
+            publication: 'Publisher Weekly',
+            count: true,
+            title: 'Title',
+            ghostComments: MOCKED_SITE_URL,
+            postId: mockedApi.postId
+        };
+
+        await page.evaluate((data) => {
+            const scriptTag = document.createElement('script');
+            scriptTag.src = data.url;
+
+            for (const option of Object.keys(data.options)) {
+                scriptTag.dataset[option] = data.options[option];
+            }
+            document.body.appendChild(scriptTag);
+        }, {url, options});
+
+        await page.locator('iframe[title="comments-frame"]').waitFor({state: 'attached'});
+
+        const commentsFrameSelector = 'iframe[title="comments-frame"]';
+        const adminFrameSelector = 'iframe[data-frame="admin-auth"]';
+
+        const commentsFrame = page.frameLocator(commentsFrameSelector);
+
+        // wait for a little bit to ensure we're not loading comments until scrolled
+        await page.waitForTimeout(250);
+
+        // check that we haven't loaded comments or admin-auth yet
+        await expect(commentsFrame.getByTestId('loading')).toHaveCount(1);
+        await expect(page.locator(adminFrameSelector)).toHaveCount(0);
+
+        // scroll the iframe into view
+        const iframeHandle = await page.locator(commentsFrameSelector);
+        iframeHandle.scrollIntoViewIfNeeded();
+
+        // loading state should be gone and admin-auth frame should be present
+        await expect(commentsFrame.getByTestId('loading')).toHaveCount(0);
+        await expect(page.locator(adminFrameSelector)).toHaveCount(1);
+    });
+});
diff --git a/apps/comments-ui/test/e2e/pagination.test.ts b/apps/comments-ui/test/e2e/pagination.test.ts
index 2ea4962532a..59fa7d7e193 100644
--- a/apps/comments-ui/test/e2e/pagination.test.ts
+++ b/apps/comments-ui/test/e2e/pagination.test.ts
@@ -1,28 +1,11 @@
-import {MockedApi, initialize} from '../utils/e2e';
+import {MockedApi, addMultipleComments, initialize} from '../utils/e2e';
 import {expect, test} from '@playwright/test';
 
 test.describe('Pagination', async () => {
-    test('Shows pagination button on top if more than 5 comments', async ({page}) => {
+    test('Shows pagination button at top if more than 20 comments', async ({page}) => {
         const mockedApi = new MockedApi({});
 
-        mockedApi.addComment({
-            html: '<p>This is comment 1</p>'
-        });
-        mockedApi.addComment({
-            html: '<p>This is comment 2</p>'
-        });
-        mockedApi.addComment({
-            html: '<p>This is comment 3</p>'
-        });
-        mockedApi.addComment({
-            html: '<p>This is comment 4</p>'
-        });
-        mockedApi.addComment({
-            html: '<p>This is comment 5</p>'
-        });
-        mockedApi.addComment({
-            html: '<p>This is comment 6</p>'
-        });
+        addMultipleComments(mockedApi, 21);
 
         const {frame} = await initialize({
             mockedApi,
@@ -36,24 +19,27 @@ test.describe('Pagination', async () => {
         await expect(frame.getByTestId('pagination-component')).toContainText('Show 1 previous comment');
 
         // Test total comments with test-id comment-component is 5
-        await expect(frame.getByTestId('comment-component')).toHaveCount(5);
+        await expect(frame.getByTestId('comment-component')).toHaveCount(20);
 
-        // Check only the first 5 comments are visible
-        await expect(frame.getByText('This is comment 1')).toBeVisible();
-        await expect(frame.getByText('This is comment 2')).toBeVisible();
-        await expect(frame.getByText('This is comment 3')).toBeVisible();
-        await expect(frame.getByText('This is comment 4')).toBeVisible();
-        await expect(frame.getByText('This is comment 5')).toBeVisible();
-        await expect(frame.getByText('This is comment 6')).not.toBeVisible();
+        // Check only the first latest 20 comments are visible
+        await expect(frame.getByText('This is comment 1.')).not.toBeVisible();
+        await expect(frame.getByText('This is comment 2.')).toBeVisible();
+        await expect(frame.getByText('This is comment 3.')).toBeVisible();
+        await expect(frame.getByText('This is comment 4.')).toBeVisible();
+        await expect(frame.getByText('This is comment 5.')).toBeVisible();
+        await expect(frame.getByText('This is comment 6.')).toBeVisible();
+        await expect(frame.getByText('This is comment 20.')).toBeVisible();
+
+        // 
 
         // Click the pagination button
         await frame.getByTestId('pagination-component').click();
 
-        // Check only 6 visible (not more than that)
-        await expect(frame.getByTestId('comment-component')).toHaveCount(6);
+        // Check only 21 visible (not more than that)
+        await expect(frame.getByTestId('comment-component')).toHaveCount(21);
 
         // Check comments 6 is visible
-        await expect(frame.getByText('This is comment 6')).toBeVisible();
+        await expect(frame.getByText('This is comment 1.')).toBeVisible();
 
         // Check the pagination button is not visible
         await expect(frame.getByTestId('pagination-component')).not.toBeVisible();
diff --git a/apps/comments-ui/test/utils/MockedApi.ts b/apps/comments-ui/test/utils/MockedApi.ts
index d415003cfbf..42b07a05559 100644
--- a/apps/comments-ui/test/utils/MockedApi.ts
+++ b/apps/comments-ui/test/utils/MockedApi.ts
@@ -62,10 +62,10 @@ export class MockedApi {
             const bDate = new Date(b.created_at).getTime();
 
             if (aDate === bDate) {
-                return a.id > b.id ? 1 : -1;
+                return a.id > b.id ? -1 : 1;
             }
 
-            return aDate > bDate ? 1 : -1;
+            return aDate > bDate ? -1 : 1;
         });
 
         let filteredComments = this.comments;
@@ -159,6 +159,14 @@ export class MockedApi {
                 });
             }
 
+            if (route.request().method() === 'PUT') {
+                const payload = JSON.parse(route.request().postData());
+                this.member = {
+                    ...this.member,
+                    ...payload
+                };
+            }
+
             await route.fulfill({
                 status: 200,
                 body: JSON.stringify(this.member)
@@ -166,29 +174,28 @@ export class MockedApi {
         });
 
         await page.route(`${path}/members/api/comments/*`, async (route) => {
-            if (route.request().method() === 'POST') {
-                const payload = JSON.parse(route.request().postData());
+            const payload = JSON.parse(route.request().postData());
 
-                this.#lastCommentDate = new Date();
-                this.addComment({
-                    ...payload.comments[0],
-                    member: this.member
-                });
-                return await route.fulfill({
-                    status: 200,
-                    body: JSON.stringify({
-                        comments: [
-                            this.comments[this.comments.length - 1]
-                        ]
-                    })
-                });
-            }
+            this.#lastCommentDate = new Date();
+            this.addComment({
+                ...payload.comments[0],
+                member: this.member
+            });
+            return await route.fulfill({
+                status: 200,
+                body: JSON.stringify({
+                    comments: [
+                        this.comments[this.comments.length - 1]
+                    ]
+                })
+            });
+        });
 
+        await page.route(`${path}/members/api/comments/post/*/*`, async (route) => {
             const url = new URL(route.request().url());
 
             const p = parseInt(url.searchParams.get('page') ?? '1');
             const limit = parseInt(url.searchParams.get('limit') ?? '5');
-            const order = url.searchParams.get('order') ?? '';
             const filter = url.searchParams.get('filter') ?? '';
 
             await route.fulfill({
@@ -196,14 +203,13 @@ export class MockedApi {
                 body: JSON.stringify(this.browseComments({
                     page: p,
                     limit,
-                    order,
                     filter
                 }))
             });
         });
 
-         // LIKE a single comment
-         await page.route(`${path}/members/api/comments/*/like/`, async (route) => {
+        // LIKE a single comment
+        await page.route(`${path}/members/api/comments/*/like/`, async (route) => {
             const url = new URL(route.request().url());
             const commentId = url.pathname.split('/').reverse()[2];
 
@@ -235,7 +241,6 @@ export class MockedApi {
             });
         });
 
-
         // GET a single comment
         await page.route(`${path}/members/api/comments/*/`, async (route) => {
             const url = new URL(route.request().url());
diff --git a/apps/comments-ui/test/utils/e2e.ts b/apps/comments-ui/test/utils/e2e.ts
index 1e3b951096b..240b0ce2ca2 100644
--- a/apps/comments-ui/test/utils/e2e.ts
+++ b/apps/comments-ui/test/utils/e2e.ts
@@ -31,7 +31,7 @@ function authFrameMain() {
         }
 
         if (!d) {
-            return
+            return;
         }
         const data: {uid: string, action: string} = d;
 
@@ -76,6 +76,14 @@ export async function mockAdminAuthFrame({admin, page}) {
     });
 }
 
+export async function mockAdminAuthFrame204({admin, page}) {
+    await page.route(admin + 'auth-frame/', async (route) => {
+        await route.fulfill({
+            status: 204
+        });
+    });
+}
+
 export async function initialize({mockedApi, page, bodyStyle, ...options}: {
     mockedApi: MockedApi,
     page: Page,
@@ -126,10 +134,23 @@ export async function initialize({mockedApi, page, bodyStyle, ...options}: {
         document.body.appendChild(scriptTag);
     }, {url, options});
 
+    const commentsFrameSelector = 'iframe[title="comments-frame"]';
+
     await page.waitForSelector('iframe');
 
+    // wait for data to be loaded because our tests expect it
+    const iframeElement = await page.locator(commentsFrameSelector).elementHandle();
+    if (!iframeElement) {
+        throw new Error('iframe not found');
+    }
+    const iframe = await iframeElement.contentFrame();
+    if (!iframe) {
+        throw new Error('iframe contentFrame not found');
+    }
+    await iframe.waitForSelector('[data-loaded="true"]');
+
     return {
-        frame: page.frameLocator('iframe[title="comments-frame"]')
+        frame: page.frameLocator(commentsFrameSelector)
     };
 }
 
@@ -181,3 +202,11 @@ export function getModifierKey() {
         return 'Control';
     }
 }
+
+export function addMultipleComments(api, numComments) {
+    for (let i = 1; i <= numComments; i++) {
+        api.addComment({
+            html: `<p>This is comment ${i}.</p>`
+        });
+    }
+}
diff --git a/apps/comments-ui/vite.config.ts b/apps/comments-ui/vite.config.ts
index f882082972c..52d7a3f4f27 100644
--- a/apps/comments-ui/vite.config.ts
+++ b/apps/comments-ui/vite.config.ts
@@ -11,6 +11,7 @@ const outputFileName = pkg.name[0] === '@' ? pkg.name.slice(pkg.name.indexOf('/'
 // https://vitejs.dev/config/
 export default (function viteConfig() {
     return defineConfig({
+        logLevel: process.env.CI ? 'info' : 'warn',
         plugins: [
             svgr(),
             react(),
@@ -31,6 +32,7 @@ export default (function viteConfig() {
             port: 5368
         },
         build: {
+            reportCompressedSize: false,
             outDir: resolve(__dirname, 'umd'),
             emptyOutDir: true,
             minify: true,
diff --git a/apps/portal/README.md b/apps/portal/README.md
index 6f4591d74b7..1c9119506ea 100644
--- a/apps/portal/README.md
+++ b/apps/portal/README.md
@@ -26,45 +26,63 @@ The script also adds custom class names to this element for open and close state
 
 Refer the [docs](https://ghost.org/help/setup-members/#customize-portal-settings) to read about ways in which Portal can be customized for your site.
 
-## Basic Setup
+## Develop
 
-This section is mostly relevant for core team only for active Portal development. Always use the unpkg link for testing/using latest released portal script.
+Run Portal within the Ghost monorepo with:
+```
+yarn dev --portal
+```
+
+Alternatively, use  `yarn dev --all` to load Portal and other supported apps/services, see [dev.js](https://github.com/TryGhost/Ghost/blob/main/.github/scripts/dev.js) for more information.
+
+---
+
+To run Portal in a standalone fashion, use `yarn start` and open [http://localhost:3000](http://localhost:3000).
 
-- Run `yarn start:dev` to start Portal in development mode
-- Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-- To use the local Portal script in a local Ghost site
-  - Update `config.local.json` in Ghost repo to add "portal" config pointing to local dev server url as instructed on terminal.
-  - By default, this uses port `5368` for loading local Portal script on Ghost site. It's also possible to specify a custom port when running the script using - `--port=xxxx`.
+## Build
 
-## Available Scripts
+To create a production minified bundle in `umd/portal.min.js`:
+```
+yarn build
+```
+
+## Test
 
-In the project directory, you can also run:
+To run tests in watch mode:
+```
+yarn test
+```
 
-### `yarn start`
+### Ghost e2e browser tests
 
-Runs the app in the development mode.<br />
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+Portal is primarily tested via Ghost's e2e browser tests. In order to test against your local changes rather than the last published package on npm you need to have the local portal build being served and to configure Ghost to use the local URL.
 
-The page will reload if you make edits.<br />
-You will also see any lint errors in the console.
+1. Run `yarn dev` in `ghost/apps/portal` to serve the local portal build on http://localhost:4175/portal.min.js
+2. Run the Ghost e2e tests in `ghost/core`, providing an ENV variable to override the portal URL:
+   ```
+   portal__url=http://localhost:4175/portal.min.js STRIPE_ACCOUNT_ID=acct_xxx STRIPE_PUBLISHABLE_KEY=pk_test_xxx STRIPE_SECRET_KEY=sk_test_xxx yarn test:browser:portal
+   ```
 
-Start the portal server when developing Ghost by running Ghost (in root folder) via `yarn dev --all` or `yarn dev --portal`. This will host the portal JavaScript files, and makes sure that Ghost uses these locally hosted assets instead of the ones from the CDN.
+## Release
 
-### `yarn build`
+A patch release can be rolled out instantly in production, whereas a minor/major release requires the Ghost monorepo to be updated and released. In either case, you need sufficient permissions to release `@tryghost` packages on NPM.
 
-Creates the production single minified bundle for external use in `umd/portal.min.js`.  <br />
+If you're releasing new code that should not immediately go live _always_ use a minor or major version when publishing.
 
-### `yarn test`
+In order to have Ghost's e2e tests run against the new code on CI or to test the new code in staging, you need to publish to npm following the Minor / major release process below.
 
-Launches the test runner in the interactive watch mode.<br />
+### Patch release
 
-## Publish
+1. Run `yarn ship` and select a patch version when prompted
+2. (Optional) Clear JsDelivr cache to get the new version out instantly ([docs](https://www.notion.so/ghost/How-to-clear-jsDelivr-CDN-cache-2930bdbac02946eca07ac23ab3199bfa?pvs=4)). Typically, you'll need to open `https://purge.jsdelivr.net/ghost/portal@~${PORTAL_VERSION}/umd/portal.min.js` and
+`https://purge.jsdelivr.net/ghost/portal@~${PORTAL_VERSION}/umd/main.css` in your browser, where `PORTAL_VERSION` is the latest minor version in `ghost/core/core/shared/config/defaults.json` ([code](https://github.com/TryGhost/Ghost/blob/0aef3d3beeebcd79a4bfd3ad27e0ac67554b5744/ghost/core/core/shared/config/defaults.json#L185))
 
-Run `yarn ship` to publish new version of script.
+### Minor / major release
 
-`yarn ship` is an alias for `npm publish`
+1. Run `yarn ship` and select a minor or major version when prompted
+2. Update the Portal version in `ghost/core/core/shared/config/defaults.json` to the new minor or major version ([code](https://github.com/TryGhost/Ghost/blob/0aef3d3beeebcd79a4bfd3ad27e0ac67554b5744/ghost/core/core/shared/config/defaults.json#L198))
+3. Wait until a new version of Ghost is released
 
-- Builds the script with latest code using `yarn build` (prePublish)
-- Publishes package on npm as `@tryghost/portal` and creates an unpkg link for script at https://unpkg.com/@tryghost/portal@VERSION
+# Copyright & License
 
-(Core team only)
+Copyright (c) 2013-2024 Ghost Foundation - Released under the [MIT license](LICENSE).
diff --git a/apps/portal/package.json b/apps/portal/package.json
index 993441c1bc0..050ffc6466c 100644
--- a/apps/portal/package.json
+++ b/apps/portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/portal",
-  "version": "2.36.2",
+  "version": "2.43.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "test:unit": "yarn test:ci",
     "lint": "eslint src --ext .js --cache",
     "preship": "yarn lint",
-    "ship": "STATUS=$(git status --porcelain); echo $STATUS; if [ -z \"$STATUS\" ]; then yarn version; fi",
+    "ship": "STATUS=$(git status --porcelain .); echo $STATUS; if [ -z \"$STATUS\" ]; then yarn version; else echo \"Uncommitted changes found.\" && exit 1; fi",
     "postship": "git push ${GHOST_UPSTREAM:-origin} --follow-tags && npm publish",
     "prepublishOnly": "yarn build"
   },
@@ -78,23 +78,23 @@
     ]
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.22.15",
-    "@doist/react-interpolate": "0.4.1",
-    "@sentry/react": "7.70.0",
-    "@sentry/tracing": "7.70.0",
+    "@babel/eslint-parser": "7.23.3",
+    "@doist/react-interpolate": "1.1.1",
+    "@sentry/react": "7.119.0",
+    "@sentry/tracing": "7.114.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.2.1",
     "@vitest/coverage-v8": "0.34.3",
     "@vitest/ui": "0.34.3",
     "concurrently": "8.2.2",
     "cross-fetch": "4.0.0",
     "eslint-plugin-i18next": "6.0.3",
-    "jsdom": "22.1.0",
+    "jsdom": "24.1.3",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "vite": "4.5.0",
+    "vite": "4.5.3",
     "vite-plugin-css-injected-by-js": "3.3.0",
     "vite-plugin-svgr": "3.3.0",
     "vitest": "0.34.3"
diff --git a/apps/portal/src/App.js b/apps/portal/src/App.js
index 669b94eee92..a7371449d1d 100644
--- a/apps/portal/src/App.js
+++ b/apps/portal/src/App.js
@@ -5,12 +5,13 @@ import Notification from './components/Notification';
 import PopupModal from './components/PopupModal';
 import setupGhostApi from './utils/api';
 import AppContext from './AppContext';
-import {hasMode} from './utils/check-mode';
+import NotificationParser from './utils/notifications';
 import * as Fixtures from './utils/fixtures';
+import {hasMode} from './utils/check-mode';
+import {transformPortalAnchorToRelative} from './utils/transform-portal-anchor-to-relative';
 import {getActivePage, isAccountPage, isOfferPage} from './pages';
 import ActionHandler from './actions';
 import './App.css';
-import NotificationParser from './utils/notifications';
 import {hasRecommendations, allowCompMemberUpgrade, createPopupNotification, getCurrencySymbol, getFirstpromoterId, getPriceIdFromPageQuery, getProductCadenceFromPrice, getProductFromId, getQueryPrice, getSiteDomain, isActiveOffer, isComplimentaryMember, isInviteOnlySite, isPaidMember, isRecentMember, isSentryEventAllowed, removePortalLinkFromUrl} from './utils/helpers';
 import {handleDataAttributes} from './data-attributes';
 
@@ -184,10 +185,9 @@ export default class App extends React.Component {
             };
             window.addEventListener('hashchange', this.hashHandler, false);
 
-            // spike ship - to test if we can show / hide signup forms inside post / page
+            // the signup card will ship hidden by default,
+            // so we need to show it if the member is not logged in
             if (!member) {
-                // the signup card will ship hidden by default, so we need to show it if the user is not logged in
-                // not sure why a user would have more than one form on a post, but just in case we'll find them all
                 const formElements = document.querySelectorAll('[data-lexical-signup-form]');
                 if (formElements.length > 0){
                     formElements.forEach((element) => {
@@ -195,7 +195,11 @@ export default class App extends React.Component {
                     });
                 }
             }
+
             this.setupRecommendationButtons();
+
+            // avoid portal links switching to homepage (e.g. from absolute link copy/pasted from Admin)
+            this.transformPortalLinksToRelative();
         } catch (e) {
             /* eslint-disable no-console */
             console.error(`[Portal] Failed to initialize:`, e);
@@ -211,7 +215,7 @@ export default class App extends React.Component {
     async fetchData() {
         const {site: apiSiteData, member} = await this.fetchApiData();
         const {site: devSiteData, ...restDevData} = this.fetchDevData();
-        const {site: linkSiteData, ...restLinkData} = this.fetchLinkData(apiSiteData);
+        const {site: linkSiteData, ...restLinkData} = this.fetchLinkData(apiSiteData, member);
         const {site: previewSiteData, ...restPreviewData} = this.fetchPreviewData();
         const {site: notificationSiteData, ...restNotificationData} = this.fetchNotificationData();
         let page = '';
@@ -311,7 +315,10 @@ export default class App extends React.Component {
         // Handle the query params key/value pairs
         for (let pair of qsParams.entries()) {
             const key = pair[0];
+
+            // Note: this needs to be cleaned up, there is no reason why we need to double encode/decode
             const value = decodeURIComponent(pair[1]);
+
             if (key === 'button') {
                 data.site.portal_button = JSON.parse(value);
             } else if (key === 'name') {
@@ -357,6 +364,8 @@ export default class App extends React.Component {
                 data.site.allow_self_signup = JSON.parse(value);
             } else if (key === 'membersSignupAccess' && value) {
                 data.site.members_signup_access = value;
+            } else if (key === 'portalDefaultPlan' && value) {
+                data.site.portal_default_plan = value;
             }
         }
         data.site.portal_plans = allowedPlans;
@@ -389,6 +398,7 @@ export default class App extends React.Component {
                 }
             ];
         }
+
         return data;
     }
 
@@ -414,18 +424,32 @@ export default class App extends React.Component {
     }
 
     /** Fetch state from Portal Links */
-    fetchLinkData(site) {
+    fetchLinkData(site, member) {
         const qParams = new URLSearchParams(window.location.search);
-        if (qParams.get('uuid') && qParams.get('action') === 'unsubscribe') {
-            return {
-                showPopup: true,
-                page: 'unsubscribe',
-                pageData: {
-                    uuid: qParams.get('uuid'),
-                    newsletterUuid: qParams.get('newsletter'),
-                    comments: qParams.get('comments')
-                }
-            };
+        if (qParams.get('action') === 'unsubscribe') {
+            // if the user is unsubscribing from a newsletter with an old unsubscribe link that we can't validate, push them to newsletter mgmt where they have to log in
+            if (qParams.get('key') && qParams.get('uuid')) {
+                return {
+                    showPopup: true,
+                    page: 'unsubscribe',
+                    pageData: {
+                        uuid: qParams.get('uuid'),
+                        key: qParams.get('key'),
+                        newsletterUuid: qParams.get('newsletter'),
+                        comments: qParams.get('comments')
+                    }
+                };
+            } else { // any malformed unsubscribe links should simply go to email prefs
+                return {
+                    showPopup: true,
+                    page: 'accountEmail',
+                    pageData: {
+                        newsletterUuid: qParams.get('newsletter'),
+                        action: 'unsubscribe',
+                        redirect: site.url + '#/portal/account/newsletters'
+                    }
+                };
+            }
         }
 
         if (hasRecommendations({site}) && qParams.get('action') === 'signup' && qParams.get('success') === 'true') {
@@ -447,19 +471,31 @@ export default class App extends React.Component {
         const linkRegex = /^\/portal\/?(?:\/(\w+(?:\/\w+)*))?\/?$/;
         const feedbackRegex = /^\/feedback\/(\w+?)\/(\w+?)\/?$/;
 
-        if (path && feedbackRegex.test(path) && hashQuery.get('uuid')) {
+        if (path && feedbackRegex.test(path)) {
             const [, postId, scoreString] = path.match(feedbackRegex);
             const score = parseInt(scoreString);
             if (score === 1 || score === 0) {
-                return {
-                    showPopup: true,
-                    page: 'feedback',
-                    pageData: {
-                        uuid: hashQuery.get('uuid'),
-                        postId,
-                        score
-                    }
-                };
+                // if logged in, submit feedback
+                if (member || (hashQuery.get('uuid') && hashQuery.get('key'))) {
+                    return {
+                        showPopup: true,
+                        page: 'feedback',
+                        pageData: {
+                            uuid: member ? null : hashQuery.get('uuid'),
+                            key: member ? null : hashQuery.get('key'),
+                            postId,
+                            score
+                        }
+                    };
+                } else {
+                    return {
+                        showPopup: true,
+                        page: 'signin',
+                        pageData: {
+                            redirect: site.url + `#/feedback/${postId}/${score}/`
+                        }
+                    };
+                }
             }
         }
         if (path && linkRegex.test(path)) {
@@ -741,7 +777,11 @@ export default class App extends React.Component {
         const customOfferRegex = /^offers\/(\w+?)\/?$/;
         const site = useSite ?? this.state.site ?? {};
 
-        if (customOfferRegex.test(path)) {
+        if (path === undefined || path === '') {
+            return {
+                page: 'default'
+            };
+        } else if (customOfferRegex.test(path)) {
             return {
                 pageQuery: path
             };
@@ -822,7 +862,9 @@ export default class App extends React.Component {
                 }
             };
         }
-        return {};
+        return {
+            page: 'default'
+        };
     }
 
     /**Get Accent color from site data*/
@@ -834,7 +876,7 @@ export default class App extends React.Component {
     /**Get final page set in App context from state data*/
     getContextPage({site, page, member}) {
         /**Set default page based on logged-in status */
-        if (!page) {
+        if (!page || page === 'default') {
             const loggedOutPage = isInviteOnlySite({site}) ? 'signin' : 'signup';
             page = member ? 'accountHome' : loggedOutPage;
         }
@@ -918,6 +960,16 @@ export default class App extends React.Component {
         }
     }
 
+    /**
+     * Transform any portal links to use relative paths
+     *
+     * Prevents unwanted/unnecessary switches to the home page when opening the
+     * portal. Especially useful for copy/pasted links from Admin screens.
+     */
+    transformPortalLinksToRelative() {
+        document.querySelectorAll('a[href*="#/portal"]').forEach(transformPortalAnchorToRelative);
+    }
+
     render() {
         if (this.state.initStatus === 'success') {
             return (
diff --git a/apps/portal/src/actions.js b/apps/portal/src/actions.js
index 686927e0622..96cc784d9a1 100644
--- a/apps/portal/src/actions.js
+++ b/apps/portal/src/actions.js
@@ -79,7 +79,8 @@ async function signout({api, state}) {
 
 async function signin({data, api, state}) {
     try {
-        await api.member.sendMagicLink({...data, emailType: 'signin'});
+        const integrityToken = await api.member.getIntegrityToken();
+        await api.member.sendMagicLink({...data, emailType: 'signin', integrityToken});
         return {
             page: 'magiclink',
             lastPage: 'signin'
@@ -100,7 +101,8 @@ async function signup({data, state, api}) {
         let {plan, tierId, cadence, email, name, newsletters, offerId} = data;
 
         if (plan.toLowerCase() === 'free') {
-            await api.member.sendMagicLink({emailType: 'signup', ...data});
+            const integrityToken = await api.member.getIntegrityToken();
+            await api.member.sendMagicLink({emailType: 'signup', integrityToken, ...data});
         } else {
             if (tierId && cadence) {
                 await api.member.checkoutPlan({plan, tierId, cadence, email, name, newsletters, offerId});
@@ -482,11 +484,13 @@ async function oneClickSubscribe({data: {siteUrl}, state}) {
     const referrerUrl = window.location.href;
     const referrerSource = getRefDomain();
 
+    const integrityToken = await externalSiteApi.member.getIntegrityToken();
     await externalSiteApi.member.sendMagicLink({
         emailType: 'signup',
         name: member.name,
         email: member.email,
         autoRedirect: false,
+        integrityToken,
         customUrlHistory: state.site.outbound_link_tagging ? [
             {
                 time: Date.now(),
diff --git a/apps/portal/src/components/Frame.styles.js b/apps/portal/src/components/Frame.styles.js
index 30accb1d1e6..122722404f8 100644
--- a/apps/portal/src/components/Frame.styles.js
+++ b/apps/portal/src/components/Frame.styles.js
@@ -30,6 +30,7 @@ const FrameStyles = `
     text-align: center;
     color: var(--grey0);
     line-height: 1.1em;
+    text-wrap: pretty;
 }
 
 .gh-portal-text-disabled {
@@ -40,6 +41,7 @@ const FrameStyles = `
 
 .gh-portal-text-center {
     text-align: center;
+    text-wrap: pretty;
 }
 
 .gh-portal-input-label {
@@ -362,6 +364,23 @@ const FrameStyles = `
     animation: none !important;
 }
 
+.gh-portal-popup-wrapper.preview.offer {
+    padding-top: 0;
+}
+
+.gh-portal-popup-container.preview.offer {
+    max-width: 420px;
+    transform: scale(0.9);
+    margin-top: 3.2vw;
+}
+
+@media (max-width: 480px) {
+    .gh-portal-popup-container.preview.offer {
+        transform-origin: top;
+        margin-top: 0;
+    }
+}
+
 @keyframes popup {
     0% {
         transform: translateY(-30px);
diff --git a/apps/portal/src/components/Global.styles.js b/apps/portal/src/components/Global.styles.js
index b9fddfc6afc..afecf0c9136 100644
--- a/apps/portal/src/components/Global.styles.js
+++ b/apps/portal/src/components/Global.styles.js
@@ -147,6 +147,7 @@ export const GlobalStyles = `
         font-size: 27px;
         margin-top: 0px;
         margin-bottom: 0.25em;
+        text-wrap: balance;
     }
 
     .gh-longform h4 {
diff --git a/apps/portal/src/components/Notification.js b/apps/portal/src/components/Notification.js
index 49095d4860d..edc1743877c 100644
--- a/apps/portal/src/components/Notification.js
+++ b/apps/portal/src/components/Notification.js
@@ -106,6 +106,12 @@ const NotificationText = ({type, status, context}) => {
                 {t('Plan checkout was cancelled.')}
             </p>
         );
+    } else if (type === 'support' && status === 'success') {
+        return (
+            <p>
+                {t('Thank you for your support!')}
+            </p>
+        );
     }
     return (
         <p>
@@ -243,7 +249,7 @@ export default class Notification extends React.Component {
         const {type, status, autoHide, duration} = this.state;
         if (type && status) {
             return (
-                <Frame style={frameStyle} title="portal-notification" head={this.renderFrameStyles()} className='gh-portal-notification-iframe' >
+                <Frame style={frameStyle} title="portal-notification" head={this.renderFrameStyles()} className='gh-portal-notification-iframe' data-testid="portal-notification-frame" >
                     <NotificationContent {...{type, status, autoHide, duration}} onHideNotification={e => this.onHideNotification(e)} />
                 </Frame>
             );
diff --git a/apps/portal/src/components/PopupModal.js b/apps/portal/src/components/PopupModal.js
index 6a5af27651d..3044290110b 100644
--- a/apps/portal/src/components/PopupModal.js
+++ b/apps/portal/src/components/PopupModal.js
@@ -131,6 +131,15 @@ class PopupContent extends React.Component {
         );
     }
 
+    sendPortalPreviewReadyEvent() {
+        if (window.self !== window.parent) {
+            window.parent.postMessage({
+                type: 'portal-preview-ready',
+                payload: {}
+            }, '*');
+        }
+    }
+
     render() {
         const {page, pageQuery, site, customSiteUrl} = this.context;
         const products = getSiteProducts({site});
@@ -202,6 +211,7 @@ class PopupContent extends React.Component {
         }
 
         const containerClassName = `${className} ${popupWidthStyle} ${pageClass}`;
+        this.sendPortalPreviewReadyEvent();
         return (
             <>
                 <div className={'gh-portal-popup-wrapper ' + pageClass} onClick={e => this.handlePopupClose(e)}>
diff --git a/apps/portal/src/components/common/CloseButton.js b/apps/portal/src/components/common/CloseButton.js
index e88a942027a..3048a81bfeb 100644
--- a/apps/portal/src/components/common/CloseButton.js
+++ b/apps/portal/src/components/common/CloseButton.js
@@ -15,7 +15,7 @@ export default class CloseButton extends React.Component {
         return (
             <div className='gh-portal-closeicon-container' data-test-button='close-popup'>
                 <CloseIcon
-                    className='gh-portal-closeicon' alt='Close' onClick = {onClick || this.closePopup}
+                    className='gh-portal-closeicon' alt='Close' onClick = {onClick || this.closePopup} data-testid='close-popup'
                 />
             </div>
         );
diff --git a/apps/portal/src/components/common/InputField.js b/apps/portal/src/components/common/InputField.js
index 00e63877561..492e0f28018 100644
--- a/apps/portal/src/components/common/InputField.js
+++ b/apps/portal/src/components/common/InputField.js
@@ -3,6 +3,9 @@ import {hasMode} from '../../utils/check-mode';
 import {isCookiesDisabled} from '../../utils/helpers';
 
 export const InputFieldStyles = `
+    .gh-portal-input-section.hidden {
+        display: none;
+    }
     .gh-portal-input {
         -webkit-appearance: none;
         -moz-appearance: none;
@@ -81,6 +84,7 @@ function InputError({message, style}) {
 function InputField({
     name,
     id,
+    hidden,
     label,
     hideLabel,
     type,
@@ -97,6 +101,7 @@ function InputField({
 }) {
     const fieldNode = useRef(null);
     id = id || `input-${name}`;
+    const sectionClasses = hidden ? 'gh-portal-input-section hidden' : 'gh-portal-input-section';
     const labelClasses = hideLabel ? 'gh-portal-input-label hidden' : 'gh-portal-input-label';
     const inputClasses = errorMessage ? 'gh-portal-input error' : 'gh-portal-input';
     if (isCookiesDisabled()) {
@@ -130,7 +135,7 @@ function InputField({
         }
     }, [autoFocus]);
     return (
-        <section className='gh-portal-input-section'>
+        <section className={sectionClasses}>
             <div className='gh-portal-input-labelcontainer'>
                 <label htmlFor={id} className={labelClasses}> {label} </label>
                 <InputError message={errorMessage} name={name} />
diff --git a/apps/portal/src/components/common/InputForm.js b/apps/portal/src/components/common/InputForm.js
index 0d809051d49..56bfecdabf4 100644
--- a/apps/portal/src/components/common/InputForm.js
+++ b/apps/portal/src/components/common/InputForm.js
@@ -12,6 +12,7 @@ const FormInput = ({field, onChange, onBlur = () => { }, onKeyDown = () => {}})
                 label = {field.label}
                 type={field.type}
                 name={field.name}
+                hidden={field.hidden}
                 placeholder={field.placeholder}
                 disabled={field.disabled}
                 value={field.value}
diff --git a/apps/portal/src/components/common/NewsletterManagement.js b/apps/portal/src/components/common/NewsletterManagement.js
index 8ddb0cfdf03..3bc9782de23 100644
--- a/apps/portal/src/components/common/NewsletterManagement.js
+++ b/apps/portal/src/components/common/NewsletterManagement.js
@@ -32,7 +32,7 @@ function SuccessIcon({show, checked}) {
     classNames.push('gh-portal-checkmark-container');
 
     return (
-        <div className={classNames.join(' ')}>
+        <div className={classNames.join(' ')} data-testid='checkmark-container'>
             <CheckmarkIcon className='gh-portal-checkmark-icon' alt='' />
         </div>
     );
@@ -46,7 +46,7 @@ function NewsletterPrefSection({newsletter, subscribedNewsletters, setSubscribed
     const [showUpdated, setShowUpdated] = useState(false);
     const [timeoutId, setTimeoutId] = useState(null);
     return (
-        <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
+        <section className='gh-portal-list-toggle-wrapper' data-testid="toggle-wrapper">
             <div className='gh-portal-list-detail'>
                 <h3>{newsletter.name}</h3>
                 <p>{newsletter?.description}</p>
@@ -95,7 +95,7 @@ function CommentsSection({updateCommentNotifications, isCommentsEnabled, enableC
     }
 
     return (
-        <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
+        <section className='gh-portal-list-toggle-wrapper' data-testid="toggle-wrapper">
             <div className='gh-portal-list-detail'>
                 <h3>{t('Comments')}</h3>
                 <p>{t('Get notified when someone replies to your comment')}</p>
diff --git a/apps/portal/src/components/common/ProductsSection.js b/apps/portal/src/components/common/ProductsSection.js
index 11c72827fb0..472e5d37fd2 100644
--- a/apps/portal/src/components/common/ProductsSection.js
+++ b/apps/portal/src/components/common/ProductsSection.js
@@ -51,7 +51,6 @@ export const ProductsSectionStyles = () => {
             height: 100% !important;
             width: 50%;
             border-radius: 999px;
-            color: var(--grey7);
             background: transparent;
             font-size: 1.5rem;
         }
@@ -79,6 +78,12 @@ export const ProductsSectionStyles = () => {
             color: var(--grey8);
         }
 
+        .gh-portal-maximum-discount {
+            font-weight: 400;
+            margin-left: 4px;
+            opacity: 0.5;
+        }
+
         .gh-portal-products-grid {
             display: flex;
             flex-wrap: wrap;
@@ -847,9 +852,17 @@ function YearlyDiscount({discount}) {
     }
 }
 
-function ProductPriceSwitch({selectedInterval, setSelectedInterval}) {
+function ProductPriceSwitch({selectedInterval, setSelectedInterval, products}) {
     const {site, t} = useContext(AppContext);
     const {portal_plans: portalPlans} = site;
+    const paidProducts = products.filter(product => product.type !== 'free');
+
+    // Extract discounts from products
+    const prices = paidProducts.map(product => calculateDiscount(product.monthlyPrice?.amount, product.yearlyPrice?.amount));
+
+    // Find the highest price using Math.max
+    const highestYearlyDiscount = Math.max(...prices);
+
     if (!portalPlans.includes('monthly') || !portalPlans.includes('yearly')) {
         return null;
     }
@@ -859,6 +872,7 @@ function ProductPriceSwitch({selectedInterval, setSelectedInterval}) {
             <div className={'gh-portal-products-pricetoggle' + (selectedInterval === 'month' ? ' left' : '')}>
                 <button
                     data-test-button='switch-monthly'
+                    data-testid="monthly-switch"
                     className={'gh-portal-btn' + (selectedInterval === 'month' ? ' active' : '')}
                     onClick={() => {
                         setSelectedInterval('month');
@@ -868,12 +882,14 @@ function ProductPriceSwitch({selectedInterval, setSelectedInterval}) {
                 </button>
                 <button
                     data-test-button='switch-yearly'
+                    data-testid="yearly-switch"
                     className={'gh-portal-btn' + (selectedInterval === 'year' ? ' active' : '')}
                     onClick={() => {
                         setSelectedInterval('year');
                     }}
                 >
                     {t('Yearly')}
+                    {(highestYearlyDiscount > 0) && <span className='gh-portal-maximum-discount'>{t('(save {{highestYearlyDiscount}}%)', {highestYearlyDiscount})}</span>}
                 </button>
             </div>
         </div>
@@ -894,7 +910,7 @@ function getSelectedPrice({products, selectedProduct, selectedInterval}) {
     return selectedPrice;
 }
 
-function getActiveInterval({portalPlans, selectedInterval = 'year'}) {
+function getActiveInterval({portalPlans, portalDefaultPlan, selectedInterval}) {
     if (selectedInterval === 'month' && portalPlans.includes('monthly')) {
         return 'month';
     }
@@ -903,28 +919,35 @@ function getActiveInterval({portalPlans, selectedInterval = 'year'}) {
         return 'year';
     }
 
-    if (portalPlans.includes('monthly')) {
-        return 'month';
+    if (portalDefaultPlan) {
+        if (portalDefaultPlan === 'monthly' && portalPlans.includes('monthly')) {
+            return 'month';
+        }
     }
 
     if (portalPlans.includes('yearly')) {
         return 'year';
     }
+
+    if (portalPlans.includes('monthly')) {
+        return 'month';
+    }
 }
 
 function ProductsSection({onPlanSelect, products, type = null, handleChooseSignup, errors}) {
     const {site, member, t} = useContext(AppContext);
-    const {portal_plans: portalPlans} = site;
-    const defaultInterval = getActiveInterval({portalPlans});
-
+    const {portal_plans: portalPlans, portal_default_plan: portalDefaultPlan} = site;
     const defaultProductId = products.length > 0 ? products[0].id : 'free';
-    const [selectedInterval, setSelectedInterval] = useState(defaultInterval);
+
+    // Note: by default we set it to null, so that it changes reactively in the preview version of Portal
+    const [selectedInterval, setSelectedInterval] = useState(null);
     const [selectedProduct, setSelectedProduct] = useState(defaultProductId);
 
     const selectedPrice = getSelectedPrice({products, selectedInterval, selectedProduct});
-    const activeInterval = getActiveInterval({portalPlans, selectedInterval});
+    const activeInterval = getActiveInterval({portalPlans, portalDefaultPlan, selectedInterval});
 
     const isComplimentary = isComplimentaryMember({member});
+    const hasOnlyFree = hasOnlyFreeProduct({site});
 
     useEffect(() => {
         setSelectedProduct(defaultProductId);
@@ -934,10 +957,6 @@ function ProductsSection({onPlanSelect, products, type = null, handleChooseSignu
         onPlanSelect(null, selectedPrice.id);
     }, [selectedPrice.id, onPlanSelect]);
 
-    if (!portalPlans.includes('monthly') && !portalPlans.includes('yearly')) {
-        return null;
-    }
-
     if (products.length === 0) {
         if (isComplimentary) {
             const supportAddress = getSupportAddress({site});
@@ -965,7 +984,7 @@ function ProductsSection({onPlanSelect, products, type = null, handleChooseSignu
         }}>
             <section className={className}>
 
-                {(!(hasOnlyFreeProduct({site})) ?
+                {(!(hasOnlyFree) ?
                     <ProductPriceSwitch
                         products={products}
                         selectedInterval={activeInterval}
@@ -1025,6 +1044,7 @@ export function ChangeProductSection({onPlanSelect, selectedPlan, products, type
                 <ProductPriceSwitch
                     selectedInterval={activeInterval}
                     setSelectedInterval={setSelectedInterval}
+                    products={products}
                 />
 
                 <div className="gh-portal-products-grid">
diff --git a/apps/portal/src/components/pages/AccountEmailPage.js b/apps/portal/src/components/pages/AccountEmailPage.js
index 9573a6e48b3..f8466b0caa7 100644
--- a/apps/portal/src/components/pages/AccountEmailPage.js
+++ b/apps/portal/src/components/pages/AccountEmailPage.js
@@ -1,11 +1,22 @@
 import AppContext from '../../AppContext';
 import {useContext, useEffect, useState} from 'react';
-import {isPaidMember} from '../../utils/helpers';
+import {isPaidMember, getSiteNewsletters} from '../../utils/helpers';
+import {SYNTAX_I18NEXT} from '@doist/react-interpolate';
 import NewsletterManagement from '../common/NewsletterManagement';
+import Interpolate from '@doist/react-interpolate';
 
 export default function AccountEmailPage() {
-    const {member, onAction, site, t} = useContext(AppContext);
+    const {member, onAction, site, t, pageData} = useContext(AppContext);
+    let newsletterUuid;
+    let action;
+    if (pageData) {
+        newsletterUuid = pageData.newsletterUuid;
+        action = pageData.action;
+    }
+    const [hasInteracted, setHasInteracted] = useState(true);
+    const siteNewsletters = getSiteNewsletters({site});
 
+    // Redirect to signin page if member is not available
     useEffect(() => {
         if (!member) {
             onAction('switchPage', {
@@ -14,6 +25,60 @@ export default function AccountEmailPage() {
         }
     }, [member, onAction]);
 
+    // this results in an infinite loop, needs to run only once...
+    useEffect(() => {
+        // attempt auto-unsubscribe if we were redirected here from an unsubscribe link
+        if (newsletterUuid && action === 'unsubscribe') {
+            // Filter out the newsletter that matches the uuid
+            const remainingNewsletterSubscriptions = member?.newsletters.filter(n => n.uuid !== newsletterUuid);
+            setSubscribedNewsletters(remainingNewsletterSubscriptions);
+            setHasInteracted(false); // this shows the dialog
+            onAction('updateNewsletterPreference', {newsletters: remainingNewsletterSubscriptions});
+        }
+    }, []);
+
+    const HeaderNotification = () => {
+        if (pageData.comments && commentsEnabled) {
+            const hideClassName = hasInteracted ? 'gh-portal-hide' : '';
+            return (
+                <>
+                    <p className={`gh-portal-text-center gh-portal-header-message ${hideClassName}`}>
+                        <Interpolate
+                            syntax={SYNTAX_I18NEXT}
+                            string={t('{{memberEmail}} will no longer receive emails when someone replies to your comments.')}
+                            mapping={{
+                                memberEmail: <strong>{member?.email}</strong>
+                            }}
+                        />
+                    </p>
+                </>
+            );
+        }
+        const unsubscribedNewsletter = siteNewsletters?.find((d) => {
+            return d.uuid === pageData.newsletterUuid;
+        });
+    
+        if (!unsubscribedNewsletter) {
+            return null;
+        }
+    
+        const hideClassName = hasInteracted ? 'gh-portal-hide' : '';
+        return (
+            <>
+                <p className={`gh-portal-text-center gh-portal-header-message ${hideClassName}`}>
+                    <Interpolate
+                        syntax={SYNTAX_I18NEXT}
+                        string={t('{{memberEmail}} will no longer receive {{newsletterName}} newsletter.')}
+                        mapping={{
+                            memberEmail: <strong>{member?.email}</strong>,
+                            newsletterName: <strong>{unsubscribedNewsletter?.name}</strong>
+                        }}
+                    />
+                </p>
+            </>
+        );
+    };
+
     const defaultSubscribedNewsletters = [...(member?.newsletters || [])];
     const [subscribedNewsletters, setSubscribedNewsletters] = useState(defaultSubscribedNewsletters);
     const {comments_enabled: commentsEnabled} = site;
@@ -25,7 +90,7 @@ export default function AccountEmailPage() {
 
     return (
         <NewsletterManagement
-            notification={null}
+            notification={newsletterUuid ? HeaderNotification : null}
             subscribedNewsletters={subscribedNewsletters}
             updateSubscribedNewsletters={(updatedNewsletters) => {
                 setSubscribedNewsletters(updatedNewsletters);
@@ -38,7 +103,7 @@ export default function AccountEmailPage() {
                 setSubscribedNewsletters([]);
                 onAction('showPopupNotification', {
                     action: 'updated:success',
-                    message: t(`Email preference updated.`)
+                    message: t(`Unsubscribed from all emails.`)
                 });
                 const data = {newsletters: []};
                 if (commentsEnabled) {
diff --git a/apps/portal/src/components/pages/AccountEmailPage.test.js b/apps/portal/src/components/pages/AccountEmailPage.test.js
new file mode 100644
index 00000000000..87c5f8ea571
--- /dev/null
+++ b/apps/portal/src/components/pages/AccountEmailPage.test.js
@@ -0,0 +1,117 @@
+import {getSiteData, getNewslettersData, getMemberData} from '../../utils/fixtures-generator';
+import {render, fireEvent} from '../../utils/test-utils';
+import AccountEmailPage from './AccountEmailPage';
+
+const setup = (overrides) => {
+    const {mockOnActionFn, context, ...utils} = render(
+        <AccountEmailPage />,
+        {
+            overrideContext: {
+                ...overrides
+            }
+        }
+    );
+    const unsubscribeAllBtn = utils.getByText('Unsubscribe from all emails');
+    const closeBtn = utils.getByTestId('close-popup');
+    
+    return {
+        unsubscribeAllBtn,
+        closeBtn,
+        mockOnActionFn,
+        context,
+        ...utils
+    };
+};
+
+describe('Account Email Page', () => {
+    test('renders', () => {
+        const newsletterData = getNewslettersData({numOfNewsletters: 2});
+        const siteData = getSiteData({
+            newsletters: newsletterData,
+            member: getMemberData({newsletters: newsletterData})
+        });
+        const {unsubscribeAllBtn, getAllByTestId, getByText} = setup({site: siteData});
+        const unsubscribeBtns = getAllByTestId(`toggle-wrapper`);
+        expect(getByText('Email preferences')).toBeInTheDocument();
+        // one for each newsletter and one for comments
+        expect(unsubscribeBtns).toHaveLength(3); 
+        expect(unsubscribeAllBtn).toBeInTheDocument();
+    });
+
+    test('can unsubscribe from all emails', async () => {
+        const newsletterData = getNewslettersData({numOfNewsletters: 2});
+        const siteData = getSiteData({
+            newsletters: newsletterData
+        });
+        const {mockOnActionFn, unsubscribeAllBtn, getAllByTestId} = setup({site: siteData, member: getMemberData({newsletters: newsletterData})});
+        let checkmarkContainers = getAllByTestId('checkmark-container');
+        // each newsletter should have the checked class (this is how we know they're enabled/subscribed to)
+        expect(checkmarkContainers[0]).toHaveClass('gh-portal-toggle-checked');
+        expect(checkmarkContainers[1]).toHaveClass('gh-portal-toggle-checked');
+        
+        fireEvent.click(unsubscribeAllBtn);
+        expect(mockOnActionFn).toHaveBeenCalledTimes(2);
+        expect(mockOnActionFn).toHaveBeenCalledWith('showPopupNotification', {action: 'updated:success', message: 'Unsubscribed from all emails.'});
+        expect(mockOnActionFn).toHaveBeenLastCalledWith('updateNewsletterPreference', {newsletters: [], enableCommentNotifications: false});
+
+        checkmarkContainers = getAllByTestId('checkmark-container');
+        expect(checkmarkContainers).toHaveLength(3);
+        checkmarkContainers.forEach((newsletter) => {
+            // each newsletter htmlElement should not have the checked class
+            expect(newsletter).not.toHaveClass('gh-portal-toggle-checked');
+        });
+    });
+
+    test('unsubscribe all is disabled when no newsletters are subscribed to', async () => {
+        const siteData = getSiteData({
+            newsletters: getNewslettersData({numOfNewsletters: 2})
+        });
+        const {unsubscribeAllBtn} = setup({site: siteData, member: getMemberData()});
+        expect(unsubscribeAllBtn).toBeDisabled();
+    });
+
+    test('can update newsletter preferences', async () => {
+        const newsletterData = getNewslettersData({numOfNewsletters: 2});
+        const siteData = getSiteData({
+            newsletters: newsletterData
+        });
+        const {mockOnActionFn, getAllByTestId} = setup({site: siteData, member: getMemberData({newsletters: newsletterData})});
+        let checkmarkContainers = getAllByTestId('checkmark-container');
+        // each newsletter should have the checked class (this is how we know they're enabled/subscribed to)
+        expect(checkmarkContainers[0]).toHaveClass('gh-portal-toggle-checked');
+        let subscriptionToggles = getAllByTestId('switch-input');
+        fireEvent.click(subscriptionToggles[0]);
+        expect(mockOnActionFn).toHaveBeenCalledWith('updateNewsletterPreference', {newsletters: [{id: newsletterData[1].id}]});
+        fireEvent.click(subscriptionToggles[0]);
+        expect(mockOnActionFn).toHaveBeenCalledWith('updateNewsletterPreference', {newsletters: [{id: newsletterData[1].id}, {id: newsletterData[0].id}]});
+    });
+
+    test('can update comment notifications', async () => {
+        const siteData = getSiteData();
+        const {mockOnActionFn, getAllByTestId} = setup({site: siteData, member: getMemberData()});
+        let subscriptionToggles = getAllByTestId('switch-input');
+        fireEvent.click(subscriptionToggles[0]);
+        expect(mockOnActionFn).toHaveBeenCalledWith('updateNewsletterPreference', {enableCommentNotifications: true});
+        fireEvent.click(subscriptionToggles[0]);
+        expect(mockOnActionFn).toHaveBeenCalledWith('updateNewsletterPreference', {enableCommentNotifications: false});
+    });
+
+    test('displays help for members with email suppressions', async () => {
+        const newsletterData = getNewslettersData({numOfNewsletters: 2});
+        const siteData = getSiteData({
+            newsletters: newsletterData
+        });
+        const {getByText} = setup({site: siteData, member: getMemberData({newsletters: newsletterData, email_suppressions: {suppressed: false}})});
+        expect(getByText('Not receiving emails?')).toBeInTheDocument();
+        expect(getByText('Get help →')).toBeInTheDocument();
+    });
+
+    test('redirects to signin page if no member', async () => {
+        const newsletterData = getNewslettersData({numOfNewsletters: 2});
+        const siteData = getSiteData({
+            newsletters: newsletterData
+        });
+        const {mockOnActionFn} = setup({site: siteData, member: null});
+        expect(mockOnActionFn).toHaveBeenCalledWith('switchPage', {page: 'signin'});
+    });
+});
diff --git a/apps/portal/src/components/pages/AccountHomePage/AccountHomePage.test.js b/apps/portal/src/components/pages/AccountHomePage/AccountHomePage.test.js
index 98ab7bebcd0..6b4c6aa1434 100644
--- a/apps/portal/src/components/pages/AccountHomePage/AccountHomePage.test.js
+++ b/apps/portal/src/components/pages/AccountHomePage/AccountHomePage.test.js
@@ -1,6 +1,7 @@
 import {render, fireEvent} from '../../../utils/test-utils';
 import AccountHomePage from './AccountHomePage';
 import {site} from '../../../utils/fixtures';
+import {getSiteData} from '../../../utils/fixtures-generator';
 
 const setup = (overrides) => {
     const {mockOnActionFn, ...utils} = render(
@@ -21,7 +22,8 @@ const setup = (overrides) => {
 
 describe('Account Home Page', () => {
     test('renders', () => {
-        const {logoutBtn, utils} = setup();
+        const siteData = getSiteData({commentsEnabled: 'off'});
+        const {logoutBtn, utils} = setup({site: siteData});
         expect(logoutBtn).toBeInTheDocument();
         expect(utils.queryByText('You\'re currently not receiving emails')).not.toBeInTheDocument();
         expect(utils.queryByText('Email newsletter')).toBeInTheDocument();
@@ -46,4 +48,11 @@ describe('Account Home Page', () => {
         fireEvent.click(manageBtn);
         expect(mockOnActionFn).toHaveBeenCalledWith('switchPage', {lastPage: 'accountHome', page: 'accountEmail'});
     });
+
+    test('hides Newsletter toggle if newsletters are disabled', () => {
+        const siteData = getSiteData({editorDefaultEmailRecipients: 'disabled'});
+        const {logoutBtn, utils} = setup({site: siteData});
+        expect(logoutBtn).toBeInTheDocument();
+        expect(utils.queryByText('Email newsletter')).not.toBeInTheDocument();
+    });
 });
diff --git a/apps/portal/src/components/pages/AccountHomePage/components/AccountActions.js b/apps/portal/src/components/pages/AccountHomePage/components/AccountActions.js
index 6a0a03402f7..f243f431aeb 100644
--- a/apps/portal/src/components/pages/AccountHomePage/components/AccountActions.js
+++ b/apps/portal/src/components/pages/AccountHomePage/components/AccountActions.js
@@ -1,6 +1,6 @@
 import AppContext from '../../../../AppContext';
 import {useContext} from 'react';
-import {hasCommentsEnabled, hasMultipleNewsletters, isEmailSuppressed} from '../../../../utils/helpers';
+import {hasCommentsEnabled, hasMultipleNewsletters, isEmailSuppressed, hasNewsletterSendingEnabled} from '../../../../utils/helpers';
 
 import PaidAccountActions from './PaidAccountActions';
 import EmailNewsletterAction from './EmailNewsletterAction';
@@ -19,6 +19,8 @@ const AccountActions = () => {
 
     const showEmailPreferences = hasMultipleNewsletters({site}) || hasCommentsEnabled({site}) || isEmailSuppressed({member});
 
+    const showEmailUnsubscribe = hasNewsletterSendingEnabled({site});
+
     return (
         <div>
             <div className='gh-portal-list'>
@@ -40,7 +42,13 @@ const AccountActions = () => {
                 {
                     showEmailPreferences
                         ? <EmailPreferencesAction />
-                        : <EmailNewsletterAction />
+                        : <></>
+                }
+
+                {
+                    showEmailUnsubscribe && !showEmailPreferences
+                        ? <EmailNewsletterAction />
+                        : <></>
                 }
 
             </div>
diff --git a/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js b/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js
index 0669f498823..ea05241b5a6 100644
--- a/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js
+++ b/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js
@@ -32,6 +32,10 @@ const AccountWelcome = () => {
             return null;
         }
 
+        if (isComplimentary) {
+            return null;
+        }
+
         if (subscriptionHasFreeTrial({sub: subscription})) {
             const trialEnd = getDateString(subscription.trial_end_at);
             return (
diff --git a/apps/portal/src/components/pages/AccountPlanPage.js b/apps/portal/src/components/pages/AccountPlanPage.js
index d58b325282b..95b23510b79 100644
--- a/apps/portal/src/components/pages/AccountPlanPage.js
+++ b/apps/portal/src/components/pages/AccountPlanPage.js
@@ -229,7 +229,7 @@ function PlansOrProductSection({selectedPlan, onPlanSelect, onPlanCheckout, chan
     const activeProduct = getMemberActiveProduct({member, site});
     return (
         <MultipleProductsPlansSection
-            products={products.length > 0 || isComplimentary ? products : [activeProduct]}
+            products={products.length > 0 || isComplimentary || !activeProduct ? products : [activeProduct]}
             selectedPlan={selectedPlan}
             changePlan={changePlan}
             onPlanSelect={onPlanSelect}
diff --git a/apps/portal/src/components/pages/AccountPlanPage.test.js b/apps/portal/src/components/pages/AccountPlanPage.test.js
index 83205110b0e..df816895758 100644
--- a/apps/portal/src/components/pages/AccountPlanPage.test.js
+++ b/apps/portal/src/components/pages/AccountPlanPage.test.js
@@ -11,8 +11,8 @@ const setup = (overrides) => {
             }
         }
     );
-    const monthlyCheckboxEl = utils.queryByRole('button', {name: 'Monthly'});
-    const yearlyCheckboxEl = utils.queryByRole('button', {name: 'Yearly'});
+    const monthlyCheckboxEl = utils.getByTestId('monthly-switch');
+    const yearlyCheckboxEl = utils.getByTestId('yearly-switch');
     const continueBtn = utils.queryByRole('button', {name: 'Continue'});
     const chooseBtns = utils.queryAllByRole('button', {name: 'Choose'});
     return {
diff --git a/apps/portal/src/components/pages/AccountProfilePage.js b/apps/portal/src/components/pages/AccountProfilePage.js
index 005679d1122..2612b6148e0 100644
--- a/apps/portal/src/components/pages/AccountProfilePage.js
+++ b/apps/portal/src/components/pages/AccountProfilePage.js
@@ -41,7 +41,7 @@ export default class AccountProfilePage extends React.Component {
         e.preventDefault();
         this.setState((state) => {
             return {
-                errors: ValidateInputForm({fields: this.getInputFields({state})})
+                errors: ValidateInputForm({fields: this.getInputFields({state}), t: this.context.t})
             };
         }, () => {
             const {email, name, errors} = this.state;
@@ -141,7 +141,7 @@ export default class AccountProfilePage extends React.Component {
             {
                 type: 'text',
                 value: state.name,
-                placeholder: 'Jamie Larson',
+                placeholder: t('Jamie Larson'),
                 label: t('Name'),
                 name: 'name',
                 required: true,
@@ -150,7 +150,7 @@ export default class AccountProfilePage extends React.Component {
             {
                 type: 'email',
                 value: state.email,
-                placeholder: 'jamie@example.com',
+                placeholder: t('jamie@example.com'),
                 label: t('Email'),
                 name: 'email',
                 required: true,
diff --git a/apps/portal/src/components/pages/EmailReceivingFAQ.js b/apps/portal/src/components/pages/EmailReceivingFAQ.js
index 704ed7b679d..33d3ae9ea04 100644
--- a/apps/portal/src/components/pages/EmailReceivingFAQ.js
+++ b/apps/portal/src/components/pages/EmailReceivingFAQ.js
@@ -28,7 +28,7 @@ export default function EmailReceivingPage() {
             <div className="gh-longform">
                 <h3>{t(`Help! I'm not receiving emails`)}</h3>
 
-                <p>{t(`If you're not receiving the email newsletter you've subscribed to, here are few things to check.`)}</p>
+                <p>{t(`If you're not receiving the email newsletter you've subscribed to, here are a few things to check.`)}</p>
 
                 <h4>{t(`Verify your email address is correct`)}</h4>
 
@@ -64,7 +64,7 @@ export default function EmailReceivingPage() {
                 <p>
                     <Interpolate
                         syntax={SYNTAX_I18NEXT}
-                        string={t(`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.`)}
+                        string={t(`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.`)}
                         mapping={{
                             senderEmail: <strong>{defaultNewsletterSenderEmail}</strong>
                         }}
diff --git a/apps/portal/src/components/pages/EmailSuppressedPage.css b/apps/portal/src/components/pages/EmailSuppressedPage.css
index a7ee0d43120..e5faaca0f27 100644
--- a/apps/portal/src/components/pages/EmailSuppressedPage.css
+++ b/apps/portal/src/components/pages/EmailSuppressedPage.css
@@ -24,7 +24,7 @@
     margin-top: 3px;
 }
 
-.accountEmail .gh-email-faq-page-button {
+.gh-portal-action-footer .gh-email-faq-page-button {
     margin-left: 4px;
 }
 
diff --git a/apps/portal/src/components/pages/FeedbackPage.js b/apps/portal/src/components/pages/FeedbackPage.js
index 39e701cd418..1720ac52d40 100644
--- a/apps/portal/src/components/pages/FeedbackPage.js
+++ b/apps/portal/src/components/pages/FeedbackPage.js
@@ -258,9 +258,9 @@ const ConfirmDialog = ({onConfirm, loading, initialScore}) => {
     );
 };
 
-async function sendFeedback({siteUrl, uuid, postId, score}) {
-    const ghostApi = setupGhostApi({siteUrl});
-    await ghostApi.feedback.add({uuid, postId, score});
+async function sendFeedback({siteUrl, uuid, key, postId, score}, api) {
+    const ghostApi = api || setupGhostApi({siteUrl});
+    await ghostApi.feedback.add({uuid, postId, key, score});
 }
 
 const LoadingFeedbackView = ({action, score}) => {
@@ -301,11 +301,10 @@ const ConfirmFeedback = ({positive}) => {
 };
 
 export default function FeedbackPage() {
-    const {site, pageData, member, t} = useContext(AppContext);
-    const {uuid, postId, score: initialScore} = pageData;
+    const {site, pageData, member, t, api} = useContext(AppContext);
+    const {uuid, key, postId, score: initialScore} = pageData;
     const [score, setScore] = useState(initialScore);
     const positive = score === 1;
-
     const isLoggedIn = !!member;
 
     const [confirmed, setConfirmed] = useState(isLoggedIn);
@@ -315,7 +314,7 @@ export default function FeedbackPage() {
     const doSendFeedback = async (selectedScore) => {
         setLoading(true);
         try {
-            await sendFeedback({siteUrl: site.url, uuid, postId, score: selectedScore});
+            await sendFeedback({siteUrl: site.url, uuid, key, postId, score: selectedScore}, api);
             setScore(selectedScore);
         } catch (e) {
             const text = HumanReadableError.getMessageFromError(e, t('There was a problem submitting your feedback. Please try again a little later.'));
@@ -341,6 +340,5 @@ export default function FeedbackPage() {
             return <LoadingFeedbackView action={doSendFeedback} score={score} />;
         }
     }
-
     return (<ConfirmFeedback positive={positive} />);
 }
diff --git a/apps/portal/src/components/pages/FeedbackPage.test.js b/apps/portal/src/components/pages/FeedbackPage.test.js
new file mode 100644
index 00000000000..729ed343010
--- /dev/null
+++ b/apps/portal/src/components/pages/FeedbackPage.test.js
@@ -0,0 +1,40 @@
+import {getMemberData, getSiteData} from '../../utils/fixtures-generator';
+import {render} from '../../utils/test-utils';
+import FeedbackPage from './FeedbackPage';
+
+const setup = (overrides) => {
+    const {mockOnActionFn, ...utils} = render(
+        <FeedbackPage />,
+        {
+            overrideContext: {
+                ...overrides
+            }
+        }
+    );
+    return {
+        mockOnActionFn,
+        ...utils
+    };
+};
+
+describe('FeedbackPage', () => {
+    const siteData = getSiteData();
+    const posts = siteData.posts;
+    const member = getMemberData();
+
+    // we need the API to actually test the component, so the bulk of tests will be in the FeedbackFlow file
+    test('renders', () => {
+        // mock what the larger app would process and set
+        const pageData = {
+            uuid: member.uuid,
+            key: 'key',
+            postId: posts[0].id,
+            score: 1
+        };
+        const {getByTestId} = setup({pageData});
+
+        const loaderIcon = getByTestId('loaderIcon');
+
+        expect(loaderIcon).toBeInTheDocument();
+    });
+});
diff --git a/apps/portal/src/components/pages/LoadingPage.js b/apps/portal/src/components/pages/LoadingPage.js
index 40778ef3c82..eafa7e6e647 100644
--- a/apps/portal/src/components/pages/LoadingPage.js
+++ b/apps/portal/src/components/pages/LoadingPage.js
@@ -6,7 +6,7 @@ export default class LoadingPage extends React.Component {
         return (
             <div style={{display: 'flex', flexDirection: 'column', color: '#313131'}}>
                 <div style={{paddingLeft: '16px', paddingRight: '16px', paddingTop: '12px', height: '50px'}}>
-                    <LoaderIcon className={'gh-portal-loadingicon dark'} />
+                    <LoaderIcon className={'gh-portal-loadingicon dark'} data-testid="loaderIcon" />
                 </div>
             </div>
         );
diff --git a/apps/portal/src/components/pages/NewsletterSelectionPage.js b/apps/portal/src/components/pages/NewsletterSelectionPage.js
index 4707fa8bae4..de49bf24417 100644
--- a/apps/portal/src/components/pages/NewsletterSelectionPage.js
+++ b/apps/portal/src/components/pages/NewsletterSelectionPage.js
@@ -11,7 +11,7 @@ function NewsletterPrefSection({newsletter, subscribedNewsletters, setSubscribed
     });
     if (newsletter.paid) {
         return (
-            <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
+            <section className='gh-portal-list-toggle-wrapper' data-testid="toggle-wrapper">
                 <div className='gh-portal-list-detail gh-portal-list-big'>
                     <h3>{newsletter.name}</h3>
                     <p>{newsletter.description}</p>
@@ -23,7 +23,7 @@ function NewsletterPrefSection({newsletter, subscribedNewsletters, setSubscribed
         );
     }
     return (
-        <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
+        <section className='gh-portal-list-toggle-wrapper' data-testid="toggle-wrapper">
             <div className='gh-portal-list-detail gh-portal-list-big'>
                 <h3>{newsletter.name}</h3>
                 <p>{newsletter.description}</p>
@@ -109,8 +109,8 @@ export default function NewsletterSelectionPage({pageData, onBack}) {
                                         id: d.id
                                     };
                                 });
-                                const {name, email, plan, offerId} = pageData;
-                                onAction('signup', {name, email, plan, newsletters, offerId});
+                                const {name, email, plan, phonenumber, offerId} = pageData;
+                                onAction('signup', {name, email, plan, phonenumber, newsletters, offerId});
                             }}
                             brandColor={brandColor}
                             label={label}
diff --git a/apps/portal/src/components/pages/OfferPage.js b/apps/portal/src/components/pages/OfferPage.js
index f1863d2581a..6a47c8cf108 100644
--- a/apps/portal/src/components/pages/OfferPage.js
+++ b/apps/portal/src/components/pages/OfferPage.js
@@ -6,6 +6,7 @@ import CloseButton from '../common/CloseButton';
 import InputForm from '../common/InputForm';
 import {getCurrencySymbol, getProductFromId, hasMultipleProductsFeature, isSameCurrency, formatNumber, hasMultipleNewsletters} from '../../utils/helpers';
 import {ValidateInputForm} from '../../utils/form';
+import {interceptAnchorClicks} from '../../utils/links';
 import NewsletterSelectionPage from './NewsletterSelectionPage';
 
 export const OfferPageStyles = () => {
@@ -37,6 +38,7 @@ export const OfferPageStyles = () => {
     margin-bottom: 24px;
     /*border: 1px dashed var(--brandcolor);*/
     background-image: url("data:image/svg+xml,%3csvg width='100%25' height='99.9%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='%23C3C3C3' stroke-width='3' stroke-dasharray='3%2c 9' stroke-dashoffset='0' stroke-linecap='square'/%3e%3c/svg%3e");
+    background-color: var(--white);
     border-radius: 6px;
 }
 
@@ -164,7 +166,7 @@ export default class OfferPage extends React.Component {
         const checkboxError = checkboxRequired && !state.termsCheckboxChecked;
 
         return {
-            ...ValidateInputForm({fields: this.getInputFields({state})}),
+            ...ValidateInputForm({fields: this.getInputFields({state}), t: this.context.t}),
             checkbox: checkboxError
         };
     }
@@ -199,7 +201,7 @@ export default class OfferPage extends React.Component {
             fields.unshift({
                 type: 'text',
                 value: member?.name || state.name,
-                placeholder: 'Jamie Larson',
+                placeholder: t('Jamie Larson'),
                 label: t('Name'),
                 name: 'name',
                 disabled: !!member,
@@ -252,13 +254,6 @@ export default class OfferPage extends React.Component {
 
         const className = `gh-portal-signup-terms ${errorClassName}`;
 
-        const interceptAnchorClicks = (e) => {
-            if (e.target.tagName === 'A') {
-                e.preventDefault();
-                window.open(e.target.href, '_blank');
-            }
-        };
-
         return (
             <div className={className} onClick={interceptAnchorClicks}>
                 {signupTerms}
@@ -287,12 +282,15 @@ export default class OfferPage extends React.Component {
             };
         }, () => {
             const {onAction} = this.context;
-            const {name, email, errors} = this.state;
+            const {name, email, phonenumber, errors} = this.state;
             const hasFormErrors = (errors && Object.values(errors).filter(d => !!d).length > 0);
             if (!hasFormErrors) {
                 const signupData = {
-                    name, email, plan: price?.id,
-                    offerId: offer?.id
+                    name,
+                    email,
+                    plan: price?.id,
+                    offerId: offer?.id,
+                    phonenumber
                 };
                 if (hasMultipleNewsletters({site})) {
                     this.setState({
diff --git a/apps/portal/src/components/pages/SigninPage.js b/apps/portal/src/components/pages/SigninPage.js
index ad60cf44d81..10621f80047 100644
--- a/apps/portal/src/components/pages/SigninPage.js
+++ b/apps/portal/src/components/pages/SigninPage.js
@@ -31,14 +31,14 @@ export default class SigninPage extends React.Component {
         e.preventDefault();
         this.setState((state) => {
             return {
-                errors: ValidateInputForm({fields: this.getInputFields({state})})
+                errors: ValidateInputForm({fields: this.getInputFields({state}), t: this.context.t})
             };
         }, async () => {
-            const {email, errors} = this.state;
+            const {email, phonenumber, errors} = this.state;
             const {redirect} = this.context.pageData ?? {};
             const hasFormErrors = (errors && Object.values(errors).filter(d => !!d).length > 0);
             if (!hasFormErrors) {
-                this.context.onAction('signin', {email, redirect});
+                this.context.onAction('signin', {email, phonenumber, redirect});
             }
         });
     }
@@ -71,6 +71,18 @@ export default class SigninPage extends React.Component {
                 required: true,
                 errorMessage: errors.email || '',
                 autoFocus: true
+            },
+            {
+                type: 'text',
+                value: state.phonenumber,
+                placeholder: '+1 (123) 456-7890',
+                // Doesn't need translation, hidden field
+                label: 'Phone number',
+                name: 'phonenumber',
+                required: false,
+                tabindex: -1,
+                autocomplete: 'off',
+                hidden: true
             }
         ];
         return fields;
diff --git a/apps/portal/src/components/pages/SignupPage.js b/apps/portal/src/components/pages/SignupPage.js
index ff88e8d5e90..8ed46ab70da 100644
--- a/apps/portal/src/components/pages/SignupPage.js
+++ b/apps/portal/src/components/pages/SignupPage.js
@@ -9,6 +9,7 @@ import InputForm from '../common/InputForm';
 import {ValidateInputForm} from '../../utils/form';
 import {getSiteProducts, getSitePrices, hasOnlyFreePlan, isInviteOnlySite, freeHasBenefitsOrDescription, hasOnlyFreeProduct, getFreeProductBenefits, getFreeTierDescription, hasMultipleNewsletters, hasFreeTrialTier, isSignupAllowed} from '../../utils/helpers';
 import {ReactComponent as InvitationIcon} from '../../images/icons/invitation.svg';
+import {interceptAnchorClicks} from '../../utils/links';
 
 export const SignupPageStyles = `
 .gh-portal-back-sitetitle {
@@ -109,6 +110,7 @@ export const SignupPageStyles = `
     font-size: 1.4rem;
     font-weight: 600;
     margin-left: 4px !important;
+    margin-bottom: -1px;
 }
 
 .gh-portal-signup-message button span {
@@ -151,7 +153,7 @@ footer.gh-portal-signin-footer {
 
 .gh-portal-content.signup.single-field .gh-portal-input,
 .gh-portal-content.signin .gh-portal-input {
-    margin-bottom: 8px;
+    margin-bottom: 12px;
 }
 
 .gh-portal-content.signup.single-field + .gh-portal-signup-footer,
@@ -202,15 +204,27 @@ footer.gh-portal-signup-footer.invite-only .gh-portal-signup-message {
 .gh-portal-signup-terms-wrapper {
     width: 100%;
     max-width: 420px;
-    margin: -16px auto 36px;
+    margin: 0 auto;
 }
 
-.gh-portal-signup-terms-wrapper.free-only {
-    margin: 0 auto;
+.signup.single-field .gh-portal-signup-terms-wrapper {
+    margin-top: 12px;
+}
+
+.signup.single-field .gh-portal-products:not(:has(.gh-portal-product-card)) {
+    margin-top: -16px;
+}
+
+.gh-portal-signup-terms {
+    margin: -16px 0 36px;
+}
+
+.gh-portal-signup-terms-wrapper.free-only .gh-portal-signup-terms {
+    margin: -16px 0 24px;
 }
 
-.gh-portal-products + .gh-portal-signup-terms-wrapper.free-only {
-    margin: 20px auto 0;
+.gh-portal-products:has(.gh-portal-product-card) + .gh-portal-signup-terms-wrapper.free-only {
+    margin: 20px auto 0 !important;
 }
 
 .gh-portal-signup-terms label {
@@ -287,6 +301,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;
 }
@@ -367,7 +385,7 @@ class SignupPage extends React.Component {
         const checkboxError = checkboxRequired && !state.termsCheckboxChecked;
 
         return {
-            ...ValidateInputForm({fields: this.getInputFields({state})}),
+            ...ValidateInputForm({fields: this.getInputFields({state}), t: this.context.t}),
             checkbox: checkboxError
         };
     }
@@ -379,20 +397,20 @@ class SignupPage extends React.Component {
             };
         }, () => {
             const {site, onAction} = this.context;
-            const {name, email, plan, errors} = this.state;
+            const {name, email, plan, phonenumber, errors} = this.state;
             const hasFormErrors = (errors && Object.values(errors).filter(d => !!d).length > 0);
             if (!hasFormErrors) {
                 if (hasMultipleNewsletters({site})) {
                     this.setState({
                         showNewsletterSelection: true,
-                        pageData: {name, email, plan},
+                        pageData: {name, email, plan, phonenumber},
                         errors: {}
                     });
                 } else {
                     this.setState({
                         errors: {}
                     });
-                    onAction('signup', {name, email, plan});
+                    onAction('signup', {name, email, phonenumber, plan});
                 }
             }
         });
@@ -460,12 +478,24 @@ class SignupPage extends React.Component {
             {
                 type: 'email',
                 value: state.email,
-                placeholder: 'jamie@example.com',
+                placeholder: t('jamie@example.com'),
                 label: t('Email'),
                 name: 'email',
                 required: true,
                 tabindex: 2,
                 errorMessage: errors.email || ''
+            },
+            {
+                type: 'text',
+                value: state.phonenumber,
+                placeholder: t('+1 (123) 456-7890'),
+                // Doesn't need translation, hidden field
+                label: t('Phone number'),
+                name: 'phonenumber',
+                required: false,
+                tabindex: -1,
+                autocomplete: 'off',
+                hidden: true
             }
         ];
 
@@ -474,7 +504,7 @@ class SignupPage extends React.Component {
             fields.unshift({
                 type: 'text',
                 value: state.name,
-                placeholder: 'Jamie Larson',
+                placeholder: t('Jamie Larson'),
                 label: t('Name'),
                 name: 'name',
                 required: true,
@@ -493,6 +523,7 @@ class SignupPage extends React.Component {
 
     renderSignupTerms() {
         const {site} = this.context;
+
         if (site.portal_signup_terms_html === null || site.portal_signup_terms_html === '') {
             return null;
         }
@@ -526,13 +557,6 @@ class SignupPage extends React.Component {
 
         const className = `gh-portal-signup-terms ${errorClassName}`;
 
-        const interceptAnchorClicks = (e) => {
-            if (e.target.tagName === 'A') {
-                e.preventDefault();
-                window.open(e.target.href, '_blank');
-            }
-        };
-
         return (
             <div className={className} onClick={interceptAnchorClicks}>
                 {signupTerms}
@@ -691,6 +715,8 @@ class SignupPage extends React.Component {
         const hasOnlyFree = hasOnlyFreeProduct({site}) || showOnlyFree;
         const sticky = !showOnlyFree && (freeBenefits.length || freeDescription);
 
+        const signupTerms = this.renderSignupTerms();
+
         return (
             <section className="gh-portal-signup">
                 <div className='gh-portal-section'>
@@ -705,14 +731,18 @@ class SignupPage extends React.Component {
                         {(hasOnlyFree ?
                             <>
                                 {this.renderProducts()}
+                                {signupTerms &&
                                 <div className='gh-portal-signup-terms-wrapper free-only'>
-                                    {this.renderSignupTerms()}
+                                    {signupTerms}
                                 </div>
+                                }
                             </> :
                             <>
+                                {signupTerms &&
                                 <div className='gh-portal-signup-terms-wrapper'>
-                                    {this.renderSignupTerms()}
+                                    {signupTerms}
                                 </div>
+                                }
                                 {this.renderProducts()}
                             </>)}
 
diff --git a/apps/portal/src/components/pages/SupportError.js b/apps/portal/src/components/pages/SupportError.js
index 14348fed31a..93f7185ad53 100644
--- a/apps/portal/src/components/pages/SupportError.js
+++ b/apps/portal/src/components/pages/SupportError.js
@@ -3,6 +3,7 @@ import AppContext from '../../AppContext';
 import CloseButton from '../common/CloseButton';
 import ActionButton from '../common/ActionButton';
 import {ReactComponent as WarningIcon} from '../../images/icons/warning-outline.svg';
+import * as Sentry from '@sentry/react';
 
 export const TipsAndDonationsErrorStyle = `
     .gh-portal-tips-and-donations .gh-tips-and-donations-icon-error {
@@ -24,10 +25,14 @@ export const TipsAndDonationsErrorStyle = `
 `;
 
 const SupportError = ({error}) => {
-    const {onAction} = useContext(AppContext);
-    const errorTitle = 'Sorry, that didn’t work.';
-    const errorMessage = error || 'There was an error processing your payment. Please try again.';
-    const buttonLabel = 'Close';
+    const {onAction, t} = useContext(AppContext);
+    const errorTitle = t('Sorry, that didn’t work.');
+    const errorMessage = error || t('There was an error processing your payment. Please try again.');
+    const buttonLabel = t('Close');
+
+    if (error) { // Log error to Sentry
+        Sentry.captureException(error);
+    }
 
     return (
         <div className='gh-portal-content gh-portal-tips-and-donations'>
diff --git a/apps/portal/src/components/pages/SupportPage.js b/apps/portal/src/components/pages/SupportPage.js
index 842696b6bb2..dfd426c9967 100644
--- a/apps/portal/src/components/pages/SupportPage.js
+++ b/apps/portal/src/components/pages/SupportPage.js
@@ -1,18 +1,20 @@
-import {useEffect, useState} from 'react';
+import {useEffect, useState, useContext} from 'react';
 import SupportError from './SupportError';
 import LoadingPage from './LoadingPage';
 import setupGhostApi from '../../utils/api';
+import AppContext from '../../AppContext';
 
 const SupportPage = () => {
     const [isLoading, setLoading] = useState(true);
     const [error, setError] = useState(null);
     const [disabledFeatureError, setDisabledFeatureError] = useState(null);
+    const {member, t} = useContext(AppContext);
 
     useEffect(() => {
         async function checkoutDonation() {
             const siteUrl = window.location.origin;
             const currentUrl = siteUrl + window.location.pathname;
-            const successUrl = `${currentUrl}#/portal/support/success`;
+            const successUrl = member ? `${currentUrl}?action=support&success=true` : `${currentUrl}#/portal/support/success`;
             const cancelUrl = currentUrl;
             const api = setupGhostApi({siteUrl});
 
@@ -24,9 +26,9 @@ const SupportPage = () => {
                 }
             } catch (err) {
                 if (err.type && err.type === 'DisabledFeatureError') {
-                    setDisabledFeatureError('This site is not accepting payments at the moment.');
+                    setDisabledFeatureError(t('This site is not accepting payments at the moment.'));
                 } else {
-                    setError('Something went wrong, please try again later.');
+                    setError(t('Something went wrong, please try again later.'));
                 }
 
                 setLoading(false);
diff --git a/apps/portal/src/components/pages/SupportSuccess.js b/apps/portal/src/components/pages/SupportSuccess.js
index 1a55f930e7c..a718e6f9c6c 100644
--- a/apps/portal/src/components/pages/SupportSuccess.js
+++ b/apps/portal/src/components/pages/SupportSuccess.js
@@ -5,12 +5,26 @@ import CloseButton from '../common/CloseButton';
 import ActionButton from '../common/ActionButton';
 
 export const TipsAndDonationsSuccessStyle = `
+    .gh-portal-tips-and-donations .gh-portal-signup-header {
+        margin-bottom: 12px;
+        padding: 0;
+    }
+
     .gh-portal-tips-and-donations .gh-tips-and-donations-icon-success {
-        padding: 10px 0;
+        margin: 24px auto 16px;
         text-align: center;
         color: var(--brandcolor);
         width: 48px;
-        margin: 0 auto;
+        height: 48px;
+    }
+
+    .gh-portal-tips-and-donations .gh-tips-and-donations-icon-success svg { 
+        width: 48px;
+        height: 48px;
+    }
+
+    .gh-portal-tips-and-donations h1.gh-portal-main-title {
+        font-size: 32px;
     }
 
     .gh-portal-tips-and-donations .gh-portal-text-center {
@@ -19,24 +33,25 @@ export const TipsAndDonationsSuccessStyle = `
 `;
 
 const SupportSuccess = () => {
-    const {onAction, brandColor} = useContext(AppContext);
-    const successTitle = 'Thank you!';
-    const successDescription = 'Your support means a lot.';
-    const buttonLabel = 'Close';
+    const {onAction, brandColor, site, t} = useContext(AppContext);
+    const successTitle = t('Thank you for your support');
+    const successDescription = t('To continue to stay up to date, subscribe to {{publication}} below.', {publication: site?.title});
+    const buttonLabel = t('Sign up');
 
     return (
         <div className='gh-portal-content gh-portal-tips-and-donations'>
             <CloseButton />
 
-            <div className="gh-tips-and-donations-icon-success">
-                <ConfettiIcon />
+            <div className="gh-portal-signup-header">
+                {site.icon ? <img className="gh-portal-signup-logo" src={site.icon} alt={site.title} /> : <div className="gh-tips-and-donations-icon-success"><ConfettiIcon /></div>}
+                <h1 className="gh-portal-main-title">{successTitle}</h1>
             </div>
-            <h1 className="gh-portal-main-title">{successTitle}</h1>
             <p className="gh-portal-text-center">{successDescription}</p>
+
             <ActionButton
                 style={{width: '100%'}}
                 retry={false}
-                onClick = {() => onAction('closePopup')}
+                onClick = {() => onAction('switchPage', {page: 'signup'})}
                 disabled={false}
                 brandColor={brandColor}
                 label={buttonLabel}
@@ -44,6 +59,18 @@ const SupportSuccess = () => {
                 tabindex='3'
                 classes={'sticky bottom'}
             />
+
+            <div className="gh-portal-signup-message">
+                <div>{t('Already a member?')}</div>
+                <button
+                    data-test-button='signin-switch'
+                    className='gh-portal-btn gh-portal-btn-link'
+                    style={{color: brandColor}}
+                    onClick={() => onAction('switchPage', {page: 'signin'})}
+                >
+                    <span>{t('Sign in')}</span>
+                </button>
+            </div>
         </div>
     );
 };
diff --git a/apps/portal/src/components/pages/UnsubscribePage.js b/apps/portal/src/components/pages/UnsubscribePage.js
index 0154c6c59e0..8717509a21a 100644
--- a/apps/portal/src/components/pages/UnsubscribePage.js
+++ b/apps/portal/src/components/pages/UnsubscribePage.js
@@ -2,12 +2,12 @@ import AppContext from '../../AppContext';
 import ActionButton from '../common/ActionButton';
 import {useContext, useEffect, useState} from 'react';
 import {getSiteNewsletters} from '../../utils/helpers';
-import setupGhostApi from '../../utils/api';
 import NewsletterManagement from '../common/NewsletterManagement';
 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);
@@ -32,18 +32,21 @@ function AccountHeader() {
     );
 }
 
-async function updateMemberNewsletters({api, memberUuid, newsletters, enableCommentNotifications}) {
+async function updateMemberNewsletters({api, memberUuid, key, newsletters, enableCommentNotifications}) {
     try {
-        return await api.member.updateNewsletters({uuid: memberUuid, newsletters, enableCommentNotifications});
+        return await api.member.updateNewsletters({uuid: memberUuid, key, newsletters, enableCommentNotifications});
     } catch (e) {
         // ignore auto unsubscribe error
     }
 }
 
+// NOTE: This modal is available even if not logged in, but because it's possible to also be logged in while making modifications,
+//  we need to update the member data in the context if logged in.
 export default function UnsubscribePage() {
-    const {site, pageData, onAction, t} = useContext(AppContext);
-    const api = setupGhostApi({siteUrl: site.url});
+    const {site, api, pageData, member: loggedInMember, onAction, t} = useContext(AppContext);
+    // member is the member data fetched from the API based on the uuid and its state is limited to just this modal, not all of Portal
     const [member, setMember] = useState();
+    const [loading, setLoading] = useState(true);
     const siteNewsletters = getSiteNewsletters({site});
     const defaultNewsletters = siteNewsletters.filter((d) => {
         return d.subscribe_on_signup;
@@ -54,47 +57,92 @@ export default function UnsubscribePage() {
     const {comments_enabled: commentsEnabled} = site;
     const {enable_comment_notifications: enableCommentNotifications = false} = member || {};
 
+    const updateNewsletters = async (newsletters) => {
+        if (loggedInMember) {
+            // when we have a member logged in, we need to update the newsletters in the context
+            onAction('updateNewsletterPreference', {newsletters});
+        } else {
+            await updateMemberNewsletters({api, memberUuid: pageData.uuid, key: pageData.key, newsletters});
+        }
+        setSubscribedNewsletters(newsletters);
+    };
+
+    const updateCommentNotifications = async (enabled) => {
+        let updatedData;
+        if (loggedInMember) {
+            // when we have a member logged in, we need to update the newsletters in the context
+            await onAction('updateNewsletterPreference', {enableCommentNotifications: enabled});
+            updatedData = {...loggedInMember, enable_comment_notifications: enabled};
+        } else {
+            updatedData = await updateMemberNewsletters({api, memberUuid: pageData.uuid, key: pageData.key, enableCommentNotifications: enabled});
+        }
+        setMember(updatedData);
+    };
+
+    const unsubscribeAll = async () => {
+        let updatedMember;
+        if (loggedInMember) {
+            await onAction('updateNewsletterPreference', {newsletters: [], enableCommentNotifications: false});
+            updatedMember = {...loggedInMember};
+            updatedMember.newsletters = [];
+            updatedMember.enable_comment_notifications = false;
+        } else {
+            updatedMember = await api.member.updateNewsletters({uuid: pageData.uuid, newsletters: [], enableCommentNotifications: false});
+        }
+        setSubscribedNewsletters([]);
+        setMember(updatedMember);
+        onAction('showPopupNotification', {
+            action: 'updated:success',
+            message: t(`Unsubscribed from all emails.`)
+        });
+    };
+
+    // This handles the url query param actions that ultimately launch this component/modal
     useEffect(() => {
-        const ghostApi = setupGhostApi({siteUrl: site.url});
         (async () => {
-            const memberData = await ghostApi.member.newsletters({uuid: pageData.uuid});
+            let memberData;
+            try {
+                memberData = await api.member.newsletters({uuid: pageData.uuid, key: pageData.key});
+                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,
-                    memberUuid: pageData.uuid,
-                    newsletters: []
-                });
-                setSubscribedNewsletters(updatedData.newsletters);
+                await updateNewsletters([]);
             } else if (pageData.newsletterUuid) {
                 // Unsubscribe link for a specific newsletter
-                const updatedData = await updateMemberNewsletters({
-                    api: ghostApi,
-                    memberUuid: pageData.uuid,
-                    newsletters: memberNewsletters?.filter((d) => {
-                        return d.uuid !== pageData.newsletterUuid;
-                    })
-                });
-                setSubscribedNewsletters(updatedData.newsletters);
+                await updateNewsletters(memberNewsletters?.filter((d) => {
+                    return d.uuid !== pageData.newsletterUuid;
+                }));
             } else if (pageData.comments && commentsEnabled) {
                 // Unsubscribe link for comments
-                const updatedData = await updateMemberNewsletters({
-                    api: ghostApi,
-                    memberUuid: pageData.uuid,
-                    enableCommentNotifications: false
-                });
-
-                setMember(updatedData);
+                await updateCommentNotifications(false);
             }
         })();
     }, [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 +224,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 (
             <>
@@ -198,23 +251,13 @@ export default function UnsubscribePage() {
             notification={HeaderNotification}
             subscribedNewsletters={subscribedNewsletters}
             updateSubscribedNewsletters={async (newsletters) => {
-                setSubscribedNewsletters(newsletters);
+                await updateNewsletters(newsletters);
                 setHasInteracted(true);
-                await api.member.updateNewsletters({uuid: pageData.uuid, newsletters});
-            }}
-            updateCommentNotifications={async (enabled) => {
-                const updatedMember = await api.member.updateNewsletters({uuid: pageData.uuid, enableCommentNotifications: enabled});
-                setMember(updatedMember);
             }}
+            updateCommentNotifications={updateCommentNotifications}
             unsubscribeAll={async () => {
+                await unsubscribeAll();
                 setHasInteracted(true);
-                setSubscribedNewsletters([]);
-                onAction('showPopupNotification', {
-                    action: 'updated:success',
-                    message: t(`Email preference updated.`)
-                });
-                const updatedMember = await api.member.updateNewsletters({uuid: pageData.uuid, newsletters: [], enableCommentNotifications: false});
-                setMember(updatedMember);
             }}
             isPaidMember={member?.status !== 'free'}
             isCommentsEnabled={commentsEnabled !== 'off'}
diff --git a/apps/portal/src/data-attributes.js b/apps/portal/src/data-attributes.js
index 7d807986336..9f4e9daefeb 100644
--- a/apps/portal/src/data-attributes.js
+++ b/apps/portal/src/data-attributes.js
@@ -56,12 +56,21 @@ export function formSubmitHandler({event, form, errorEl, siteUrl, submitHandler}
         }
     }
 
-    fetch(`${siteUrl}/members/api/send-magic-link/`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(reqBody)
+    return fetch(`${siteUrl}/members/api/integrity-token/`, {
+        method: 'GET'
+    }).then((res) => {
+        return res.text();
+    }).then((integrityToken) => {
+        return fetch(`${siteUrl}/members/api/send-magic-link/`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                ...reqBody,
+                integrityToken
+            })
+        });
     }).then(function (res) {
         form.addEventListener('submit', submitHandler);
         form.classList.remove('loading');
diff --git a/apps/portal/src/images/icons/thumbs-down.svg b/apps/portal/src/images/icons/thumbs-down.svg
index cfffa7a0af6..f94b5fc003e 100644
--- a/apps/portal/src/images/icons/thumbs-down.svg
+++ b/apps/portal/src/images/icons/thumbs-down.svg
@@ -1,4 +1,3 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<defs><style>path{stroke:currentColor;}</style></defs>
-<path d="M9.20837 15.8011C9.83721 15.4781 10.4682 15.1573 11.1013 14.8386C22.77 8.94169 22.1989 10.0903 32.1897 10.0903C36.3605 10.0903 38.4812 12.8045 39.7132 16.7796V16.8053L42.7451 26.9244V26.9436C42.8892 27.4178 42.92 27.9192 42.835 28.4075C42.75 28.8958 42.5516 29.3572 42.2558 29.7549C41.9599 30.1525 41.5748 30.4751 41.1316 30.6967C40.6883 30.9184 40.1992 31.0329 39.7036 31.0311H31.9073C31.4217 31.0324 30.9426 31.144 30.5064 31.3574C30.0701 31.5708 29.688 31.8805 29.3888 32.2631C29.0915 32.6461 28.8867 33.0927 28.7904 33.568C28.6941 34.0433 28.7089 34.5344 28.8337 35.003L30.2358 40.2935C30.3448 40.7044 30.3548 41.1353 30.265 41.5508C30.1752 41.9662 29.9882 42.3545 29.7192 42.6837C29.4535 43.0094 29.1162 43.2693 28.7335 43.4432C28.3508 43.6172 27.9332 43.7004 27.5131 43.6864C27.093 43.6724 26.6818 43.5617 26.3115 43.3627C25.9412 43.1637 25.6219 42.882 25.3784 42.5394L17.6046 30.5883C17.3083 30.1754 16.9182 29.8388 16.4664 29.6062C16.0146 29.3736 15.514 29.2517 15.0058 29.2504H9.20837M6 32.4587H9.20833V10.0003H6" stroke="black" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M42 26.572h-6.2A3.43 3.43 0 0 0 33.024 28l-8.31 12.771a2.92 2.92 0 0 1-3.587.967 2.875 2.875 0 0 1-1.609-3.366l1.5-5.656a3.36 3.36 0 0 0-1.788-3.895 3.438 3.438 0 0 0-1.5-.348H9.397a3.388 3.388 0 0 1-3.251-4.367v-.02l3.24-10.815v-.029c1.32-4.248 3.585-7.146 8.044-7.146 10.682 0 10.072-1.231 22.544 5.073.679.338 1.354.682 2.027 1.03v18.1"/>
+</svg>
\ No newline at end of file
diff --git a/apps/portal/src/images/icons/thumbs-up.svg b/apps/portal/src/images/icons/thumbs-up.svg
index 7004429b569..08524dd1fb8 100644
--- a/apps/portal/src/images/icons/thumbs-up.svg
+++ b/apps/portal/src/images/icons/thumbs-up.svg
@@ -1,4 +1,3 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<defs><style>path{stroke:currentColor;}</style></defs>
-<path d="M9.20837 33.8868C9.83721 34.2098 10.4682 34.5306 11.1013 34.8493C22.77 40.7462 22.1989 39.5976 32.1897 39.5976C36.3605 39.5976 38.4812 36.8834 39.7132 32.9083V32.8826L42.7451 22.7635V22.7443C42.8892 22.2701 42.92 21.7687 42.835 21.2804C42.75 20.7922 42.5516 20.3307 42.2558 19.9331C41.9599 19.5355 41.5748 19.2129 41.1316 18.9912C40.6883 18.7695 40.1992 18.655 39.7036 18.6568H31.9073C31.4217 18.6555 30.9426 18.5439 30.5064 18.3305C30.0701 18.1171 29.688 17.8074 29.3888 17.4248C29.0915 17.0418 28.8867 16.5952 28.7904 16.1199C28.6941 15.6446 28.7089 15.1535 28.8337 14.6849L30.2358 9.39439C30.3448 8.98352 30.3548 8.55265 30.265 8.13716C30.1752 7.72167 29.9882 7.33339 29.7192 7.00418C29.4535 6.67851 29.1162 6.41858 28.7335 6.24467C28.3508 6.07075 27.9332 5.98754 27.5131 6.00151C27.093 6.01548 26.6818 6.12626 26.3115 6.32522C25.9412 6.52418 25.6219 6.80594 25.3784 7.14856L17.6046 19.0996C17.3083 19.5125 16.9182 19.8491 16.4664 20.0817C16.0146 20.3143 15.514 20.4362 15.0058 20.4375H9.20837M6 17.2292H9.20833V39.6876H6" stroke="black" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="M6.002 21.429H12.2a3.432 3.432 0 0 0 2.777-1.43L23.29 7.23a2.916 2.916 0 0 1 3.586-.967A2.876 2.876 0 0 1 28.48 9.63l-1.497 5.652a3.36 3.36 0 0 0 1.787 3.897c.466.229.98.347 1.498.35h8.334a3.39 3.39 0 0 1 3.253 4.366v.02l-3.24 10.815v.027c-1.32 4.248-3.588 7.146-8.047 7.146-10.68 0-10.067 1.231-22.544-5.073-.675-.338-1.35-.684-2.025-1.026V18.002"/>
+</svg>
\ No newline at end of file
diff --git a/apps/portal/src/tests/App.test.js b/apps/portal/src/tests/App.test.js
new file mode 100644
index 00000000000..8b0b5611f1b
--- /dev/null
+++ b/apps/portal/src/tests/App.test.js
@@ -0,0 +1,34 @@
+import App from '../App';
+import setupGhostApi from '../utils/api';
+import {appRender} from '../utils/test-utils';
+import {site as FixtureSite, member as FixtureMember} from '../utils/test-fixtures';
+
+describe('App', function () {
+    beforeEach(function () {
+        // Stub window.location with a URL object so we have an expected origin
+        const location = new URL('http://example.com');
+        delete window.location;
+        window.location = location;
+    });
+
+    test('transforms portal links on render', async () => {
+        const link = document.createElement('a');
+        link.setAttribute('href', 'http://example.com/#/portal/signup');
+        document.body.appendChild(link);
+
+        const ghostApi = setupGhostApi({siteUrl: 'http://example.com'});
+        ghostApi.init = jest.fn(() => {
+            return Promise.resolve({
+                site: FixtureSite.singleTier.basic,
+                member: FixtureMember.free
+            });
+        });
+        const utils = appRender(
+            <App api={ghostApi} />
+        );
+
+        await utils.findByTitle(/portal-popup/i);
+
+        expect(link.getAttribute('href')).toBe('#/portal/signup');
+    });
+});
diff --git a/apps/portal/src/tests/EmailSubscriptionsFlow.test.js b/apps/portal/src/tests/EmailSubscriptionsFlow.test.js
new file mode 100644
index 00000000000..90abd15c5b5
--- /dev/null
+++ b/apps/portal/src/tests/EmailSubscriptionsFlow.test.js
@@ -0,0 +1,292 @@
+import App from '../App.js';
+import {appRender, fireEvent, within, waitFor} from '../utils/test-utils';
+import {newsletters as Newsletters, site as FixtureSite, member as FixtureMember} from '../utils/test-fixtures';
+import setupGhostApi from '../utils/api.js';
+import userEvent from '@testing-library/user-event';
+
+const setup = async ({site, member = null, newsletters}, loggedOut = false) => {
+    const ghostApi = setupGhostApi({siteUrl: 'https://example.com'});
+    ghostApi.init = jest.fn(() => {
+        return Promise.resolve({
+            site,
+            member: loggedOut ? null : member,
+            newsletters
+        });
+    });
+
+    ghostApi.member.update = jest.fn(({newsletters: newNewsletters}) => {
+        return Promise.resolve({
+            newsletters: newNewsletters,
+            enable_comment_notifications: false
+        });
+    });
+
+    ghostApi.member.newsletters = jest.fn(() => {
+        return Promise.resolve({
+            newsletters
+        });
+    });
+
+    ghostApi.member.updateNewsletters = jest.fn(({uuid: memberUuid, newsletters: newNewsletters, enableCommentNotifications}) => {
+        return Promise.resolve({
+            uuid: memberUuid,
+            newsletters: newNewsletters,
+            enable_comment_notifications: enableCommentNotifications
+        });
+    });
+
+    const utils = appRender(
+        <App api={ghostApi} />
+    );
+
+    const triggerButtonFrame = await utils.findByTitle(/portal-trigger/i);
+    const triggerButton = within(triggerButtonFrame.contentDocument).getByTestId('portal-trigger-button');
+    const popupFrame = utils.queryByTitle(/portal-popup/i);
+    const popupIframeDocument = popupFrame.contentDocument;
+    const emailInput = within(popupIframeDocument).queryByLabelText(/email/i);
+    const nameInput = within(popupIframeDocument).queryByLabelText(/name/i);
+    const submitButton = within(popupIframeDocument).queryByRole('button', {name: 'Continue'});
+    const signinButton = within(popupIframeDocument).queryByRole('button', {name: 'Sign in'});
+    const siteTitle = within(popupIframeDocument).queryByText(site.title);
+    const freePlanTitle = within(popupIframeDocument).queryByText('Free');
+    const monthlyPlanTitle = within(popupIframeDocument).queryByText('Monthly');
+    const yearlyPlanTitle = within(popupIframeDocument).queryByText('Yearly');
+    const fullAccessTitle = within(popupIframeDocument).queryByText('Full access');
+    const accountHomeTitle = within(popupIframeDocument).queryByText('Your account');
+    const viewPlansButton = within(popupIframeDocument).queryByRole('button', {name: 'View plans'});
+    const manageSubscriptionsButton = within(popupIframeDocument).queryByRole('button', {name: 'Manage'});
+    return {
+        ghostApi,
+        popupIframeDocument,
+        popupFrame,
+        triggerButtonFrame,
+        triggerButton,
+        siteTitle,
+        emailInput,
+        nameInput,
+        signinButton,
+        submitButton,
+        freePlanTitle,
+        monthlyPlanTitle,
+        yearlyPlanTitle,
+        fullAccessTitle,
+        accountHomeTitle,
+        viewPlansButton,
+        manageSubscriptionsButton,
+        ...utils
+    };
+};
+
+describe('Newsletter Subscriptions', () => {
+    test('list newsletters to subscribe to', async () => {
+        const {popupFrame, triggerButtonFrame, accountHomeTitle, manageSubscriptionsButton, popupIframeDocument} = await setup({
+            site: FixtureSite.singleTier.onlyFreePlanWithoutStripe,
+            member: FixtureMember.subbedToNewsletter,
+            newsletters: Newsletters
+        });
+        expect(popupFrame).toBeInTheDocument();
+        expect(triggerButtonFrame).toBeInTheDocument();
+        expect(accountHomeTitle).toBeInTheDocument();
+        expect(manageSubscriptionsButton).toBeInTheDocument();
+
+        // unsure why fireEvent has no effect here
+        await userEvent.click(manageSubscriptionsButton);
+        
+        await waitFor(() => {
+            const newsletter1 = within(popupIframeDocument).queryByText('Newsletter 1');
+            const newsletter2 = within(popupIframeDocument).queryByText('Newsletter 2');
+            const emailPreferences = within(popupIframeDocument).queryByText('Email preferences');
+            
+            // within(popupIframeDocument).getByText('dslkfjsdlk');
+            expect(newsletter1).toBeInTheDocument();
+            expect(newsletter2).toBeInTheDocument();
+            expect(emailPreferences).toBeInTheDocument();
+        });
+    });
+
+    test('toggle subscribing to a newsletter', async () => {
+        const {ghostApi, popupFrame, triggerButtonFrame, accountHomeTitle, manageSubscriptionsButton, popupIframeDocument} = await setup({
+            site: FixtureSite.singleTier.onlyFreePlanWithoutStripe,
+            member: FixtureMember.subbedToNewsletter,
+            newsletters: Newsletters
+        });
+        expect(popupFrame).toBeInTheDocument();
+        expect(triggerButtonFrame).toBeInTheDocument();
+        expect(accountHomeTitle).toBeInTheDocument();
+        expect(manageSubscriptionsButton).toBeInTheDocument();
+
+        await userEvent.click(manageSubscriptionsButton);
+
+        const newsletter1 = within(popupIframeDocument).queryByText('Newsletter 1');
+        expect(newsletter1).toBeInTheDocument();
+
+        // unsubscribe from Newsletter 1
+        const subscriptionToggles = within(popupIframeDocument).getAllByTestId('switch-input');
+        const newsletter1Toggle = subscriptionToggles[0];
+        expect(newsletter1Toggle).toBeInTheDocument();
+        await userEvent.click(newsletter1Toggle);
+        
+        // verify that subscription to Newsletter 1 was removed
+        const expectedSubscriptions = Newsletters.filter(n => n.id !== Newsletters[0].id).map(n => ({id: n.id}));
+        expect(ghostApi.member.update).toHaveBeenLastCalledWith(
+            {newsletters: expectedSubscriptions}
+        );
+        const subscriptionToggleContainers = within(popupIframeDocument).getAllByTestId('checkmark-container');
+        const newsletter1ToggleContainer = subscriptionToggleContainers[0];
+        expect(newsletter1ToggleContainer).toBeInTheDocument();
+        expect(newsletter1ToggleContainer).not.toHaveClass('gh-portal-toggle-checked');
+        const newsletter2ToggleContainer = subscriptionToggleContainers[1];
+        expect(newsletter2ToggleContainer).toBeInTheDocument();
+        expect(newsletter2ToggleContainer).toHaveClass('gh-portal-toggle-checked');
+
+        // resubscribe to Newsletter 1
+        await userEvent.click(newsletter1Toggle);
+        expect(newsletter1ToggleContainer).toHaveClass('gh-portal-toggle-checked');
+        expect(ghostApi.member.update).toHaveBeenLastCalledWith(
+            {newsletters: Newsletters.reverse().map(n => ({id: n.id}))}
+        );
+    });
+
+    test('unsubscribe from all newsletters when logged in', async () => {
+        const {ghostApi, popupFrame, triggerButtonFrame, accountHomeTitle, manageSubscriptionsButton, popupIframeDocument} = await setup({
+            site: FixtureSite.singleTier.onlyFreePlanWithoutStripe,
+            member: FixtureMember.subbedToNewsletter,
+            newsletters: Newsletters
+        });
+        expect(popupFrame).toBeInTheDocument();
+        expect(triggerButtonFrame).toBeInTheDocument();
+        expect(accountHomeTitle).toBeInTheDocument();
+        expect(manageSubscriptionsButton).toBeInTheDocument();
+        await userEvent.click(manageSubscriptionsButton);
+        const unsubscribeAllButton = within(popupIframeDocument).queryByRole('button', {name: 'Unsubscribe from all emails'});
+        expect(unsubscribeAllButton).toBeInTheDocument();
+
+        fireEvent.click(unsubscribeAllButton);
+
+        expect(ghostApi.member.update).toHaveBeenCalledWith({newsletters: [], enableCommentNotifications: false});
+        // Verify the local state shows the newsletter as unsubscribed
+        let newsletterToggles = within(popupIframeDocument).queryAllByTestId('checkmark-container');
+        let newsletter1Toggle = newsletterToggles[0];
+        let newsletter2Toggle = newsletterToggles[1];
+
+        expect(newsletter1Toggle).toBeInTheDocument();
+        expect(newsletter2Toggle).toBeInTheDocument();
+        expect(newsletter1Toggle).not.toHaveClass('gh-portal-toggle-checked');
+        expect(newsletter2Toggle).not.toHaveClass('gh-portal-toggle-checked');
+    });
+
+    describe('from the unsubscribe link > UnsubscribePage', () => {
+        test('unsubscribe via email link while not logged in', async () => {
+            // Mock window.location
+            Object.defineProperty(window, 'location', {
+                value: new URL(`https://portal.localhost/?action=unsubscribe&uuid=${FixtureMember.subbedToNewsletter.uuid}&newsletter=${Newsletters[0].uuid}&key=hashedMemberUuid`),
+                writable: true
+            });
+
+            const {ghostApi, popupFrame, popupIframeDocument} = await setup({
+                site: FixtureSite.singleTier.onlyFreePlanWithoutStripe,
+                member: FixtureMember.subbedToNewsletter,
+                newsletters: Newsletters
+            }, true);
+
+            // Verify the API was hit to collect subscribed newsletters
+            expect(ghostApi.member.newsletters).toHaveBeenLastCalledWith(
+                {
+                    uuid: FixtureMember.subbedToNewsletter.uuid,
+                    key: 'hashedMemberUuid'
+                }
+            );
+            expect(popupFrame).toBeInTheDocument();
+            
+            expect(within(popupIframeDocument).getByText(/will no longer receive/)).toBeInTheDocument();
+            // Verify the local state shows the newsletter as unsubscribed
+            let newsletterToggles = within(popupIframeDocument).queryAllByTestId('checkmark-container');
+            let newsletter1Toggle = newsletterToggles[0];
+            let newsletter2Toggle = newsletterToggles[1];
+
+            expect(newsletter1Toggle).toBeInTheDocument();
+            expect(newsletter2Toggle).toBeInTheDocument();
+            expect(newsletter1Toggle).not.toHaveClass('gh-portal-toggle-checked');
+            expect(newsletter2Toggle).toHaveClass('gh-portal-toggle-checked');
+        });
+
+        test('unsubscribe via email link while logged in', async () => {
+            // Mock window.location
+            Object.defineProperty(window, 'location', {
+                value: new URL(`https://portal.localhost/?action=unsubscribe&uuid=${FixtureMember.subbedToNewsletter.uuid}&newsletter=${Newsletters[0].uuid}&key=hashedMemberUuid`),
+                writable: true
+            });
+
+            const {ghostApi, popupFrame, popupIframeDocument, triggerButton, queryByTitle} = await setup({
+                site: FixtureSite.singleTier.onlyFreePlanWithoutStripe,
+                member: FixtureMember.subbedToNewsletter,
+                newsletters: Newsletters
+            });
+
+            // Verify the API was hit to collect subscribed newsletters
+            expect(ghostApi.member.newsletters).toHaveBeenLastCalledWith(
+                {
+                    uuid: FixtureMember.subbedToNewsletter.uuid,
+                    key: 'hashedMemberUuid'
+                }
+            );
+            // Verify the local state shows the newsletter as unsubscribed
+            let newsletterToggles = within(popupIframeDocument).queryAllByTestId('checkmark-container');
+            let newsletter1Toggle = newsletterToggles[0];
+            let newsletter2Toggle = newsletterToggles[1];
+
+            expect(within(popupIframeDocument).getByText(/will no longer receive/)).toBeInTheDocument();
+
+            expect(newsletter1Toggle).toBeInTheDocument();
+            expect(newsletter2Toggle).toBeInTheDocument();
+            expect(newsletter1Toggle).not.toHaveClass('gh-portal-toggle-checked');
+            expect(newsletter2Toggle).toHaveClass('gh-portal-toggle-checked');
+
+            // Close the UnsubscribePage popup frame
+            const popupCloseButton = within(popupIframeDocument).queryByTestId('close-popup');
+            await userEvent.click(popupCloseButton);
+            expect(popupFrame).not.toBeInTheDocument();
+            
+            // Reopen Portal and go to the unsubscribe page
+            await userEvent.click(triggerButton);
+            // We have a new popup frame - can't use the old locator from setup
+            const newPopupFrame = queryByTitle(/portal-popup/i);
+            expect(newPopupFrame).toBeInTheDocument();
+            const newPopupIframeDocument = newPopupFrame.contentDocument;
+            
+            // Open the NewsletterManagement page
+            const manageSubscriptionsButton = within(newPopupIframeDocument).queryByRole('button', {name: 'Manage'});
+            await userEvent.click(manageSubscriptionsButton);
+
+            // Verify that the unsubscribed newsletter is shown as unsubscribed in the new popup
+            newsletterToggles = within(newPopupIframeDocument).queryAllByTestId('checkmark-container');
+            newsletter1Toggle = newsletterToggles[0];
+            newsletter2Toggle = newsletterToggles[1];
+            expect(newsletter1Toggle).toBeInTheDocument();
+            expect(newsletter2Toggle).toBeInTheDocument();
+            expect(newsletter1Toggle).not.toHaveClass('gh-portal-toggle-checked');
+            expect(newsletter2Toggle).toHaveClass('gh-portal-toggle-checked');
+        });
+
+        test('unsubscribe link without a key param', async () => {
+            // Mock window.location
+            Object.defineProperty(window, 'location', {
+                value: new URL(`https://portal.localhost/?action=unsubscribe&uuid=${FixtureMember.subbedToNewsletter.uuid}&newsletter=${Newsletters[0].uuid}`),
+                writable: true
+            });
+
+            const {ghostApi, popupFrame, popupIframeDocument} = await setup({
+                site: FixtureSite.singleTier.onlyFreePlanWithoutStripe,
+                member: FixtureMember.subbedToNewsletter,
+                newsletters: Newsletters
+            }, true);
+
+            // Verify the popup frame is not shown
+            expect(popupFrame).toBeInTheDocument();
+            // Verify the API was hit to collect subscribed newsletters
+            expect(ghostApi.member.newsletters).not.toHaveBeenCalled();
+            // expect sign in page
+            expect(within(popupIframeDocument).queryByText('Sign in')).toBeInTheDocument();
+        });
+    });
+});
diff --git a/apps/portal/src/tests/FeedbackFlow.test.js b/apps/portal/src/tests/FeedbackFlow.test.js
new file mode 100644
index 00000000000..14d231d22a4
--- /dev/null
+++ b/apps/portal/src/tests/FeedbackFlow.test.js
@@ -0,0 +1,181 @@
+import App from '../App.js';
+import {appRender, fireEvent, waitFor, within} from '../utils/test-utils';
+import setupGhostApi from '../utils/api.js';
+import {getMemberData, getPostsData, getSiteData} from '../utils/fixtures-generator.js';
+
+const siteData = getSiteData();
+const memberData = getMemberData();
+const posts = getPostsData();
+const postSlug = posts[0].slug;
+const postId = posts[0].id;
+
+const setup = async (site = siteData, member = memberData, loggedOut = false, api = {}) => {
+    const ghostApi = setupGhostApi({siteUrl: site.url});
+    ghostApi.init = api?.init || jest.fn(() => {
+        return Promise.resolve({
+            site,
+            member: loggedOut ? null : member
+        });
+    });
+    ghostApi.feedback.add = api?.add || jest.fn(() => {
+        return Promise.resolve({
+            feedback: [
+                {
+                    id: 1,
+                    postId: 1,
+                    memberId: member ? member.uuid : null,
+                    score: 1
+                }
+            ]
+        });
+    });
+
+    const utils = appRender(
+        <App api={ghostApi} />
+    );
+
+    // Note: this await is CRITICAL otherwise the iframe won't be loaded
+    const popupFrame = await utils.findByTitle(/portal-popup/i);
+    const popupIframeDocument = popupFrame.contentDocument;
+
+    return {
+        ghostApi,
+        popupIframeDocument,
+        popupFrame,
+        ...utils
+    };
+};
+
+describe('Feedback Submission Flow', () => {
+    describe('Valid feedback URL', () => {
+        describe('Logged in', () => {
+            test('Autosubmits feedback', async () => {
+                Object.defineProperty(window, 'location', {
+                    value: new URL(`${siteData.url}/${postSlug}/#/feedback/${postId}/1/?uuid=${memberData.uuid}&key=key`),
+                    writable: true
+                });
+
+                const {ghostApi, popupFrame, popupIframeDocument} = await setup();
+                
+                expect(popupFrame).toBeInTheDocument();
+                expect(ghostApi.feedback.add).toHaveBeenCalledTimes(1);    
+
+                within(popupIframeDocument).getByText('Thanks for the feedback!');
+                within(popupIframeDocument).getByText('Your input helps shape what gets published.');
+            });
+
+            test('Autosubmits feedback w/o uuid or key params', async () => {
+                Object.defineProperty(window, 'location', {
+                    value: new URL(`${siteData.url}/${postSlug}/#/feedback/${postId}/1/`),
+                    writable: true
+                });
+                const {ghostApi, popupFrame, popupIframeDocument} = await setup();
+
+                expect(popupFrame).toBeInTheDocument();
+                expect(ghostApi.feedback.add).toHaveBeenCalledTimes(1);    
+                within(popupIframeDocument).getByText('Thanks for the feedback!');
+                within(popupIframeDocument).getByText('Your input helps shape what gets published.');
+            });
+        });
+
+        describe('Logged out', () => {
+            test('Requires confirmation', async () => {
+                Object.defineProperty(window, 'location', {
+                    value: new URL(`${siteData.url}/${postSlug}/#/feedback/${postId}/1/?uuid=${memberData.uuid}&key=key`),
+                    writable: true
+                });
+                const {ghostApi, popupFrame, popupIframeDocument} = await setup(siteData, null, true);
+
+                expect(popupFrame).toBeInTheDocument();
+                expect(within(popupIframeDocument).getByText('Give feedback on this post')).toBeInTheDocument();
+                expect(within(popupIframeDocument).getByText('More like this')).toBeInTheDocument();
+                expect(within(popupIframeDocument).getByText('Less like this')).toBeInTheDocument();
+                expect(ghostApi.feedback.add).toHaveBeenCalledTimes(0);
+
+                const submitBtn = within(popupIframeDocument).getByText('Submit feedback');
+                fireEvent.click(submitBtn);
+
+                expect(ghostApi.feedback.add).toHaveBeenCalledTimes(1);
+                
+                // the re-render loop is slow to get to the final state
+                await waitFor(() => {
+                    within(popupIframeDocument).getByText('Thanks for the feedback!');
+                    within(popupIframeDocument).getByText('Your input helps shape what gets published.');
+                });
+            });
+
+            test('Requires login without key', async () => {
+                Object.defineProperty(window, 'location', {
+                    value: new URL(`${siteData.url}/${postSlug}/#/feedback/${postId}/1/?uuid=${memberData.uuid}`),
+                    writable: true
+                });
+                const {ghostApi, popupFrame, popupIframeDocument} = await setup(siteData, null, true);
+
+                expect(popupFrame).toBeInTheDocument();
+                expect(ghostApi.feedback.add).toHaveBeenCalledTimes(0);
+                expect(within(popupIframeDocument).getByText(/Sign in/)).toBeInTheDocument();
+                expect(within(popupIframeDocument).getByText(/Sign up/)).toBeInTheDocument();
+            });
+
+            test('Requires login without uuid or key', async () => {
+                Object.defineProperty(window, 'location', {
+                    value: new URL(`${siteData.url}/${postSlug}/#/feedback/${postId}/1/`),
+                    writable: true
+                });
+                const {ghostApi, popupFrame, popupIframeDocument} = await setup(siteData, null, true);
+
+                expect(popupFrame).toBeInTheDocument();
+                expect(ghostApi.feedback.add).toHaveBeenCalledTimes(0);
+                expect(within(popupIframeDocument).getByText(/Sign in/)).toBeInTheDocument();
+                expect(within(popupIframeDocument).getByText(/Sign up/)).toBeInTheDocument();
+            });
+        });
+
+        test('Error on fail to submit', async () => {
+            Object.defineProperty(window, 'location', {
+                value: new URL(`${siteData.url}/${postSlug}/#/feedback/${postId}/1/?uuid=${memberData.uuid}&key=key`),
+                writable: true
+            });
+            const mockApi = {
+                add: jest.fn(() => {
+                    return Promise.reject(new Error('Failed to submit feedback'));
+                })
+            };
+            const {ghostApi, popupFrame, popupIframeDocument} = await setup(siteData, memberData, false, mockApi);
+
+            expect(popupFrame).toBeInTheDocument();
+            expect(ghostApi.feedback.add).toHaveBeenCalledTimes(1);
+            expect(within(popupIframeDocument).getByText(/Sorry/)).toBeInTheDocument();
+            expect(within(popupIframeDocument).getByText(/There was a problem submitting your feedback/)).toBeInTheDocument();
+        });
+    });
+
+    describe('Invalid feedback URL', () => {
+        test('Redirects logged in members to account settings', async () => {
+            Object.defineProperty(window, 'location', {
+                value: new URL(`${siteData.url}/postslughere/#/feedback/1/1/1/`),
+                writable: true
+            });
+            const {popupFrame, popupIframeDocument} = await setup();
+
+            expect(popupFrame).toBeInTheDocument();
+            expect(within(popupIframeDocument).getByText(/Your account/)).toBeInTheDocument();
+            expect(within(popupIframeDocument).getByText(/Sign out/)).toBeInTheDocument();
+        });
+
+        test('Redirects logged out users to sign up', async () => {
+            Object.defineProperty(window, 'location', {
+                value: new URL(`${siteData.url}/postslughere/#/feedback/1/1/1/`),
+                writable: true
+            });
+            const {popupFrame, popupIframeDocument} = await setup(siteData, null, true);
+
+            expect(popupFrame).toBeInTheDocument();
+            // takes to sign up
+            await waitFor(() => {
+                expect(within(popupIframeDocument).getByText(/Name/)).toBeInTheDocument();
+                expect(within(popupIframeDocument).getByText(/Email/)).toBeInTheDocument();
+            });
+        });
+    });
+});
diff --git a/apps/portal/src/tests/SigninFlow.test.js b/apps/portal/src/tests/SigninFlow.test.js
index 5186965b781..5a75d29ac62 100644
--- a/apps/portal/src/tests/SigninFlow.test.js
+++ b/apps/portal/src/tests/SigninFlow.test.js
@@ -16,6 +16,10 @@ const setup = async ({site, member = null}) => {
         return Promise.resolve('success');
     });
 
+    ghostApi.member.getIntegrityToken = jest.fn(() => {
+        return Promise.resolve('testtoken');
+    });
+
     ghostApi.member.checkoutPlan = jest.fn(() => {
         return Promise.resolve();
     });
@@ -67,6 +71,10 @@ const multiTierSetup = async ({site, member = null}) => {
         return Promise.resolve('success');
     });
 
+    ghostApi.member.getIntegrityToken = jest.fn(() => {
+        return Promise.resolve(`testtoken`);
+    });
+
     ghostApi.member.checkoutPlan = jest.fn(() => {
         return Promise.resolve();
     });
@@ -139,13 +147,15 @@ describe('Signin', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
 
             fireEvent.click(submitButton);
-            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
-                email: 'jamie@example.com',
-                emailType: 'signin'
-            });
 
             const magicLink = await within(popupIframeDocument).findByText(/Now check your email/i);
             expect(magicLink).toBeInTheDocument();
+
+            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
+                email: 'jamie@example.com',
+                emailType: 'signin',
+                integrityToken: 'testtoken'
+            });
         });
 
         test('without name field', async () => {
@@ -165,13 +175,15 @@ describe('Signin', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
 
             fireEvent.click(submitButton);
-            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
-                email: 'jamie@example.com',
-                emailType: 'signin'
-            });
 
             const magicLink = await within(popupIframeDocument).findByText(/Now check your email/i);
             expect(magicLink).toBeInTheDocument();
+
+            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
+                email: 'jamie@example.com',
+                emailType: 'signin',
+                integrityToken: 'testtoken'
+            });
         });
 
         test('with only free plan', async () => {
@@ -191,13 +203,15 @@ describe('Signin', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
 
             fireEvent.click(submitButton);
-            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
-                email: 'jamie@example.com',
-                emailType: 'signin'
-            });
 
             const magicLink = await within(popupIframeDocument).findByText(/Now check your email/i);
             expect(magicLink).toBeInTheDocument();
+
+            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
+                email: 'jamie@example.com',
+                emailType: 'signin',
+                integrityToken: 'testtoken'
+            });
         });
     });
 });
@@ -231,13 +245,15 @@ describe('Signin', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
 
             fireEvent.click(submitButton);
-            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
-                email: 'jamie@example.com',
-                emailType: 'signin'
-            });
 
             const magicLink = await within(popupIframeDocument).findByText(/Now check your email/i);
             expect(magicLink).toBeInTheDocument();
+
+            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
+                email: 'jamie@example.com',
+                emailType: 'signin',
+                integrityToken: 'testtoken'
+            });
         });
 
         test('without name field', async () => {
@@ -257,13 +273,15 @@ describe('Signin', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
 
             fireEvent.click(submitButton);
-            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
-                email: 'jamie@example.com',
-                emailType: 'signin'
-            });
 
             const magicLink = await within(popupIframeDocument).findByText(/Now check your email/i);
             expect(magicLink).toBeInTheDocument();
+
+            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
+                email: 'jamie@example.com',
+                emailType: 'signin',
+                integrityToken: 'testtoken'
+            });
         });
 
         test('with only free plan available', async () => {
@@ -283,13 +301,15 @@ describe('Signin', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
 
             fireEvent.click(submitButton);
-            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
-                email: 'jamie@example.com',
-                emailType: 'signin'
-            });
 
             const magicLink = await within(popupIframeDocument).findByText(/Now check your email/i);
             expect(magicLink).toBeInTheDocument();
+
+            expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
+                email: 'jamie@example.com',
+                emailType: 'signin',
+                integrityToken: 'testtoken'
+            });
         });
     });
 });
diff --git a/apps/portal/src/tests/SignupFlow.test.js b/apps/portal/src/tests/SignupFlow.test.js
index 59ca3634775..c293cf73d41 100644
--- a/apps/portal/src/tests/SignupFlow.test.js
+++ b/apps/portal/src/tests/SignupFlow.test.js
@@ -16,6 +16,10 @@ const offerSetup = async ({site, member = null, offer}) => {
         return Promise.resolve('success');
     });
 
+    ghostApi.member.getIntegrityToken = jest.fn(() => {
+        return Promise.resolve(`testtoken`);
+    });
+
     ghostApi.site.offer = jest.fn(() => {
         return Promise.resolve({
             offers: [offer]
@@ -80,6 +84,10 @@ const setup = async ({site, member = null}) => {
         return Promise.resolve('success');
     });
 
+    ghostApi.member.getIntegrityToken = jest.fn(() => {
+        return Promise.resolve(`testtoken`);
+    });
+
     ghostApi.member.checkoutPlan = jest.fn(() => {
         return Promise.resolve();
     });
@@ -133,6 +141,10 @@ const multiTierSetup = async ({site, member = null}) => {
         return Promise.resolve('success');
     });
 
+    ghostApi.member.getIntegrityToken = jest.fn(() => {
+        return Promise.resolve(`testtoken`);
+    });
+
     ghostApi.member.checkoutPlan = jest.fn(() => {
         return Promise.resolve();
     });
@@ -205,14 +217,17 @@ describe('Signup', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
             expect(nameInput).toHaveValue('Jamie Larsen');
             fireEvent.click(chooseBtns[0]);
+
+            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
+            expect(magicLink).toBeInTheDocument();
+
             expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
                 email: 'jamie@example.com',
                 emailType: 'signup',
                 name: 'Jamie Larsen',
-                plan: 'free'
+                plan: 'free',
+                integrityToken: 'testtoken'
             });
-            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
-            expect(magicLink).toBeInTheDocument();
         });
 
         test('without name field', async () => {
@@ -240,16 +255,17 @@ describe('Signup', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
             fireEvent.click(chooseBtns[0]);
 
+            // Check if magic link page is shown
+            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
+            expect(magicLink).toBeInTheDocument();
+
             expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
                 email: 'jamie@example.com',
                 emailType: 'signup',
                 name: '',
-                plan: 'free'
+                plan: 'free',
+                integrityToken: 'testtoken'
             });
-
-            // Check if magic link page is shown
-            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
-            expect(magicLink).toBeInTheDocument();
         });
 
         test('with only free plan', async () => {
@@ -260,17 +276,25 @@ describe('Signup', () => {
                 site: FixtureSite.singleTier.onlyFreePlan
             });
 
+            const freeProduct = FixtureSite.singleTier.onlyFreePlan.products.find(p => p.type === 'free');
+            const benefitText = freeProduct.benefits[0].name;
+
             expect(popupFrame).toBeInTheDocument();
             expect(triggerButtonFrame).toBeInTheDocument();
             expect(siteTitle).toBeInTheDocument();
             expect(emailInput).toBeInTheDocument();
             expect(nameInput).toBeInTheDocument();
-            expect(freePlanTitle).not.toBeInTheDocument();
             expect(monthlyPlanTitle).not.toBeInTheDocument();
             expect(yearlyPlanTitle).not.toBeInTheDocument();
             expect(fullAccessTitle).not.toBeInTheDocument();
             expect(signinButton).toBeInTheDocument();
             expect(submitButton).not.toBeInTheDocument();
+
+            // Free tier title, description and benefits should render
+            expect(freePlanTitle).toBeInTheDocument();
+            await within(popupIframeDocument).findByText(freeProduct.description);
+            await within(popupIframeDocument).findByText(benefitText);
+
             submitButton = within(popupIframeDocument).queryByRole('button', {name: 'Sign up'});
 
             fireEvent.change(emailInput, {target: {value: 'jamie@example.com'}});
@@ -280,16 +304,17 @@ describe('Signup', () => {
             expect(nameInput).toHaveValue('Jamie Larsen');
             fireEvent.click(submitButton);
 
+            // Check if magic link page is shown
+            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
+            expect(magicLink).toBeInTheDocument();
+
             expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
                 email: 'jamie@example.com',
                 emailType: 'signup',
                 name: 'Jamie Larsen',
-                plan: 'free'
+                plan: 'free',
+                integrityToken: 'testtoken'
             });
-
-            // Check if magic link page is shown
-            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
-            expect(magicLink).toBeInTheDocument();
         });
     });
 
@@ -562,14 +587,17 @@ describe('Signup', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
             expect(nameInput).toHaveValue('Jamie Larsen');
             fireEvent.click(chooseBtns[0]);
+
+            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
+            expect(magicLink).toBeInTheDocument();
+
             expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
                 email: 'jamie@example.com',
                 emailType: 'signup',
                 name: 'Jamie Larsen',
-                plan: 'free'
+                plan: 'free',
+                integrityToken: 'testtoken'
             });
-            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
-            expect(magicLink).toBeInTheDocument();
         });
 
         test('without name field', async () => {
@@ -593,16 +621,17 @@ describe('Signup', () => {
             expect(emailInput).toHaveValue('jamie@example.com');
             fireEvent.click(chooseBtns[0]);
 
+            // Check if magic link page is shown
+            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
+            expect(magicLink).toBeInTheDocument();
+
             expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
                 email: 'jamie@example.com',
                 emailType: 'signup',
                 name: '',
-                plan: 'free'
+                plan: 'free',
+                integrityToken: 'testtoken'
             });
-
-            // Check if magic link page is shown
-            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
-            expect(magicLink).toBeInTheDocument();
         });
 
         test('with only free plan available', async () => {
@@ -613,14 +642,22 @@ describe('Signup', () => {
                 site: FixtureSite.multipleTiers.onlyFreePlan
             });
 
+            const freeProduct = FixtureSite.multipleTiers.onlyFreePlan.products.find(p => p.type === 'free');
+            const benefitText = freeProduct.benefits[0].name;
+
             expect(popupFrame).toBeInTheDocument();
             expect(triggerButtonFrame).toBeInTheDocument();
             expect(siteTitle).toBeInTheDocument();
             expect(emailInput).toBeInTheDocument();
             expect(nameInput).toBeInTheDocument();
-            expect(freePlanTitle.length).toBe(0);
             expect(signinButton).toBeInTheDocument();
             expect(submitButton).not.toBeInTheDocument();
+
+            // Free tier title, description and benefits should render
+            expect(freePlanTitle.length).toBe(1);
+            await within(popupIframeDocument).findByText(freeProduct.description);
+            await within(popupIframeDocument).findByText(benefitText);
+
             submitButton = within(popupIframeDocument).queryByRole('button', {name: 'Sign up'});
 
             fireEvent.change(emailInput, {target: {value: 'jamie@example.com'}});
@@ -630,16 +667,17 @@ describe('Signup', () => {
             expect(nameInput).toHaveValue('Jamie Larsen');
             fireEvent.click(submitButton);
 
+            // Check if magic link page is shown
+            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
+            expect(magicLink).toBeInTheDocument();
+
             expect(ghostApi.member.sendMagicLink).toHaveBeenLastCalledWith({
                 email: 'jamie@example.com',
                 emailType: 'signup',
                 name: 'Jamie Larsen',
-                plan: 'free'
+                plan: 'free',
+                integrityToken: 'testtoken'
             });
-
-            // Check if magic link page is shown
-            const magicLink = await within(popupIframeDocument).findByText(/now check your email/i);
-            expect(magicLink).toBeInTheDocument();
         });
 
         test('should not show free plan if it is hidden', async () => {
@@ -783,4 +821,3 @@ describe('Signup', () => {
         });
     });
 });
-
diff --git a/apps/portal/src/tests/data-attributes.test.js b/apps/portal/src/tests/data-attributes.test.js
index 689f5380409..0a0ec95f55e 100644
--- a/apps/portal/src/tests/data-attributes.test.js
+++ b/apps/portal/src/tests/data-attributes.test.js
@@ -86,6 +86,13 @@ describe('Member Data attributes:', () => {
                 });
             }
 
+            if (url.includes('api/integrity-token')) {
+                return Promise.resolve({
+                    ok: true,
+                    text: async () => 'testtoken'
+                });
+            }
+
             if (url.includes('api/session')) {
                 return Promise.resolve({
                     ok: true,
@@ -139,12 +146,12 @@ describe('Member Data attributes:', () => {
         jest.restoreAllMocks();
     });
     describe('data-members-form', () => {
-        test('allows free signup', () => {
+        test('allows free signup', async () => {
             const {event, form, errorEl, siteUrl, submitHandler} = getMockData();
 
-            formSubmitHandler({event, form, errorEl, siteUrl, submitHandler});
+            await formSubmitHandler({event, form, errorEl, siteUrl, submitHandler});
 
-            expect(window.fetch).toHaveBeenCalledTimes(1);
+            expect(window.fetch).toHaveBeenCalledTimes(2);
             const expectedBody = JSON.stringify({
                 email: 'jamie@example.com',
                 emailType: 'signup',
@@ -157,9 +164,10 @@ describe('Member Data attributes:', () => {
                     refSource: 'ghost-explore',
                     refUrl: 'https://example.com/blog/',
                     time: 1611234567890
-                }]
+                }],
+                integrityToken: 'testtoken'
             });
-            expect(window.fetch).toHaveBeenCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: expectedBody, headers: {'Content-Type': 'application/json'}, method: 'POST'});
+            expect(window.fetch).toHaveBeenLastCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: expectedBody, headers: {'Content-Type': 'application/json'}, method: 'POST'});
         });
     });
 
@@ -241,16 +249,16 @@ describe('Member Data attributes:', () => {
     });
 
     describe('data-members-newsletter', () => {
-        test('includes specified newsletters in request', () => {
+        test('includes specified newsletters in request', async () => {
             const {event, form, errorEl, siteUrl, submitHandler} = getMockData({
                 newsletterQuerySelectorResult: [{
                     value: 'Some Newsletter'
                 }]
             });
 
-            formSubmitHandler({event, form, errorEl, siteUrl, submitHandler});
+            await formSubmitHandler({event, form, errorEl, siteUrl, submitHandler});
 
-            expect(window.fetch).toHaveBeenCalledTimes(1);
+            expect(window.fetch).toHaveBeenCalledTimes(2);
             const expectedBody = JSON.stringify({
                 email: 'jamie@example.com',
                 emailType: 'signup',
@@ -264,19 +272,20 @@ describe('Member Data attributes:', () => {
                     refUrl: 'https://example.com/blog/',
                     time: 1611234567890
                 }],
-                newsletters: [{name: 'Some Newsletter'}]
+                newsletters: [{name: 'Some Newsletter'}],
+                integrityToken: 'testtoken'
             });
-            expect(window.fetch).toHaveBeenCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: expectedBody, headers: {'Content-Type': 'application/json'}, method: 'POST'});
+            expect(window.fetch).toHaveBeenLastCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: expectedBody, headers: {'Content-Type': 'application/json'}, method: 'POST'});
         });
 
-        test('does not include newsletters in request if there are no newsletter inputs', () => {
+        test('does not include newsletters in request if there are no newsletter inputs', async () => {
             const {event, form, errorEl, siteUrl, submitHandler} = getMockData({
                 newsletterQuerySelectorResult: []
             });
 
-            formSubmitHandler({event, form, errorEl, siteUrl, submitHandler});
+            await formSubmitHandler({event, form, errorEl, siteUrl, submitHandler});
 
-            expect(window.fetch).toHaveBeenCalledTimes(1);
+            expect(window.fetch).toHaveBeenCalledTimes(2);
             const expectedBody = JSON.stringify({
                 email: 'jamie@example.com',
                 emailType: 'signup',
@@ -289,9 +298,10 @@ describe('Member Data attributes:', () => {
                     refSource: 'ghost-explore',
                     refUrl: 'https://example.com/blog/',
                     time: 1611234567890
-                }]
+                }],
+                integrityToken: 'testtoken'
             });
-            expect(window.fetch).toHaveBeenCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: expectedBody, headers: {'Content-Type': 'application/json'}, method: 'POST'});
+            expect(window.fetch).toHaveBeenLastCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: expectedBody, headers: {'Content-Type': 'application/json'}, method: 'POST'});
         });
     });
 });
diff --git a/apps/portal/src/tests/unit/transform-portal-anchor-to-relative.test.js b/apps/portal/src/tests/unit/transform-portal-anchor-to-relative.test.js
new file mode 100644
index 00000000000..e15a2916a54
--- /dev/null
+++ b/apps/portal/src/tests/unit/transform-portal-anchor-to-relative.test.js
@@ -0,0 +1,37 @@
+import {transformPortalAnchorToRelative} from '../../utils/transform-portal-anchor-to-relative';
+
+// NOTE: window.location.origin = http://localhost:3000
+
+describe('transformPortalAnchorToRelative', function () {
+    test('ignores non-portal links', function () {
+        const anchor = document.createElement('a');
+        anchor.setAttribute('href', 'http://localhost:3000/#/signup');
+        transformPortalAnchorToRelative(anchor);
+
+        expect(anchor.getAttribute('href')).toBe('http://localhost:3000/#/signup');
+    });
+
+    test('ignores already-relative links', function () {
+        const anchor = document.createElement('a');
+        anchor.setAttribute('href', '#/portal/signup');
+        transformPortalAnchorToRelative(anchor);
+
+        expect(anchor.getAttribute('href')).toBe('#/portal/signup');
+    });
+
+    test('ignores external links', function () {
+        const anchor = document.createElement('a');
+        anchor.setAttribute('href', 'https://example.com/#/portal/signup');
+        transformPortalAnchorToRelative(anchor);
+
+        expect(anchor.getAttribute('href')).toBe('https://example.com/#/portal/signup');
+    });
+
+    test('converts absolute to a relative link', function () {
+        const anchor = document.createElement('a');
+        anchor.setAttribute('href', 'http://localhost:3000/#/portal/signup');
+        transformPortalAnchorToRelative(anchor);
+
+        expect(anchor.getAttribute('href')).toBe('#/portal/signup');
+    });
+});
diff --git a/apps/portal/src/utils/api.js b/apps/portal/src/utils/api.js
index e6478631c8b..9d8f32e082d 100644
--- a/apps/portal/src/utils/api.js
+++ b/apps/portal/src/utils/api.js
@@ -134,10 +134,11 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}) {
     };
 
     api.feedback = {
-        async add({uuid, postId, score}) {
+        async add({uuid, key, postId, score}) {
             let url = endpointFor({type: 'members', resource: 'feedback'});
-            url = url + `?uuid=${uuid}`;
-
+            if (uuid && key) { // only necessary if not logged in, and both are required if so
+                url = url + `?uuid=${uuid}&key=${key}`;
+            }
             const body = {
                 feedback: [
                     {
@@ -243,7 +244,21 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}) {
             });
         },
 
-        async sendMagicLink({email, emailType, labels, name, oldEmail, newsletters, redirect, customUrlHistory, autoRedirect = true}) {
+        async getIntegrityToken() {
+            const url = endpointFor({type: 'members', resource: 'integrity-token'});
+            const res = await makeRequest({
+                url,
+                method: 'GET'
+            });
+
+            if (res.ok) {
+                return res.text();
+            } else {
+                throw new Error('Failed to start a members session');
+            }
+        },
+
+        async sendMagicLink({email, emailType, labels, name, oldEmail, newsletters, redirect, integrityToken, phonenumber, customUrlHistory, autoRedirect = true}) {
             const url = endpointFor({type: 'members', resource: 'send-magic-link'});
             const body = {
                 name,
@@ -254,6 +269,8 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}) {
                 labels,
                 requestSrc: 'portal',
                 redirect,
+                integrityToken,
+                honeypot: phonenumber, // we don't actually use a phone #, this is from a hidden field to prevent bot activity
                 autoRedirect
             };
             const urlHistory = customUrlHistory ?? getUrlHistory();
@@ -282,11 +299,17 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}) {
             }
         },
 
-        signout() {
+        signout(all = false) {
             const url = endpointFor({type: 'members', resource: 'session'});
             return makeRequest({
                 url,
-                method: 'DELETE'
+                method: 'DELETE',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({
+                    all
+                })
             }).then(function (res) {
                 if (res.ok) {
                     window.location.replace(siteUrl);
@@ -297,9 +320,9 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}) {
             });
         },
 
-        async newsletters({uuid}) {
+        async newsletters({uuid, key}) {
             let url = endpointFor({type: 'members', resource: `member/newsletters`});
-            url = url + `?uuid=${uuid}`;
+            url = url + `?uuid=${uuid}&key=${key}`;
             return makeRequest({
                 url,
                 credentials: 'same-origin'
@@ -311,9 +334,9 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}) {
             });
         },
 
-        async updateNewsletters({uuid, newsletters, enableCommentNotifications}) {
+        async updateNewsletters({uuid, newsletters, key, enableCommentNotifications}) {
             let url = endpointFor({type: 'members', resource: `member/newsletters`});
-            url = url + `?uuid=${uuid}`;
+            url = url + `?uuid=${uuid}&key=${key}`;
             const body = {
                 newsletters
             };
diff --git a/apps/portal/src/utils/fixtures-generator.js b/apps/portal/src/utils/fixtures-generator.js
index 3ea199dc81a..d87f8fa530f 100644
--- a/apps/portal/src/utils/fixtures-generator.js
+++ b/apps/portal/src/utils/fixtures-generator.js
@@ -39,7 +39,9 @@ export function getSiteData({
     portalButtonSignupText: portal_button_signup_text = 'Subscribe now',
     portalButtonStyle: portal_button_style = 'icon-and-text',
     membersSupportAddress: members_support_address = 'support@example.com',
+    editorDefaultEmailRecipients: editor_default_email_recipients = 'visibility',
     newsletters = [],
+    posts = getPostsData(),
     commentsEnabled,
     recommendations = [],
     recommendationsEnabled
@@ -66,10 +68,12 @@ export function getSiteData({
         portal_button_signup_text,
         portal_button_style,
         members_support_address,
-        comments_enabled: !!commentsEnabled,
+        comments_enabled: commentsEnabled !== 'off',
         newsletters,
         recommendations,
-        recommendations_enabled: !!recommendationsEnabled
+        recommendations_enabled: !!recommendationsEnabled,
+        editor_default_email_recipients,
+        posts
     };
 }
 
@@ -121,7 +125,8 @@ export function getMemberData({
     email_suppression = {
         suppressed: false,
         info: null
-    }
+    },
+    newsletters = []
 } = {}) {
     return {
         uuid: `member_${objectId()}`,
@@ -132,7 +137,70 @@ export function getMemberData({
         subscribed,
         avatar_image,
         subscriptions,
-        email_suppression
+        email_suppression,
+        newsletters
+    };
+}
+
+export function getNewsletterData({
+    id = `${objectId()}`,
+    uuid = `${objectId()}`,
+    name = 'Newsletter',
+    description = 'Newsletter description',
+    slug = 'newsletter',
+    sender_email = null,
+    subscribe_on_signup = true,
+    visibility = 'members',
+    sort_order = 0
+}) {
+    return {
+        id,
+        uuid,
+        name,
+        description,
+        slug,
+        sender_email,
+        subscribe_on_signup,
+        visibility,
+        sort_order
+    };
+}
+
+export function getNewslettersData({numOfNewsletters = 3} = {}) {
+    const newsletters = [];
+    for (let i = 0; i < numOfNewsletters; i++) {
+        newsletters.push(getNewsletterData({
+            name: `Newsletter ${i + 1}`,
+            description: `Newsletter ${i + 1} description`
+        }));
+    }
+    return newsletters.slice(0, numOfNewsletters);
+}
+
+export function getPostsData({numOfPosts = 3} = {}) {
+    const posts = [];
+    for (let i = 0; i < numOfPosts; i++) {
+        posts.push(getPostData({
+            title: `Post ${i + 1}`,
+            slug: `post-${i + 1}`
+        }));
+    }
+    return posts.slice(0, numOfPosts);
+}
+
+export function getPostData({
+    id = `post_${objectId()}`,
+    title = 'Post',
+    excerpt = 'Post excerpt',
+    slug = 'post',
+    featured = false
+} = {}) {
+    return {
+        id,
+        title,
+        excerpt,
+        slug,
+        featured
     };
 }
 
@@ -224,11 +292,14 @@ export function getFreeProduct({
 }
 
 export function getBenefits({numOfBenefits}) {
+    const timestamp = Date.now();
+    const random = Math.floor(Math.random() * 100);
+
     const beenfits = [
-        getBenefitData({name: 'Limited early adopter pricing'}),
-        getBenefitData({name: 'Latest gear reviews'}),
-        getBenefitData({name: 'Weekly email newsletter'}),
-        getBenefitData({name: 'Listen to my podcast'})
+        getBenefitData({name: `Limited early adopter pricing #${random}-${timestamp}`}),
+        getBenefitData({name: `Latest gear reviews #${random}-${timestamp}`}),
+        getBenefitData({name: `Weekly email newsletter #${random}-${timestamp}`}),
+        getBenefitData({name: `Listen to my podcast #$${random}-${timestamp}`})
     ];
     return beenfits.slice(0, numOfBenefits);
 }
diff --git a/apps/portal/src/utils/fixtures.js b/apps/portal/src/utils/fixtures.js
index 16ebb827394..baf43cd66cd 100644
--- a/apps/portal/src/utils/fixtures.js
+++ b/apps/portal/src/utils/fixtures.js
@@ -121,6 +121,29 @@ export const site = getSiteData({
             subscribe_on_signup: false,
             paid: false
         }
+    ],
+    posts: [
+        {
+            id: 'post_66aacfe061c94e10eb6e4fc1',
+            title: 'Post 1',
+            excerpt: 'Post excerpt',
+            slug: 'post-1',
+            featured: false
+        },
+        {
+            id: 'post_66aacfe04f14b8dbb56c5721',
+            title: 'Post 2',
+            excerpt: 'Post excerpt',
+            slug: 'post-2',
+            featured: false
+        },
+        {
+            id: 'post_66aacfe03d609460819af18c',
+            title: 'Post 3',
+            excerpt: 'Post excerpt',
+            slug: 'post-3',
+            featured: false
+        }
     ]
 });
 
diff --git a/apps/portal/src/utils/form.js b/apps/portal/src/utils/form.js
index cef2533cb07..2800e553c52 100644
--- a/apps/portal/src/utils/form.js
+++ b/apps/portal/src/utils/form.js
@@ -1,31 +1,37 @@
 import * as Validator from './validator';
 
-export const FormInputError = ({field}) => {
+export const FormInputError = ({field, t}) => {
     if (field.required && !field.value) {
         switch (field.name) {
         case 'name':
-            return `Enter your name`;
-        
+            return t(`Enter your name`);
+
         case 'email':
-            return `Enter your email address`;
+            return t(`Enter your email address`);
 
         default:
-            return `Please enter ${field.name}`;
+            return t(`Please enter {{fieldName}}`, {fieldName: field.name});
         }
     }
 
     if (field.type === 'email' && !Validator.isValidEmail(field.value)) {
-        return `Invalid email address`;
+        return t(`Invalid email address`);
     }
     return null;
 };
 
-export const ValidateInputForm = ({fields}) => {
+/**
+ * Validate input fields
+ * @param {Array} fields
+ * @param {Function} t
+ * @returns {Object} errors
+ */
+export const ValidateInputForm = ({fields, t}) => {
     const errors = {};
     fields.forEach((field) => {
         const name = field.name;
-        const fieldError = FormInputError({field});
+        const fieldError = FormInputError({field, t});
         errors[name] = fieldError;
     });
     return errors;
-};
\ No newline at end of file
+};
diff --git a/apps/portal/src/utils/helpers.js b/apps/portal/src/utils/helpers.js
index 7135f3c41e7..c178c4c11aa 100644
--- a/apps/portal/src/utils/helpers.js
+++ b/apps/portal/src/utils/helpers.js
@@ -86,6 +86,10 @@ export function getNewsletterFromUuid({site, uuid}) {
     });
 }
 
+export function hasNewsletterSendingEnabled({site}) {
+    return site?.editor_default_email_recipients === 'visibility';
+}
+
 export function allowCompMemberUpgrade({member}) {
     return member?.subscriptions?.[0]?.tier?.expiry_at !== undefined;
 }
@@ -431,7 +435,8 @@ export function getSiteProducts({site, pageQuery}) {
     }
     if (hasFreeProductPrice({site})) {
         products.unshift({
-            id: 'free'
+            id: 'free',
+            type: 'free'
         });
     }
     return products;
@@ -450,11 +455,8 @@ export function getFreeProductBenefits({site}) {
 }
 
 export function getFreeTierTitle({site}) {
-    if (hasOnlyFreeProduct({site})) {
-        return 'Free membership';
-    } else {
-        return 'Free';
-    }
+    const freeProduct = getFreeProduct({site});
+    return freeProduct?.name || 'Free';
 }
 
 export function getFreeTierDescription({site}) {
@@ -700,27 +702,42 @@ export const getMemberName = ({member}) => {
 };
 
 export const getSupportAddress = ({site}) => {
-    const {members_support_address: supportAddress} = site || {};
+    const {members_support_address: oldSupportAddress, support_email_address: supportAddress} = site || {};
 
-    if (supportAddress?.indexOf('@') < 0) {
+    // If available, use the calculated setting support_email_address
+    if (supportAddress) {
+        return supportAddress;
+    }
+
+    // Deprecated: use the saved setting members_support_address
+    if (oldSupportAddress?.indexOf('@') < 0) {
         const siteDomain = getSiteDomain({site});
         const updatedDomain = siteDomain?.replace(/^(www)\.(?=[^/]*\..{2,5})/, '') || '';
-        return `${supportAddress}@${updatedDomain}`;
+        return `${oldSupportAddress}@${updatedDomain}`;
     }
 
-    if (supportAddress?.split('@')?.length > 1) {
-        const [recipient, domain] = supportAddress.split('@');
+    if (oldSupportAddress?.split('@')?.length > 1) {
+        const [recipient, domain] = oldSupportAddress.split('@');
         const updatedDomain = domain?.replace(/^(www)\.(?=[^/]*\..{2,5})/, '') || '';
         return `${recipient}@${updatedDomain}`;
     }
-    return supportAddress || '';
+
+    return oldSupportAddress || '';
 };
 
 export const getDefaultNewsletterSender = ({site}) => {
+    const {default_email_address: defaultEmailAddress} = site || {};
+
+    // If available, use the calculated setting default_email_address as default
+    const defaultAddress = defaultEmailAddress || `noreply@${getSiteDomain({site})}`;
+
     const newsletters = getSiteNewsletters({site});
     const defaultNewsletter = newsletters?.[0];
-    if (defaultNewsletter) {
-        return defaultNewsletter.sender_email || `noreply@${getSiteDomain({site})}`;
+
+    if (defaultNewsletter && defaultNewsletter.sender_email) {
+        return defaultNewsletter.sender_email;
+    } else {
+        return defaultAddress;
     }
 };
 
diff --git a/apps/portal/src/utils/helpers.test.js b/apps/portal/src/utils/helpers.test.js
index adea069cdb5..03c90168c75 100644
--- a/apps/portal/src/utils/helpers.test.js
+++ b/apps/portal/src/utils/helpers.test.js
@@ -1,4 +1,4 @@
-import {getAllProductsForSite, getAvailableProducts, getCurrencySymbol, getFreeProduct, getMemberName, getMemberSubscription, getPriceFromSubscription, getPriceIdFromPageQuery, getSupportAddress, getUrlHistory, hasMultipleProducts, isActiveOffer, isInviteOnlySite, isPaidMember, isSameCurrency, transformApiTiersData, isSigninAllowed, isSignupAllowed, getCompExpiry, isInThePast} from './helpers';
+import {getAllProductsForSite, getAvailableProducts, getCurrencySymbol, getFreeProduct, getMemberName, getMemberSubscription, getPriceFromSubscription, getPriceIdFromPageQuery, getSupportAddress, getDefaultNewsletterSender, getUrlHistory, hasMultipleProducts, isActiveOffer, isInviteOnlySite, isPaidMember, isSameCurrency, transformApiTiersData, isSigninAllowed, isSignupAllowed, getCompExpiry, isInThePast} from './helpers';
 import * as Fixtures from './fixtures-generator';
 import {site as FixturesSite, member as FixtureMember, offer as FixtureOffer, transformTierFixture as TransformFixtureTiers} from '../utils/test-fixtures';
 import {isComplimentaryMember} from '../utils/helpers';
@@ -284,51 +284,101 @@ describe('Helpers - ', () => {
     });
 
     describe('getSupportAddress -', () => {
-        test('returns expected support address for non sub domain', () => {
-            let site = {
-                members_support_address: 'jamie@example.com'
-            };
-            const supportAddress = getSupportAddress({site});
-
-            expect(supportAddress).toBe('jamie@example.com');
+        describe('when the calculated support address is available', () => {
+            test('returns the calculated support email address, if available', () => {
+                let site = {
+                    support_email_address: 'support@example.com',
+                    members_support_address: 'noreply@example.com'
+                };
+                const supportAddress = getSupportAddress({site});
+
+                expect(supportAddress).toBe('support@example.com');
+            });
         });
 
-        test('returns expected support address for non www sub domain', () => {
-            let site = {
-                members_support_address: 'jamie@blog.example.com'
-            };
-            const supportAddress = getSupportAddress({site});
+        describe('[Deprecated] when the calculated support address is not available', () => {
+            test('returns expected support address for non sub domain', () => {
+                let site = {
+                    members_support_address: 'jamie@example.com'
+                };
+                const supportAddress = getSupportAddress({site});
+
+                expect(supportAddress).toBe('jamie@example.com');
+            });
+
+            test('returns expected support address for non www sub domain', () => {
+                let site = {
+                    members_support_address: 'jamie@blog.example.com'
+                };
+                const supportAddress = getSupportAddress({site});
+
+                expect(supportAddress).toBe('jamie@blog.example.com');
+            });
+
+            test('returns expected support address for www domain', () => {
+                let site = {
+                    members_support_address: 'jamie@www.example.com'
+                };
+                const supportAddress = getSupportAddress({site});
 
-            expect(supportAddress).toBe('jamie@blog.example.com');
+                expect(supportAddress).toBe('jamie@example.com');
+            });
+
+            test('returns expected support address for default noreply value', () => {
+                let site = {
+                    members_support_address: 'noreply',
+                    url: 'https://www.example.com'
+                };
+                const supportAddress = getSupportAddress({site});
+
+                expect(supportAddress).toBe('noreply@example.com');
+            });
+
+            test('returns empty string for missing support address', () => {
+                let site = {
+                    members_support_address: null,
+                    url: 'https://www.example.com'
+                };
+                const supportAddress = getSupportAddress({site});
+
+                expect(supportAddress).toBe('');
+            });
         });
+    });
 
-        test('returns expected support address for www domain', () => {
+    describe('getDefaultNewsletterSender - ', () => {
+        test('returns the sender_email from the first newsletter when available', () => {
             let site = {
-                members_support_address: 'jamie@www.example.com'
+                default_email_address: 'default@example.com',
+                url: 'https://example.com',
+                newsletters: [
+                    {
+                        sender_email: 'sender_email@example.com'
+                    }
+                ]
             };
-            const supportAddress = getSupportAddress({site});
+            const defaultAddress = getDefaultNewsletterSender({site});
 
-            expect(supportAddress).toBe('jamie@example.com');
+            expect(defaultAddress).toBe('sender_email@example.com');
         });
 
-        test('returns expected support address for default noreply value', () => {
+        test('otherwise, fallbacks to the calculated default_email_address when available', () => {
             let site = {
-                members_support_address: 'noreply',
-                url: 'https://www.example.com'
+                default_email_address: 'default@example.com',
+                url: 'https://example.com'
             };
-            const supportAddress = getSupportAddress({site});
+            const defaultAddress = getDefaultNewsletterSender({site});
 
-            expect(supportAddress).toBe('noreply@example.com');
+            expect(defaultAddress).toBe('default@example.com');
         });
 
-        test('returns empty string for missing support address', () => {
+        test('otherwise, fallbacks to noreply@sitedomain.com', () => {
             let site = {
-                members_support_address: null,
-                url: 'https://www.example.com'
+                url: 'https://example.com'
             };
-            const supportAddress = getSupportAddress({site});
+            const defaultAddress = getDefaultNewsletterSender({site});
 
-            expect(supportAddress).toBe('');
+            expect(defaultAddress).toBe('noreply@example.com');
         });
     });
 
@@ -426,10 +476,12 @@ describe('Helpers - ', () => {
         });
 
         it('returns the expiry date of a comped subscription', () => {
-            expect(getCompExpiry({member})).toEqual('13 Oct 2023');
+            const date = new Date('2023-10-13T00:00:00.000Z');
+            expect(getCompExpiry({member})).toEqual(date.toLocaleDateString('en-GB', {year: 'numeric', month: 'short', day: 'numeric'}));
         });
 
         it('returns the expiry date of a comped subscription if the member has multiple subscriptions', () => {
+            const date = new Date('2023-10-13T00:00:00.000Z');
             member.subscriptions.push({
                 status: 'cancelled',
                 price: {
@@ -439,7 +491,7 @@ describe('Helpers - ', () => {
                     expiry_at: '2023-10-14T00:00:00.000Z'
                 }
             });
-            expect(getCompExpiry({member})).toEqual('13 Oct 2023');
+            expect(getCompExpiry({member})).toEqual(date.toLocaleDateString('en-GB', {year: 'numeric', month: 'short', day: 'numeric'}));
         });
 
         it('returns an empty string if the subscription has no expiry date', () => {
diff --git a/apps/portal/src/utils/links.js b/apps/portal/src/utils/links.js
new file mode 100644
index 00000000000..d31e9f6fc54
--- /dev/null
+++ b/apps/portal/src/utils/links.js
@@ -0,0 +1,10 @@
+export const interceptAnchorClicks = (e) => {
+    if (e.currentTarget.contains(e.target)) {
+        const anchor = e.target.closest('a');
+
+        if (anchor) {
+            e.preventDefault();
+            window.open(anchor.href, '_blank');
+        }
+    }
+};
diff --git a/apps/portal/src/utils/test-fixtures.js b/apps/portal/src/utils/test-fixtures.js
index e5ad5894fa7..63d77258604 100644
--- a/apps/portal/src/utils/test-fixtures.js
+++ b/apps/portal/src/utils/test-fixtures.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars*/
-import {getFreeProduct, getMemberData, getOfferData, getPriceData, getProductData, getSiteData, getSubscriptionData, getTestSite} from './fixtures-generator';
+import {getFreeProduct, getMemberData, getOfferData, getPriceData, getProductData, getSiteData, getSubscriptionData, getNewsletterData} from './fixtures-generator';
 
 export const transformTierFixture = [
     getFreeProduct({
@@ -24,11 +24,24 @@ export const transformTierFixture = [
     })
 ];
 
+export const newsletters = [
+    getNewsletterData({
+        name: 'Newsletter 1',
+        description: 'Newsletter 1 description',
+        sort_order: 1
+    }),
+    getNewsletterData({
+        name: 'Newsletter 2',
+        description: 'Newsletter 2 description',
+        sort_order: 2
+    })
+];
+
 export const singleSiteTier = [
     getFreeProduct({
         name: 'Free',
         description: 'Free tier description',
-        numOfBenefits: 0
+        numOfBenefits: 1
     })
     ,
     getProductData({
@@ -163,7 +176,8 @@ export const site = {
         onlyFreePlanWithoutStripe: {
             ...baseSingleTierSite,
             portal_plans: ['free'],
-            is_stripe_configured: false
+            is_stripe_configured: false,
+            newsletters: newsletters
         },
         membersInviteOnly: {
             ...baseSingleTierSite,
@@ -213,7 +227,8 @@ export const member = {
         subscriptions: [],
         paid: false,
         avatarImage: '',
-        subscribed: true
+        subscribed: true,
+        newsletters: []
     }),
     altFree: getMemberData({
         name: 'Jimmie Larson',
@@ -301,7 +316,19 @@ export const member = {
                 currentPeriodEnd: '2021-06-05T11:42:40.000Z'
             })
         ]
+    }),
+    subbedToNewsletter: getMemberData({
+        newsletters: newsletters,
+        enable_comment_notifications: true
     })
 };
-/* eslint-enable no-unused-vars*/
 
+export const memberWithNewsletter = {
+    uuid: member.free.uuid,
+    email: member.free.email,
+    name: member.free.name,
+    newsletters: newsletters,
+    enable_comment_notifications: true,
+    status: 'free'
+};
+/* eslint-enable no-unused-vars*/
diff --git a/apps/portal/src/utils/transform-portal-anchor-to-relative.js b/apps/portal/src/utils/transform-portal-anchor-to-relative.js
new file mode 100644
index 00000000000..69366fdeee5
--- /dev/null
+++ b/apps/portal/src/utils/transform-portal-anchor-to-relative.js
@@ -0,0 +1,22 @@
+export function transformPortalAnchorToRelative(anchor) {
+    const href = anchor.getAttribute('href');
+    const url = new URL(href, window.location.origin);
+
+    // ignore non-portal links
+    if (!url.hash || !url.hash.startsWith('#/portal')) {
+        return;
+    }
+
+    // ignore already-relative links
+    if (href.startsWith('#/portal')) {
+        return;
+    }
+
+    // ignore external links
+    if (url.origin !== window.location.origin) {
+        return;
+    }
+
+    // convert to a relative link
+    anchor.setAttribute('href', url.hash);
+}
diff --git a/apps/portal/vite.config.js b/apps/portal/vite.config.js
index 82d7ec40058..8890ea371d3 100644
--- a/apps/portal/vite.config.js
+++ b/apps/portal/vite.config.js
@@ -14,6 +14,7 @@ export default defineConfig((config) => {
     const outputFileName = pkg.name[0] === '@' ? pkg.name.slice(pkg.name.indexOf('/') + 1) : pkg.name;
 
     return {
+        logLevel: process.env.CI ? 'info' : 'warn',
         clearScreen: false,
         define: {
             'process.env.NODE_ENV': JSON.stringify(config.mode),
@@ -53,6 +54,7 @@ export default defineConfig((config) => {
         build: {
             outDir: resolve(__dirname, 'umd'),
             emptyOutDir: true,
+            reportCompressedSize: false,
             minify: true,
             sourcemap: true,
             cssCodeSplit: false,
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..64aa39e95da 100644
--- a/apps/signup-form/package.json
+++ b/apps/signup-form/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tryghost/signup-form",
-    "version": "0.1.3",
+    "version": "0.1.5",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -20,7 +20,7 @@
         "dev": "concurrently \"vite --port 6173\" \"vite preview -l silent\" \"vite build --watch\"",
         "preview": "concurrently \"vite preview -l silent\" \"vite build --watch\"",
         "dev:test": "vite build && vite preview --port 6175",
-        "build": "tsc && vite build",
+        "build": "concurrently \"tsc\" \"vite build\"",
         "lint": "yarn run lint:js",
         "lint:js": "eslint --ext .js,.ts,.cjs,.tsx --cache src test",
         "test:unit": "yarn build",
@@ -35,39 +35,40 @@
         "prepublishOnly": "yarn build"
     },
     "dependencies": {
-        "react": "18.2.0",
-        "react-dom": "18.2.0"
+        "react": "18.3.1",
+        "react-dom": "18.3.1"
     },
     "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-essentials": "7.6.20",
+        "@storybook/addon-interactions": "7.6.20",
+        "@storybook/addon-links": "7.6.20",
         "@storybook/addon-styling": "1.3.7",
-        "@storybook/blocks": "7.4.0",
-        "@storybook/react": "7.4.0",
-        "@storybook/react-vite": "7.4.0",
+        "@storybook/blocks": "7.6.20",
+        "@storybook/react": "7.6.20",
+        "@storybook/react-vite": "7.6.4",
         "@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",
-        "autoprefixer": "10.4.16",
+        "@tryghost/i18n": "0.0.0",
+        "@types/react": "18.3.3",
+        "@types/react-dom": "18.3.0",
+        "@vitejs/plugin-react": "4.2.1",
+        "autoprefixer": "10.4.19",
         "concurrently": "8.2.2",
         "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",
+        "jsdom": "24.1.3",
+        "postcss": "8.4.39",
+        "postcss-import": "16.1.0",
         "prop-types": "15.8.1",
         "rollup-plugin-node-builtins": "2.1.2",
-        "storybook": "7.4.0",
+        "storybook": "7.6.20",
         "stylelint": "15.10.3",
-        "tailwindcss": "3.3.5",
-        "vite": "4.5.0",
-        "vite-plugin-commonjs": "0.10.0",
+        "tailwindcss": "3.4.10",
+        "vite": "4.5.3",
+        "vite-plugin-commonjs": "0.10.1",
         "vite-plugin-svgr": "3.3.0",
-        "vitest": "0.34.3",
-        "@tryghost/i18n": "0.0.0"
+        "vitest": "0.34.3"
     }
 }
diff --git a/apps/signup-form/src/Preview.stories.tsx b/apps/signup-form/src/Preview.stories.tsx
index 3274bed9daa..9463dcd5f02 100644
--- a/apps/signup-form/src/Preview.stories.tsx
+++ b/apps/signup-form/src/Preview.stories.tsx
@@ -45,6 +45,13 @@ const Preview: React.FC<SignupFormOptions & {
                 }
 
                 return;
+            },
+            getIntegrityToken: async () => {
+                await new Promise((resolve) => {
+                    setTimeout(resolve, 500);
+                });
+
+                return 'testtoken';
             }
         },
         t: i18n.t,
diff --git a/apps/signup-form/src/components/pages/FormPage.tsx b/apps/signup-form/src/components/pages/FormPage.tsx
index 608e04746c5..453ae3c3f52 100644
--- a/apps/signup-form/src/components/pages/FormPage.tsx
+++ b/apps/signup-form/src/components/pages/FormPage.tsx
@@ -21,7 +21,8 @@ export const FormPage: React.FC = () => {
         setLoading(true);
 
         try {
-            await api.sendMagicLink({email, labels: options.labels});
+            const integrityToken = await api.getIntegrityToken();
+            await api.sendMagicLink({email, labels: options.labels, integrityToken});
 
             if (minimal) {
                 // Don't go to the success page, but show the success state in the form
diff --git a/apps/signup-form/src/utils/api.tsx b/apps/signup-form/src/utils/api.tsx
index 65dc51733f1..4485c976c64 100644
--- a/apps/signup-form/src/utils/api.tsx
+++ b/apps/signup-form/src/utils/api.tsx
@@ -12,14 +12,31 @@ export const setupGhostApi = ({siteUrl}: {siteUrl: string}) => {
     }
 
     return {
-        sendMagicLink: async ({email, labels}: {email: string, labels: string[]}) => {
+        getIntegrityToken: async (): Promise<string> => {
+            const url = endpointFor({type: 'members', resource: 'integrity-token'});
+
+            const response = await fetch(url, {
+                headers: {
+                    'app-pragma': 'no-cache',
+                    'x-ghost-version': '5.90'
+                }
+            });
+
+            if (response.status < 200 || response.status >= 300) {
+                throw new Error(response.statusText);
+            }
+
+            return response.text();
+        },
+        sendMagicLink: async ({email, integrityToken, labels}: {email: string, labels: string[], integrityToken: string}) => {
             const url = endpointFor({type: 'members', resource: 'send-magic-link'});
 
             const payload = JSON.stringify({
                 email,
                 emailType: 'signup',
                 labels,
-                urlHistory: getUrlHistory({siteUrl})
+                urlHistory: getUrlHistory({siteUrl}),
+                integrityToken
             });
 
             const response = await fetch(url, {
diff --git a/apps/signup-form/test/utils/e2e.ts b/apps/signup-form/test/utils/e2e.ts
index 92d3d54a9a1..b8ac0e35dad 100644
--- a/apps/signup-form/test/utils/e2e.ts
+++ b/apps/signup-form/test/utils/e2e.ts
@@ -65,5 +65,9 @@ export async function mockApi({page, status = 200}: {page: any, status?: number}
         await route.abort('addressunreachable');
     });
 
+    await page.route(`${MOCKED_SITE_URL}/members/api/integrity-token/`, async (route) => {
+        await route.fulfill('testtoken');
+    });
+
     return lastApiRequest;
 }
diff --git a/apps/signup-form/vite.config.ts b/apps/signup-form/vite.config.ts
index 20ae4ba636f..9fca8f1d855 100644
--- a/apps/signup-form/vite.config.ts
+++ b/apps/signup-form/vite.config.ts
@@ -11,6 +11,7 @@ const outputFileName = pkg.name[0] === '@' ? pkg.name.slice(pkg.name.indexOf('/'
 // https://vitejs.dev/config/
 export default (function viteConfig() {
     return defineConfig({
+        logLevel: process.env.CI ? 'info' : 'warn',
         plugins: [
             svgr(),
             react(),
@@ -29,6 +30,7 @@ export default (function viteConfig() {
         },
         build: {
             outDir: resolve(__dirname, 'umd'),
+            reportCompressedSize: false,
             emptyOutDir: true,
             minify: true,
             sourcemap: true,
diff --git a/apps/sodo-search/package.json b/apps/sodo-search/package.json
index 6a91e1ae20e..0d90d478650 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.21",
     "flexsearch": "0.7.21",
     "react": "17.0.2",
     "react-dom": "17.0.2"
@@ -82,11 +82,12 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "5.16.5",
+    "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "12.1.5",
-    "@vitejs/plugin-react": "4.1.0",
+    "@vitejs/plugin-react": "4.2.1",
+    "jsdom": "24.1.3",
     "nock": "13.3.3",
-    "vite": "4.5.0",
+    "vite": "4.5.3",
     "vite-plugin-svgr": "3.3.0",
     "vitest": "0.34.3"
   }
diff --git a/apps/sodo-search/vite.config.js b/apps/sodo-search/vite.config.js
index ab69e4687f9..52d8e243e64 100644
--- a/apps/sodo-search/vite.config.js
+++ b/apps/sodo-search/vite.config.js
@@ -12,6 +12,7 @@ export default defineConfig((config) => {
     const outputFileName = pkg.name[0] === '@' ? pkg.name.slice(pkg.name.indexOf('/') + 1) : pkg.name;
 
     return {
+        logLevel: process.env.CI ? 'info' : 'warn',
         clearScreen: false,
         define: {
             'process.env.NODE_ENV': JSON.stringify(config.mode)
@@ -50,6 +51,7 @@ export default defineConfig((config) => {
         },
         build: {
             outDir: resolve(__dirname, 'umd'),
+            reportCompressedSize: false,
             emptyOutDir: true,
             minify: true,
             sourcemap: true,
diff --git a/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js b/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js
index 93644da5b62..9a1177aefef 100644
--- a/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js
+++ b/ghost/adapter-cache-redis/lib/AdapterCacheRedis.js
@@ -1,5 +1,7 @@
 const BaseCacheAdapter = require('@tryghost/adapter-base-cache');
 const logging = require('@tryghost/logging');
+const metrics = require('@tryghost/metrics');
+const debug = require('@tryghost/debug')('redis-cache');
 const cacheManager = require('cache-manager');
 const redisStoreFactory = require('./redis-store-factory');
 const calculateSlot = require('cluster-key-slot');
@@ -13,7 +15,10 @@ 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 {Number} [config.getTimeoutMilliseconds] - default timeout for cache get operations in *milliseconds*
+     * @param {Number} [config.refreshAheadFactor] - 0-1 number to use to determine how old (as a percentage of ttl) an entry should be before refreshing it
      * @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 +43,12 @@ class AdapterCacheRedis extends BaseCacheAdapter {
                 ttl: config.ttl,
                 host: config.host,
                 port: config.port,
+                username: config.username,
                 password: config.password,
+                retryStrategy: () => {
+                    return (config.storeConfig.retryConnectSeconds || 10) * 1000;
+                },
+                ...config.storeConfig,
                 clusterConfig: config.clusterConfig
             };
             const store = redisStoreFactory.getRedisStore(storeOptions, config.reuseConnection);
@@ -49,6 +59,10 @@ class AdapterCacheRedis extends BaseCacheAdapter {
             });
         }
 
+        this.ttl = config.ttl;
+        this.refreshAheadFactor = config.refreshAheadFactor || 0;
+        this.getTimeoutMilliseconds = config.getTimeoutMilliseconds || null;
+        this.currentlyExecutingBackgroundRefreshes = new Set();
         this.keyPrefix = config.keyPrefix;
         this._keysPattern = config.keyPrefix ? `${config.keyPrefix}*` : '';
         this.redisClient = this.cache.store.getClient();
@@ -60,6 +74,7 @@ class AdapterCacheRedis extends BaseCacheAdapter {
     }
 
     #getPrimaryRedisNode() {
+        debug('getPrimaryRedisNode');
         if (this.redisClient.constructor.name !== 'Cluster') {
             return this.redisClient;
         }
@@ -74,6 +89,7 @@ class AdapterCacheRedis extends BaseCacheAdapter {
     }
 
     #scanNodeForKeys(node) {
+        debug(`scanNodeForKeys matching ${this._keysPattern}`);
         return new Promise((resolve, reject) => {
             const stream = node.scanStream({match: this._keysPattern, count: 100});
             let keys = [];
@@ -90,6 +106,7 @@ class AdapterCacheRedis extends BaseCacheAdapter {
     }
 
     async #getKeys() {
+        debug('#getKeys');
         const primaryNode = this.#getPrimaryRedisNode();
         if (primaryNode === null) {
             return [];
@@ -123,11 +140,91 @@ class AdapterCacheRedis extends BaseCacheAdapter {
 
     /**
      *
-     * @param {String} key
+     * @param {String} internalKey
      */
-    async get(key) {
+    async shouldRefresh(internalKey) {
+        if (this.refreshAheadFactor === 0) {
+            debug(`shouldRefresh ${internalKey}: false - refreshAheadFactor = 0`);
+            return false;
+        }
+        if (this.refreshAheadFactor === 1) {
+            debug(`shouldRefresh ${internalKey}: true - refreshAheadFactor = 1`);
+            return true;
+        }
         try {
-            return await this.cache.get(this._buildKey(key));
+            const ttlRemainingForEntry = await this.cache.ttl(internalKey);
+            const shouldRefresh = ttlRemainingForEntry < this.refreshAheadFactor * this.ttl;
+            debug(`shouldRefresh ${internalKey}: ${shouldRefresh} - TTL remaining = ${ttlRemainingForEntry}`);
+            return shouldRefresh;
+        } catch (err) {
+            logging.error(err);
+            return false;
+        }
+    }
+
+    /**
+     * Returns the specified key from the cache if it exists, otherwise returns null
+     * - If getTimeoutMilliseconds is set, the method will return a promise that resolves with the value or null if the timeout is exceeded
+     * 
+     * @param {string} key 
+     */
+    async _get(key) {
+        if (typeof this.getTimeoutMilliseconds !== 'number') {
+            return this.cache.get(key);
+        } else {
+            return new Promise((resolve) => {
+                const timer = setTimeout(() => {
+                    debug('get', key, 'timeout');
+                    resolve(null);
+                }, this.getTimeoutMilliseconds);
+    
+                this.cache.get(key).then((result) => {
+                    clearTimeout(timer);
+                    resolve(result);
+                });
+            });
+        }
+    }
+
+    /**
+     *
+     * @param {string} key
+     * @param {() => Promise<any>} [fetchData] An optional function to fetch the data, which will be used in the case of a cache MISS or a background refresh
+     */
+    async get(key, fetchData) {
+        const internalKey = this._buildKey(key);
+        try {
+            const result = await this._get(internalKey);
+            debug(`get ${internalKey}: Cache ${result ? 'HIT' : 'MISS'}`);
+            if (!fetchData) {
+                return result;
+            }
+            if (result) {
+                const shouldRefresh = await this.shouldRefresh(internalKey);
+                const isRefreshing = this.currentlyExecutingBackgroundRefreshes.has(internalKey);
+                if (isRefreshing) {
+                    debug(`Background refresh already happening for ${internalKey}`);
+                }
+                if (!isRefreshing && shouldRefresh) {
+                    debug(`Doing background refresh for ${internalKey}`);
+                    this.currentlyExecutingBackgroundRefreshes.add(internalKey);
+                    fetchData().then(async (data) => {
+                        await this.set(key, data); // We don't use `internalKey` here because `set` handles it
+                        this.currentlyExecutingBackgroundRefreshes.delete(internalKey);
+                    }).catch((error) => {
+                        this.currentlyExecutingBackgroundRefreshes.delete(internalKey);
+                        logging.error({
+                            message: 'There was an error refreshing cache data in the background',
+                            error: error
+                        });
+                    });
+                }
+                return result;
+            } else {
+                const data = await fetchData();
+                await this.set(key, data); // We don't use `internalKey` here because `set` handles it
+                return data;
+            }
         } catch (err) {
             logging.error(err);
         }
@@ -139,8 +236,10 @@ class AdapterCacheRedis extends BaseCacheAdapter {
      * @param {*} value
      */
     async set(key, value) {
+        const internalKey = this._buildKey(key);
+        debug('set', internalKey);
         try {
-            return await this.cache.set(this._buildKey(key), value);
+            return await this.cache.set(internalKey, value);
         } catch (err) {
             logging.error(err);
         }
@@ -150,11 +249,21 @@ class AdapterCacheRedis extends BaseCacheAdapter {
      * Reset the cache by deleting everything from redis
      */
     async reset() {
+        debug('reset');
         try {
+            const t0 = performance.now();
+            logging.debug(`[RedisAdapter] Clearing cache: scanning for keys matching ${this._keysPattern}`);
             const keys = await this.#getKeys();
+            logging.debug(`[RedisAdapter] Clearing cache: found ${keys.length} keys matching ${this._keysPattern} in ${(performance.now() - t0).toFixed(1)}ms`);
+            metrics.metric('cache-reset-scan', (performance.now() - t0).toFixed(1));
+            const t1 = performance.now();
             for (const key of keys) {
                 await this.cache.del(key);
             }
+            logging.debug(`[RedisAdapter] Clearing cache: deleted ${keys.length} keys matching ${this._keysPattern} in ${(performance.now() - t1).toFixed(1)}ms`);
+            metrics.metric('cache-reset-delete', (performance.now() - t1).toFixed(1));
+            metrics.metric('cache-reset', (performance.now() - t0).toFixed(1));
+            metrics.metric('cache-reset-key-count', keys.length);
         } catch (err) {
             logging.error(err);
         }
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..3b25a9cc7df 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 = {
@@ -45,6 +59,152 @@ describe('Adapter Cache Redis', function () {
 
             assert.equal(value, 'value from cache');
         });
+
+        it('returns null if getTimeoutMilliseconds is exceeded', async function () {
+            const redisCacheInstanceStub = {
+                get: sinon.stub().callsFake(async () => {
+                    return new Promise((resolve) => {
+                        setTimeout(() => {
+                            resolve('value from cache');
+                        }, 200);
+                    });
+                }),
+                store: {
+                    getClient: sinon.stub().returns({
+                        on: sinon.stub()
+                    })
+                }
+            };
+            const cache = new RedisCache({
+                cache: redisCacheInstanceStub,
+                getTimeoutMilliseconds: 100
+            });
+
+            const value = await cache.get('key');
+            assert.equal(value, null);
+        });
+
+        it('can update the cache in the case of a cache miss', async function () {
+            const KEY = 'update-cache-on-miss';
+            let cachedValue = null;
+            const redisCacheInstanceStub = {
+                get: function (key) {
+                    assert(key === KEY);
+                    return cachedValue;
+                },
+                set: function (key, value) {
+                    assert(key === KEY);
+                    cachedValue = value;
+                },
+                store: {
+                    getClient: sinon.stub().returns({
+                        on: sinon.stub()
+                    })
+                }
+            };
+            const cache = new RedisCache({
+                cache: redisCacheInstanceStub
+            });
+
+            const fetchData = sinon.stub().resolves('Da Value');
+
+            checkFirstRead: {
+                const value = await cache.get(KEY, fetchData);
+                assert.equal(fetchData.callCount, 1);
+                assert.equal(value, 'Da Value');
+                break checkFirstRead;
+            }
+
+            checkSecondRead: {
+                const value = await cache.get(KEY, fetchData);
+                assert.equal(fetchData.callCount, 1);
+                assert.equal(value, 'Da Value');
+                break checkSecondRead;
+            }
+        });
+
+        it('Can do a background update of the cache', async function () {
+            const KEY = 'update-cache-in-background';
+            let cachedValue = null;
+            let remainingTTL = 100;
+
+            const redisCacheInstanceStub = {
+                get: function (key) {
+                    assert(key === KEY);
+                    return cachedValue;
+                },
+                set: function (key, value) {
+                    assert(key === KEY);
+                    cachedValue = value;
+                },
+                ttl: function (key) {
+                    assert(key === KEY);
+                    return remainingTTL;
+                },
+                store: {
+                    getClient: sinon.stub().returns({
+                        on: sinon.stub()
+                    })
+                }
+            };
+            const cache = new RedisCache({
+                cache: redisCacheInstanceStub,
+                ttl: 100,
+                refreshAheadFactor: 0.2
+            });
+
+            const fetchData = sinon.stub();
+            fetchData.onFirstCall().resolves('First Value');
+            fetchData.onSecondCall().resolves('Second Value');
+
+            checkFirstRead: {
+                const value = await cache.get(KEY, fetchData);
+                assert.equal(fetchData.callCount, 1);
+                assert.equal(value, 'First Value');
+                break checkFirstRead;
+            }
+
+            // We simulate having been in the cache for 15 seconds
+            remainingTTL = 85;
+
+            checkSecondRead: {
+                const value = await cache.get(KEY, fetchData);
+                assert.equal(fetchData.callCount, 1);
+                assert.equal(value, 'First Value');
+                break checkSecondRead;
+            }
+
+            // We simulate having been in the cache for 30 seconds
+            remainingTTL = 70;
+
+            checkThirdRead: {
+                const value = await cache.get(KEY, fetchData);
+                assert.equal(fetchData.callCount, 1);
+                assert.equal(value, 'First Value');
+                break checkThirdRead;
+            }
+
+            // We simulate having been in the cache for 85 seconds
+            // This should trigger a background refresh
+            remainingTTL = 15;
+
+            checkFourthRead: {
+                const value = await cache.get(KEY, fetchData);
+                assert.equal(fetchData.callCount, 2);
+                assert.equal(value, 'First Value');
+                break checkFourthRead;
+            }
+
+            // We reset the TTL to 100 for the most recent write
+            remainingTTL = 100;
+
+            checkFifthRead: {
+                const value = await cache.get(KEY, fetchData);
+                assert.equal(fetchData.callCount, 2);
+                assert.equal(value, 'Second Value');
+                break checkFifthRead;
+            }
+        });
     });
 
     describe('set', function () {
diff --git a/ghost/adapter-manager/package.json b/ghost/adapter-manager/package.json
index 4c9b6eff59e..68d1f516a33 100644
--- a/ghost/adapter-manager/package.json
+++ b/ghost/adapter-manager/package.json
@@ -24,6 +24,6 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26"
+    "@tryghost/errors": "1.3.5"
   }
 }
diff --git a/ghost/admin/.eslintrc.js b/ghost/admin/.eslintrc.js
index 131aaa8000a..abd701459f3 100644
--- a/ghost/admin/.eslintrc.js
+++ b/ghost/admin/.eslintrc.js
@@ -51,5 +51,19 @@ module.exports = {
 
         'react/jsx-uses-react': 'error',
         'react/jsx-uses-vars': 'error'
-    }
+    },
+    overrides: [{
+        files: 'tests/**/*.js',
+        env: {
+            embertest: true,
+            mocha: true
+        },
+        extends: [
+            'plugin:ghost/test'
+        ],
+        rules: {
+            'ghost/ember/no-invalid-debug-function-arguments': 'off',
+            'ghost/mocha/no-setup-in-describe': 'off'
+        }
+    }]
 };
diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo
index 579705fe2d0..5e6e66fb1a3 100644
--- a/ghost/admin/.lint-todo
+++ b/ghost/admin/.lint-todo
@@ -1,353 +1,196 @@
-add|ember-template-lint|no-passed-in-event-handlers|23|16|23|16|d47dcf0c8eea7584639b48d5a99b7db07436c259|1697068800000|1707440400000|1712620800000|app/components/gh-benefit-item.hbs
-add|ember-template-lint|no-passed-in-event-handlers|24|16|24|16|14a806b3f993ec777b1a5ff7e00887e5840bbb77|1697068800000|1707440400000|1712620800000|app/components/gh-benefit-item.hbs
-add|ember-template-lint|no-action|2|54|2|54|8618d17e29821f45d8809ad2d6cf6053b825f7fe|1697068800000|1707440400000|1712620800000|app/components/gh-billing-update-button.hbs
-add|ember-template-lint|no-action|5|11|5|11|8eaebb48eca1563c6e0b18581df84ab59188d971|1697068800000|1707440400000|1712620800000|app/components/gh-cm-editor.hbs
-add|ember-template-lint|no-passed-in-event-handlers|5|4|5|4|3a763e253744b070633bb8bd424b6c8e55f6b20a|1697068800000|1707440400000|1712620800000|app/components/gh-cm-editor.hbs
-add|ember-template-lint|no-invalid-interactive|1|103|1|103|534029ab0ba1b74eff4a2f31c8b4dd9f1460316a|1697068800000|1707440400000|1712620800000|app/components/gh-context-menu.hbs
-add|ember-template-lint|no-invalid-interactive|5|53|5|53|9647ef6afba919b2af04fe551b0fdf0fb63be849|1697068800000|1707440400000|1712620800000|app/components/gh-context-menu.hbs
-add|ember-template-lint|no-action|5|18|5|18|0c80a75b2a80d404755333991c266c81c97c9cda|1697068800000|1707440400000|1712620800000|app/components/gh-date-time-picker.hbs
-add|ember-template-lint|require-input-label|11|16|11|16|36ecd3af7ac0e4bbafbf933cc20ff9f3ff8f0947|1697068800000|1707440400000|1712620800000|app/components/gh-date-time-picker.hbs
-add|ember-template-lint|require-input-label|29|8|29|8|334a3ea0fb16fabf58967294e125af8437504bdb|1697068800000|1707440400000|1712620800000|app/components/gh-date-time-picker.hbs
-add|ember-template-lint|no-action|9|19|9|19|d12bcf1144bfb2fe70e7ab0f66836f1c6207a589|1697068800000|1707440400000|1712620800000|app/components/gh-editor.hbs
-add|ember-template-lint|no-action|10|20|10|20|16d94650de2ffbe8ee3f2ce3ba5ca97a6304b739|1697068800000|1707440400000|1712620800000|app/components/gh-editor.hbs
-add|ember-template-lint|no-action|11|17|11|17|30d64b1bf8990e2f84c52665690739fcc726e9f7|1697068800000|1707440400000|1712620800000|app/components/gh-editor.hbs
-add|ember-template-lint|no-action|8|12|8|12|9eb2aa69ff4ec506e54d133fa8c91e6b9953d04c|1697068800000|1707440400000|1712620800000|app/components/gh-feature-flag.hbs
-add|ember-template-lint|no-action|2|111|2|111|7e581bf2ffd5254ae851201e1f23cb9eaa9b198b|1697068800000|1707440400000|1712620800000|app/components/gh-file-upload.hbs
-add|ember-template-lint|require-input-label|1|0|1|0|80e39573b35eef3b8f874fbc35bdd2bfd65695b1|1697068800000|1707440400000|1712620800000|app/components/gh-file-upload.hbs
-add|ember-template-lint|no-action|6|77|6|77|76726a13a086d82dab219df12e86db1773a9de32|1697068800000|1707440400000|1712620800000|app/components/gh-file-uploader.hbs
-add|ember-template-lint|no-action|18|73|18|73|bbc5d9a459cd07e56d8c79dde619775b89d7cc89|1697068800000|1707440400000|1712620800000|app/components/gh-file-uploader.hbs
-add|ember-template-lint|no-action|2|45|2|45|55b33496610b2f4ef6b9fe62713f4b4ddee37f19|1697068800000|1707440400000|1712620800000|app/components/gh-fullscreen-modal.hbs
-add|ember-template-lint|no-action|10|29|10|29|ebbd89a393bcec7f537f2104ace2a6b1941a19a7|1697068800000|1707440400000|1712620800000|app/components/gh-fullscreen-modal.hbs
-add|ember-template-lint|no-action|11|32|11|32|ab89b6f10c519be1271386203e9439d261eecd67|1697068800000|1707440400000|1712620800000|app/components/gh-fullscreen-modal.hbs
-add|ember-template-lint|no-action|13|36|13|36|3776877637b49b65deef537c68ae490b2fb081a9|1697068800000|1707440400000|1712620800000|app/components/gh-fullscreen-modal.hbs
-add|ember-template-lint|no-invalid-interactive|2|45|2|45|918fdec8490009c6197091e319d6ec52ee95b983|1697068800000|1707440400000|1712620800000|app/components/gh-fullscreen-modal.hbs
-add|ember-template-lint|link-href-attributes|8|8|8|8|2078c6e43d1e5548ae745b7ac8cb736f7d2aaf68|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader-with-preview.hbs
-add|ember-template-lint|no-invalid-interactive|8|60|8|60|2078c6e43d1e5548ae745b7ac8cb736f7d2aaf68|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader-with-preview.hbs
-add|ember-template-lint|require-valid-alt-text|3|13|3|13|079fc89fa5c7c47f6b0b219820cdda3819c44e26|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader-with-preview.hbs
-add|ember-template-lint|no-action|12|58|12|58|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader.hbs
-add|ember-template-lint|no-action|17|75|17|75|bbc5d9a459cd07e56d8c79dde619775b89d7cc89|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader.hbs
-add|ember-template-lint|no-action|22|52|22|52|b1bd53a513ad82434d5a0a9a96441a45d416d7ad|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader.hbs
-add|ember-template-lint|no-action|31|16|31|16|4c64ddeaf795ee831d0d7346667a305814ca9855|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader.hbs
-add|ember-template-lint|no-action|32|15|32|15|b1bd53a513ad82434d5a0a9a96441a45d416d7ad|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader.hbs
-add|ember-template-lint|no-invalid-interactive|22|52|22|52|74dea739bef284d6557987ff3da53fa1278030e2|1697068800000|1707440400000|1712620800000|app/components/gh-image-uploader.hbs
-add|ember-template-lint|no-action|10|16|10|16|8d8dd8c2cb5f9910c2de5ca6acc76ee4262a876e|1697068800000|1707440400000|1712620800000|app/components/gh-members-import-mapping-input.hbs
-add|ember-template-lint|no-action|9|36|9|36|05358b6ec6e9afbaa47416266c49f40a3ffb4490|1697068800000|1707440400000|1712620800000|app/components/gh-members-import-table.hbs
-add|ember-template-lint|no-action|10|36|10|36|c5ce93cf577ec47970f715ed83ed11a63adb7a63|1697068800000|1707440400000|1712620800000|app/components/gh-members-import-table.hbs
-add|ember-template-lint|no-action|39|107|39|107|79d2eeaed67e929e989261416abd3cd2dbbf4861|1697068800000|1707440400000|1712620800000|app/components/gh-membership-tiers-alpha.hbs
-add|ember-template-lint|no-action|8|50|8|50|de589665046a78748832e8f93d2e495d1d259265|1697068800000|1707440400000|1712620800000|app/components/gh-mobile-nav-bar.hbs
-add|ember-template-lint|no-action|149|48|149|48|01f579966c325cf66d3a87799e8cea7dd1fded81|1697068800000|1707440400000|1712620800000|app/components/gh-portal-links.hbs
-add|ember-template-lint|no-action|36|43|36|43|66cebfc8448eced0bccf3faa57b4af0cd633e65e|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|37|47|37|47|70f3e9aa9a9aa52142c4e0c015a8f173d12b05ed|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|56|41|56|41|43cc094c1a6b50ecd24c8af325dfdfcac863bb14|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|57|41|57|41|e7f429eefd04a55d4ef1875fe601da1b69964364|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|87|50|87|50|0e827c1770073f988535ceb9d6c49808a153d896|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|104|39|104|39|5cbc9d2abf29e108bfc207579df1206485e2a74d|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|105|43|105|43|1f2dd4961e9757ede9706bb0aa9b8baf9c49b22b|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|115|105|115|105|90dbb84741c72aa86a601e1cb95c066bd53898bd|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|122|46|122|46|56ca074eb0236b8becc4084423056a8ffa4453e9|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|157|73|157|73|b07bf9d50af5f00861571521b150cf6504b90704|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|171|56|171|56|38755451c044c56040684339301c21b2aab49ecb|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|189|50|189|50|9f1c3c88187e5db774f97704269e372f8331eba5|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|195|50|195|50|97acfb2045b33a97621258596b631362ad4c56d5|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|201|51|201|51|358336432fcb413c522c5f1ff3062a68ef9f449f|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|207|50|207|50|78a45cbb7eafdda134d96f6035b0026f339e75ad|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|213|50|213|50|693211baf08c011e77284b483c30e28ecaf63520|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|222|105|222|105|de5b68b49193c72f85c0e478f151a00180321d91|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|235|167|235|167|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|592|163|592|163|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|598|34|598|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|607|47|607|47|67551960e57b2ad06d24289e0d6f256dc5635cae|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|608|51|608|51|50e3029f4c845049ff10130cf0dc2ea06c7a3d2d|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|623|47|623|47|0d852775b4028d61c2c91b5d821c79de3cdbd1de|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|624|51|624|51|194439ec4cb10e176eecb1f55c2995c00f6c67b4|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|638|47|638|47|3be93048908ab43d74726c3983982fcb9a3570e3|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|639|51|639|51|40871d259cc307345b8096e4215ae58e5886b724|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|665|166|665|166|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|672|34|672|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|677|44|677|44|d2abbb4bb55b6cb1131ca0bc56c31632b32b980c|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|678|44|678|44|3ede83bd64d206d665edb4f1b73f03b4122edfad|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|688|47|688|47|13b7064b520a924d9e57a4a680621ce979d23923|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|689|51|689|51|b0fc38b818f4ca2613684588e4122e12da0090b9|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|704|47|704|47|f34f084dc72c079be9ba3eb93c255bd8853612bd|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|705|51|705|51|c5c09d001fa96a623649cc88ef13b3c6c164f05b|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|733|167|733|167|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|739|34|739|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|744|44|744|44|32101c0834d9e8d2caa87dee9cb1a92fe633cfde|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|745|44|745|44|c8a82286cfe4220cb2d8a059b1daf7f6c8d54cf5|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|755|47|755|47|31800fb83f1797de5d91b7007c48432cf2fae803|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|756|51|756|51|5ce0788874489341385f031810e9f7f62724aaf8|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|769|47|769|47|1cbd7d922a9d202772a9dca214d97bed18777d6e|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|770|51|770|51|16fb2c7c87dc282c6ee49a032aaaf22628b88084|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|801|168|801|168|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|807|34|807|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|814|50|814|50|d03e7bbf2b6de94b08fae1c33bd5a2f16874e03a|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|816|48|816|48|bca167f0250b40d56ff1ed40ec21bc88f8e27ec3|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|827|50|827|50|93ae447fb1054de4dbe501fc60167a6ff3273687|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|829|48|829|48|ecb9ed2577be7ea0300563f22d8e9fde2fed12a6|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|36|36|36|36|fed655605208b290a18b9f7da51a6cf7b40c0e9a|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|104|32|104|32|187e85e14470b453a1e6df8c5f18549d11c441a0|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|607|40|607|40|f290a04fd56f613d80d61244d161631f630185a8|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|623|40|623|40|c1af88109f705acc93fab4ee7b4d89096136ffe1|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|638|40|638|40|852cbb2c63e19a28d700d3b18e6f887edef303fa|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|688|40|688|40|58185c92e8b6261ea1483a70296d9fa837d3f2f5|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|704|40|704|40|c4353acd715c396564c69389edd0a52246d3b966|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|755|40|755|40|29f26e46559dc40d9724a05b7516cb52f1481aaa|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|769|40|769|40|42e0617f832585eaa056c9c66dffe1a126318faf|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|814|40|814|40|d1dccfeee5b103fac3b14d5b4567bc65ee08fd5a|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-passed-in-event-handlers|827|40|827|40|055c4b70aa8daba6b97077eefa95ebed7f7f5315|1697068800000|1707440400000|1712620800000|app/components/gh-post-settings-menu.hbs
-add|ember-template-lint|no-action|4|14|4|14|c8f6146f9286ec1b289e28983ab446386f390f01|1697068800000|1707440400000|1712620800000|app/components/gh-psm-authors-input.hbs
-add|ember-template-lint|no-action|5|14|5|14|a90edd9a99596008f60bfcdbc6befe7fe8d26321|1697068800000|1707440400000|1712620800000|app/components/gh-psm-tags-input.hbs
-add|ember-template-lint|no-action|6|14|6|14|3924d7cfb394cbcfd6b1bf9cf13a5040ac8f94b5|1697068800000|1707440400000|1712620800000|app/components/gh-psm-tags-input.hbs
-add|ember-template-lint|no-action|10|20|10|20|8b7921c0514cfd3fec8c3a474187048bc26faf7f|1697068800000|1707440400000|1712620800000|app/components/gh-psm-tags-input.hbs
-add|ember-template-lint|no-action|9|24|9|24|2e612be5e2b8e0b792f951c3c75b2f71df880365|1697068800000|1707440400000|1712620800000|app/components/gh-psm-template-select.hbs
-add|ember-template-lint|no-action|7|16|7|16|86819b20fcc42bc1d4607519c1d45532ee337884|1697068800000|1707440400000|1712620800000|app/components/gh-psm-visibility-input.hbs
-add|ember-template-lint|no-invalid-interactive|8|80|8|80|bb724c391e9e56cc994322717d453c488ca5ae28|1697068800000|1707440400000|1712620800000|app/components/gh-role-selection.hbs
-add|ember-template-lint|no-invalid-interactive|36|75|36|75|7eff29b73ce875c9b087ff1340647bab0d21ac19|1697068800000|1707440400000|1712620800000|app/components/gh-role-selection.hbs
-add|ember-template-lint|no-invalid-interactive|72|75|72|75|d541b87fe28c3dc1c1fce306c988bb09f777b1bc|1697068800000|1707440400000|1712620800000|app/components/gh-role-selection.hbs
-add|ember-template-lint|no-invalid-interactive|108|82|108|82|f77e549a4fa7232cea39feff73f3e1c5bc98f467|1697068800000|1707440400000|1712620800000|app/components/gh-role-selection.hbs
-add|ember-template-lint|no-autofocus-attribute|13|16|13|16|fa0ffb960072633b72117849e3927673be0059af|1697068800000|1707440400000|1712620800000|app/components/gh-search-input.hbs
-add|ember-template-lint|require-iframe-title|1|0|1|0|956ab219134ac63aec3fd2d35582076c21631b75|1697068800000|1707440400000|1712620800000|app/components/gh-site-iframe.hbs
-add|ember-template-lint|no-yield-only|1|0|1|0|a5fa6e8c1e0f03fb31b5cd17770e4368d44932e4|1697068800000|1707440400000|1712620800000|app/components/gh-text-input.hbs
-add|ember-template-lint|no-action|1|51|1|51|674a942db62e014b25156b02d014f6c63b2f1cb2|1697068800000|1707440400000|1712620800000|app/components/gh-theme-error-li.hbs
-add|ember-template-lint|no-unused-block-params|2|48|2|48|640ae072a8a8b4a1eebde20f7f6510bf94ec120f|1697068800000|1707440400000|1712620800000|app/components/gh-theme-table.hbs
-add|ember-template-lint|no-action|12|16|12|16|40e7337ccf8501ef3b2fea94812d4de8435286da|1697068800000|1707440400000|1712620800000|app/components/gh-tiers-price-billingperiod.hbs
-add|ember-template-lint|no-action|9|16|9|16|0232e593042bb48fcc89bf9ab0b91b242f264fba|1697068800000|1707440400000|1712620800000|app/components/gh-timezone-select.hbs
-add|ember-template-lint|no-action|2|11|2|11|2b1317e72b94ec31bf2700acc3f041e6be974b72|1697068800000|1707440400000|1712620800000|app/components/gh-uploader.hbs
-add|ember-template-lint|no-action|7|13|7|13|add4b57d48167f809045245535d45bedb00cb753|1697068800000|1707440400000|1712620800000|app/components/gh-uploader.hbs
-add|ember-template-lint|no-action|8|22|8|22|ce1eba2b791c0f120baf10871fd3949c1b9f6a79|1697068800000|1707440400000|1712620800000|app/components/gh-uploader.hbs
-add|ember-template-lint|no-action|9|22|9|22|0209f233628ec084b87894b4be9073c29f2a4f47|1697068800000|1707440400000|1712620800000|app/components/gh-uploader.hbs
-add|ember-template-lint|no-passed-in-event-handlers|4|4|4|4|3dedc53191768d81765eac4a7a049a9aba7df442|1697068800000|1707440400000|1712620800000|app/components/gh-url-input.hbs
-add|ember-template-lint|no-action|1|71|1|71|2e6351f546807d88cc8eb9dbe8baa149468b5cb9|1697068800000|1707440400000|1712620800000|app/components/gh-view-title.hbs
-add|ember-template-lint|no-invalid-role|1|0|1|0|3e651d38e0110e1be20e5082075db1b879b59a36|1697068800000|1707440400000|1712620800000|app/components/gh-view-title.hbs
-add|ember-template-lint|no-action|4|53|4|53|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-disconnect-stripe.hbs
-add|ember-template-lint|no-action|15|41|15|41|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-disconnect-stripe.hbs
-add|ember-template-lint|no-action|4|55|4|55|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-action|4|79|4|79|d465b362b15b90cf42a093e72895155f49cdf6f2|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-action|16|27|16|27|d0065f512527491cf1e2532437e84b9cf867c925|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-action|26|27|26|27|b5a468ed19153bfd25303ca31bc45aeaf65c358f|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-action|37|31|37|31|085289ac1e1263eed8737dc26c8774a9ea90598b|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-action|38|33|38|33|bf202ad54f2ff2a7e57d2e657d4d68f7814eba84|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-action|55|71|55|71|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-passed-in-event-handlers|16|20|16|20|5fc3de620138bb4bee07640a9114b5e2be172f59|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-passed-in-event-handlers|26|20|26|20|8a899292e274791646c6c820fc584ac3aa4b1d83|1697068800000|1707440400000|1712620800000|app/components/modal-free-membership-settings.hbs
-add|ember-template-lint|no-action|5|50|5|50|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-impersonate-member.hbs
-add|ember-template-lint|no-action|5|74|5|74|d465b362b15b90cf42a093e72895155f49cdf6f2|1697068800000|1707440400000|1712620800000|app/components/modal-impersonate-member.hbs
-add|ember-template-lint|no-action|34|60|34|60|190532b9954beb4e7e9e0f1c51d170e64d4a5315|1697068800000|1707440400000|1712620800000|app/components/modal-import-content.hbs
-add|ember-template-lint|no-action|80|95|80|95|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-content.hbs
-add|ember-template-lint|no-action|43|57|43|57|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|50|56|50|56|190532b9954beb4e7e9e0f1c51d170e64d4a5315|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|56|34|56|34|ff609af61e9159dfc5386543d559f6d217d39531|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|57|29|57|29|9a0a72738b6e1a4f46415b2328c37d1814562717|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|110|89|110|89|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|116|91|116|91|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|119|116|119|116|7e581bf2ffd5254ae851201e1f23cb9eaa9b198b|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|129|120|129|120|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|132|103|132|103|7e581bf2ffd5254ae851201e1f23cb9eaa9b198b|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|143|112|143|112|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|147|110|147|110|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|153|97|153|97|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|156|112|156|112|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|160|99|160|99|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|163|110|163|110|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|171|91|171|91|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|174|102|174|102|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|181|95|181|95|031d04576149d3034549aa3d14bc26da704cd70c|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|185|102|185|102|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-import-members.hbs
-add|ember-template-lint|no-action|2|50|2|50|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-invite-new-user.hbs
-add|ember-template-lint|no-action|2|74|2|74|d465b362b15b90cf42a093e72895155f49cdf6f2|1697068800000|1707440400000|1712620800000|app/components/modal-invite-new-user.hbs
-add|ember-template-lint|no-action|26|27|26|27|1709109776bf3fc47aaecc21e6d3ec8a0489ad6b|1697068800000|1707440400000|1712620800000|app/components/modal-invite-new-user.hbs
-add|ember-template-lint|no-action|28|30|28|30|60f8b21893815d9e7a53a2fd75d89d5eb02516d2|1697068800000|1707440400000|1712620800000|app/components/modal-invite-new-user.hbs
-add|ember-template-lint|no-action|37|37|37|37|67e49e01cecb20912daabd71037b7bba8ae35d53|1697068800000|1707440400000|1712620800000|app/components/modal-invite-new-user.hbs
-add|ember-template-lint|no-action|38|37|38|37|e9ede6075ef60dc141631856eb197cfc4458ad81|1697068800000|1707440400000|1712620800000|app/components/modal-invite-new-user.hbs
-add|ember-template-lint|no-passed-in-event-handlers|26|20|26|20|ce0d7e2e732b22ce3643fb9b1ac6ecef07c275ff|1697068800000|1707440400000|1712620800000|app/components/modal-invite-new-user.hbs
-add|ember-template-lint|no-invalid-interactive|28|24|28|24|42a29ae16e22270f0590c9ce5caa7bfec541ca0b|1697068800000|1707440400000|1712620800000|app/components/modal-member-tier.hbs
-add|ember-template-lint|no-action|5|57|5|57|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|14|45|14|45|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|23|59|23|59|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|23|83|23|83|d465b362b15b90cf42a093e72895155f49cdf6f2|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|34|31|34|31|a8ad062b8379233b7970fe5ea74296fdf5011567|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|47|82|47|82|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|49|16|49|16|d465b362b15b90cf42a093e72895155f49cdf6f2|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|55|113|55|113|c259009ff744c2e9f7bb273e0eb3a3879036ba85|1697068800000|1707440400000|1712620800000|app/components/modal-members-label-form.hbs
-add|ember-template-lint|no-action|13|112|13|112|decaf649532f1148f5071c2070b99d4e28986150|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|18|160|18|160|d7344cff0074353f10626fbe36707360e8ffd52c|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|35|69|35|69|b5e82dc8693610f3eb52006adac6456b86fb5ff1|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|59|65|59|65|fc5db5638fa960219dcaac666df85bd49ae5ba39|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|83|73|83|73|437199817818c66e4539bbc8501bd73148b521fd|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|111|73|111|73|4a9c1575e2a51a19d342f234cc41b045ea419ae3|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|132|73|132|73|40f0dc3732c554bb3f69d3d126263eb0a24f7738|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|171|64|171|64|eaa96ff81a7c4b4743ca191655c017bd90549e96|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|183|112|183|112|d4947b819970cbee74170cd33c3067f75dde86d2|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|188|85|188|85|d7344cff0074353f10626fbe36707360e8ffd52c|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|202|64|202|64|6cb8968d67fbe25c46f1f963ad4f5564f51746f0|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|225|64|225|64|4432d73cb43005a6c5ab22362c8773f0f21d0ac4|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|236|68|236|68|3ae31e5d2f432b152768be816a2fc40803434382|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|243|183|243|183|b84f11a781130328997f76bd3ef2f3faa57a31d0|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|257|80|257|80|7fab1dccd9502d972b0b6f3fbbea8340483ada89|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|262|133|262|133|22c6e583ac81ee6f218414ee5f5271469891c114|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|267|141|267|141|69e5f19c951bf70e9e7eaa72ea2b784ab97c3dff|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|294|59|294|59|bb06a1edb1abab80686af224b1e77ff4cba9d604|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|305|112|305|112|044d2c50ef7e4765d1130fb40d620b90bae19174|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|310|85|310|85|d0601ba765735657d724123264ad81ccb959cd6b|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|316|55|316|55|b7fa34dcfcdeab84175766fab6106fe6659f53e7|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|334|122|334|122|d6149e8bd18677704c261b7d3e9afeaf8be9f6a6|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|348|32|348|32|b7ca157f62b1295d8f5839c8f5d33a6020bc98a8|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|355|57|355|57|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-passed-in-event-handlers|294|52|294|52|825f0e3d4a33b20b5154b1fb4905e9ef5b1944d9|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-passed-in-event-handlers|316|48|316|48|f182f9c53280940bba6c3153bd676cce9f4b09b5|1697068800000|1707440400000|1712620800000|app/components/modal-portal-settings.hbs
-add|ember-template-lint|no-action|20|125|20|125|ba0f8b6ba2697f1b071200d1a3dae9c34fcb2882|1697068800000|1707440400000|1712620800000|app/components/modal-post-history.hbs
-add|ember-template-lint|no-action|31|34|31|34|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-post-history.hbs
-add|ember-template-lint|no-action|43|46|43|46|2f3118270fbb1ff6e5da6b0d482ccd21e69df3b5|1697068800000|1707440400000|1712620800000|app/components/modal-post-history.hbs
-add|ember-template-lint|require-valid-alt-text|12|28|12|28|bc0bb4f51567cea7289bfcb30d02932f0f57d0d9|1697068800000|1707440400000|1712620800000|app/components/modal-post-history.hbs
-add|ember-template-lint|no-action|4|53|4|53|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-reset-all-passwords.hbs
-add|ember-template-lint|no-action|11|79|11|79|e36addc82ad99ca2e46fce288afd43c8a56cc904|1697068800000|1707440400000|1712620800000|app/components/modal-reset-all-passwords.hbs
-add|ember-template-lint|no-action|23|41|23|41|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-reset-all-passwords.hbs
-add|ember-template-lint|no-action|21|39|21|39|c1c116347fcaf9f69d60fa7ae58d746e9994cdbd|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|37|39|37|39|7307d2c5d78fa732b959ced6823b3d82dcc07446|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|46|39|46|39|7307d2c5d78fa732b959ced6823b3d82dcc07446|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|74|56|74|56|fa36149ee581ce634903cef877ccfdc133aa67ec|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|86|51|86|51|dcc09bb23a476d5b83b273b693cd8cb2aba68365|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|97|51|97|51|a80dd18e18dda6fb6f1f97d87bef2b8c2ce3d847|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|175|47|175|47|73ac7d3892fcbcf15c3d5c44fca14dd21016daea|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|181|53|181|53|c76b92d7bdb6ed498238b647928748aa4146dc24|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|182|55|182|55|02efc45b808f4cfdbe5f7b72b784337aef4e98a7|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|183|56|183|56|4227b643fe44a6c343b819bbee7eecdfb7916ccc|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|184|57|184|57|115cc8adc4c0f98e2d93a59ff8efbee711541336|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|192|41|192|41|c76b92d7bdb6ed498238b647928748aa4146dc24|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|193|44|193|44|4227b643fe44a6c343b819bbee7eecdfb7916ccc|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|194|45|194|45|115cc8adc4c0f98e2d93a59ff8efbee711541336|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|313|71|313|71|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|315|8|315|8|d465b362b15b90cf42a093e72895155f49cdf6f2|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-passed-in-event-handlers|21|32|21|32|f69395e36c890a23e3f603ad3fd2cb384932af93|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-passed-in-event-handlers|37|32|37|32|86b5983929a27ca8d458ff051c95a50a406fbe57|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-passed-in-event-handlers|46|32|46|32|86b5983929a27ca8d458ff051c95a50a406fbe57|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-passed-in-event-handlers|86|44|86|44|dcb4785647a50814bcfce82f8d68ac8dd8f54ec2|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-passed-in-event-handlers|97|44|97|44|70487c008d7dda453fef82f0140699ee93c0055c|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|style-concatenation|245|54|245|54|23293f0c3838b23432d2b2daaf04b34504896d91|1697068800000|1707440400000|1712620800000|app/components/modal-tier.hbs
-add|ember-template-lint|no-action|4|53|4|53|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-unsubscribe-members.hbs
-add|ember-template-lint|no-action|50|89|50|89|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-unsubscribe-members.hbs
-add|ember-template-lint|no-action|54|71|54|71|141d456b03124abca146e58e4ae15825fdd040bb|1697068800000|1707440400000|1712620800000|app/components/modal-unsubscribe-members.hbs
-add|ember-template-lint|require-valid-alt-text|4|12|4|12|8369d1b06deac93e8c8e05444670c15182aea434|1697068800000|1707440400000|1712620800000|app/templates/application-error.hbs
-add|ember-template-lint|no-passed-in-event-handlers|41|36|41|36|55f7b92a44dc897758496ba1560e34a1d53fb946|1697068800000|1707440400000|1712620800000|app/templates/offer.hbs
-add|ember-template-lint|no-passed-in-event-handlers|205|52|205|52|eb97a902a644abbe2df5bc2e57f7affa0a96fdac|1697068800000|1707440400000|1712620800000|app/templates/offer.hbs
-add|ember-template-lint|no-passed-in-event-handlers|227|40|227|40|5c7497369e17fd561d43dd7edad9c0887c21e9ff|1697068800000|1707440400000|1712620800000|app/templates/offer.hbs
-add|ember-template-lint|no-passed-in-event-handlers|241|40|241|40|f6273c4d79a992751e950f5793ddf17bcf03e649|1697068800000|1707440400000|1712620800000|app/templates/offer.hbs
-add|ember-template-lint|no-passed-in-event-handlers|256|36|256|36|5257e566aba16d7d9a28cf1df37a625c1eebfb25|1697068800000|1707440400000|1712620800000|app/templates/offer.hbs
-add|ember-template-lint|no-action|20|31|20|31|3aa834e53af871a821ebb1b47f7a04f925c2b593|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|21|35|21|35|ae65e93ed2b79a307e0eba50b154fe84ee1ae210|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|37|31|37|31|eefdee43411bdd45c2786b9e826e6b550fd6212d|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|38|35|38|35|a8e4bd4c57a8f2df65749b0cfa4349da22b2a0aa|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|55|31|55|31|1709109776bf3fc47aaecc21e6d3ec8a0489ad6b|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|56|35|56|35|8000241a81189d3876d264331ec0c9b6476df076|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|73|31|73|31|6756e119daad4aa143724e9b56a6aef744d65251|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|74|35|74|35|26b1d89c0e5bbcd629a215903c0819d35f798aa6|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-passed-in-event-handlers|20|24|20|24|f0b7babba7593639d68dadae2f19e7144dd8c63e|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-passed-in-event-handlers|37|24|37|24|2692530760cb1f7156dcf9570aacf0f8baca2770|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-passed-in-event-handlers|55|24|55|24|ce0d7e2e732b22ce3643fb9b1ac6ecef07c275ff|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-passed-in-event-handlers|73|24|73|24|80681fcec2258c3d81a231bbd635aa1f03ff1452|1697068800000|1707440400000|1712620800000|app/templates/setup.hbs
-add|ember-template-lint|no-action|6|108|6|108|ccc38f66549f9baedaa3b9943ae6634ea8f99e69|1697068800000|1707440400000|1712620800000|app/templates/tags.hbs
-add|ember-template-lint|no-action|7|110|7|110|c3819ce2b6989e8596be570ed0c9fb82b5012521|1697068800000|1707440400000|1712620800000|app/templates/tags.hbs
-add|ember-template-lint|require-valid-alt-text|15|32|15|32|80c1ce6724481312363dc4e1db42bf28b41909f2|1697068800000|1707440400000|1712620800000|app/templates/whatsnew.hbs
-add|ember-template-lint|require-input-label|33|16|33|16|91baa7e6ceea36e93d45f5dc9ac213cb7f1d8a59|1697068800000|1707440400000|1712620800000|app/components/custom-theme-settings/color.hbs
-add|ember-template-lint|style-concatenation|3|40|3|40|ba5764956a2805ed8d72306fd9a8b8cd10a97119|1697068800000|1707440400000|1712620800000|app/components/custom-theme-settings/color.hbs
-add|ember-template-lint|no-invalid-interactive|22|71|22|71|c1a223c4a0c265ed64685dbfbdd39581ba237083|1697068800000|1707440400000|1712620800000|app/components/custom-theme-settings/image.hbs
-add|ember-template-lint|require-valid-alt-text|22|24|22|24|c1a223c4a0c265ed64685dbfbdd39581ba237083|1697068800000|1707440400000|1712620800000|app/components/custom-theme-settings/image.hbs
-add|ember-template-lint|no-invalid-interactive|7|32|7|32|2da5baf637c4f17f4acd498968b6022ffc0f3105|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/design.hbs
-add|ember-template-lint|no-action|106|83|106|83|40a33b8afd29e93eebeaccdb49d729c06f755e1f|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|no-invalid-interactive|106|83|106|83|91111b837d1217ec9988076f5263b0e32df72604|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|38|104|38|104|156670ca427c49c51f0a94f862b286ccc9466d92|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|48|107|48|107|156670ca427c49c51f0a94f862b286ccc9466d92|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|58|131|58|131|156670ca427c49c51f0a94f862b286ccc9466d92|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|93|93|93|93|156670ca427c49c51f0a94f862b286ccc9466d92|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|require-context-role|43|89|43|89|0be75355d0dd43dafc60091285ba906c43350d19|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|require-context-role|66|57|66|57|0be75355d0dd43dafc60091285ba906c43350d19|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|require-context-role|71|57|71|57|0be75355d0dd43dafc60091285ba906c43350d19|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|require-context-role|82|131|82|131|0be75355d0dd43dafc60091285ba906c43350d19|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/footer.hbs
-add|ember-template-lint|no-action|10|110|10|110|4bbb6ad1f623335866ac715f34f2ce9829b1d55b|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-action|26|30|26|30|8eee88dbd40609f8ddc00330f4a47b1d30c483f0|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-action|128|110|128|110|c8306856104d54d12e3db50acab26094d0793fb3|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-invalid-interactive|26|30|26|30|929269f70336deb9f640bc0b5d54a0bd5336d27a|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-invalid-link-title|22|24|22|24|17a357b69040eb9e19a79fe08468c698eab84939|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|22|51|22|51|b8aae2daed1c14cf280800b3d282d11fb14851a4|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|27|103|27|103|571c3d774ed33480f528b54b323b23bfd7148eee|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|46|118|46|118|b8aae2daed1c14cf280800b3d282d11fb14851a4|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-unknown-arguments-for-builtin-components|118|95|118|95|b8aae2daed1c14cf280800b3d282d11fb14851a4|1697068800000|1707440400000|1712620800000|app/components/gh-nav-menu/main.hbs
-add|ember-template-lint|no-invalid-interactive|8|51|8|51|66a27dbed218d15e49e91c72a93215ad0d90f778|1697068800000|1707440400000|1712620800000|app/components/gh-power-select/trigger.hbs
-add|ember-template-lint|no-yield-only|1|0|1|0|a5fa6e8c1e0f03fb31b5cd17770e4368d44932e4|1697068800000|1707440400000|1712620800000|app/components/gh-token-input/label-token.hbs
-add|ember-template-lint|no-yield-only|1|0|1|0|a5fa6e8c1e0f03fb31b5cd17770e4368d44932e4|1697068800000|1707440400000|1712620800000|app/components/gh-token-input/tag-token.hbs
-add|ember-template-lint|no-action|8|19|8|19|73ac7d3892fcbcf15c3d5c44fca14dd21016daea|1697068800000|1707440400000|1712620800000|app/components/gh-token-input/trigger.hbs
-add|ember-template-lint|no-positive-tabindex|46|8|46|8|6118264a9a0599fab6ad4da7264c1bfffa88687e|1697068800000|1707440400000|1712620800000|app/components/gh-token-input/trigger.hbs
-add|ember-template-lint|require-iframe-title|27|20|27|20|94e58d11848d5613900c2188ba63dac41f4c03bb|1697068800000|1707440400000|1712620800000|app/components/modals/email-preview.hbs
-add|ember-template-lint|require-iframe-title|42|16|42|16|a3292b469dc37f2f4791e7f224b0b65c8ecf5d18|1697068800000|1707440400000|1712620800000|app/components/modals/email-preview.hbs
-add|ember-template-lint|no-autofocus-attribute|21|20|21|20|942419d05c04ded6716f09faecd6b1ab55418121|1697068800000|1707440400000|1712620800000|app/components/modals/new-custom-integration.hbs
-add|ember-template-lint|no-invalid-interactive|2|37|2|37|e21ba31f54b631a428c28a1c9f88d0dc66f2f5fc|1697068800000|1707440400000|1712620800000|app/components/modals/search.hbs
-add|ember-template-lint|no-action|31|26|31|26|0e827c1770073f988535ceb9d6c49808a153d896|1697068800000|1707440400000|1712620800000|app/components/settings/members-default-post-access.hbs
-add|ember-template-lint|no-action|31|190|31|190|ed86b04ad5f38f1a14076d74e0021268c98b3927|1697068800000|1707440400000|1712620800000|app/templates/settings/code-injection.hbs
-add|ember-template-lint|no-action|39|190|39|190|2164918a2fce3dd29c513fd604fe36e3cef2b7c3|1697068800000|1707440400000|1712620800000|app/templates/settings/code-injection.hbs
-add|ember-template-lint|no-action|29|61|29|61|55c24e7e54f416f3d86061f4f1c1ccaba8fbfc27|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|37|43|37|43|03e3188d8e2dfe0b2937d5b71883f016d07a4946|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|38|47|38|47|1c60e378fb19511c2cac50a7a42b6aee20605994|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|48|43|48|43|03463f0fb55cc878bd4c913e47d55f41e2947661|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|49|47|49|47|6cdbcde69f3d62415e293a78dbcf26b96fc36f45|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|66|61|66|61|f3fb07d2afa3090b0f97067437413284ed58f6c5|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|74|40|74|40|0232e593042bb48fcc89bf9ab0b91b242f264fba|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|86|61|86|61|6128361491f571a637abfda97ad687f73ab667c3|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|94|43|94|43|ba45af3e814e72ad4d95a8f317bb9cc9ad9215c8|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|95|47|95|47|2c1cc5f0c3aeddb4838344241fd5ad1706fa7f98|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|117|61|117|61|bf49560351459e5d6c9fde8cb2f052ce17b1b657|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|131|55|131|55|0a0ef4f73dbe59f49337893fdc92d2a55728ed07|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|144|55|144|55|c7ba1dbb7596398deeed5fb7a7fe3f7e57929ddb|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|179|61|179|61|d26ee22129821fa02604d8e2a93e9ae0a916639f|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|192|52|192|52|3732114c07810566f79f1afa68845ee20b92fa18|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|193|52|193|52|bc30430315dac2132453165473d30c5b2d80ba92|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|203|51|203|51|4345c59c19cd5b007ab34318b7fa11f34cca667a|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|214|51|214|51|44ee454f126f973a6a74fb5541a028ec8c35c670|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|267|61|267|61|84ed8480d5bf5a95046ccc582c64bc97f705018e|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|280|56|280|56|c6cdf101b8a83665bceda4c602acf68cdf3ef67b|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|281|56|281|56|1c05a27faf63c386a263092a5c7e44034a773719|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|291|55|291|55|3ca4850a38d0a79f31de327e4f0619cb4bd61305|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|302|55|302|55|97850bdbac4ce72904bbac5af258e64ccbeab822|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|356|61|356|61|e5c846bf3deb14ba03604a3d324a61d16248b453|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|408|44|408|44|3f4324c899d78620bab1b84fd1824e93c737c15c|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|426|51|426|51|866af142283d04b707df59f73fb539df98728301|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|427|47|427|47|674aac6769471bd8c724fab4dbd566cf220e1166|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|37|36|37|36|cfeb8caa552eac5ebbb6d91854cb74f89cdf6e1a|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|48|36|48|36|83c111cfc155ec3b6832e60e2d1a9414f6f75623|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|94|36|94|36|c34c2e482b61c7ccd2b1103b5dee4b291eb2ec47|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|131|48|131|48|615e13dcb9f6e380efec5f70a1bd4619c0ad1426|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|144|48|144|48|f25458443d396a354c2971d0c90c2ddccf964fb1|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|203|44|203|44|b48c77bffa2c66754ecbbb20b4d59b8ee317ae0f|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|214|44|214|44|46e9644476d397c95936c4f2173ca0c4a214dd9e|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|291|48|291|48|c6a6197b290f6b1e41cdc0b88a2571db7c025ddd|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|302|48|302|48|3c119ddbb78d06c18da5b1e812440b28881a9448|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-passed-in-event-handlers|427|40|427|40|60888a79c6c68107f859a65663f794408bc434f4|1697068800000|1707440400000|1712620800000|app/templates/settings/general.hbs
-add|ember-template-lint|no-action|40|61|40|61|aea6df58f8bc5e92ec7e059aff378cc785db5733|1697068800000|1707440400000|1712620800000|app/templates/settings/labs.hbs
-add|ember-template-lint|no-action|107|44|107|44|69e5f19c951bf70e9e7eaa72ea2b784ab97c3dff|1697068800000|1707440400000|1712620800000|app/templates/settings/labs.hbs
-add|ember-template-lint|no-action|120|49|120|49|03987b6ed09575e15d2bac6a91e1d93d56125c51|1697068800000|1707440400000|1712620800000|app/templates/settings/labs.hbs
-add|ember-template-lint|no-action|156|44|156|44|69e5f19c951bf70e9e7eaa72ea2b784ab97c3dff|1697068800000|1707440400000|1712620800000|app/templates/settings/labs.hbs
-add|ember-template-lint|no-action|169|49|169|49|cc3eebe4d4988160eb63e445ccf7b62bcf122531|1697068800000|1707440400000|1712620800000|app/templates/settings/labs.hbs
-add|ember-template-lint|no-action|14|19|14|19|1cf358e2bf9d6fbb6abdc967c327ac9236e817dc|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-action|15|22|15|22|b05a3bfe0536cd1cacb3a5803246be6f16857425|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-action|16|23|16|23|29e3a04f98d37252bdd540ec2adcda840bd6f929|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-action|26|20|26|20|3c723798059c71aedfa95cd70507bc0308728544|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-action|27|25|27|25|e27fd2ebfccd2eed3d401b8854fc4d5d2f74cfc2|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-action|35|49|35|49|18f748b67f9fe570b08c7a1c1d99114f31b41598|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-action|39|52|39|52|4d50f3b33a672c365969169a4c0ca14cf83fe39c|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-passed-in-event-handlers|14|12|14|12|4069dec45ac2a31d440780c914b2307ad1c6ea5f|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-passed-in-event-handlers|15|12|15|12|e53f64794fdd0fe8c8b027d1831942d7c78c503b|1697068800000|1707440400000|1712620800000|app/components/settings/navigation/nav-item.hbs
-add|ember-template-lint|no-action|51|52|51|52|2b83cff3852a6f3cb1f2d2613e1bb611e1af4996|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/amp.hbs
-add|ember-template-lint|no-action|71|54|71|54|2fc1814780dbf5fab6c8d588de3644dce925acbc|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/amp.hbs
-add|ember-template-lint|require-valid-alt-text|24|20|24|20|91e015c567087d47025b0e457150eb9d6a3a8f1c|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/amp.hbs
-add|ember-template-lint|no-action|51|48|51|48|2b83cff3852a6f3cb1f2d2613e1bb611e1af4996|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/firstpromoter.hbs
-add|ember-template-lint|no-action|71|50|71|50|2fc1814780dbf5fab6c8d588de3644dce925acbc|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/firstpromoter.hbs
-add|ember-template-lint|require-valid-alt-text|24|20|24|20|6cfcbac2f373de035261f93c852c6d6d372b6ce4|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/firstpromoter.hbs
-add|ember-template-lint|no-action|37|94|37|94|3230630f00a597aa98dfb1dd3533375d55516667|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-action|50|55|50|55|2c1e9f8787439af0488bbeeed6adc276a525e585|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-action|51|59|51|59|126db4f8e2a36d157b01c874381f548fd8d4a79e|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-action|53|58|53|58|2fc1814780dbf5fab6c8d588de3644dce925acbc|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-action|76|55|76|55|f790efaece9bf04396b25c2fedf4625a426f2467|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-action|78|58|78|58|2fc1814780dbf5fab6c8d588de3644dce925acbc|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-passed-in-event-handlers|50|48|50|48|138f75fcc7408e61c79185c37265529c752af8b3|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-passed-in-event-handlers|76|48|76|48|8fb95409c6333d15490f0777239f6e04641215e6|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|require-valid-alt-text|24|20|24|20|a500be6114ce681e610b6fec7d2a6cea2f4555f7|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/slack.hbs
-add|ember-template-lint|no-action|51|56|51|56|2b83cff3852a6f3cb1f2d2613e1bb611e1af4996|1697068800000|1707440400000|1712620800000|app/templates/settings/integrations/unsplash.hbs
+add|ember-template-lint|no-action|2|54|2|54|8618d17e29821f45d8809ad2d6cf6053b825f7fe|1712707200000|1723075200000|1728259200000|app/components/gh-billing-update-button.hbs
+add|ember-template-lint|no-action|5|11|5|11|8eaebb48eca1563c6e0b18581df84ab59188d971|1712707200000|1723075200000|1728259200000|app/components/gh-cm-editor.hbs
+add|ember-template-lint|no-passed-in-event-handlers|5|4|5|4|3a763e253744b070633bb8bd424b6c8e55f6b20a|1712707200000|1723075200000|1728259200000|app/components/gh-cm-editor.hbs
+add|ember-template-lint|no-invalid-interactive|1|103|1|103|534029ab0ba1b74eff4a2f31c8b4dd9f1460316a|1712707200000|1723075200000|1728259200000|app/components/gh-context-menu.hbs
+add|ember-template-lint|no-invalid-interactive|5|53|5|53|9647ef6afba919b2af04fe551b0fdf0fb63be849|1712707200000|1723075200000|1728259200000|app/components/gh-context-menu.hbs
+add|ember-template-lint|no-action|5|18|5|18|0c80a75b2a80d404755333991c266c81c97c9cda|1712707200000|1723075200000|1728259200000|app/components/gh-date-time-picker.hbs
+add|ember-template-lint|require-input-label|11|16|11|16|36ecd3af7ac0e4bbafbf933cc20ff9f3ff8f0947|1712707200000|1723075200000|1728259200000|app/components/gh-date-time-picker.hbs
+add|ember-template-lint|require-input-label|29|8|29|8|334a3ea0fb16fabf58967294e125af8437504bdb|1712707200000|1723075200000|1728259200000|app/components/gh-date-time-picker.hbs
+add|ember-template-lint|no-action|9|19|9|19|d12bcf1144bfb2fe70e7ab0f66836f1c6207a589|1712707200000|1723075200000|1728259200000|app/components/gh-editor.hbs
+add|ember-template-lint|no-action|10|20|10|20|16d94650de2ffbe8ee3f2ce3ba5ca97a6304b739|1712707200000|1723075200000|1728259200000|app/components/gh-editor.hbs
+add|ember-template-lint|no-action|11|17|11|17|30d64b1bf8990e2f84c52665690739fcc726e9f7|1712707200000|1723075200000|1728259200000|app/components/gh-editor.hbs
+add|ember-template-lint|no-action|2|45|2|45|55b33496610b2f4ef6b9fe62713f4b4ddee37f19|1712707200000|1723075200000|1728259200000|app/components/gh-fullscreen-modal.hbs
+add|ember-template-lint|no-action|10|29|10|29|ebbd89a393bcec7f537f2104ace2a6b1941a19a7|1712707200000|1723075200000|1728259200000|app/components/gh-fullscreen-modal.hbs
+add|ember-template-lint|no-action|11|32|11|32|ab89b6f10c519be1271386203e9439d261eecd67|1712707200000|1723075200000|1728259200000|app/components/gh-fullscreen-modal.hbs
+add|ember-template-lint|no-action|13|36|13|36|3776877637b49b65deef537c68ae490b2fb081a9|1712707200000|1723075200000|1728259200000|app/components/gh-fullscreen-modal.hbs
+add|ember-template-lint|no-invalid-interactive|2|45|2|45|918fdec8490009c6197091e319d6ec52ee95b983|1712707200000|1723075200000|1728259200000|app/components/gh-fullscreen-modal.hbs
+add|ember-template-lint|link-href-attributes|8|8|8|8|2078c6e43d1e5548ae745b7ac8cb736f7d2aaf68|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader-with-preview.hbs
+add|ember-template-lint|no-invalid-interactive|8|60|8|60|2078c6e43d1e5548ae745b7ac8cb736f7d2aaf68|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader-with-preview.hbs
+add|ember-template-lint|require-valid-alt-text|3|13|3|13|079fc89fa5c7c47f6b0b219820cdda3819c44e26|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader-with-preview.hbs
+add|ember-template-lint|no-action|12|58|12|58|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader.hbs
+add|ember-template-lint|no-action|17|75|17|75|bbc5d9a459cd07e56d8c79dde619775b89d7cc89|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader.hbs
+add|ember-template-lint|no-action|22|52|22|52|b1bd53a513ad82434d5a0a9a96441a45d416d7ad|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader.hbs
+add|ember-template-lint|no-action|31|16|31|16|4c64ddeaf795ee831d0d7346667a305814ca9855|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader.hbs
+add|ember-template-lint|no-action|32|15|32|15|b1bd53a513ad82434d5a0a9a96441a45d416d7ad|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader.hbs
+add|ember-template-lint|no-invalid-interactive|22|52|22|52|74dea739bef284d6557987ff3da53fa1278030e2|1712707200000|1723075200000|1728259200000|app/components/gh-image-uploader.hbs
+add|ember-template-lint|no-action|10|16|10|16|8d8dd8c2cb5f9910c2de5ca6acc76ee4262a876e|1712707200000|1723075200000|1728259200000|app/components/gh-members-import-mapping-input.hbs
+add|ember-template-lint|no-action|9|36|9|36|05358b6ec6e9afbaa47416266c49f40a3ffb4490|1712707200000|1723075200000|1728259200000|app/components/gh-members-import-table.hbs
+add|ember-template-lint|no-action|10|36|10|36|c5ce93cf577ec47970f715ed83ed11a63adb7a63|1712707200000|1723075200000|1728259200000|app/components/gh-members-import-table.hbs
+add|ember-template-lint|no-action|8|50|8|50|de589665046a78748832e8f93d2e495d1d259265|1712707200000|1723075200000|1728259200000|app/components/gh-mobile-nav-bar.hbs
+add|ember-template-lint|no-action|149|48|149|48|01f579966c325cf66d3a87799e8cea7dd1fded81|1712707200000|1723075200000|1728259200000|app/components/gh-portal-links.hbs
+add|ember-template-lint|no-action|36|43|36|43|66cebfc8448eced0bccf3faa57b4af0cd633e65e|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|37|47|37|47|70f3e9aa9a9aa52142c4e0c015a8f173d12b05ed|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|56|41|56|41|43cc094c1a6b50ecd24c8af325dfdfcac863bb14|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|57|41|57|41|e7f429eefd04a55d4ef1875fe601da1b69964364|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|87|50|87|50|0e827c1770073f988535ceb9d6c49808a153d896|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|104|39|104|39|5cbc9d2abf29e108bfc207579df1206485e2a74d|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|105|43|105|43|1f2dd4961e9757ede9706bb0aa9b8baf9c49b22b|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|115|105|115|105|90dbb84741c72aa86a601e1cb95c066bd53898bd|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|122|46|122|46|56ca074eb0236b8becc4084423056a8ffa4453e9|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|157|73|157|73|b07bf9d50af5f00861571521b150cf6504b90704|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|171|56|171|56|38755451c044c56040684339301c21b2aab49ecb|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|189|50|189|50|9f1c3c88187e5db774f97704269e372f8331eba5|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|195|50|195|50|97acfb2045b33a97621258596b631362ad4c56d5|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|201|51|201|51|358336432fcb413c522c5f1ff3062a68ef9f449f|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|207|50|207|50|78a45cbb7eafdda134d96f6035b0026f339e75ad|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|213|50|213|50|693211baf08c011e77284b483c30e28ecaf63520|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|222|105|222|105|de5b68b49193c72f85c0e478f151a00180321d91|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|235|167|235|167|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|600|163|600|163|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|606|34|606|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|615|47|615|47|67551960e57b2ad06d24289e0d6f256dc5635cae|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|616|51|616|51|50e3029f4c845049ff10130cf0dc2ea06c7a3d2d|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|631|47|631|47|0d852775b4028d61c2c91b5d821c79de3cdbd1de|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|632|51|632|51|194439ec4cb10e176eecb1f55c2995c00f6c67b4|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|646|47|646|47|3be93048908ab43d74726c3983982fcb9a3570e3|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|647|51|647|51|40871d259cc307345b8096e4215ae58e5886b724|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|673|166|673|166|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|680|34|680|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|685|44|685|44|d2abbb4bb55b6cb1131ca0bc56c31632b32b980c|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|686|44|686|44|3ede83bd64d206d665edb4f1b73f03b4122edfad|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|696|47|696|47|13b7064b520a924d9e57a4a680621ce979d23923|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|697|51|697|51|b0fc38b818f4ca2613684588e4122e12da0090b9|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|712|47|712|47|f34f084dc72c079be9ba3eb93c255bd8853612bd|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|713|51|713|51|c5c09d001fa96a623649cc88ef13b3c6c164f05b|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|741|167|741|167|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|747|34|747|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|752|44|752|44|32101c0834d9e8d2caa87dee9cb1a92fe633cfde|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|753|44|753|44|c8a82286cfe4220cb2d8a059b1daf7f6c8d54cf5|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|763|47|763|47|31800fb83f1797de5d91b7007c48432cf2fae803|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|764|51|764|51|5ce0788874489341385f031810e9f7f62724aaf8|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|777|47|777|47|1cbd7d922a9d202772a9dca214d97bed18777d6e|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|778|51|778|51|16fb2c7c87dc282c6ee49a032aaaf22628b88084|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|809|168|809|168|0145b67f0faef0aad141c6a4269c35c6ef8f0a47|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|815|34|815|34|3d44a2ad21d60d18bed6f79265caa4887361aaa4|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|822|50|822|50|d03e7bbf2b6de94b08fae1c33bd5a2f16874e03a|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|824|48|824|48|bca167f0250b40d56ff1ed40ec21bc88f8e27ec3|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|835|50|835|50|93ae447fb1054de4dbe501fc60167a6ff3273687|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|837|48|837|48|ecb9ed2577be7ea0300563f22d8e9fde2fed12a6|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|36|36|36|36|fed655605208b290a18b9f7da51a6cf7b40c0e9a|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|104|32|104|32|187e85e14470b453a1e6df8c5f18549d11c441a0|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|615|40|615|40|f290a04fd56f613d80d61244d161631f630185a8|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|631|40|631|40|c1af88109f705acc93fab4ee7b4d89096136ffe1|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|646|40|646|40|852cbb2c63e19a28d700d3b18e6f887edef303fa|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|696|40|696|40|58185c92e8b6261ea1483a70296d9fa837d3f2f5|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|712|40|712|40|c4353acd715c396564c69389edd0a52246d3b966|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|763|40|763|40|29f26e46559dc40d9724a05b7516cb52f1481aaa|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|777|40|777|40|42e0617f832585eaa056c9c66dffe1a126318faf|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|822|40|822|40|d1dccfeee5b103fac3b14d5b4567bc65ee08fd5a|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-passed-in-event-handlers|835|40|835|40|055c4b70aa8daba6b97077eefa95ebed7f7f5315|1712707200000|1723075200000|1728259200000|app/components/gh-post-settings-menu.hbs
+add|ember-template-lint|no-action|4|14|4|14|c8f6146f9286ec1b289e28983ab446386f390f01|1712707200000|1723075200000|1728259200000|app/components/gh-psm-authors-input.hbs
+add|ember-template-lint|no-action|5|14|5|14|a90edd9a99596008f60bfcdbc6befe7fe8d26321|1712707200000|1723075200000|1728259200000|app/components/gh-psm-tags-input.hbs
+add|ember-template-lint|no-action|6|14|6|14|3924d7cfb394cbcfd6b1bf9cf13a5040ac8f94b5|1712707200000|1723075200000|1728259200000|app/components/gh-psm-tags-input.hbs
+add|ember-template-lint|no-action|10|20|10|20|8b7921c0514cfd3fec8c3a474187048bc26faf7f|1712707200000|1723075200000|1728259200000|app/components/gh-psm-tags-input.hbs
+add|ember-template-lint|no-action|9|24|9|24|2e612be5e2b8e0b792f951c3c75b2f71df880365|1712707200000|1723075200000|1728259200000|app/components/gh-psm-template-select.hbs
+add|ember-template-lint|no-action|7|16|7|16|86819b20fcc42bc1d4607519c1d45532ee337884|1712707200000|1723075200000|1728259200000|app/components/gh-psm-visibility-input.hbs
+add|ember-template-lint|no-autofocus-attribute|13|16|13|16|fa0ffb960072633b72117849e3927673be0059af|1712707200000|1723075200000|1728259200000|app/components/gh-search-input.hbs
+add|ember-template-lint|require-iframe-title|1|0|1|0|956ab219134ac63aec3fd2d35582076c21631b75|1712707200000|1723075200000|1728259200000|app/components/gh-site-iframe.hbs
+add|ember-template-lint|no-yield-only|1|0|1|0|a5fa6e8c1e0f03fb31b5cd17770e4368d44932e4|1712707200000|1723075200000|1728259200000|app/components/gh-text-input.hbs
+add|ember-template-lint|no-action|1|51|1|51|674a942db62e014b25156b02d014f6c63b2f1cb2|1712707200000|1723075200000|1728259200000|app/components/gh-theme-error-li.hbs
+add|ember-template-lint|no-action|2|11|2|11|2b1317e72b94ec31bf2700acc3f041e6be974b72|1712707200000|1723075200000|1728259200000|app/components/gh-uploader.hbs
+add|ember-template-lint|no-action|7|13|7|13|add4b57d48167f809045245535d45bedb00cb753|1712707200000|1723075200000|1728259200000|app/components/gh-uploader.hbs
+add|ember-template-lint|no-action|8|22|8|22|ce1eba2b791c0f120baf10871fd3949c1b9f6a79|1712707200000|1723075200000|1728259200000|app/components/gh-uploader.hbs
+add|ember-template-lint|no-action|9|22|9|22|0209f233628ec084b87894b4be9073c29f2a4f47|1712707200000|1723075200000|1728259200000|app/components/gh-uploader.hbs
+add|ember-template-lint|no-passed-in-event-handlers|4|4|4|4|3dedc53191768d81765eac4a7a049a9aba7df442|1712707200000|1723075200000|1728259200000|app/components/gh-url-input.hbs
+add|ember-template-lint|no-action|1|71|1|71|2e6351f546807d88cc8eb9dbe8baa149468b5cb9|1712707200000|1723075200000|1728259200000|app/components/gh-view-title.hbs
+add|ember-template-lint|no-invalid-role|1|0|1|0|3e651d38e0110e1be20e5082075db1b879b59a36|1712707200000|1723075200000|1728259200000|app/components/gh-view-title.hbs
+add|ember-template-lint|no-action|5|50|5|50|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-impersonate-member.hbs
+add|ember-template-lint|no-action|5|74|5|74|d465b362b15b90cf42a093e72895155f49cdf6f2|1712707200000|1723075200000|1728259200000|app/components/modal-impersonate-member.hbs
+add|ember-template-lint|no-action|43|57|43|57|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|50|56|50|56|190532b9954beb4e7e9e0f1c51d170e64d4a5315|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|56|34|56|34|ff609af61e9159dfc5386543d559f6d217d39531|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|57|29|57|29|9a0a72738b6e1a4f46415b2328c37d1814562717|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|110|89|110|89|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|116|91|116|91|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|119|116|119|116|7e581bf2ffd5254ae851201e1f23cb9eaa9b198b|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|129|120|129|120|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|132|103|132|103|7e581bf2ffd5254ae851201e1f23cb9eaa9b198b|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|143|112|143|112|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|147|110|147|110|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|153|97|153|97|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|156|112|156|112|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|160|99|160|99|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|163|110|163|110|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|171|91|171|91|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|174|102|174|102|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|181|95|181|95|031d04576149d3034549aa3d14bc26da704cd70c|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-action|185|102|185|102|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-import-members.hbs
+add|ember-template-lint|no-invalid-interactive|28|24|28|24|42a29ae16e22270f0590c9ce5caa7bfec541ca0b|1712707200000|1723075200000|1728259200000|app/components/modal-member-tier.hbs
+add|ember-template-lint|no-action|5|57|5|57|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|14|45|14|45|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|23|59|23|59|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|23|83|23|83|d465b362b15b90cf42a093e72895155f49cdf6f2|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|34|31|34|31|a8ad062b8379233b7970fe5ea74296fdf5011567|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|47|82|47|82|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|49|16|49|16|d465b362b15b90cf42a093e72895155f49cdf6f2|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|55|113|55|113|c259009ff744c2e9f7bb273e0eb3a3879036ba85|1712707200000|1723075200000|1728259200000|app/components/modal-members-label-form.hbs
+add|ember-template-lint|no-action|20|125|20|125|ba0f8b6ba2697f1b071200d1a3dae9c34fcb2882|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
+add|ember-template-lint|no-action|31|34|31|34|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
+add|ember-template-lint|no-action|43|46|43|46|2f3118270fbb1ff6e5da6b0d482ccd21e69df3b5|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
+add|ember-template-lint|require-valid-alt-text|12|28|12|28|bc0bb4f51567cea7289bfcb30d02932f0f57d0d9|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
+add|ember-template-lint|no-action|4|53|4|53|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-unsubscribe-members.hbs
+add|ember-template-lint|no-action|50|89|50|89|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-unsubscribe-members.hbs
+add|ember-template-lint|no-action|54|71|54|71|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-unsubscribe-members.hbs
+add|ember-template-lint|require-valid-alt-text|4|12|4|12|8369d1b06deac93e8c8e05444670c15182aea434|1712707200000|1723075200000|1728259200000|app/templates/application-error.hbs
+add|ember-template-lint|no-passed-in-event-handlers|41|36|41|36|55f7b92a44dc897758496ba1560e34a1d53fb946|1712707200000|1723075200000|1728259200000|app/templates/offer.hbs
+add|ember-template-lint|no-passed-in-event-handlers|205|52|205|52|eb97a902a644abbe2df5bc2e57f7affa0a96fdac|1712707200000|1723075200000|1728259200000|app/templates/offer.hbs
+add|ember-template-lint|no-passed-in-event-handlers|227|40|227|40|5c7497369e17fd561d43dd7edad9c0887c21e9ff|1712707200000|1723075200000|1728259200000|app/templates/offer.hbs
+add|ember-template-lint|no-passed-in-event-handlers|241|40|241|40|f6273c4d79a992751e950f5793ddf17bcf03e649|1712707200000|1723075200000|1728259200000|app/templates/offer.hbs
+add|ember-template-lint|no-passed-in-event-handlers|256|36|256|36|5257e566aba16d7d9a28cf1df37a625c1eebfb25|1712707200000|1723075200000|1728259200000|app/templates/offer.hbs
+add|ember-template-lint|no-action|20|31|20|31|3aa834e53af871a821ebb1b47f7a04f925c2b593|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|21|35|21|35|ae65e93ed2b79a307e0eba50b154fe84ee1ae210|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|37|31|37|31|eefdee43411bdd45c2786b9e826e6b550fd6212d|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|38|35|38|35|a8e4bd4c57a8f2df65749b0cfa4349da22b2a0aa|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|55|31|55|31|1709109776bf3fc47aaecc21e6d3ec8a0489ad6b|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|56|35|56|35|8000241a81189d3876d264331ec0c9b6476df076|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|73|31|73|31|6756e119daad4aa143724e9b56a6aef744d65251|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|74|35|74|35|26b1d89c0e5bbcd629a215903c0819d35f798aa6|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-passed-in-event-handlers|20|24|20|24|f0b7babba7593639d68dadae2f19e7144dd8c63e|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-passed-in-event-handlers|37|24|37|24|2692530760cb1f7156dcf9570aacf0f8baca2770|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-passed-in-event-handlers|55|24|55|24|ce0d7e2e732b22ce3643fb9b1ac6ecef07c275ff|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-passed-in-event-handlers|73|24|73|24|80681fcec2258c3d81a231bbd635aa1f03ff1452|1712707200000|1723075200000|1728259200000|app/templates/setup.hbs
+add|ember-template-lint|no-action|6|108|6|108|ccc38f66549f9baedaa3b9943ae6634ea8f99e69|1712707200000|1723075200000|1728259200000|app/templates/tags.hbs
+add|ember-template-lint|no-action|7|110|7|110|c3819ce2b6989e8596be570ed0c9fb82b5012521|1712707200000|1723075200000|1728259200000|app/templates/tags.hbs
+add|ember-template-lint|require-valid-alt-text|15|32|15|32|80c1ce6724481312363dc4e1db42bf28b41909f2|1712707200000|1723075200000|1728259200000|app/templates/whatsnew.hbs
+add|ember-template-lint|no-action|106|83|106|83|40a33b8afd29e93eebeaccdb49d729c06f755e1f|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|no-invalid-interactive|106|83|106|83|91111b837d1217ec9988076f5263b0e32df72604|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|no-unknown-arguments-for-builtin-components|38|104|38|104|156670ca427c49c51f0a94f862b286ccc9466d92|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|no-unknown-arguments-for-builtin-components|48|107|48|107|156670ca427c49c51f0a94f862b286ccc9466d92|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|no-unknown-arguments-for-builtin-components|58|131|58|131|156670ca427c49c51f0a94f862b286ccc9466d92|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|no-unknown-arguments-for-builtin-components|93|93|93|93|156670ca427c49c51f0a94f862b286ccc9466d92|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|require-context-role|43|89|43|89|0be75355d0dd43dafc60091285ba906c43350d19|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|require-context-role|66|57|66|57|0be75355d0dd43dafc60091285ba906c43350d19|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|require-context-role|71|57|71|57|0be75355d0dd43dafc60091285ba906c43350d19|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|require-context-role|82|131|82|131|0be75355d0dd43dafc60091285ba906c43350d19|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+add|ember-template-lint|no-action|10|110|10|110|4bbb6ad1f623335866ac715f34f2ce9829b1d55b|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-action|26|30|26|30|8eee88dbd40609f8ddc00330f4a47b1d30c483f0|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-action|132|110|132|110|c8306856104d54d12e3db50acab26094d0793fb3|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-invalid-interactive|26|30|26|30|929269f70336deb9f640bc0b5d54a0bd5336d27a|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-invalid-link-title|22|24|22|24|17a357b69040eb9e19a79fe08468c698eab84939|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-unknown-arguments-for-builtin-components|22|51|22|51|b8aae2daed1c14cf280800b3d282d11fb14851a4|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-unknown-arguments-for-builtin-components|27|103|27|103|571c3d774ed33480f528b54b323b23bfd7148eee|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-unknown-arguments-for-builtin-components|46|118|46|118|b8aae2daed1c14cf280800b3d282d11fb14851a4|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/main.hbs
+add|ember-template-lint|no-invalid-interactive|8|51|8|51|66a27dbed218d15e49e91c72a93215ad0d90f778|1712707200000|1723075200000|1728259200000|app/components/gh-power-select/trigger.hbs
+add|ember-template-lint|no-yield-only|1|0|1|0|a5fa6e8c1e0f03fb31b5cd17770e4368d44932e4|1712707200000|1723075200000|1728259200000|app/components/gh-token-input/label-token.hbs
+add|ember-template-lint|no-yield-only|1|0|1|0|a5fa6e8c1e0f03fb31b5cd17770e4368d44932e4|1712707200000|1723075200000|1728259200000|app/components/gh-token-input/tag-token.hbs
+add|ember-template-lint|no-action|8|19|8|19|73ac7d3892fcbcf15c3d5c44fca14dd21016daea|1712707200000|1723075200000|1728259200000|app/components/gh-token-input/trigger.hbs
+add|ember-template-lint|no-positive-tabindex|46|8|46|8|6118264a9a0599fab6ad4da7264c1bfffa88687e|1712707200000|1723075200000|1728259200000|app/components/gh-token-input/trigger.hbs
+add|ember-template-lint|require-iframe-title|27|20|27|20|94e58d11848d5613900c2188ba63dac41f4c03bb|1712707200000|1723075200000|1728259200000|app/components/modals/email-preview.hbs
+add|ember-template-lint|require-iframe-title|42|16|42|16|a3292b469dc37f2f4791e7f224b0b65c8ecf5d18|1712707200000|1723075200000|1728259200000|app/components/modals/email-preview.hbs
+add|ember-template-lint|no-autofocus-attribute|21|20|21|20|942419d05c04ded6716f09faecd6b1ab55418121|1712707200000|1723075200000|1728259200000|app/components/modals/new-custom-integration.hbs
+add|ember-template-lint|no-invalid-interactive|2|37|2|37|e21ba31f54b631a428c28a1c9f88d0dc66f2f5fc|1712707200000|1723075200000|1728259200000|app/components/modals/search.hbs
+remove|ember-template-lint|no-unknown-arguments-for-builtin-components|93|93|93|93|156670ca427c49c51f0a94f862b286ccc9466d92|1712707200000|1723075200000|1728259200000|app/components/gh-nav-menu/footer.hbs
+remove|ember-template-lint|no-action|20|125|20|125|ba0f8b6ba2697f1b071200d1a3dae9c34fcb2882|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
+remove|ember-template-lint|no-action|31|34|31|34|141d456b03124abca146e58e4ae15825fdd040bb|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
+remove|ember-template-lint|no-action|43|46|43|46|2f3118270fbb1ff6e5da6b0d482ccd21e69df3b5|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
+remove|ember-template-lint|require-valid-alt-text|12|28|12|28|bc0bb4f51567cea7289bfcb30d02932f0f57d0d9|1712707200000|1723075200000|1728259200000|app/components/modal-post-history.hbs
diff --git a/ghost/admin/README.md b/ghost/admin/README.md
index 2b2caa8894c..04fa03e8edb 100644
--- a/ghost/admin/README.md
+++ b/ghost/admin/README.md
@@ -2,51 +2,52 @@
 
 This is the home of the Ember.js-based Admin app that ships with [Ghost](https://github.com/tryghost/ghost).
 
-## Running tests
+## Test
 
-Build and run tests once:
+### Running tests in the browser
 
-```bash
-TZ=UTC yarn test
-```
-_Note the `TZ=UTC` environment variable which is currently required to get tests working if your system timezone doesn't match UTC._
+Run all tests in the browser by running `yarn dev` in the Ghost monorepo and visiting http://localhost:4200/tests. The code is hotloaded on change and you can filter which tests to run.
 
-If you are serving the admin app (e.g., when running `yarn serve`, or when running `yarn dev` in the main Ghost project),  you can also run the tests in your browser by going to http://localhost:4200/tests. 
+[Testing public documentation](https://ghost.notion.site/Testing-Ember-560cec6700fc4d37a58b3ba9febb4b4b)
 
-This has the additional benefit that you can use `await this.pauseTest()` in your tests to temporarily pause tests (best to also add `this.timeout(0);` to avoid timeouts). This allows you to inspect the DOM in your browser to debug tests. You can resume tests by running `resumeTest()` in your browser console.
+---
 
-[More information](https://guides.emberjs.com/v3.28.0/testing/testing-application/#toc_debugging-your-tests)
+Tip: You can use `this.timeout(0); await this.pauseTest();` in your tests to temporarily pause the execution of browser tests. Use the browser console to inspect and debug the DOM, then resume tests by running `resumeTest()` directly in the browser console ([docs](https://guides.emberjs.com/v3.28.0/testing/testing-application/#toc_debugging-your-tests))
 
 
-### Writing tests
+### Running tests in the CLI
 
-When writing tests and not using the `http://localhost:4200/tests` browser tests, it can be easier to have a separate watching build that builds the project for the test environment (this drastically reduces the time you have to wait when running tests):
+To build and run tests in the CLI, you can use:
 
 ```bash
-yarn build --environment=test -w -o="dist-test"
+TZ=UTC yarn test
 ```
+_Note the `TZ=UTC` environment variable which is currently required to get tests working if your system timezone doesn't match UTC._
 
-After that, you can easily run tests locally:
+---
 
-Run all tests:
+However, this is very slow when writing tests, as it requires the app to be rebuilt on every change. Instead, create a separate watching build with:
 
 ```bash
-TZ=UTC yarn test 1 --path="dist-test"
+yarn build --environment=test -w -o="dist-test"
 ```
 
-To have a cleaner output:
+Then run tests with:
 
 ```bash
-TZ=UTC yarn test 1 --reporter dot  --path="dist-test"
+TZ=UTC yarn test 1 --reporter dot --path="dist-test"
 ```
 
-This shows a dot (`.`) for every successful test, and `F` for every failed test. At the end, it will only show the output of the failed tests.
+The `--reporter dot` shows a dot (`.`) for every successful test, and `F` for every failed test. It renders the output of the failed tests only.
+
+---
 
 To run a specific test file:
 ```bash
-TZ=UTC yarn test 1 --reporter dot  --path="dist-test" -mp=tests/acceptance/settings/newsletters-test.js
+TZ=UTC yarn test 1 --reporter dot --path="dist-test" -mp=tests/unit/helpers/gh-count-characters-test.js
 ```
-_Hint: you can easily copy the path of a test in VSCode by right clicking on the test file and choosing `Copy Relative Path`._
+
+---
 
 To have a full list of the available options, run
 ```bash
@@ -55,4 +56,4 @@ ember exam --help
 
 # Copyright & License
 
-Copyright (c) 2013-2023 Ghost Foundation - Released under the [MIT license](LICENSE). Ghost and the Ghost Logo are trademarks of Ghost Foundation Ltd. Please see our [trademark policy](https://ghost.org/trademark/) for info on acceptable usage.
+Copyright (c) 2013-2024 Ghost Foundation - Released under the [MIT license](LICENSE). Ghost and the Ghost Logo are trademarks of Ghost Foundation Ltd. Please see our [trademark policy](https://ghost.org/trademark/) for info on acceptable usage.
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/activitypub.hbs b/ghost/admin/app/components/admin-x/activitypub.hbs
new file mode 100644
index 00000000000..ed901509b3a
--- /dev/null
+++ b/ghost/admin/app/components/admin-x/activitypub.hbs
@@ -0,0 +1 @@
+<div {{react-render this.ReactComponent}}></div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/admin-x/activitypub.js b/ghost/admin/app/components/admin-x/activitypub.js
new file mode 100644
index 00000000000..0f7edb5422c
--- /dev/null
+++ b/ghost/admin/app/components/admin-x/activitypub.js
@@ -0,0 +1,8 @@
+import AdminXComponent from './admin-x-component';
+import {inject as service} from '@ember/service';
+
+export default class AdminXActivityPub extends AdminXComponent {
+    @service upgradeStatus;
+
+    static packageName = '@tryghost/admin-x-activitypub';
+}
diff --git a/ghost/admin/app/components/admin-x/admin-x-component.js b/ghost/admin/app/components/admin-x/admin-x-component.js
new file mode 100644
index 00000000000..0be6116504f
--- /dev/null
+++ b/ghost/admin/app/components/admin-x/admin-x-component.js
@@ -0,0 +1,288 @@
+import * as Sentry from '@sentry/ember';
+import Component from '@glimmer/component';
+import React, {Suspense} from 'react';
+import config from 'ghost-admin/config/environment';
+import fetchKoenigLexical from 'ghost-admin/utils/fetch-koenig-lexical';
+import ghostPaths from 'ghost-admin/utils/ghost-paths';
+import {action} from '@ember/object';
+import {camelize} from '@ember/string';
+import {inject} from 'ghost-admin/decorators/inject';
+import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
+import {tracked} from '@glimmer/tracking';
+
+export const defaultUnsplashHeaders = {
+    Authorization: `Client-ID 8672af113b0a8573edae3aa3713886265d9bb741d707f6c01a486cde8c278980`,
+    'Accept-Version': 'v1',
+    'Content-Type': 'application/json',
+    'App-Pragma': 'no-cache',
+    'X-Unsplash-Cache': true
+};
+
+class ErrorHandler extends React.Component {
+    state = {
+        hasError: false
+    };
+
+    static getDerivedStateFromError() {
+        return {hasError: true};
+    }
+
+    render() {
+        if (this.state.hasError) {
+            return (
+                <div className="admin-x-container-error">
+                    <div className="admin-x-error">
+                        <h1>Loading interrupted</h1>
+                        <p>They say life is a series of trials and tribulations. This moment right here? It's a tribulation. Our app was supposed to load, and yet here we are. Loadless. Click back to the dashboard to try again.</p>
+                        <a href={ghostPaths().adminRoot}>&larr; Back to the dashboard</a>
+                    </div>
+                </div>
+            );
+        }
+
+        return this.props.children;
+    }
+}
+
+export const importComponent = async (packageName) => {
+    if (window[packageName]) {
+        return window[packageName];
+    }
+
+    const relativePath = packageName.replace('@tryghost/', '');
+    const configKey = camelize(relativePath);
+
+    if (!config[`${configKey}Filename`] || !config[`${configKey}Hash`]) {
+        throw new Error(`Missing config for ${packageName}. Add it in asset delivery.`);
+    }
+
+    const baseUrl = (config.cdnUrl ? `${config.cdnUrl}assets/` : ghostPaths().assetRootWithHost);
+    const url = new URL(`${baseUrl}${relativePath}/${config[`${configKey}Filename`]}?v=${config[`${configKey}Hash`]}`);
+
+    if (url.protocol === 'http:') {
+        window[packageName] = await import(`http://${url.host}${url.pathname}${url.search}`);
+    } else {
+        window[packageName] = await import(`https://${url.host}${url.pathname}${url.search}`);
+    }
+
+    return window[packageName];
+};
+
+const fetchComponent = function (packageName) {
+    if (!packageName) {
+        throw new Error('Unknown package name. Make sure you set a static packageName property on your AdminX component class');
+    }
+
+    let status = 'pending';
+    let response;
+
+    const suspender = importComponent(packageName).then(
+        (res) => {
+            status = 'success';
+            response = res;
+        },
+        (err) => {
+            status = 'error';
+            response = err;
+        }
+    );
+
+    const read = () => {
+        switch (status) {
+        case 'pending':
+            throw suspender;
+        case 'error':
+            throw response;
+        default:
+            return response;
+        }
+    };
+
+    return {read};
+};
+
+const emberDataTypeMapping = {
+    IntegrationsResponseType: {type: 'integration'},
+    InvitesResponseType: {type: 'invite'},
+    OffersResponseType: {type: 'offer'},
+    NewslettersResponseType: {type: 'newsletter'},
+    RecommendationResponseType: {type: 'recommendation'},
+    SettingsResponseType: {type: 'setting', singleton: true},
+    ThemesResponseType: {type: 'theme'},
+    TiersResponseType: {type: 'tier'},
+    UsersResponseType: {type: 'user'},
+    CustomThemeSettingsResponseType: {type: 'custom-theme-setting'}
+};
+
+// Abstract class which AdminX components should inherit from
+export default class AdminXComponent extends Component {
+    @service ajax;
+    @service feature;
+    @service ghostPaths;
+    @service session;
+    @service store;
+    @service settings;
+    @service router;
+    @service membersUtils;
+    @service themeManagement;
+
+    @inject config;
+
+    @tracked display = 'none';
+
+    @action
+    onError(error) {
+        // ensure we're still showing errors in development
+        console.error(error); // eslint-disable-line
+
+        if (this.config.sentry_dsn) {
+            Sentry.captureException(error);
+        }
+
+        // don't rethrow, app should attempt to gracefully recover
+    }
+
+    onUpdate = (dataType, response) => {
+        if (!emberDataTypeMapping[dataType]) {
+            throw new Error(`A mutation updating ${dataType} succeeded in AdminX but there is no mapping to an Ember type. Add one to emberDataTypeMapping`);
+        }
+
+        const {type, singleton} = emberDataTypeMapping[dataType];
+
+        if (singleton) {
+            // Special singleton objects like settings don't work with pushPayload, we need to add the ID explicitly
+            this.store.push(this.store.serializerFor(type).normalizeSingleResponse(
+                this.store,
+                this.store.modelFor(type),
+                response,
+                null,
+                'queryRecord'
+            ));
+        } else {
+            this.store.pushPayload(type, response);
+        }
+
+        if (dataType === 'SettingsResponseType') {
+            // Blog title is based on settings, but the one stored in config is used instead in various places
+            this.config.blogTitle = response.settings.find(setting => setting.key === 'title').value;
+
+            this.settings.reload();
+        }
+
+        if (dataType === 'TiersResponseType') {
+            // membersUtils has local state which needs to be updated
+            this.membersUtils.reload();
+        }
+
+        if (dataType === 'ThemesResponseType') {
+            const activated = response.themes.find(theme => theme.active);
+
+            if (activated) {
+                const previouslyActive = this.store.peekAll('theme').find(theme => theme.active && theme.name !== activated.name);
+                previouslyActive?.set('active', false);
+
+                const newlyActive = this.store.peekAll('theme').filterBy('name', activated.name).firstObject;
+                newlyActive?.set('active', true);
+                this.themeManagement.activeTheme = newlyActive;
+            }
+        }
+    };
+
+    onInvalidate = (dataType) => {
+        if (!emberDataTypeMapping[dataType]) {
+            throw new Error(`A mutation invalidating ${dataType} succeeded in AdminX but there is no mapping to an Ember type. Add one to emberDataTypeMapping`);
+        }
+
+        const {type, singleton} = emberDataTypeMapping[dataType];
+
+        if (singleton) {
+            // eslint-disable-next-line no-console
+            console.warn(`An AdminX mutation invalidated ${dataType}, but this is is marked as a singleton and cannot be reloaded in Ember. You probably wanted to use updateQueries instead of invalidateQueries`);
+            return;
+        }
+
+        run(() => this.store.unloadAll(type));
+
+        if (dataType === 'TiersResponseType') {
+            // membersUtils has local state which needs to be updated
+            this.membersUtils.reload();
+        }
+    };
+
+    onDelete = (dataType, id) => {
+        if (!emberDataTypeMapping[dataType]) {
+            throw new Error(`A mutation deleting ${dataType} succeeded in AdminX but there is no mapping to an Ember type. Add one to emberDataTypeMapping`);
+        }
+
+        const {type} = emberDataTypeMapping[dataType];
+
+        const record = this.store.peekRecord(type, id);
+
+        if (record) {
+            record.unloadRecord();
+        }
+    };
+
+    externalNavigate = ({route, models = []}) => {
+        if (!route.startsWith('/')) {
+            route = `/${route}`;
+        }
+        this.router.transitionTo(route, ...models);
+    };
+
+    resource = fetchComponent(this.constructor.packageName);
+
+    AdminXApp = (props) => {
+        const {AdminXApp: _AdminXApp} = this.resource.read();
+        return <_AdminXApp {...props} />;
+    };
+
+    // Can be overridden by subclasses to add additional props to the React app
+    additionalProps = () => ({});
+
+    ReactComponent = () => {
+        const fallback = (
+            <div className="admin-x-settings-container--loading" style={{
+                width: '100%',
+                height: '100vh',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                paddingBottom: '8vh'
+            }}>
+                <video width="100" height="100" loop autoPlay muted playsInline preload="metadata" style={{
+                    width: '100px',
+                    height: '100px'
+                }}>
+                    <source src="assets/videos/logo-loader.mp4" type="video/mp4" />
+                    <div className="gh-loading-spinner"></div>
+                </video>
+            </div>
+        );
+        return (
+            <div className={['admin-x-settings-container-', (this.feature.nightShift && 'dark'), this.args.className].filter(Boolean).join(' ')}>
+                <ErrorHandler>
+                    <Suspense fallback={fallback}>
+                        <this.AdminXApp
+                            framework={{
+                                ghostVersion: config.APP.version,
+                                externalNavigate: this.externalNavigate,
+                                unsplashConfig: defaultUnsplashHeaders,
+                                sentryDSN: this.config.sentry_dsn ?? null,
+                                onUpdate: this.onUpdate,
+                                onInvalidate: this.onInvalidate,
+                                onDelete: this.onDelete
+                            }}
+                            designSystem={{
+                                fetchKoenigLexical: fetchKoenigLexical,
+                                darkMode: this.feature.nightShift
+                            }}
+                            {...this.additionalProps()}
+                        />
+                    </Suspense>
+                </ErrorHandler>
+            </div>
+        );
+    };
+}
diff --git a/ghost/admin/app/components/admin-x/demo.hbs b/ghost/admin/app/components/admin-x/demo.hbs
new file mode 100644
index 00000000000..ed901509b3a
--- /dev/null
+++ b/ghost/admin/app/components/admin-x/demo.hbs
@@ -0,0 +1 @@
+<div {{react-render this.ReactComponent}}></div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/admin-x/demo.js b/ghost/admin/app/components/admin-x/demo.js
new file mode 100644
index 00000000000..17a6c42b415
--- /dev/null
+++ b/ghost/admin/app/components/admin-x/demo.js
@@ -0,0 +1,8 @@
+import AdminXComponent from './admin-x-component';
+import {inject as service} from '@ember/service';
+
+export default class AdminXDemo extends AdminXComponent {
+    @service upgradeStatus;
+
+    static packageName = '@tryghost/admin-x-demo';
+}
diff --git a/ghost/admin/app/components/admin-x/settings.js b/ghost/admin/app/components/admin-x/settings.js
index e061d19ab52..5e46924207c 100644
--- a/ghost/admin/app/components/admin-x/settings.js
+++ b/ghost/admin/app/components/admin-x/settings.js
@@ -1,14 +1,5 @@
-import * as Sentry from '@sentry/ember';
-import Component from '@glimmer/component';
-import React, {Suspense} from 'react';
-import config from 'ghost-admin/config/environment';
-import fetchKoenigLexical from 'ghost-admin/utils/fetch-koenig-lexical';
-import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import {action} from '@ember/object';
-import {inject} from 'ghost-admin/decorators/inject';
-import {run} from '@ember/runloop';
+import AdminXComponent from './admin-x-component';
 import {inject as service} from '@ember/service';
-import {tracked} from '@glimmer/tracking';
 
 // TODO: Long term move asset management directly in AdminX
 const officialThemes = [{
@@ -196,257 +187,14 @@ const zapierTemplates = [{
     url: 'https://zapier.com/webintent/create-zap?template=359342'
 }];
 
-export const defaultUnsplashHeaders = {
-    Authorization: `Client-ID 8672af113b0a8573edae3aa3713886265d9bb741d707f6c01a486cde8c278980`,
-    'Accept-Version': 'v1',
-    'Content-Type': 'application/json',
-    'App-Pragma': 'no-cache',
-    'X-Unsplash-Cache': true
-};
-
-class ErrorHandler extends React.Component {
-    state = {
-        hasError: false
-    };
-
-    static getDerivedStateFromError() {
-        return {hasError: true};
-    }
-
-    render() {
-        if (this.state.hasError) {
-            return (
-                <div className="admin-x-settings-container-error">
-                    <div className="admin-x-settings-error">
-                        <h1>Loading interrupted</h1>
-                        <p>They say life is a series of trials and tribulations. This moment right here? It's a tribulation. Our app was supposed to load, and yet here we are. Loadless. Click back to the dashboard to try again.</p>
-                        <a href={ghostPaths().adminRoot}>&larr; Back to the dashboard</a>
-                    </div>
-                </div>
-            );
-        }
-
-        return this.props.children;
-    }
-}
-
-export const importSettings = async () => {
-    if (window['@tryghost/admin-x-settings']) {
-        return window['@tryghost/admin-x-settings'];
-    }
-
-    const baseUrl = (config.cdnUrl ? `${config.cdnUrl}assets/` : ghostPaths().assetRootWithHost);
-    const url = new URL(`${baseUrl}admin-x-settings/${config.adminXSettingsFilename}?v=${config.adminXSettingsHash}`);
-
-    if (url.protocol === 'http:') {
-        window['@tryghost/admin-x-settings'] = await import(`http://${url.host}${url.pathname}${url.search}`);
-    } else {
-        window['@tryghost/admin-x-settings'] = await import(`https://${url.host}${url.pathname}${url.search}`);
-    }
-
-    return window['@tryghost/admin-x-settings'];
-};
-
-const fetchSettings = function () {
-    let status = 'pending';
-    let response;
-
-    const suspender = importSettings().then(
-        (res) => {
-            status = 'success';
-            response = res;
-        },
-        (err) => {
-            status = 'error';
-            response = err;
-        }
-    );
-
-    const read = () => {
-        switch (status) {
-        case 'pending':
-            throw suspender;
-        case 'error':
-            throw response;
-        default:
-            return response;
-        }
-    };
-
-    return {read};
-};
-
-const emberDataTypeMapping = {
-    IntegrationsResponseType: {type: 'integration'},
-    InvitesResponseType: {type: 'invite'},
-    NewslettersResponseType: {type: 'newsletter'},
-    RecommendationResponseType: {type: 'recommendation'},
-    SettingsResponseType: {type: 'setting', singleton: true},
-    ThemesResponseType: {type: 'theme'},
-    TiersResponseType: {type: 'tier'},
-    UsersResponseType: {type: 'user'},
-    CustomThemeSettingsResponseType: {type: 'custom-theme-setting'}
-};
-
-export default class AdminXSettings extends Component {
-    @service ajax;
-    @service feature;
-    @service ghostPaths;
-    @service session;
-    @service store;
-    @service settings;
-    @service router;
-    @service membersUtils;
-    @service themeManagement;
+export default class AdminXSettings extends AdminXComponent {
     @service upgradeStatus;
 
-    @inject config;
-
-    @tracked display = 'none';
-
-    @action
-    onError(error) {
-        // ensure we're still showing errors in development
-        console.error(error); // eslint-disable-line
-
-        if (this.config.sentry_dsn) {
-            Sentry.captureException(error, {
-                tags: {
-                    adminx: true
-                }
-            });
-        }
-
-        // don't rethrow, app should attempt to gracefully recover
-    }
-
-    onUpdate = (dataType, response) => {
-        if (!emberDataTypeMapping[dataType]) {
-            throw new Error(`A mutation updating ${dataType} succeeded in AdminX but there is no mapping to an Ember type. Add one to emberDataTypeMapping`);
-        }
-
-        const {type, singleton} = emberDataTypeMapping[dataType];
-
-        if (singleton) {
-            // Special singleton objects like settings don't work with pushPayload, we need to add the ID explicitly
-            this.store.push(this.store.serializerFor(type).normalizeSingleResponse(
-                this.store,
-                this.store.modelFor(type),
-                response,
-                null,
-                'queryRecord'
-            ));
-        } else {
-            this.store.pushPayload(type, response);
-        }
-
-        if (dataType === 'SettingsResponseType') {
-            // Blog title is based on settings, but the one stored in config is used instead in various places
-            this.config.blogTitle = response.settings.find(setting => setting.key === 'title').value;
-
-            this.settings.reload();
-        }
-
-        if (dataType === 'TiersResponseType') {
-            // membersUtils has local state which needs to be updated
-            this.membersUtils.reload();
-        }
-
-        if (dataType === 'ThemesResponseType') {
-            const activated = response.themes.find(theme => theme.active);
-
-            if (activated) {
-                this.themeManagement.activeTheme = this.store.peekAll('theme').filterBy('name', activated.name).firstObject;
-            }
-        }
-    };
-
-    onInvalidate = (dataType) => {
-        if (!emberDataTypeMapping[dataType]) {
-            throw new Error(`A mutation invalidating ${dataType} succeeded in AdminX but there is no mapping to an Ember type. Add one to emberDataTypeMapping`);
-        }
-
-        const {type, singleton} = emberDataTypeMapping[dataType];
-
-        if (singleton) {
-            // eslint-disable-next-line no-console
-            console.warn(`An AdminX mutation invalidated ${dataType}, but this is is marked as a singleton and cannot be reloaded in Ember. You probably wanted to use updateQueries instead of invalidateQueries`);
-            return;
-        }
-
-        run(() => this.store.unloadAll(type));
-
-        if (dataType === 'TiersResponseType') {
-            // membersUtils has local state which needs to be updated
-            this.membersUtils.reload();
-        }
-    };
-
-    onDelete = (dataType, id) => {
-        if (!emberDataTypeMapping[dataType]) {
-            throw new Error(`A mutation deleting ${dataType} succeeded in AdminX but there is no mapping to an Ember type. Add one to emberDataTypeMapping`);
-        }
-
-        const {type} = emberDataTypeMapping[dataType];
-
-        const record = this.store.peekRecord(type, id);
-
-        if (record) {
-            record.unloadRecord();
-        }
-    };
-
-    externalNavigate = ({route, models = []}) => {
-        this.router.transitionTo(route, ...models);
-    };
-
-    editorResource = fetchSettings();
-
-    AdminXApp = (props) => {
-        const {AdminXApp: _AdminXApp} = this.editorResource.read();
-        return <_AdminXApp {...props} />;
-    };
+    static packageName = '@tryghost/admin-x-settings';
 
-    ReactComponent = () => {
-        const fallback = (
-            <div className="admin-x-settings-container--loading" style={{
-                width: '100vw',
-                height: '100vh',
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-                paddingBottom: '8vh'
-            }}>
-                <video width="100" height="100" loop autoPlay muted playsInline preload="metadata" style={{
-                    width: '100px',
-                    height: '100px'
-                }}>
-                    <source src="assets/videos/logo-loader.mp4" type="video/mp4" />
-                    <div className="gh-loading-spinner"></div>
-                </video>
-            </div>
-        );
-        return (
-            <div className={['admin-x-settings-container-', (this.feature.nightShift && 'dark'), this.args.className].filter(Boolean).join(' ')}>
-                <ErrorHandler>
-                    <Suspense fallback={fallback}>
-                        <this.AdminXApp
-                            ghostVersion={config.APP.version}
-                            officialThemes={officialThemes}
-                            zapierTemplates={zapierTemplates}
-                            externalNavigate={this.externalNavigate}
-                            darkMode={this.feature.nightShift}
-                            unsplashConfig={defaultUnsplashHeaders}
-                            sentry={this.config.sentry_dsn ? Sentry : undefined}
-                            fetchKoenigLexical={fetchKoenigLexical}
-                            onUpdate={this.onUpdate}
-                            onInvalidate={this.onInvalidate}
-                            onDelete={this.onDelete}
-                            upgradeStatus={this.upgradeStatus}
-                        />
-                    </Suspense>
-                </ErrorHandler>
-            </div>
-        );
-    };
+    additionalProps = () => ({
+        officialThemes,
+        zapierTemplates,
+        upgradeStatus: this.upgradeStatus
+    });
 }
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/dashboard/onboarding-checklist.hbs b/ghost/admin/app/components/dashboard/onboarding-checklist.hbs
new file mode 100644
index 00000000000..b03e22850d7
--- /dev/null
+++ b/ghost/admin/app/components/dashboard/onboarding-checklist.hbs
@@ -0,0 +1,85 @@
+<div class="gh-onboarding-wrapper" data-test-dashboard="onboarding-checklist">
+    <div class="gh-onboarding-header">
+        {{#if (feature "nightShift")}}
+            <div class="gh-onboarding-ghost-logo-wrapper">
+                <video width="80" height="80" loop autoplay muted playsinline preload="metadata" style="width: 80px; height: 80px;" class="gh-onboarding-ghost-logo--dark" {{autoplay}}>
+                    <source src="assets/videos/logo-loader-dark.mp4" type="video/mp4" />
+                </video>
+                <div class="gh-onboarding-ghost-logo-overlay"></div>
+            </div>
+        {{else}}
+            <div class="gh-onboarding-ghost-logo-wrapper">
+                <video width="80" height="80" loop autoplay muted playsinline preload="metadata" style="width: 80px; height: 80px;" class="gh-onboarding-ghost-logo--light" {{autoplay}}>
+                    <source src="assets/videos/logo-loader.mp4" type="video/mp4" />
+                </video>
+            </div>
+        {{/if}}
+
+        {{#if this.onboarding.allStepsCompleted}}
+            <h2 class="gh-canvas-title">You’re all set.</h2>
+        {{else}}
+            <h2 class="gh-canvas-title">Let’s get started!</h2>
+            <p>Welcome! It’s time to set up {{get-setting "title"}}.</p>
+        {{/if}}
+    </div>
+
+    <div class="gh-onboarding-items">
+        <div>
+            {{!-- Step 1 --}}
+            <div class="gh-onboarding-item gh-onboarding-item--completed">
+                <Dashboard::Onboarding::Step
+                    @icon="rocket"
+                    @title="Start a new Ghost publication"
+                    @complete={{true}}
+                />
+            </div>
+            {{!-- Step 2 --}}
+            <LinkTo @route="settings-x.settings-x" @model="design/edit?ref=setup" class="gh-onboarding-item {{onboarding-step-class "customize-design"}}" id="ob-customize-design" {{on "click" (fn this.onboarding.markStepCompleted "customize-design")}}>
+                <Dashboard::Onboarding::Step
+                    @icon="brush"
+                    @title="Customize your design"
+                    @description="Craft a look that reflects your brand and style."
+                    @complete={{is-onboarding-step-completed "customize-design"}}
+                />
+            </LinkTo>
+            {{!-- Step 3 --}}
+            <LinkTo @route="lexical-editor.new" @model="post" class="gh-onboarding-item {{onboarding-step-class "first-post"}}" id="ob-first-post" {{on "click" (fn this.onboarding.markStepCompleted "first-post")}}>
+                <Dashboard::Onboarding::Step
+                    @icon="writing"
+                    @title="Explore the editor"
+                    @description="Get to know a writing experience you'll love."
+                    @complete={{is-onboarding-step-completed "first-post"}}
+                />
+            </LinkTo>
+            {{!-- Step 4 --}}
+            <LinkTo @route="members" class="gh-onboarding-item {{onboarding-step-class "build-audience"}}" id="ob-build-audience" {{on "click" (fn this.onboarding.markStepCompleted "build-audience")}}>
+                <Dashboard::Onboarding::Step
+                    @icon="member-add"
+                    @title="Build your audience"
+                    @description="Add members and grow your readership."
+                    @complete={{is-onboarding-step-completed "build-audience"}}
+                />
+            </LinkTo>
+            {{!-- Step 5 --}}
+            <div role="button" {{on "click" this.openShareModal}} class="gh-onboarding-item {{onboarding-step-class "share-publication"}}" id="ob-share-publication">
+                <Dashboard::Onboarding::Step
+                    @icon="megaphone"
+                    @title="Share your publication"
+                    @description="Expand your reach on social media."
+                    @complete={{is-onboarding-step-completed "share-publication"}}
+                    role="presentation"
+                />
+            </div>
+        </div>
+    </div>
+
+    {{#if this.onboarding.allStepsCompleted}}
+        <a href="#" class="gh-onboarding-explore-dashboard" id="ob-completed" {{on "click" this.onboarding.completeChecklist}}>Explore your dashboard</a>
+    {{/if}}
+
+    <p class="gh-onboarding-help">More questions? Check out our <a href="https://ghost.org/help?utm_source=admin&utm_campaign=onboarding" id="ob-help-center" target="_blank" rel="noopener noreferrer">Help Center</a>.</p>
+
+    {{#unless this.onboarding.allStepsCompleted}}
+        <a href="#" class="gh-onboarding-skip" id="ob-skip" {{on "click" this.onboarding.dismissChecklist}}>Skip onboarding</a>
+    {{/unless}}
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/dashboard/onboarding-checklist.js b/ghost/admin/app/components/dashboard/onboarding-checklist.js
new file mode 100644
index 00000000000..36861619ffa
--- /dev/null
+++ b/ghost/admin/app/components/dashboard/onboarding-checklist.js
@@ -0,0 +1,30 @@
+import Component from '@glimmer/component';
+import ShareModal from './onboarding/share-modal';
+import {action} from '@ember/object';
+import {inject} from 'ghost-admin/decorators/inject';
+import {inject as service} from '@ember/service';
+
+export default class OnboardingChecklist extends Component {
+    @service modals;
+    @service onboarding;
+
+    @inject config;
+
+    shareModal = null;
+
+    willDestroy() {
+        super.willDestroy(...arguments);
+        this.dismissModal?.close();
+        this.shareModal?.close();
+    }
+
+    get siteUrl() {
+        return this.config.blogTitle;
+    }
+
+    @action
+    openShareModal() {
+        this.onboarding.markStepCompleted('share-publication');
+        this.shareModal = this.modals.open(ShareModal);
+    }
+}
diff --git a/ghost/admin/app/components/dashboard/onboarding/share-modal.hbs b/ghost/admin/app/components/dashboard/onboarding/share-modal.hbs
new file mode 100644
index 00000000000..eb8bf8b3718
--- /dev/null
+++ b/ghost/admin/app/components/dashboard/onboarding/share-modal.hbs
@@ -0,0 +1,63 @@
+<div class="modal-content" data-test-modal="onboarding-share">
+    <header class="modal-header">
+        <h1>Share your publication</h1>
+    </header>
+    <button type="button" class="close" id="ob-close-share-modal" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
+
+    <div class="gh-share-card-container">
+        {{#let (get-setting "coverImage") as |imageUrl|}}
+            {{#if imageUrl}}
+                <div class="gh-share-card-image">
+                    <img src={{imageUrl}} alt="" role="presentation" />
+                </div>
+            {{else}}
+                <div class="gh-share-card-image gh-cover-placeholder">{{svg-jar "picture"}}</div>
+            {{/if}}
+
+            <div class="gh-share-card-content">
+                <div class="gh-share-card-title">{{get-setting "title"}}</div>
+                <div class="gh-share-card-description">
+                    {{get-setting "description"}}
+                </div>
+            </div>
+        {{/let}}
+    </div>
+
+
+    <span class="gh-tip">Set your publication's cover image and description in <LinkTo @route="settings-x.settings-x" @model="design/edit?ref=setup" id="ob-share-modal-design-settings">Design settings</LinkTo>.</span>
+
+    <div class="gh-copy-publication-link">
+        <span>{{this.config.blogUrl}}</span>
+        <GhTaskButton
+            data-test-button="copy-share-link"
+            id="ob-copy-publication-link"
+            @buttonText="Copy"
+            @task={{this.copySiteUrl}}
+            @successText="Copied!"
+            @successClass="gh-share-link-success"
+            @class="gh-btn-icon"
+        />
+    </div>
+
+    <ul class="gh-share-links">
+        <li>
+            <a href="https://twitter.com/intent/tweet?url={{this.encodedUrl}}" target="_blank" rel="noopener noreferrer" class="gh-share-link" id="ob-share-on-x" title="Share your publication on X">
+                <span>{{svg-jar "social-x"}}</span>
+            </a>
+        </li>
+        <li>
+            <a href="https://www.facebook.com/sharer/sharer.php?u={{this.encodedUrl}}" target="_blank" rel="noopener noreferrer" class="gh-share-link" id="ob-share-on-fb" title="Share your publication on Facebook">
+                <div class="share-link-content">
+                    <span>{{svg-jar "social-facebook"}}</span>
+                </div>
+            </a>
+        </li>
+        <li>
+            <a href="https://www.linkedin.com/feed/?shareActive=true&text={{this.encodedUrl}}" target="_blank" rel="noopener noreferrer" class="gh-share-link" id="ob-share-on-li" title="Share your publication on LinkedIn">
+                <div class="share-link-content">
+                    <span>{{svg-jar "social-linkedin"}}</span>
+                </div>
+            </a>
+        </li>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/dashboard/onboarding/share-modal.js b/ghost/admin/app/components/dashboard/onboarding/share-modal.js
new file mode 100644
index 00000000000..ce8b73ab5fd
--- /dev/null
+++ b/ghost/admin/app/components/dashboard/onboarding/share-modal.js
@@ -0,0 +1,22 @@
+import Component from '@glimmer/component';
+import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
+import {inject} from 'ghost-admin/decorators/inject';
+import {task} from 'ember-concurrency';
+
+export default class OnboardingShareModal extends Component {
+    @inject config;
+
+    static modalOptions = {
+        backgroundBlur: true
+    };
+
+    get encodedUrl() {
+        return encodeURIComponent(this.config.blogUrl);
+    }
+
+    @task
+    *copySiteUrl() {
+        yield copyTextToClipboard(this.config.blogUrl);
+        return true;
+    }
+}
diff --git a/ghost/admin/app/components/dashboard/onboarding/step.hbs b/ghost/admin/app/components/dashboard/onboarding/step.hbs
new file mode 100644
index 00000000000..efdb845a337
--- /dev/null
+++ b/ghost/admin/app/components/dashboard/onboarding/step.hbs
@@ -0,0 +1,16 @@
+<div class="gh-onboarding-item-content">
+    {{svg-jar @icon}}
+    <div class="gh-onboarding-item-details">
+        <span class="gh-onboarding-item-title">{{@title}}</span>
+        {{#if @description}}
+            <span class="gh-onboarding-item-description">{{@description}}</span>
+        {{/if}}
+    </div>
+</div>
+<div class={{if @complete "gh-onboarding-item-checkmark" "gh-onboarding-item-action"}}>
+    {{#if @complete}}
+        {{svg-jar "check-circle-simple"}}
+    {{else}}
+        {{svg-jar "arrow-right-tail"}}
+    {{/if}}
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/dashboard/resources/resources.hbs b/ghost/admin/app/components/dashboard/resources/resources.hbs
index 70ac6b826ea..2590d952378 100644
--- a/ghost/admin/app/components/dashboard/resources/resources.hbs
+++ b/ghost/admin/app/components/dashboard/resources/resources.hbs
@@ -15,7 +15,7 @@
                     </a>
                 </div>
                 <div class="gh-dashboard-resource-footer">
-                    <a href="https://ghost.org/resources/" target="_blank" rel="noopener noreferrer">Read this article &rarr;</a>
+                    <a href="{{this.resource.url}}" target="_blank" rel="noopener noreferrer">Read this article &rarr;</a>
                 </div>
             </div>
         {{/if}}
diff --git a/ghost/admin/app/components/dashboard/resources/whats-new.hbs b/ghost/admin/app/components/dashboard/resources/whats-new.hbs
index 67db066f8c8..8dc23a459c3 100644
--- a/ghost/admin/app/components/dashboard/resources/whats-new.hbs
+++ b/ghost/admin/app/components/dashboard/resources/whats-new.hbs
@@ -4,17 +4,17 @@
             <h4>{{svg-jar "gift" alt="Gift" class="v-mid"}}What's new</h4>
         </div>
         <div class="gh-dashboard-resource-body">
-             <div class="gh-dashboard-list {{if this.whatsNew.hasNew "has-new"}}">
+            <div class="gh-dashboard-list {{if this.whatsNew.hasNew "has-new"}}">
                 {{#if (not (or this.loading this.error))}}
                     <div class="gh-dashboard-list-body">
                         {{#each this.entries as |entry|}}
                             <div class="gh-dashboard-list-item">
-                                <LinkTo class="gh-dashboard-list-post" @route="whatsnew" @query={{hash entry=entry.slug}}>
+                                <a href={{entry.url}} class="gh-dashboard-list-post" target="_blank" rel="noopener noreferrer">
                                     <span class="gh-dashboard-list-link">
                                         <span>{{entry.title}}</span>
                                     </span>
                                     <div class="gh-dashboard-resource-secondary">{{moment-format entry.published_at "D MMM YYYY"}}</div>
-                                </LinkTo>
+                                </a>
                             </div>
                         {{else}}
                             <div class="gh-dashboard-list-empty">
@@ -26,7 +26,7 @@
             </div>
         </div>
         <div class="gh-dashboard-resource-footer">
-            <LinkTo @route="whatsnew" @query={{hash entry=null}} class="green">View more features &rarr;</LinkTo>
+            <a href="https://ghost.org/changelog" class="green" target="_blank" rel="noopener noreferrer">View more features &rarr;</a>
         </div>
     </article>
 </section>
diff --git a/ghost/admin/app/components/editor/modals/preview/email.hbs b/ghost/admin/app/components/editor/modals/preview/email.hbs
index 897fc365cbe..14a2a3c8341 100644
--- a/ghost/admin/app/components/editor/modals/preview/email.hbs
+++ b/ghost/admin/app/components/editor/modals/preview/email.hbs
@@ -13,7 +13,7 @@
                                 @triggerComponent={{component "gh-power-select/trigger"}}
                                 @triggerClass="gh-preview-newsletter-trigger"
                                 @dropdownClass="gh-publish-newsletter-dropdown gh-preview-newsletter-dropdown"
-                                @extra={{concat "<" (full-email-address (or this.newsletter.senderEmail "noreply")) ">"}}
+                                @extra={{concat "<" (sender-email-address this.newsletter.senderEmail) ">"}}
                                 @selectedItemComponent={{component "editor/modals/preview/selected-newsletter-label"}}
                                 data-test-email-preview-newsletter-select
                                 as |option|
@@ -22,8 +22,7 @@
                             </PowerSelect>
                         {{else}}
                             <p class="gh-preview-newsletter-name">{{this.newsletter.name}} <span
-                                class="gh-preview-email-address">&lt;{{full-email-address
-                                (or this.newsletter.senderEmail "noreply")}}&gt;</span></p>
+                                class="gh-preview-email-address">&lt;{{sender-email-address this.newsletter.senderEmail}}&gt;</span></p>
                         {{/if}}
                     </div>
                     <div class="gh-email-preview-newsletter-select" data-test-email-preview-segment-select-section>
diff --git a/ghost/admin/app/components/editor/modals/publish-flow.hbs b/ghost/admin/app/components/editor/modals/publish-flow.hbs
index e8264e47466..c964c637b37 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow.hbs
@@ -1,6 +1,6 @@
 <div class="flex flex-column h-100 items-center overflow-auto" data-test-modal="publish-flow">
     <header class="gh-publish-header">
-        <button class="gh-btn-editor gh-publish-back-button" title="Close" type="button" {{on "click" @close}} data-test-button="close-publish-flow">
+        <button class="gh-btn-editor gh-publish-back-button" title="Close" type="button" {{on "click" @close}}>
             <span>{{svg-jar "arrow-left"}} Editor</span>
         </button>
 
@@ -45,12 +45,6 @@
                 @close={{@close}}
             />
         {{else if this.isComplete}}
-            <Editor::Modals::PublishFlow::Complete
-                @publishOptions={{@data.publishOptions}}
-                @recipientType={{this.recipientType}}
-                @postCount={{this.postCount}}
-                @close={{@close}}
-            />
         {{else}}
             <Editor::Modals::PublishFlow::Options
                 @publishOptions={{@data.publishOptions}}
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.hbs b/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.hbs
index ee39f5731fe..621001312ec 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.hbs
@@ -26,7 +26,7 @@
     <div class="gh-publish-cta">
         <GhTaskButton
             @task={{this.retryEmailTask}}
-            @buttonText="Retry sending email"
+            @buttonText={{if this.isPartialError "Send remaining emails" "Retry sending email"}}
             @runningText="Sending"
             @successText="Sent"
             @class="gh-btn gh-btn-large gh-btn-red"
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js b/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js
index a1264748c15..8fe33f99253 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js
+++ b/ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js
@@ -20,6 +20,12 @@ export default class PublishFlowCompleteWithEmailError extends Component {
         return this.newEmailErrorMessage || this.args.emailErrorMessage;
     }
 
+    get isPartialError() {
+        // For now we look at the error message.
+        // This is covered in E2E tests so we'll be notified when this changes.
+        return this.emailErrorMessage && this.emailErrorMessage.includes('partially');
+    }
+
     @task({drop: true})
     *retryEmailTask() {
         this.retryErrorMessage = null;
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs b/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs
index 26f1b3d099d..505cd3bd8e2 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs
@@ -97,14 +97,7 @@
             </p>
         {{else}}
             <p class="gh-publish-confirmation gh-publish-confirmation-with-feedback">
-                <button
-                    type="button"
-                    class="gh-back-to-editor"
-                    {{on "click" @close}}
-                    data-test-button="back-to-editor"
-                >
-                    <span>Back to editor</span>
-                </button>
+                <LinkTo @route="dashboard" class="gh-back-to-editor" data-test-button="back-to-dashboard">Back to dashboard</LinkTo>
             </p>
         {{/if}}
     {{/if}}
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/confirm.js b/ghost/admin/app/components/editor/modals/publish-flow/confirm.js
index 54410befbec..30706a1216e 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/confirm.js
+++ b/ghost/admin/app/components/editor/modals/publish-flow/confirm.js
@@ -13,6 +13,8 @@ function isString(str) {
 
 export default class PublishFlowOptions extends Component {
     @service settings;
+    @service feature;
+    @service router;
 
     @tracked errorMessage;
 
@@ -91,6 +93,32 @@ export default class PublishFlowOptions extends Component {
 
         try {
             yield this.args.saveTask.perform();
+
+            if (this.args.publishOptions.isScheduled) {
+                localStorage.setItem('ghost-last-scheduled-post', JSON.stringify({
+                    id: this.args.publishOptions.post.id,
+                    type: this.args.publishOptions.post.displayName
+                }));
+                if (this.args.publishOptions.post.displayName !== 'page') {
+                    this.router.transitionTo('posts');
+                } else {
+                    this.router.transitionTo('pages');
+                }
+            } else {
+                localStorage.setItem('ghost-last-published-post', JSON.stringify({
+                    id: this.args.publishOptions.post.id,
+                    type: this.args.publishOptions.post.displayName
+                }));
+                if (this.args.publishOptions.post.displayName !== 'page') {
+                    if (this.args.publishOptions.post.hasEmail) {
+                        this.router.transitionTo('posts.analytics', this.args.publishOptions.post.id);
+                    } else {
+                        this.router.transitionTo('posts');
+                    }
+                } else {
+                    this.router.transitionTo('pages');
+                }
+            }
         } catch (e) {
             if (e === undefined && this.args.publishOptions.post.errors.length !== 0) {
                 // validation error
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
index 42dd5d2852b..3be1d3d0978 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow/options.hbs
@@ -129,7 +129,7 @@
             <div class="gh-publish-setting-trigger">
                 <span>
                     {{#if @publishOptions.isScheduled}}
-                        {{capitalize (gh-format-post-time @publishOptions.scheduledAtUTC draft=true)}}
+                        {{capitalize (gh-format-post-time @publishOptions.scheduledAtUTC relative=true)}}
                     {{else}}
                         Right now
                     {{/if}}
diff --git a/ghost/admin/app/components/editor/modals/tk-reminder.hbs b/ghost/admin/app/components/editor/modals/tk-reminder.hbs
new file mode 100644
index 00000000000..d0470d30571
--- /dev/null
+++ b/ghost/admin/app/components/editor/modals/tk-reminder.hbs
@@ -0,0 +1,18 @@
+<div class="modal-content gh-tk-reminder" data-test-modal="tk-reminder">
+    <header class="modal-header">
+        <h1>Forget something?</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>
+            Looks like you've got some unfinished business.
+            There {{if (eq @data.tkCount 1) "is" "are" }} <strong>{{gh-pluralize @data.tkCount "TK reminder"}}</strong> left in your post.
+        </p>
+    </div>
+
+    <div class="modal-footer">
+        <button type="button" class="gh-btn" {{on "click" (fn @close true)}}><span>Continue to publish</span></button>
+        <button type="button" class="gh-btn gh-btn-black" {{on "click" @close}}><span>Back to editor</span></button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/editor/publish-management.js b/ghost/admin/app/components/editor/publish-management.js
index ce156a0e733..eb2906522b8 100644
--- a/ghost/admin/app/components/editor/publish-management.js
+++ b/ghost/admin/app/components/editor/publish-management.js
@@ -3,6 +3,7 @@ import EmailFailedError from 'ghost-admin/errors/email-failed-error';
 import PreviewModal from './modals/preview';
 import PublishFlowModal from './modals/publish-flow';
 import PublishOptionsResource from 'ghost-admin/helpers/publish-options';
+import TkReminderModal from './modals/tk-reminder';
 import UpdateFlowModal from './modals/update-flow';
 import envConfig from 'ghost-admin/config/environment';
 import {action} from '@ember/object';
@@ -45,7 +46,17 @@ export default class PublishManagement extends Component {
 
         const isValid = await this._validatePost();
 
-        if (isValid && !this.publishFlowModal || this.publishFlowModal?.isClosing) {
+        if (this.args.tkCount > 0) {
+            const ignoreTks = await this.modals.open(TkReminderModal, {
+                tkCount: this.args.tkCount
+            });
+
+            if (ignoreTks !== true) {
+                return;
+            }
+        }
+
+        if (isValid && (!this.publishFlowModal || this.publishFlowModal?.isClosing)) {
             this.publishOptions.resetPastScheduledAt();
 
             this.publishFlowModal = this.modals.open(PublishFlowModal, {
@@ -72,7 +83,7 @@ export default class PublishManagement extends Component {
 
         const isValid = await this._validatePost();
 
-        if (isValid && !this.updateFlowModal || this.updateFlowModal.isClosing) {
+        if (isValid && (!this.updateFlowModal || this.updateFlowModal.isClosing)) {
             this.updateFlowModal = this.modals.open(UpdateFlowModal, {
                 publishOptions: this.publishOptions,
                 saveTask: this.publishTask
@@ -88,10 +99,12 @@ export default class PublishManagement extends Component {
     }
 
     @action
-    openPreview(event, {skipAnimation} = {}) {
+    async openPreview(event, {skipAnimation} = {}) {
         event?.preventDefault();
 
-        if (!this.previewModal || this.previewModal.isClosing) {
+        const isValid = await this._validatePost();
+
+        if (isValid && (!this.previewModal || this.previewModal.isClosing)) {
             // open publish flow modal underneath to offer quick switching
             // without restarting the flow or causing flicker
 
@@ -239,7 +252,7 @@ export default class PublishManagement extends Component {
             yield this.publishTask.perform({taskName: 'revertToDraftTask'});
 
             const postType = capitalize(this.args.post.displayName);
-            this.notifications.showNotification(`${postType} successfully reverted to a draft.`, {type: 'success'});
+            this.notifications.showNotification(`${postType} reverted to a draft.`, {type: 'success'});
 
             return true;
         } catch (e) {
diff --git a/ghost/admin/app/components/gh-alert.js b/ghost/admin/app/components/gh-alert.js
index ca22911459a..2114ae97a10 100644
--- a/ghost/admin/app/components/gh-alert.js
+++ b/ghost/admin/app/components/gh-alert.js
@@ -9,8 +9,8 @@ export default class GhAlert extends Component {
         const typeMapping = {
             success: 'green',
             error: 'red',
-            warn: 'blue',
-            info: 'blue'
+            warn: 'black',
+            info: 'black'
         };
 
         const type = this.args.message.type;
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-billing-iframe.hbs b/ghost/admin/app/components/gh-billing-iframe.hbs
index 5a0ed002412..d1b237c65df 100644
--- a/ghost/admin/app/components/gh-billing-iframe.hbs
+++ b/ghost/admin/app/components/gh-billing-iframe.hbs
@@ -1 +1 @@
-<iframe id="billing-frame" class="billing-frame" frameborder="0" title="Billing" ...attributes {{did-insert this.setup}}></iframe>
\ No newline at end of file
+<iframe id="billing-frame" class="billing-frame" frameborder="0" title="Billing" allow="clipboard-write" ...attributes {{did-insert this.setup}}></iframe>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-context-menu.js b/ghost/admin/app/components/gh-context-menu.js
index 8b3de5a54bd..205e488bb1f 100644
--- a/ghost/admin/app/components/gh-context-menu.js
+++ b/ghost/admin/app/components/gh-context-menu.js
@@ -1,5 +1,5 @@
 import Component from '@glimmer/component';
-import SelectionList from '../utils/selection-list';
+import SelectionList from './posts-list/selection-list';
 import {action} from '@ember/object';
 import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/gh-date-time-picker.hbs b/ghost/admin/app/components/gh-date-time-picker.hbs
index 6f2a6bf5879..a634c5f928e 100644
--- a/ghost/admin/app/components/gh-date-time-picker.hbs
+++ b/ghost/admin/app/components/gh-date-time-picker.hbs
@@ -37,7 +37,7 @@
         >
         <small class="gh-date-time-picker-timezone" data-test-date-time-picker-timezone>{{this.timezone}}</small>
     </div>
-    {{#if this.hasError}}
-        <div class="gh-date-time-picker-error" data-test-date-time-picker-error>{{this.dateError}}{{this.timeError}}</div>
-    {{/if}}
 </div>
+{{#if this.hasError}}
+    <div class="gh-date-time-picker-error" data-test-date-time-picker-error>{{this.dateError}}{{this.timeError}}</div>
+{{/if}}
diff --git a/ghost/admin/app/components/gh-editor-feature-image.hbs b/ghost/admin/app/components/gh-editor-feature-image.hbs
index 411e3eae872..0d934a7d878 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"}}">
@@ -52,11 +46,11 @@
                     @imageSrc={{@image}}
                     @saveImage={{fn this.saveImage uploader.setFiles}}
                 />
-                <button type="button" class="image-action image-delete" title="Delete image" {{on "click" @clearImage}}>
+                <button type="button" class="image-action image-delete" data-tooltip="Delete" {{on "click" @clearImage}}>
                     {{svg-jar "koenig/kg-trash"}}
                 </button>
             </div>
-            <div class="flex justify-between align-center">
+            <div class="gh-editor-feature-image-caption-container">
                 {{#if this.isEditingAlt}}
                     <input
                         type="text"
@@ -75,7 +69,9 @@
                         @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}}
+                        @onTKCountChange={{this.onTKCountChange}}
+                        @registerAPI={{this.registerEditorAPI}}
                     />
                 {{/if}}
                 <button
@@ -84,10 +80,16 @@
                 >
                     Alt
                 </button>
+
+                {{#if (and this.tkCount (not this.isEditingAlt))}}
+                    <div class="tk-indicator" data-testid="feature-image-tk-indicator" role="button" {{on "click" this.focusCaptionEditor}}>
+                        TK
+                    </div>
+                {{/if}}
             </div>
         {{else}}
             {{!-- no-image state --}}
-            <div class="flex flex-row items-center {{if this.hideButton "invisible"}}">
+            <div class="gh-editor-feature-image-add">
                 {{#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..d621d0de5f3 100644
--- a/ghost/admin/app/components/gh-editor-feature-image.js
+++ b/ghost/admin/app/components/gh-editor-feature-image.js
@@ -15,14 +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;
-    }
+    @tracked tkCount = 0;
 
     get caption() {
         const content = this.args.caption;
@@ -39,6 +35,24 @@ export default class GhEditorFeatureImageComponent extends Component {
         this.args.updateCaption(cleanedHtml);
     }
 
+    @action
+    registerEditorAPI(API) {
+        this.editorAPI = API;
+    }
+
+    @action
+    focusCaptionEditor() {
+        if (this.editorAPI) {
+            this.editorAPI.focusEditor({position: 'bottom'});
+        }
+    }
+
+    @action
+    handleCaptionBlur() {
+        this.captionInputFocused = false;
+        this.args.handleCaptionBlur();
+    }
+
     @action
     setUploadedImage(results) {
         if (results[0]) {
@@ -115,4 +129,12 @@ export default class GhEditorFeatureImageComponent extends Component {
         this.canDrop = false;
         setFiles([imageFile]);
     }
+
+    @action
+    onTKCountChange(count) {
+        if (this.args.onTKCountChange) {
+            this.tkCount = count;
+            this.args.onTKCountChange(count);
+        }
+    }
 }
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..cc425e88e09 100644
--- a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
+++ b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
@@ -16,17 +16,28 @@
             @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}}
+            @onTKCountChange={{@updateFeatureImageTkCount}}
         />
 
-        <div class="gh-editor-title-container page-improvements">
+        <div class="gh-editor-title-container">
             {{#if (and (not @cardOptions.post.showTitleAndFeatureImage) (not @featureImage))}}
                 <span class="gh-editor-hidden-indicator" data-tooltip="Post title is hidden on page">
                     {{svg-jar "eye-closed"}}
                 </span>
             {{/if}}
 
+            {{#if @titleHasTk}}
+                <div
+                    class="tk-indicator" data-testid="tk-indicator"
+                    {{on "click" this.focusTitle}}
+                >
+                    TK
+                </div>
+            {{/if}}
+
             <GhTextarea
                 @class="gh-editor-title {{if (and (not @cardOptions.post.showTitleAndFeatureImage) (not this.titleIsFocused)) "faded"}}"
                 @placeholder={{@titlePlaceholder}}
@@ -45,6 +56,39 @@
                 {{on "paste" this.cleanPastedTitle}}
                 data-test-editor-title-input={{true}}
             />
+
+            {{#if (feature 'editorExcerpt')}}
+                <div class="relative">
+                    <GhTextarea
+                        @class={{concat "gh-editor-excerpt " (if @excerptErrorMessage "red")}}
+                        @placeholder="Add an excerpt"
+                        @shouldFocus={{false}}
+                        @tabindex="1"
+                        @autoExpand=".gh-koenig-editor"
+                        @value={{readonly this.excerpt}}
+                        @input={{this.onExcerptInput}}
+                        @keyDown={{this.onExcerptKeydown}}
+                        @didCreateTextarea={{this.registerExcerptElement}}
+                        {{on "blur" @onExcerptBlur}}
+                        data-test-textarea="excerpt"
+                    />
+                    {{#if @excerptHasTk}}
+                        <div
+                            class="tk-indicator tk-indicator-excerpt"
+                            data-testid="tk-indicator-excerpt"
+                            {{on "click" this.focusExcerpt}}
+                        >
+                            TK
+                        </div>
+                    {{/if}}
+                    <hr class="gh-editor-title-divider {{if @excerptErrorMessage "gh-editor-title-divider-error" ""}}">
+                    {{#if @excerptErrorMessage}}
+                        <div class="gh-editor-excerpt-error" data-test-error="excerpt">
+                            {{@excerptErrorMessage}}
+                        </div>
+                    {{/if}}
+                </div>
+            {{/if}}
         </div>
 
         <KoenigLexicalEditor
@@ -52,9 +96,12 @@
             @placeholder={{@bodyPlaceholder}}
             @cardConfig={{@cardOptions}}
             @onChange={{@onBodyChange}}
+            @updateSecondaryInstanceModel={{@updateSecondaryInstanceModel}}
             @registerAPI={{this.registerEditorAPI}}
-            @cursorDidExitAtTop={{this.focusTitle}}
+            @registerSecondaryAPI={{this.registerSecondaryEditorAPI}}
+            @cursorDidExitAtTop={{if this.feature.editorExcerpt this.focusExcerpt this.focusTitle}}
             @updateWordCount={{@updateWordCount}}
+            @updatePostTkCount={{@updatePostTkCount}}
         />
     </div>
 </div>
diff --git a/ghost/admin/app/components/gh-koenig-editor-lexical.js b/ghost/admin/app/components/gh-koenig-editor-lexical.js
index 0d1822b2495..be28f73a5f7 100644
--- a/ghost/admin/app/components/gh-koenig-editor-lexical.js
+++ b/ghost/admin/app/components/gh-koenig-editor-lexical.js
@@ -4,15 +4,18 @@ import {action} from '@ember/object';
 import {inject as service} from '@ember/service';
 import {tracked} from '@glimmer/tracking';
 
-export default class GhKoenigEditorReactComponent extends Component {
+export default class GhKoenigEditorLexical extends Component {
     @service settings;
+    @service feature;
 
     containerElement = null;
     titleElement = null;
+    excerptElement = null;
     mousedownY = 0;
     uploadUrl = `${ghostPaths().apiRoot}/images/upload/`;
 
     editorAPI = null;
+    secondaryEditorAPI = null;
     skipFocusEditor = false;
 
     @tracked titleIsHovered = false;
@@ -30,6 +33,10 @@ export default class GhKoenigEditorReactComponent extends Component {
         return color;
     }
 
+    get excerpt() {
+        return this.args.excerpt || '';
+    }
+
     @action
     registerElement(element) {
         this.containerElement = element;
@@ -44,10 +51,15 @@ export default class GhKoenigEditorReactComponent extends Component {
         // mouseup/click event can occur outside of the initially clicked card, in
         // which case we don't want to then "re-focus" the editor and cause unexpected
         // selection changes
-        const clickedOnDecorator = (event.target.closest('[data-lexical-decorator]') !== null) || event.target.hasAttribute('data-lexical-decorator');
-        const clickedOnSlashMenu = (event.target.closest('[data-kg-slash-menu]') !== null) || event.target.hasAttribute('data-kg-slash-menu');
+        let skipFocus = false;
+        for (const elem of (event.path || event.composedPath())) {
+            if (elem.matches?.('[data-lexical-decorator], [data-kg-slash-menu]')) {
+                skipFocus = true;
+                break;
+            }
+        }
 
-        if (clickedOnDecorator || clickedOnSlashMenu) {
+        if (skipFocus) {
             this.skipFocusEditor = true;
         }
     }
@@ -101,25 +113,106 @@ export default class GhKoenigEditorReactComponent extends Component {
         this.titleElement.focus();
     }
 
-    // move cursor to the editor on
-    // - Tab
-    // - Arrow Down/Right when input is empty or caret at end of input
-    // - Enter, creating an empty paragraph when editor is not empty
     @action
     onTitleKeydown(event) {
-        const {editorAPI} = this;
+        if (this.feature.editorExcerpt) {
+            // move cursor to the excerpt on
+            // - Tab (handled by browser)
+            // - Arrow Down/Right when input is empty or caret at end of input
+            // - Enter
+            const {key} = event;
+            const {value, selectionStart} = event.target;
+
+            if (key === 'Enter') {
+                event.preventDefault();
+                this.excerptElement?.focus();
+            }
 
-        if (!editorAPI) {
-            return;
+            if ((key === 'ArrowDown' || key === 'ArrowRight') && !event.shiftKey) {
+                const couldLeaveTitle = !value || selectionStart === value.length;
+
+                if (couldLeaveTitle) {
+                    event.preventDefault();
+                    this.excerptElement?.focus();
+                }
+            }
+        } else {
+            // move cursor to the editor on
+            // - Tab
+            // - Arrow Down/Right when input is empty or caret at end of input
+            // - Enter, creating an empty paragraph when editor is not empty
+            const {editorAPI} = this;
+
+            if (!editorAPI || event.originalEvent.isComposing) {
+                return;
+            }
+
+            const {key} = event;
+            const {value, selectionStart} = event.target;
+
+            const couldLeaveTitle = !value || selectionStart === value.length;
+            const arrowLeavingTitle = ['ArrowDown', 'ArrowRight'].includes(key) && couldLeaveTitle;
+
+            if (key === 'Enter' || key === 'Tab' || arrowLeavingTitle) {
+                event.preventDefault();
+
+                if (key === 'Enter' && !editorAPI.editorIsEmpty()) {
+                    editorAPI.insertParagraphAtTop({focus: true});
+                } else {
+                    editorAPI.focusEditor({position: 'top'});
+                }
+            }
         }
+    }
+
+    // Subtitle ("excerpt") Actions -------------------------------------------
 
+    @action
+    registerExcerptElement(element) {
+        this.excerptElement = element;
+    }
+
+    @action
+    focusExcerpt() {
+        this.excerptElement?.focus();
+
+        // timeout ensures this occurs after the keyboard events
+        setTimeout(() => {
+            this.excerptElement?.setSelectionRange(-1, -1);
+        }, 0);
+    }
+
+    @action
+    onExcerptInput(event) {
+        this.args.setExcerpt?.(event.target.value);
+    }
+
+    @action
+    onExcerptKeydown(event) {
+        // move cursor to the title on
+        // - Shift+Tab (handled by the browser)
+        // - Arrow Up/Left when input is empty or caret at start of input
+        // move cursor to the editor on
+        // - Tab
+        // - Arrow Down/Right when input is empty or caret at end of input
+        // - Enter, creating an empty paragraph when editor is not empty
         const {key} = event;
         const {value, selectionStart} = event.target;
 
+        if ((key === 'ArrowUp' || key === 'ArrowLeft') && !event.shiftKey) {
+            const couldLeaveTitle = !value || selectionStart === 0;
+
+            if (couldLeaveTitle) {
+                event.preventDefault();
+                this.focusTitle();
+            }
+        }
+
+        const {editorAPI} = this;
         const couldLeaveTitle = !value || selectionStart === value.length;
-        const arrowLeavingTitle = ['ArrowDown', 'ArrowRight'].includes(key) && couldLeaveTitle;
+        const arrowLeavingTitle = (key === 'ArrowRight' || key === 'ArrowDown') && couldLeaveTitle;
 
-        if (key === 'Enter' || key === 'Tab' || arrowLeavingTitle) {
+        if (key === 'Enter' || (key === 'Tab' && !event.shiftKey) || arrowLeavingTitle) {
             event.preventDefault();
 
             if (key === 'Enter' && !editorAPI.editorIsEmpty()) {
@@ -130,6 +223,8 @@ export default class GhKoenigEditorReactComponent extends Component {
         }
     }
 
+    // move cursor to the editor on
+
     // Body actions ------------------------------------------------------------
 
     @action
@@ -138,11 +233,17 @@ export default class GhKoenigEditorReactComponent extends Component {
         this.args.registerAPI(API);
     }
 
+    @action
+    registerSecondaryEditorAPI(API) {
+        this.secondaryEditorAPI = API;
+        this.args.registerSecondaryAPI(API);
+    }
+
     // focus the editor when the editor canvas is clicked below the editor content,
     // otherwise the browser will defocus the editor and the cursor will disappear
     @action
     focusEditor(event) {
-        if (!this.skipFocusEditor && event.target.classList.contains('gh-koenig-editor-pane')) {
+        if (!this.skipFocusEditor && event.target.classList.contains('gh-koenig-editor-pane') && this.editorAPI) {
             let editorCanvas = this.editorAPI.editorInstance.getRootElement();
             let {bottom} = editorCanvas.getBoundingClientRect();
 
diff --git a/ghost/admin/app/components/gh-member-label-input.hbs b/ghost/admin/app/components/gh-member-label-input.hbs
index fed32b75035..b75832dff41 100644
--- a/ghost/admin/app/components/gh-member-label-input.hbs
+++ b/ghost/admin/app/components/gh-member-label-input.hbs
@@ -19,7 +19,7 @@
     <div style="display: flex; width: 100%;">
         <span
             class="dropdown-label"
-            style="flex-grow: 1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;"
+            style="display: -webkit-box; flex-grow: 1; overflow: hidden; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"
             title="{{label.name}}"
             data-test-label-filter={{label.name}}>
             {{label.name}}
diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs
index a4da152d918..c6a3234c0a0 100644
--- a/ghost/admin/app/components/gh-member-settings-form.hbs
+++ b/ghost/admin/app/components/gh-member-settings-form.hbs
@@ -111,122 +111,104 @@
                     <div class="gh-main-section-content grey gh-member-tier-container" data-test-tier={{tier.id}}>
                         <div class="gh-main-content-card gh-cp-membertier gh-cp-membertier-attribution gh-membertier-subscription {{if (gt tier.subscriptions.length 1) "multiple-subs" ""}}">
                             {{#each tier.subscriptions as |sub index|}}
-                            <div class="gh-tier-card-header flex items-center">
-                                <div class="gh-tier-card-price">
-                                    <div class="flex items-start">
-                                        <span class="currency-symbol">{{sub.price.currencySymbol}}</span>
-                                        <span class="amount">{{sub.price.nonDecimalAmount}}</span>
+                                <div class="gh-tier-card-header flex items-center">
+                                    <div class="gh-tier-card-price">
+                                        <div class="flex items-start">
+                                            <span class="currency-symbol">{{sub.price.currencySymbol}}</span>
+                                            <span class="amount">{{format-number sub.price.nonDecimalAmount}}</span>
+                                        </div>
+                                        <div class="period">{{if (eq sub.price.interval "year") "yearly" "monthly"}}</div>
                                     </div>
-                                    <div class="period">{{if (eq sub.price.interval "year") "yearly" "monthly"}}</div>
-                                </div>
-                                <div style="margin-left: 16px; flex-grow: 1;">
-                                    <h3 class="gh-membertier-name" data-test-text="tier-name" style="align-items:center !important; justify-content:flex-start !important;">
-                                        {{tier.name}}
-                                        {{#if (eq sub.status "canceled")}}
-                                            <span class="gh-badge archived" data-test-text="member-subscription-status">Cancelled</span>
-                                        {{else if sub.cancel_at_period_end}}
-                                            <span class="gh-badge archived" data-test-text="member-subscription-status">Cancelled</span>
-                                        {{else if sub.compExpiry}}
-                                            <span class="gh-badge active" data-test-text="member-subscription-status">Active</span>
-                                        {{else if sub.trialUntil}}
-                                            <span class="gh-badge active" data-test-text="member-subscription-status">Active</span>
-                                        {{else}}
-                                            <span class="gh-badge active" data-test-text="member-subscription-status">Active</span>
-                                        {{/if}}
-                                        {{#if (gt tier.subscriptions.length 1)}}
-                                            <span class="gh-membertier-subcount">{{tier.subscriptions.length}} subscriptions</span>
-                                        {{/if}}
-                                    </h3>
-                                    <div>
-                                        {{#if sub.trialUntil}}
-                                            <span class="gh-cp-membertier-pricelabel">Free trial </span>
-                                        {{else}}
-                                            {{#if (or (eq sub.price.nickname "Monthly") (eq sub.price.nickname "Yearly"))}}
+                                    <div style="margin-left: 16px; flex-grow: 1;">
+                                        <h3 class="gh-membertier-name" data-test-text="tier-name" style="align-items:center !important; justify-content:flex-start !important;">
+                                            {{tier.name}}
+                                            {{#if (eq sub.status "canceled")}}
+                                                <span class="gh-badge archived" data-test-text="member-subscription-status">Canceled</span>
+                                            {{else if sub.cancel_at_period_end}}
+                                                <span class="gh-badge archived" data-test-text="member-subscription-status">Canceled</span>
+                                            {{else if sub.compExpiry}}
+                                                <span class="gh-badge active" data-test-text="member-subscription-status">Active</span>
+                                            {{else if sub.trialUntil}}
+                                                <span class="gh-badge active" data-test-text="member-subscription-status">Active</span>
                                             {{else}}
-                                                <span class="gh-cp-membertier-pricelabel">{{sub.price.nickname}}</span><span class="gh-cp-membertier-renewal"> &ndash;</span>
+                                                <span class="gh-badge active" data-test-text="member-subscription-status">Active</span>
                                             {{/if}}
-                                        {{/if}}
-
-                                        {{#if (eq sub.status "canceled")}}
-                                            <span class="gh-cp-membertier-renewal">Ended {{sub.validUntil}}</span>
-                                        {{else if sub.cancel_at_period_end}}
-                                            <span class="gh-cp-membertier-renewal">Has access until {{sub.validUntil}}</span>
-                                        {{else if sub.compExpiry}}
-                                            <span class="gh-cp-membertier-renewal">Expires {{sub.compExpiry}}</span>
-                                        {{else if sub.trialUntil}}
-                                            <span class="gh-cp-membertier-renewal">Ends {{sub.trialUntil}}</span>
-                                        {{else}}
-                                            <span class="gh-cp-membertier-renewal">Renews {{sub.validUntil}}</span>
-                                        {{/if}}
+                                            {{#if (gt tier.subscriptions.length 1)}}
+                                                <span class="gh-membertier-subcount">{{tier.subscriptions.length}} subscriptions</span>
+                                            {{/if}}
+                                        </h3>
+                                        <div>
+                                            <span class="gh-cp-membertier-pricelabel">{{sub.priceLabel}}</span>
+                                            <span class="gh-cp-membertier-renewal">{{sub.validityDetails}}</span>
+                                        </div>
+                                        <Member::SubscriptionDetailBox @sub={{sub}} @index={{index}} />
                                     </div>
-                                    <Member::SubscriptionDetailBox @sub={{sub}} @index={{index}} />
-                                </div>
-                                {{#if sub.isComplimentary}}
-                                    <span class="action-menu">
-                                        <GhDropdownButton
-                                            @dropdownName="subscription-menu-complimentary"
-                                            @classNames="gh-btn gh-btn-outline gh-btn-icon fill gh-btn-subscription-action icon-only"
-                                            @title="Actions"
-                                            data-test-button="subscription-actions"
-                                        >
-                                            <span>
-                                                {{svg-jar "dotdotdot"}}
-                                                <span class="hidden">Subscription menu</span>
-                                            </span>
-                                        </GhDropdownButton>
-                                        <GhDropdown
-                                            @name="subscription-menu-complimentary"
-                                            @tagName="ul"
-                                            @classNames="tier-actions-menu dropdown-menu dropdown-align-right"
-                                        >
-                                            <li>
-                                                <button
-                                                    type="button"
-                                                    {{on "click" (fn this.removeComplimentary (or tier.id tier.tier_id))}}
-                                                    data-test-button="remove-complimentary"
-                                                >
-                                                    <span class="red">Remove complimentary subscription</span>
-                                                </button>
-                                            </li>
-                                        </GhDropdown>
-                                    </span>
-                                {{else}}
-                                    <span class="action-menu">
-                                        <GhDropdownButton @dropdownName="subscription-menu-{{sub.id}}" @classNames="gh-btn gh-btn-outline gh-btn-icon fill gh-btn-subscription-action icon-only" @title="Actions">
-                                            <span>
-                                                {{svg-jar "dotdotdot"}}
-                                                <span class="hidden">Subscription menu</span>
-                                            </span>
-                                        </GhDropdownButton>
-                                        <GhDropdown @name="subscription-menu-{{sub.id}}" @tagName="ul" @classNames="tier-actions-menu dropdown-menu dropdown-align-right">
-                                            <li>
-                                                <a href="https://dashboard.stripe.com/customers/{{sub.customer.id}}" target="_blank" rel="noopener noreferrer">
-                                                    View Stripe customer
-                                                </a>
-                                            </li>
-                                            <li class="divider"></li>
-                                            <li>
-                                                <a href="https://dashboard.stripe.com/subscriptions/{{sub.id}}" target="_blank" rel="noopener noreferrer">
-                                                    View Stripe subscription
-                                                </a>
-                                            </li>
-                                            <li>
-                                            {{#if (not-eq sub.status "canceled")}}
-                                                {{#if sub.cancel_at_period_end}}
-                                                    <button type="button" {{on "click" (fn this.continueSubscription sub.id)}}>
-                                                        <span>Continue subscription</span>
-                                                    </button>
-                                                {{else}}
-                                                    <button type="button" {{on "click" (fn this.cancelSubscription sub.id)}}>
-                                                        <span class="red">Cancel subscription</span>
+                                    {{#if sub.isComplimentary}}
+                                        <span class="action-menu">
+                                            <GhDropdownButton
+                                                @dropdownName="subscription-menu-complimentary"
+                                                @classNames="gh-btn gh-btn-outline gh-btn-icon fill gh-btn-subscription-action icon-only"
+                                                @title="Actions"
+                                                data-test-button="subscription-actions"
+                                            >
+                                                <span>
+                                                    {{svg-jar "dotdotdot"}}
+                                                    <span class="hidden">Subscription menu</span>
+                                                </span>
+                                            </GhDropdownButton>
+                                            <GhDropdown
+                                                @name="subscription-menu-complimentary"
+                                                @tagName="ul"
+                                                @classNames="tier-actions-menu dropdown-menu dropdown-align-right"
+                                            >
+                                                <li>
+                                                    <button
+                                                        type="button"
+                                                        {{on "click" (fn this.removeComplimentary (or tier.id tier.tier_id))}}
+                                                        data-test-button="remove-complimentary"
+                                                    >
+                                                        <span class="red">Remove complimentary subscription</span>
                                                     </button>
+                                                </li>
+                                            </GhDropdown>
+                                        </span>
+                                    {{else}}
+                                        <span class="action-menu">
+                                            <GhDropdownButton @dropdownName="subscription-menu-{{sub.id}}" @classNames="gh-btn gh-btn-outline gh-btn-icon fill gh-btn-subscription-action icon-only" @title="Actions">
+                                                <span>
+                                                    {{svg-jar "dotdotdot"}}
+                                                    <span class="hidden">Subscription menu</span>
+                                                </span>
+                                            </GhDropdownButton>
+                                            <GhDropdown @name="subscription-menu-{{sub.id}}" @tagName="ul" @classNames="tier-actions-menu dropdown-menu dropdown-align-right">
+                                                <li>
+                                                    <a href="https://dashboard.stripe.com/customers/{{sub.customer.id}}" target="_blank" rel="noopener noreferrer">
+                                                        View Stripe customer
+                                                    </a>
+                                                </li>
+                                                <li class="divider"></li>
+                                                <li>
+                                                    <a href="https://dashboard.stripe.com/subscriptions/{{sub.id}}" target="_blank" rel="noopener noreferrer">
+                                                        View Stripe subscription
+                                                    </a>
+                                                </li>
+                                                <li>
+                                                {{#if (not-eq sub.status "canceled")}}
+                                                    {{#if sub.cancel_at_period_end}}
+                                                        <button type="button" {{on "click" (fn this.continueSubscription sub.id)}}>
+                                                            <span>Continue subscription</span>
+                                                        </button>
+                                                    {{else}}
+                                                        <button type="button" {{on "click" (fn this.cancelSubscription sub.id)}}>
+                                                            <span class="red">Cancel subscription</span>
+                                                        </button>
+                                                    {{/if}}
                                                 {{/if}}
-                                            {{/if}}
-                                            </li>
-                                        </GhDropdown>
-                                    </span>
-                                {{/if}}
-                            </div>
+                                                </li>
+                                            </GhDropdown>
+                                        </span>
+                                    {{/if}}
+                                </div>
                             {{/each}}
 
                             {{#if (eq tier.subscriptions.length 0)}}
diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js
index 467a240a24f..bcd9193bf50 100644
--- a/ghost/admin/app/components/gh-member-settings-form.js
+++ b/ghost/admin/app/components/gh-member-settings-form.js
@@ -1,9 +1,8 @@
 import Component from '@glimmer/component';
-import moment from 'moment-timezone';
 import {action} from '@ember/object';
-import {getNonDecimal, getSymbol} from 'ghost-admin/utils/currency';
+import {didCancel, task} from 'ember-concurrency';
+import {getSubscriptionData} from 'ghost-admin/utils/subscription-data';
 import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
 export default class extends Component {
@@ -60,38 +59,9 @@ export default class extends Component {
                 return typeof value.id !== 'undefined' && self.findIndex(element => (element.tier_id || element.id) === (value.tier_id || value.id)) === index;
             });
 
-        let subscriptionData = subscriptions.filter((sub) => {
-            return !!sub.price;
-        }).map((sub) => {
-            const data = {
-                ...sub,
-                attribution: {
-                    ...sub.attribution,
-                    referrerSource: sub.attribution?.referrer_source || 'Unknown',
-                    referrerMedium: sub.attribution?.referrer_medium || '-'
-                },
-                startDate: sub.start_date ? moment(sub.start_date).format('D MMM YYYY') : '-',
-                validUntil: sub.current_period_end ? moment(sub.current_period_end).format('D MMM YYYY') : '-',
-                cancellationReason: sub.cancellation_reason,
-                price: {
-                    ...sub.price,
-                    currencySymbol: getSymbol(sub.price.currency),
-                    nonDecimalAmount: getNonDecimal(sub.price.amount)
-                },
-                isComplimentary: !sub.id
-            };
-            if (sub.trial_end_at) {
-                const inTrialMode = moment(sub.trial_end_at).isAfter(new Date(), 'day');
-                if (inTrialMode) {
-                    data.trialUntil = moment(sub.trial_end_at).format('D MMM YYYY');
-                }
-            }
+        let subsWithPrice = subscriptions.filter(sub => !!sub.price);
+        let subscriptionData = subsWithPrice.map(sub => getSubscriptionData(sub));
 
-            if (!sub.id && sub.tier?.expiry_at) {
-                data.compExpiry = moment(sub.tier.expiry_at).utc().format('D MMM YYYY');
-            }
-            return data;
-        });
         return tiers.map((tier) => {
             let tierSubscriptions = subscriptionData.filter((subscription) => {
                 return subscription?.price?.tier?.tier_id === (tier.tier_id || tier.id);
@@ -134,8 +104,17 @@ export default class extends Component {
 
     @action
     setup() {
-        this.fetchTiers.perform();
-        this.fetchNewsletters.perform();
+        try {
+            this.fetchTiers.perform();
+            this.fetchNewsletters.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
+        }
     }
 
     @action
diff --git a/ghost/admin/app/components/gh-members-no-members.hbs b/ghost/admin/app/components/gh-members-no-members.hbs
index 32926e99f8a..e7563464caa 100644
--- a/ghost/admin/app/components/gh-members-no-members.hbs
+++ b/ghost/admin/app/components/gh-members-no-members.hbs
@@ -9,7 +9,7 @@
         <p class="gh-members-empty-secondary-cta">Have members already? <LinkTo @route="member.new">Add them manually</LinkTo> or <LinkTo @route="members.import">import from CSV</LinkTo></p>
     {{else}}
         <p>Memberships have been disabled. Adjust your Subscription Access settings to start adding members.</p>
-        <LinkTo @route="settings-x.settings-x" @model="access" class="gh-btn gh-btn-green">
+        <LinkTo @route="settings-x.settings-x" @model="members" class="gh-btn gh-btn-green">
             <span>Membership settings</span>
         </LinkTo>
     {{/if}}
diff --git a/ghost/admin/app/components/gh-members-no-members.js b/ghost/admin/app/components/gh-members-no-members.js
index 1db29001314..42692f186ca 100644
--- a/ghost/admin/app/components/gh-members-no-members.js
+++ b/ghost/admin/app/components/gh-members-no-members.js
@@ -8,6 +8,7 @@ export default class GhMembersNoMembersComponent extends Component {
     @service store;
     @service notifications;
     @service settings;
+    @service membersCountCache;
 
     @action
     addYourself() {
@@ -34,10 +35,13 @@ export default class GhMembersNoMembersComponent extends Component {
 
             this.notifications.showNotification('Member added',
                 {
-                    description: 'You\'ve successfully added yourself as a member.'
+                    description: 'You\'ve added yourself as a member.'
                 }
             );
 
+            // force update the member count; this otherwise only updates every minute
+            yield this.membersCountCache.count({});
+
             return member;
         } catch (error) {
             if (error) {
diff --git a/ghost/admin/app/components/gh-members-segment-count.js b/ghost/admin/app/components/gh-members-segment-count.js
index 6ca4240d6f5..e1c7b991e50 100644
--- a/ghost/admin/app/components/gh-members-segment-count.js
+++ b/ghost/admin/app/components/gh-members-segment-count.js
@@ -6,6 +6,7 @@ import {tracked} from '@glimmer/tracking';
 export default class GhMembersSegmentCountComponent extends Component {
     @service store;
     @service session;
+    @service membersCountCache;
 
     @tracked total = 0;
     @tracked segmentTotal = 0;
@@ -17,9 +18,7 @@ export default class GhMembersSegmentCountComponent extends Component {
         this.fetchSegmentTotalTask.perform();
 
         const filter = this.args.enforcedFilter || undefined;
-
-        const members = yield this.store.query('member', {limit: 1, filter});
-        this.total = members.meta.pagination.total;
+        this.total = yield this.membersCountCache.count({filter});
     }
 
     @task({group: 'fetchTasks'})
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-migrate-iframe.js b/ghost/admin/app/components/gh-migrate-iframe.js
index be54474df00..b1e76dd354d 100644
--- a/ghost/admin/app/components/gh-migrate-iframe.js
+++ b/ghost/admin/app/components/gh-migrate-iframe.js
@@ -63,7 +63,8 @@ export default class GhMigrateIframe extends Component {
                 apiUrl: this.migrate.apiUrl,
                 apiToken: theToken,
                 darkMode: this.feature.nightShift,
-                stripe: this.migrate.isStripeConnected
+                stripe: this.migrate.isStripeConnected,
+                ghostVersion: this.migrate.ghostVersion
             }
         }, new URL(this.migrate.getIframeURL()).origin);
     }
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-nav-menu/footer-banner.hbs b/ghost/admin/app/components/gh-nav-menu/footer-banner.hbs
new file mode 100644
index 00000000000..7ebaa07e970
--- /dev/null
+++ b/ghost/admin/app/components/gh-nav-menu/footer-banner.hbs
@@ -0,0 +1,28 @@
+{{#if this.showReferralInvite}}
+    <div class="gh-sidebar-banner gh-referral-toast">
+        <button class="gh-sidebar-banner-close" type="button" {{on "click" this.dismissReferralInvite}}>&#xd7;</button>
+        <a href="https://referrals.ghost.org/?ref=admin" target="_blank" rel="noopener noreferrer">
+            <strong>You qualify for our invite-only referral program.</strong>
+            <p class="gh-footer-toast-p">Refer people to Ghost and earn a <strong>30% share</strong> of the subscription revenue, every single month.</p>
+            <div class="gh-btn gh-btn-black gh-sidebar-banner-button" type="button"><span>Find out more &rarr;</span></div>
+        </a>
+    </div>
+{{/if}}
+
+{{#if (and this.showWhatsNew this.whatsNew.hasNew)}}
+    {{#let (get this.whatsNew.entries "0") as |entry|}}
+    <div class="gh-sidebar-banner gh-whatsnew-toast">
+        <button class="gh-sidebar-banner-close" type="button" {{on "click" this.dismissWhatsNewToast}}>&#xd7;</button>
+        <a class="gh-sidebar-banner-container" href={{entry.url}} target="_blank" rel="noopener noreferrer" {{on "click" (fn this.openFeaturedWhatsNew entry.url)}}>
+            <div class="gh-sidebar-banner-head">
+                {{svg-jar "sparkle-fill" class="gh-sidebar-banner-icon gh-whatsnew-banner-icon"}}
+                <span class="gh-sidebar-banner-subhead">What's new?</span>
+            </div>
+            <div class="gh-sidebar-banner-msg">{{entry.title}}</div>
+            {{#if entry.custom_excerpt}}
+                <div class="gh-sidebar-banner-details">{{entry.custom_excerpt}}</div>
+            {{/if}}
+        </a>
+    </div>
+    {{/let}}
+{{/if}}
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-nav-menu/footer-banner.js b/ghost/admin/app/components/gh-nav-menu/footer-banner.js
new file mode 100644
index 00000000000..fab716af821
--- /dev/null
+++ b/ghost/admin/app/components/gh-nav-menu/footer-banner.js
@@ -0,0 +1,89 @@
+import Component from '@glimmer/component';
+import envConfig from 'ghost-admin/config/environment';
+import moment from 'moment-timezone';
+import {action} from '@ember/object';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+
+export default class FooterBanner extends Component {
+    @service session;
+    @service dashboardStats;
+    @service feature;
+    @service membersUtils;
+    @service modals;
+    @service settings;
+    @service whatsNew;
+
+    constructor() {
+        super(...arguments);
+        this.loadCurrentMRR.perform();
+    }
+
+    get isAdminOrOwner() {
+        return this.session.user.isAdmin;
+    }
+
+    get isReferralNotificationNotDismissed() {
+        return !this.feature.accessibility.referralInviteDismissed;
+    }
+
+    get stripeLiveModeEnabled() {
+        // allow testing mode when not in a production environment
+        const isDevModeStripeEnabled = envConfig.environment !== 'production' && this.membersUtils.isStripeEnabled;
+        const isLiveEnabled = this.settings.stripeConnectLivemode;
+        return isDevModeStripeEnabled || isLiveEnabled;
+    }
+
+    get hasReachedMRR() {
+        return this.dashboardStats.currentMRR / 100 >= 100;
+    }
+
+    get showReferralInvite() {
+        // Conditions to see the referral invite
+        // 1. Needs to be Owner or Admin
+        // 2. Stripe is setup and enabled in live mode
+        // 3. MRR is > $100
+        // 4. Notification has not yet been dismissed by the user
+        return !this.args.hasThemeErrors && this.isAdminOrOwner && this.isReferralNotificationNotDismissed && this.stripeLiveModeEnabled && this.hasReachedMRR;
+    }
+
+    get showWhatsNew() {
+        return !this.showReferralInvite && this.whatsNew.hasNewFeatured;
+    }
+
+    @task
+    *loadCurrentMRR() {
+        if (this.isAdminOrOwnern) {
+            try {
+                yield this.dashboardStats.loadMrrStats();
+            } catch (error) {
+                // noop
+            }
+        }
+    }
+
+    @action
+    dismissReferralInvite(event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        if (!this.feature.referralInviteDismissed) {
+            this.feature.referralInviteDismissed = moment().tz(this.settings.timezone);
+        }
+    }
+
+    @action
+    dismissWhatsNewToast(event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        // Dismiss
+        this.whatsNew.seen();
+    }
+
+    @action
+    openFeaturedWhatsNew(href) {
+        window.open(href, '_blank');
+        this.whatsNew.seen();
+    }
+}
diff --git a/ghost/admin/app/components/gh-nav-menu/footer.hbs b/ghost/admin/app/components/gh-nav-menu/footer.hbs
index 57e0b286591..e40db083631 100644
--- a/ghost/admin/app/components/gh-nav-menu/footer.hbs
+++ b/ghost/admin/app/components/gh-nav-menu/footer.hbs
@@ -1,12 +1,19 @@
 <div class="gh-nav-bottom">
     {{#if this.hasThemeErrors}}
-    <button type="button" class="gh-footer-toast gh-theme-error-toast" {{on "click" (fn this.openThemeErrors null)}}>
-        <span class="gh-footer-toast-title gh-notification-title">Your theme contains errors</span>
-        <span class="gh-footer-toast-p">Some functionality on your site may be limited &rarr;</span>
-    </button>
+    <div class="gh-sidebar-banner gh-error-banner">
+        <button class="gh-sidebar-banner-container" type="button" {{on "click" (fn this.openThemeErrors null)}}>
+            <div>
+                {{svg-jar "warning-fill" class="gh-sidebar-banner-icon"}}
+            </div>
+            <div>
+                <span class="gh-sidebar-banner-subhead">Your theme has errors</span>
+                <p class="gh-sidebar-banner-msg">Some functionality on your site may be limited &rarr;</p>
+            </div>
+        </button>
+    </div>
     {{/if}}
 
-    <GhReferralInvite @hasThemeErrors={{this.hasThemeErrors}} />
+    <GhNavMenu::FooterBanner @hasThemeErrors={{this.hasThemeErrors}} />
 
     <div class="flex items-center justify-between">
         <div class="pe-all">
@@ -14,7 +21,7 @@
                 <dropdown.Trigger class="outline-0 pointer">
                     <div class="flex-auto flex items-center">
                         <div class="gh-user-avatar relative" style={{background-image-style this.session.user.profileImageUrl}}>
-                            {{#if this.whatsNew.hasNew}}<span class="absolute dib ba b--white br-100 gh-whats-new-badge-account"></span>{{/if}}
+                            {{#if (and this.whatsNew.hasNew (not this.whatsNew.hasNewFeatured))}}<span class="absolute dib ba b--white br-100 gh-whats-new-badge-account"></span>{{/if}}
                         </div>
                         {{svg-jar "arrow-down" class="w3 mr1 fill-darkgrey"}}
                     </div>
@@ -45,12 +52,12 @@
                             <li class="divider" role="separator"></li>
                         {{else}}
                             <li>
-                                <LinkTo @route="whatsnew" @query={{hash entry=null}} class="dropdown-item" @role="menuitem" tabindex="-1" data-test-nav="whatsnew">
+                                <button class="dropdown-item" tabindex="-1" data-test-nav="whatsnew" type="button" {{on "click" this.openWhatsNew}}>
                                     What's new?
                                     {{#if this.whatsNew.hasNew}}
                                         <div class="flex-grow-1 flex justify-end"><span class="dib w2 h2 top-0 right-0 bg-green br-100"></span></div>
                                     {{/if}}
-                                </LinkTo>
+                                </button>
                             </li>
                         {{/if}}
 
@@ -100,7 +107,7 @@
         </div>
         <div class="flex items-center pe-all">
             {{#if (or (gh-user-can-admin this.session.user) this.session.user.isEditor)}}
-                <LinkTo class="gh-nav-bottom-tabicon" @route="settings-x" @current-when={{this.isSettingsRoute}} data-test-nav="settings">{{svg-jar "settings"}}</LinkTo>
+                <LinkTo class="gh-nav-bottom-tabicon" @route="settings-x" @current-when={{this.isSettingsRoute}} data-test-nav="settings">{{svg-jar "settings" title="Settings (CTRL/⌘ + ,)"}}</LinkTo>
             {{/if}}
             <div class="nightshift-toggle-container">
                 <div class="nightshift-toggle {{if this.feature.nightShift "on"}}" {{action (toggle "nightShift" this.feature)}}>
diff --git a/ghost/admin/app/components/gh-nav-menu/footer.js b/ghost/admin/app/components/gh-nav-menu/footer.js
index eb9e9eba1fc..b51777f2359 100644
--- a/ghost/admin/app/components/gh-nav-menu/footer.js
+++ b/ghost/admin/app/components/gh-nav-menu/footer.js
@@ -1,5 +1,6 @@
 import Component from '@ember/component';
 import ThemeErrorsModal from '../modals/design/theme-errors';
+import WhatsNew from '../modals/whats-new';
 import calculatePosition from 'ember-basic-dropdown/utils/calculate-position';
 import classic from 'ember-classic-decorator';
 import {action} from '@ember/object';
@@ -43,7 +44,7 @@ export default class Footer extends Component {
         // filter errors that have other UI to display to users that the functionality is not working
         const filteredErrors = errors?.filter((error) => {
             if (error.code === 'GS110-NO-MISSING-PAGE-BUILDER-USAGE' && error?.failures?.[0].message.includes(`show_title_and_feature_image`)) {
-                return false;                
+                return false;
             }
             return true;
         });
@@ -60,4 +61,9 @@ export default class Footer extends Component {
 
         return {horizontalPosition, verticalPosition, style};
     }
+
+    @action
+    openWhatsNew() {
+        return this.modals.open(WhatsNew);
+    }
 }
diff --git a/ghost/admin/app/components/gh-nav-menu/main.hbs b/ghost/admin/app/components/gh-nav-menu/main.hbs
index 08d8a63b9c6..0af5771c24c 100644
--- a/ghost/admin/app/components/gh-nav-menu/main.hbs
+++ b/ghost/admin/app/components/gh-nav-menu/main.hbs
@@ -7,7 +7,7 @@
                 <div class="gh-nav-menu-details-sitetitle">{{this.config.blogTitle}}</div>
             </div>
             <div class="gh-nav-menu-search">
-                <button class="gh-nav-btn-search" title="Search site (Ctrl/⌘ + K)" type="button" {{on "click" (action "openSearchModal")}}><span>{{svg-jar "search"}}</span></button>
+                <button class="gh-nav-btn-search" title="Search site (Ctrl/⌘ + K)" type="button" {{on "click" (action "openSearchModal")}} data-test-button="search"><span>{{svg-jar "search"}}</span></button>
             </div>
         </header>
     {{/unless}}
@@ -18,7 +18,7 @@
             <div class="gh-nav-top">
                 <ul class="gh-nav-list gh-nav-main">
                     {{#if (gh-user-can-admin this.session.user)}}
-                    <li class="relative">
+                    <li class="relative gh-nav-list-home">
                         <LinkTo @route="dashboard" @alt="Dashboard" title="Dashboard" data-test-nav="dashboard">{{svg-jar "house"}} Dashboard</LinkTo>
                     </li>
                     {{/if}}
@@ -32,6 +32,11 @@
                             <span>{{svg-jar "external"}}</span>
                         </a>
                     </li>
+                    {{#if (and (gh-user-can-admin this.session.user) this.config.stats)}}
+                    <li class="relative">
+                        <LinkTo @route="stats">{{svg-jar "stats"}}Stats</LinkTo>
+                    </li>
+                    {{/if}}
                     {{#if (gh-user-can-admin this.session.user)}}
                     <li class="relative">
                         <a href="javascript:void(0)" class={{if this.explore.exploreWindowOpen "active"}} {{on "click" (fn this.toggleExploreWindow "")}} data-test-nav="explore">
@@ -100,24 +105,33 @@
                         <li class="relative">
                             {{#if (eq this.router.currentRouteName "members.index")}}
                                 <LinkTo @route="members" @current-when="members member member.new" @query={{reset-query-params "members.index"}} data-test-nav="members">{{svg-jar "members"}}Members
-                                    {{#unless this.memberCountLoading}}
-                                        <span class="gh-nav-member-count">{{format-number this.membersStats.memberCount}}</span>
-                                    {{/unless}}
+                                    {{#let (members-count-fetcher) as |count|}}
+                                        {{#unless count.isLoading}}
+                                            <span class="gh-nav-member-count">{{format-number count.count}}</span>
+                                        {{/unless}}
+                                    {{/let}}
                                 </LinkTo>
                             {{else}}
                                 <LinkTo @route="members" @current-when="members member member.new" data-test-nav="members">{{svg-jar "members"}}Members
-                                    {{#unless this.memberCountLoading}}
-                                        <span class="gh-nav-member-count">{{format-number this.membersStats.memberCount}}</span>
-                                    {{/unless}}
+                                    {{#let (members-count-fetcher) as |count|}}
+                                        {{#unless count.isLoading}}
+                                            <span class="gh-nav-member-count">{{format-number count.count}}</span>
+                                        {{/unless}}
+                                    {{/let}}
                                 </LinkTo>
                             {{/if}}
                         </li>
 
-                        {{#if this.settings.paidMembersEnabled}}
-                            <li>
-                                <LinkTo @route="offers" @current-when="offers offer offer.new" @alt="Offers" data-test-nav="offers">{{svg-jar "percentage"}}Offers</LinkTo>
-                            </li>
-                        {{/if}}
+                    {{/if}}
+                    {{#if (feature "adminXDemo")}}
+                        <li>
+                            <LinkTo @route="demo-x" @current-when="demo-x">{{svg-jar "star"}}AdminX Demo</LinkTo>
+                        </li>
+                    {{/if}}
+                    {{#if (feature "ActivityPub")}}
+                        <li>
+                            <LinkTo @route="activitypub-x" @current-when="activitypub-x">{{svg-jar "star"}}ActivityPub Demo</LinkTo>
+                        </li>
                     {{/if}}
                 </ul>
 
diff --git a/ghost/admin/app/components/gh-nav-menu/main.js b/ghost/admin/app/components/gh-nav-menu/main.js
index 1f8b8cea216..d47997f0a33 100644
--- a/ghost/admin/app/components/gh-nav-menu/main.js
+++ b/ghost/admin/app/components/gh-nav-menu/main.js
@@ -10,7 +10,6 @@ import {htmlSafe} from '@ember/template';
 import {inject} from 'ghost-admin/decorators/inject';
 import {inject as service} from '@ember/service';
 import {tagName} from '@ember-decorators/component';
-import {task} from 'ember-concurrency';
 
 @classic
 @tagName('')
@@ -24,16 +23,15 @@ export default class Main extends Component.extend(ShortcutsMixin) {
     @service router;
     @service session;
     @service ui;
-    @service whatsNew;
     @service membersStats;
     @service settings;
     @service explore;
+    @service notifications;
 
     @inject config;
 
     iconStyle = '';
     iconClass = '';
-    memberCountLoading = true;
     shortcuts = null;
 
     @match('router.currentRouteName', /^settings\.integration/)
@@ -59,6 +57,7 @@ export default class Main extends Component.extend(ShortcutsMixin) {
         let shortcuts = {};
 
         shortcuts[`${ctrlOrCmd}+k`] = {action: 'openSearchModal'};
+        shortcuts[`${ctrlOrCmd}+,`] = {action: 'openSettings'};
         this.shortcuts = shortcuts;
     }
 
@@ -69,10 +68,6 @@ export default class Main extends Component.extend(ShortcutsMixin) {
     didReceiveAttrs() {
         super.didReceiveAttrs(...arguments);
         this._setIconStyle();
-
-        if (this.session.user && this.session.user.isAdmin) {
-            this._loadMemberCountsTask.perform();
-        }
     }
 
     didInsertElement() {
@@ -104,6 +99,11 @@ export default class Main extends Component.extend(ShortcutsMixin) {
         return this.modals.open(SearchModal);
     }
 
+    @action
+    openSettings() {
+        this.router.transitionTo('settings-x');
+    }
+
     @action
     toggleBillingModal() {
         this.billing.openBillingWindow(this.router.currentURL);
@@ -114,17 +114,6 @@ export default class Main extends Component.extend(ShortcutsMixin) {
         this.explore.openExploreWindow();
     }
 
-    @task(function* () {
-        try {
-            this.set('memberCountLoading', true);
-            yield this.membersStats.fetchMemberCount();
-            this.set('memberCountLoading', false);
-        } catch (e) {
-            return false;
-        }
-    })
-        _loadMemberCountsTask;
-
     _setIconStyle() {
         let icon = this.icon;
 
diff --git a/ghost/admin/app/components/gh-notification.hbs b/ghost/admin/app/components/gh-notification.hbs
index a3f51736676..6b957708751 100644
--- a/ghost/admin/app/components/gh-notification.hbs
+++ b/ghost/admin/app/components/gh-notification.hbs
@@ -1,30 +1,36 @@
 <article class="gh-notification gh-notification-passive {{this.typeClass}}" {{on "animationend" this.closeOnFadeOut}} ...attributes>
-    <div class="gh-notification-icon">
-        {{#if @message.icon}}
-            {{svg-jar @message.icon}}
-        {{else}}
-            {{#if (eq @message.type "success")}}
-                {{svg-jar "check-circle"}}
-            {{else if (eq @message.type "error")}}
-                {{svg-jar "warning-stroke"}}
-            {{else if (eq @message.type "warn")}}
-                {{svg-jar "warning-stroke"}}
-            {{else}}
-                {{svg-jar "check-circle"}}
-            {{/if}}
-        {{/if}}
-    </div>
     <div class="gh-notification-content" data-test-text="notification-content">
-        <span class="gh-notification-title">{{@message.message}}</span>
-
+        <div class="gh-notification-header">
+            <div class="gh-notification-icon">
+                {{#if @message.icon}}
+                    {{svg-jar @message.icon}}
+                {{else}}
+                    {{#if (eq @message.type "success")}}
+                        {{svg-jar "check-circle-filled"}}
+                    {{else if (eq @message.type "error")}}
+                        {{svg-jar "warning-circle-filled"}}
+                    {{else if (eq @message.type "warn")}}
+                        {{svg-jar "warning-circle-filled"}}
+                    {{else}}
+                        {{svg-jar "check-circle-filled"}}
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div>
+                <span class="gh-notification-title">{{@message.message}}</span>
+            </div>
+        </div>
+    </div>
+    {{#if (or @message.description @message.actions)}}
+    <div class="gh-notification-details">
         {{#if @message.description}}
             <p>{{@message.description}}</p>
         {{/if}}
-
         {{#if @message.actions}}
             <span class="gh-notification-actions">{{@message.actions}}</span>
         {{/if}}
     </div>
+    {{/if}}
     <button class="gh-notification-close" data-test-button="close-notification" type="button" {{on "click" this.closeNotification}}>
         {{svg-jar "close"}}<span class="hidden">Close</span>
     </button>
diff --git a/ghost/admin/app/components/gh-portal-links.hbs b/ghost/admin/app/components/gh-portal-links.hbs
index 26d4a881d0e..6ef97aea2b5 100644
--- a/ghost/admin/app/components/gh-portal-links.hbs
+++ b/ghost/admin/app/components/gh-portal-links.hbs
@@ -352,7 +352,6 @@
                         </td>
                     </tr>
                 {{/if}}
-                {{#if (feature "tipsAndDonations")}}
                 <tr>
                     <td colspan="2"><hr class="gh-portal-links-group-divider" /></td>
                 </tr>
@@ -389,7 +388,6 @@
                         </div>
                     </td>
                 </tr>
-                {{/if}}
                 <tr>
                     <td colspan="2"><hr class="gh-portal-links-group-divider" /></td>
                 </tr>
diff --git a/ghost/admin/app/components/gh-post-settings-menu.hbs b/ghost/admin/app/components/gh-post-settings-menu.hbs
index 90b0abab3df..ee91b2af809 100644
--- a/ghost/admin/app/components/gh-post-settings-menu.hbs
+++ b/ghost/admin/app/components/gh-post-settings-menu.hbs
@@ -93,7 +93,7 @@
                             {{/if}}
                         {{/if}}
 
-
+                        {{#unless (feature 'editorExcerpt')}}
                         <GhFormGroup @errors={{this.post.errors}} @hasValidated={{this.post.hasValidated}} @property="customExcerpt">
                             <label for="custom-excerpt">Excerpt</label>
                             <GhTextarea
@@ -108,6 +108,7 @@
                             />
                             <GhErrorMessage @errors={{this.post.errors}} @property="customExcerpt" data-test-error="custom-excerpt" />
                         </GhFormGroup>
+                        {{/unless}}
 
                         {{#unless this.session.user.isAuthorOrContributor}}
                             <GhFormGroup class="for-select mb8" @errors={{this.post.errors}} @hasValidated={{this.post.hasValidated}} @property="authors" data-test-input="authors">
@@ -219,7 +220,7 @@
                 </form>
                 {{#unless this.post.isNew}}
                     <div class="settings-menu-delete-button">
-                        <button type="button" class="gh-btn gh-btn-outline gh-btn-icon gh-btn-fullwidth" {{action "deletePostInternal"}}>
+                        <button type="button" class="gh-btn gh-btn-outline gh-btn-icon gh-btn-fullwidth" {{action "deletePostInternal"}} data-test-button="delete-post">
                             <span>{{svg-jar "trash"}} Delete {{this.post.displayName}}</span>
                         </button>
                     </div>
@@ -265,8 +266,9 @@
                                     <div class="gh-shortcut">
                                         <div><s>Strike through</s></div>
                                         <div class="gh-keys">
-                                            <GhPostSettingsMenu::CtrlOrCmd />
-                                            <span class="gh-key mono">X</span>
+                                            <GhPostSettingsMenu::CtrlOrSymbol />
+                                            <GhPostSettingsMenu::OptionOrAlt />
+                                            <span class="gh-key mono">U</span>
                                         </div>
                                     </div>
                                     <div class="gh-shortcut">
@@ -318,15 +320,16 @@
                                         <div>H2</div>
                                         <div class="gh-keys">
                                             <GhPostSettingsMenu::CtrlOrSymbol />
-                                            <span class="gh-key mono">H</span>
+                                            <GhPostSettingsMenu::OptionOrAlt />
+                                            <span class="gh-key mono">2</span>
                                         </div>
                                     </div>
                                     <div class="gh-shortcut">
                                         <div>H3</div>
                                         <div class="gh-keys">
                                             <GhPostSettingsMenu::CtrlOrSymbol />
-                                            <span class="gh-key mono">H</span>
-                                            <span class="gh-key mono clear">2x</span>
+                                            <GhPostSettingsMenu::OptionOrAlt />
+                                            <span class="gh-key mono">3</span>
                                         </div>
                                     </div>
                                 </GhFormGroup>
@@ -427,6 +430,12 @@
                                             <span class="gh-key" data-tooltip="Return">&#8617;</span>
                                         </div>
                                     </div>
+                                    <div class="gh-shortcut">
+                                        <div>Emoji</div>
+                                        <div class="gh-keys">
+                                            <span class="gh-key mono">:emoji_name:</span>
+                                        </div>
+                                    </div>
                                     <div class="gh-shortcut">
                                         <div>Image</div>
                                         <div class="gh-keys">
@@ -844,6 +853,7 @@
                     post=this.post
                     editorAPI=this.editorAPI
                     toggleSettingsMenu=this.toggleSettingsMenu
+                    secondaryEditorAPI=this.secondaryEditorAPI
                 }}
                 @close={{this.closePostHistory}}
                 @modifier="total-overlay post-history" />
diff --git a/ghost/admin/app/components/gh-resource-select.js b/ghost/admin/app/components/gh-resource-select.js
index 9bc2f08f59c..061399cd85c 100644
--- a/ghost/admin/app/components/gh-resource-select.js
+++ b/ghost/admin/app/components/gh-resource-select.js
@@ -6,9 +6,18 @@ import {
     filterOptions
 } from 'ember-power-select/utils/group-utils';
 import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
+import {task, timeout} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
+const DEBOUNCE_MS = 200;
+
+function mapResource(resource) {
+    return {
+        id: resource.id,
+        title: resource.title
+    };
+}
+
 export default class GhResourceSelect extends Component {
     @service store;
 
@@ -19,7 +28,7 @@ export default class GhResourceSelect extends Component {
     }
 
     get searchField() {
-        return this.args.searchField === undefined ? 'name' : this.args.searchField;
+        return this.args.searchField === undefined ? 'title' : this.args.searchField;
     }
 
     @action
@@ -40,6 +49,11 @@ export default class GhResourceSelect extends Component {
 
         newOptions = this._filter(A(newOptions), term);
 
+        if (newOptions.length === 0) {
+            // Do a query lookup
+            newOptions = yield this.fetchOptionsForSearchTask.perform(term);
+        }
+
         return newOptions;
     }
 
@@ -112,23 +126,16 @@ export default class GhResourceSelect extends Component {
     @task
     *fetchOptionsTask() {
         const options = yield [];
-        
+
         if (this.args.type === 'email') {
-            const posts = yield this.store.query('post', {filter: '(status:published,status:sent)+newsletter_id:-null', limit: 'all'});
+            const posts = yield this.store.query('post', {filter: '(status:published,status:sent)+newsletter_id:-null', limit: '25', fields: 'id,title'});
             options.push(...posts.map(mapResource));
             this._options = options;
             return;
         }
 
-        const posts = yield this.store.query('post', {filter: 'status:published', limit: 'all'});
-        const pages = yield this.store.query('page', {filter: 'status:published', limit: 'all'});
-
-        function mapResource(resource) {
-            return {
-                id: resource.id,
-                title: resource.title
-            };
-        }
+        const posts = yield this.store.query('post', {filter: 'status:published', limit: '25', fields: 'id,title'});
+        const pages = yield this.store.query('page', {filter: 'status:published', limit: '25', fields: 'id,title'});
 
         if (posts.length > 0) {
             options.push({
@@ -146,4 +153,31 @@ export default class GhResourceSelect extends Component {
 
         this._options = options;
     }
+
+    @task({restartable: true})
+    *fetchOptionsForSearchTask(searchTerm) {
+        // Debounce
+        yield timeout(DEBOUNCE_MS);
+
+        const options = yield [];
+
+        if (this.args.type === 'email') {
+            const posts = yield this.store.query('post', {filter: '(status:published,status:sent)+newsletter_id:-null+title:~\'' + searchTerm.replace('\'', '\\\'') + '\'', limit: '10', fields: 'id,title'});
+            options.push(...posts.map(mapResource));
+            return options;
+        }
+
+        const posts = yield this.store.query('post', {filter: 'status:published+title:~\'' + searchTerm.replace('\'', '\\\'') + '\'', limit: '10', fields: 'id,title'});
+        const pages = yield this.store.query('page', {filter: 'status:published+title:~\'' + searchTerm.replace('\'', '\\\'') + '\'', limit: '10', fields: 'id,title'});
+
+        if (posts.length > 0) {
+            options.push(...posts.map(mapResource));
+        }
+
+        if (pages.length > 0) {
+            options.push(...pages.map(mapResource));
+        }
+
+        return options;
+    }
 }
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-search-input.hbs b/ghost/admin/app/components/gh-search-input.hbs
index f55293c0b47..0258afdb4b2 100644
--- a/ghost/admin/app/components/gh-search-input.hbs
+++ b/ghost/admin/app/components/gh-search-input.hbs
@@ -1,7 +1,7 @@
 <div ...attributes>
     <div class="ember-power-select-search">
         <PowerSelect
-            @search={{perform this.searchTask}}
+            @search={{perform this.search.searchTask}}
             @onChange={{this.openSelected}}
             @onClose={{this.onClose}}
             @placeholder="Search site"
diff --git a/ghost/admin/app/components/gh-search-input.js b/ghost/admin/app/components/gh-search-input.js
index c6086cca3d3..886d5a8f1a9 100644
--- a/ghost/admin/app/components/gh-search-input.js
+++ b/ghost/admin/app/components/gh-search-input.js
@@ -1,48 +1,11 @@
-/* eslint-disable camelcase */
 import Component from '@glimmer/component';
-import RSVP from 'rsvp';
 import {action} from '@ember/object';
-import {isBlank, isEmpty} from '@ember/utils';
-import {pluralize} from 'ember-inflector';
 import {run} from '@ember/runloop';
 import {inject as service} from '@ember/service';
-import {task, timeout, waitForProperty} from 'ember-concurrency';
 
 export default class GhSearchInputComponent extends Component {
-    @service ajax;
-    @service notifications;
     @service router;
-    @service store;
-
-    content = [];
-    contentExpiresAt = false;
-    contentExpiry = 30000;
-
-    searchables = [{
-        name: 'Posts',
-        model: 'post',
-        fields: ['id', 'title'],
-        idField: 'id',
-        titleField: 'title'
-    }, {
-        name: 'Pages',
-        model: 'page',
-        fields: ['id', 'title'],
-        idField: 'id',
-        titleField: 'title'
-    }, {
-        name: 'Users',
-        model: 'user',
-        fields: ['slug', 'name'],
-        idField: 'slug',
-        titleField: 'name'
-    }, {
-        name: 'Tags',
-        model: 'tag',
-        fields: ['slug', 'name'],
-        idField: 'slug',
-        titleField: 'name'
-    }];
+    @service search;
 
     @action
     openSelected(selected) {
@@ -52,22 +15,22 @@ export default class GhSearchInputComponent extends Component {
 
         this.args.onSelected?.(selected);
 
-        if (selected.searchable === 'Posts') {
+        if (selected.groupName === 'Posts') {
             let id = selected.id.replace('post.', '');
             this.router.transitionTo('lexical-editor.edit', 'post', id);
         }
 
-        if (selected.searchable === 'Pages') {
+        if (selected.groupName === 'Pages') {
             let id = selected.id.replace('page.', '');
             this.router.transitionTo('lexical-editor.edit', 'page', id);
         }
 
-        if (selected.searchable === 'Users') {
+        if (selected.groupName === 'Staff') {
             let id = selected.id.replace('user.', '');
             this.router.transitionTo('settings-x.settings-x', `staff/${id}`);
         }
 
-        if (selected.searchable === 'Tags') {
+        if (selected.groupName === 'Tags') {
             let id = selected.id.replace('tag.', '');
             this.router.transitionTo('tag', id);
         }
@@ -80,89 +43,4 @@ export default class GhSearchInputComponent extends Component {
             keyboardEvent?.target.focus();
         });
     }
-
-    @task({restartable: true})
-    *searchTask(term) {
-        if (isBlank(term)) {
-            return [];
-        }
-
-        // start loading immediately in the background
-        this.refreshContentTask.perform();
-
-        // debounce searches to 200ms to avoid thrashing CPU
-        yield timeout(200);
-
-        // wait for any on-going refresh to finish
-        if (this.refreshContentTask.isRunning) {
-            yield waitForProperty(this, 'refreshContentTask.isIdle');
-        }
-
-        const searchResult = this._searchContent(term);
-
-        return searchResult;
-    }
-
-    _searchContent(term) {
-        const normalizedTerm = term.toString().toLowerCase();
-        const results = [];
-
-        this.searchables.forEach((searchable) => {
-            const matchedContent = this.content.filter((item) => {
-                const normalizedTitle = item.title.toString().toLowerCase();
-                return (item.searchable === searchable.name) && (normalizedTitle.indexOf(normalizedTerm) >= 0);
-            });
-
-            if (!isEmpty(matchedContent)) {
-                results.push({
-                    groupName: searchable.name,
-                    options: matchedContent
-                });
-            }
-        });
-
-        return results;
-    }
-
-    @task({drop: true})
-    *refreshContentTask() {
-        let now = new Date();
-        let contentExpiresAt = this.contentExpiresAt;
-
-        if (contentExpiresAt > now) {
-            return true;
-        }
-
-        const content = [];
-        const promises = this.searchables.map(searchable => this._loadSearchable(searchable, content));
-
-        try {
-            yield RSVP.all(promises);
-            this.content = content;
-        } catch (error) {
-            // eslint-disable-next-line
-            console.error(error);
-        }
-
-        let contentExpiry = this.contentExpiry;
-        this.contentExpiresAt = new Date(now.getTime() + contentExpiry);
-    }
-
-    _loadSearchable(searchable, content) {
-        let url = `${this.store.adapterFor(searchable.model).urlForQuery({}, searchable.model)}/`;
-        let maxSearchableLimit = '10000';
-        let query = {fields: searchable.fields, limit: maxSearchableLimit};
-
-        return this.ajax.request(url, {data: query}).then((response) => {
-            const items = response[pluralize(searchable.model)].map(item => ({
-                id: `${searchable.model}.${item[searchable.idField]}`,
-                title: item[searchable.titleField],
-                searchable: searchable.name
-            }));
-
-            content.push(...items);
-        }).catch((error) => {
-            this.notifications.showAPIError(error, {key: `search.load${searchable.name}.error`});
-        });
-    }
 }
diff --git a/ghost/admin/app/components/gh-task-button.hbs b/ghost/admin/app/components/gh-task-button.hbs
index 0dac4bd764d..0a48b2333ea 100644
--- a/ghost/admin/app/components/gh-task-button.hbs
+++ b/ghost/admin/app/components/gh-task-button.hbs
@@ -6,8 +6,41 @@
         isFailure=this.isFailure
     )}}
 {{else}}
-    {{#if this.isRunning}}<span data-test-task-button-state="running">{{#if this.showIcon}}{{svg-jar "spinner" class="gh-icon-spinner"}} {{/if}}{{this.runningText}}</span>{{/if}}
-    {{#if this.isIdle}}<span data-test-task-button-state="idle">{{this.buttonText}}</span>{{/if}}
-    {{#if this.isSuccess}}<span {{did-insert this.handleReset}} data-test-task-button-state="success">{{#if this.showIcon}}{{svg-jar "check-circle"}} {{/if}}{{this.successText}}</span>{{/if}}
-    {{#if this.isFailure}}<span data-test-task-button-state="failure">{{#if this.showIcon}}{{svg-jar "retry"}} {{/if}}{{this.failureText}}</span>{{/if}}
+    {{#if this.isRunning}}
+        <span data-test-task-button-state="running">
+            {{#if this.showIcon}}
+                {{svg-jar "spinner" class="gh-icon-spinner"}} 
+            {{/if}}
+            {{this.runningText}}
+        </span>
+    {{/if}}
+
+    {{#if (and this.isIdle (not (or this.isRunning this.isSuccess this.isFailure)))}}
+    <span data-test-task-button-state="idle">
+        {{#if this.showIcon}}
+            {{#if this.idleIcon}}
+                {{svg-jar this.idleIcon}}
+            {{/if}}
+        {{/if}}
+        {{this.buttonText}}
+    </span>
+{{/if}}
+
+
+    {{#if this.isSuccess}}
+        <span {{did-insert this.handleReset}} data-test-task-button-state="success">
+            {{#if this.showIcon}}
+                {{svg-jar "check-circle"}} 
+            {{/if}}
+            {{this.successText}}
+        </span>
+    {{/if}}
+    {{#if this.isFailure}}
+        <span data-test-task-button-state="failure">
+            {{#if this.showIcon}}
+                {{svg-jar "retry"}} 
+            {{/if}}
+            {{this.failureText}}
+        </span>
+    {{/if}}
 {{/if}}
diff --git a/ghost/admin/app/components/gh-task-button.js b/ghost/admin/app/components/gh-task-button.js
index f23faeb66c8..873c3603667 100644
--- a/ghost/admin/app/components/gh-task-button.js
+++ b/ghost/admin/app/components/gh-task-button.js
@@ -33,6 +33,7 @@ const GhTaskButton = Component.extend({
     defaultClick: false,
     buttonText: 'Save',
     idleClass: '',
+    idleIcon: '',
     runningClass: '',
     showIcon: true,
     showSuccess: true, // set to false if you want the spinner to show until a transition occurs
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-token-input/label-token.js b/ghost/admin/app/components/gh-token-input/label-token.js
index 7f1a3b04f6f..0327c9c3924 100644
--- a/ghost/admin/app/components/gh-token-input/label-token.js
+++ b/ghost/admin/app/components/gh-token-input/label-token.js
@@ -1,10 +1,17 @@
 import DraggableObject from 'ember-drag-drop/components/draggable-object';
 import classic from 'ember-classic-decorator';
+import {alias} from '@ember/object/computed';
 import {attributeBindings, classNames} from '@ember-decorators/component';
+import {computed} from '@ember/object';
 
 @classic
 @attributeBindings('title')
 @classNames('label-token')
 export default class LabelToken extends DraggableObject {
-    title = 'Label';
+    @alias('content.name') name;
+
+    @computed('name')
+    get title() {
+        return this.name ?? 'Label';
+    }
 }
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-image-editor.hbs b/ghost/admin/app/components/koenig-image-editor.hbs
index f5180629176..f58b2a165e0 100644
--- a/ghost/admin/app/components/koenig-image-editor.hbs
+++ b/ghost/admin/app/components/koenig-image-editor.hbs
@@ -6,10 +6,10 @@
         <button
             type="button"
             class="{{if @className @className "image-action image-edit"}}"
-            title="Edit image"
+            data-tooltip="Edit"
             {{on "click" (fn this.handleClick uploader)}}
         >
-            {{svg-jar "koenig/kg-edit"}}
+            {{svg-jar "koenig/kg-wand"}}
         </button>
     </GhUploader>
 {{/if}}
diff --git a/ghost/admin/app/components/koenig-image-editor.js b/ghost/admin/app/components/koenig-image-editor.js
index 209d47798cf..1ab92083b24 100644
--- a/ghost/admin/app/components/koenig-image-editor.js
+++ b/ghost/admin/app/components/koenig-image-editor.js
@@ -1,8 +1,8 @@
 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 {trackEvent} from '../utils/analytics';
 import {tracked} from '@glimmer/tracking';
 
 export default class KoenigImageEditor extends Component {
diff --git a/ghost/admin/app/components/koenig-lexical-editor-input.js b/ghost/admin/app/components/koenig-lexical-editor-input.js
index f33d6985afb..0d963a057fb 100644
--- a/ghost/admin/app/components/koenig-lexical-editor-input.js
+++ b/ghost/admin/app/components/koenig-lexical-editor-input.js
@@ -14,6 +14,18 @@ class ErrorHandler extends React.Component {
         return {hasError: true};
     }
 
+    componentDidCatch(error) {
+        if (this.props.config.sentry_dsn) {
+            Sentry.captureException(error, {
+                tags: {
+                    lexical: true
+                }
+            });
+        }
+
+        console.error(error); // eslint-disable-line
+    }
+
     render() {
         if (this.state.hasError) {
             return (
@@ -40,6 +52,16 @@ const HtmlOutputPlugin = ({editorResource, ...props}) => {
     return <_HtmlOutputPlugin {...props} />;
 };
 
+const EmojiPickerPlugin = ({editorResource, ...props}) => {
+    const {EmojiPickerPlugin: _EmojiPickerPlugin} = editorResource.read();
+    return <_EmojiPickerPlugin {...props} />;
+};
+
+const TKCountPlugin = ({editorResource, ...props}) => {
+    const {TKCountPlugin: _TKCountPlugin} = editorResource.read();
+    return <_TKCountPlugin {...props} />;
+};
+
 export default class KoenigLexicalEditorInput extends Component {
     @service ajax;
     @service feature;
@@ -50,6 +72,10 @@ export default class KoenigLexicalEditorInput extends Component {
 
     editorResource = this.koenig.resource;
 
+    get emojiPicker() {
+        return this.args.emojiPicker ?? true;
+    }
+
     @action
     onError(error) {
         // ensure we're still showing errors in development
@@ -69,12 +95,13 @@ export default class KoenigLexicalEditorInput extends Component {
     ReactComponent = (props) => {
         return (
             <div className={['koenig-react-editor', this.args.className].filter(Boolean).join(' ')}>
-                <ErrorHandler>
+                <ErrorHandler config={this.config}>
                     <Suspense fallback={<p className="koenig-react-editor-loading">Loading editor...</p>}>
                         <KoenigComposer
                             editorResource={this.editorResource}
                             initialEditorState={this.args.lexical}
                             onError={this.onError}
+                            isTKEnabled={this.args.onTKCountChange ? true : false}
                         >
                             <KoenigComposableEditor
                                 editorResource={this.editorResource}
@@ -87,8 +114,11 @@ export default class KoenigLexicalEditorInput extends Component {
                                 className={`koenig-lexical-editor-input ${this.feature.nightShift ? 'dark' : ''}`}
                                 placeholderText={props.placeholderText}
                                 placeholderClassName="koenig-lexical-editor-input-placeholder"
+                                registerAPI={this.args.registerAPI}
                             >
                                 <HtmlOutputPlugin editorResource={this.editorResource} html={props.html} setHtml={props.onChangeHtml} />
+                                {this.emojiPicker ? <EmojiPickerPlugin editorResource={this.editorResource} /> : null}
+                                {this.args.onTKCountChange ? <TKCountPlugin editorResource={this.editorResource} onChange={this.args.onTKCountChange} /> : null}
                             </KoenigComposableEditor>
                         </KoenigComposer>
                     </Suspense>
diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js
index b429dbd1616..fc0534349a4 100644
--- a/ghost/admin/app/components/koenig-lexical-editor.js
+++ b/ghost/admin/app/components/koenig-lexical-editor.js
@@ -3,10 +3,11 @@ import Component from '@glimmer/component';
 import React, {Suspense} from 'react';
 import fetch from 'fetch';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
+import moment from 'moment-timezone';
 import {action} from '@ember/object';
+import {didCancel, task} from 'ember-concurrency';
 import {inject} from 'ghost-admin/decorators/inject';
 import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
 
 export const fileTypes = {
     image: {
@@ -40,6 +41,70 @@ export const fileTypes = {
     }
 };
 
+function LockIcon({...props}) {
+    return (
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" {...props}>
+            <g transform="matrix(0.6666666666666666,0,0,0.6666666666666666,0,0)">
+                <path fill="currentColor" d="M19.5,9.5h-.75V6.75a6.75,6.75,0,0,0-13.5,0V9.5H4.5a2,2,0,0,0-2,2V22a2,2,0,0,0,2,2h15a2,2,0,0,0,2-2V11.5A2,2,0,0,0,19.5,9.5Zm-7.5,9a2,2,0,1,1,2-2A2,2,0,0,1,12,18.5ZM16.25,9a.5.5,0,0,1-.5.5H8.25a.5.5,0,0,1-.5-.5V6.75a4.25,4.25,0,0,1,8.5,0Z"></path>
+            </g>
+        </svg>
+    );
+}
+
+function DollarIcon({...props}) {
+    return (
+        <svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24" {...props}>
+            <g fill="currentColor" class="nc-icon-wrapper">
+                <path
+                    d="M13,10.265V5.013a9.722,9.722,0,0,1,2.6.722l1.342.662,1.327-2.69-1.345-.663A12.4,12.4,0,0,0,13,1.989V0H11V1.983c-3.537.306-5.773,2.3-5.773,5.264,0,3.726,3.174,4.85,5.773,5.577V18.09a15.77,15.77,0,0,1-4.24-.819l-1.411-.509L4.33,19.583l1.411.51A18.577,18.577,0,0,0,11,21.1V24h2V21.087c5.125-.431,5.708-3.776,5.708-5.264C18.708,12.129,15.587,10.993,13,10.265ZM8.227,7.247c0-1.6,1.6-2.1,2.773-2.249V9.69C9.1,9.092,8.227,8.523,8.227,7.247ZM13,18.072V13.4c1.857.591,2.708,1.161,2.708,2.422C15.708,16.382,15.7,17.769,13,18.072Z"
+                    fill="currentColor"
+                ></path>
+            </g>
+        </svg>
+    );
+}
+
+export function decoratePostSearchResult(item, settings) {
+    const date = moment.utc(item.publishedAt).tz(settings.timezone).format('D MMM YYYY');
+
+    item.metaText = date;
+
+    if (settings.membersEnabled && item.visibility) {
+        if (item.visibility === 'members') {
+            item.MetaIcon = LockIcon;
+            item.metaIconTitle = 'Members only';
+        } else if (item.visibility === 'paid') {
+            item.MetaIcon = DollarIcon;
+            item.metaIconTitle = 'Paid-members only';
+        } else if (item.visibility === 'tiers') {
+            item.MetaIcon = DollarIcon;
+            item.metaIconTitle = 'Specific tiers only';
+        }
+    }
+}
+
+/**
+ * Fetches the URLs of all active offers
+ * @returns {Promise<{label: string, value: string}[]>}
+ */
+export async function offerUrls() {
+    let offers = [];
+
+    try {
+        offers = await this.fetchOffersTask.perform();
+    } catch (e) {
+        // No-op: if offers are not available (e.g. missing permissions), return an empty array
+        return [];
+    }
+
+    return offers.map((offer) => {
+        return {
+            label: `Offer — ${offer.name}`,
+            value: this.config.getSiteUrl(offer.code)
+        };
+    });
+}
+
 class ErrorHandler extends React.Component {
     state = {
         hasError: false
@@ -49,6 +114,18 @@ class ErrorHandler extends React.Component {
         return {hasError: true};
     }
 
+    componentDidCatch(error) {
+        if (this.props.config.sentry_dsn) {
+            Sentry.captureException(error, {
+                tags: {
+                    lexical: true
+                }
+            });
+        }
+
+        console.error(error); // eslint-disable-line
+    }
+
     render() {
         if (this.state.hasError) {
             return (
@@ -75,20 +152,27 @@ const WordCountPlugin = ({editorResource, ...props}) => {
     return <_WordCountPlugin {...props} />;
 };
 
+const TKCountPlugin = ({editorResource, ...props}) => {
+    const {TKCountPlugin: _TKCountPlugin} = editorResource.read();
+    return <_TKCountPlugin {...props} />;
+};
+
 export default class KoenigLexicalEditor extends Component {
     @service ajax;
     @service feature;
     @service ghostPaths;
     @service koenig;
+    @service membersUtils;
+    @service search;
     @service session;
-    @service store;
     @service settings;
-    @service membersUtils;
+    @service store;
 
     @inject config;
 
     offers = null;
     contentKey = null;
+    defaultLinks = null;
 
     editorResource = this.koenig.resource;
 
@@ -164,7 +248,7 @@ export default class KoenigLexicalEditor extends Component {
         // don't rethrow, Lexical will attempt to gracefully recover
     }
 
-    @task({restartable: true})
+    @task({restartable: false})
     *fetchOffersTask() {
         if (this.offers) {
             return this.offers;
@@ -173,7 +257,7 @@ export default class KoenigLexicalEditor extends Component {
         return this.offers;
     }
 
-    @task({restartable: true})
+    @task({restartable: false})
     *fetchLabelsTask() {
         if (this.labels) {
             return this.labels;
@@ -211,8 +295,6 @@ export default class KoenigLexicalEditor extends Component {
         };
 
         const fetchAutocompleteLinks = async () => {
-            const offers = await this.fetchOffersTask.perform();
-
             const defaults = [
                 {label: 'Homepage', value: window.location.origin + '/'},
                 {label: 'Free signup', value: '#/portal/signup/free'}
@@ -236,9 +318,9 @@ export default class KoenigLexicalEditor extends Component {
             };
 
             const donationLink = () => {
-                if (this.feature.tipsAndDonations && this.settings.donationsEnabled) {
+                if (this.settings.donationsEnabled) {
                     return [{
-                        label: 'Tip or donation',
+                        label: 'Tips and donations',
                         value: '#/portal/support'
                     }];
                 }
@@ -257,22 +339,98 @@ export default class KoenigLexicalEditor extends Component {
                 return [];
             };
 
-            const offersLinks = offers.toArray().map((offer) => {
-                return {
-                    label: `Offer - ${offer.name}`,
-                    value: this.config.getSiteUrl(offer.code)
-                };
-            });
+            const offersLinks = await offerUrls.call(this);
 
             return [...defaults, ...memberLinks(), ...donationLink(), ...recommendationLink(), ...offersLinks];
         };
 
         const fetchLabels = async () => {
-            const labels = await this.fetchLabelsTask.perform();
+            let labels = [];
+            try {
+                labels = await this.fetchLabelsTask.perform();
+            } catch (e) {
+                // Do not throw cancellation errors
+                if (didCancel(e)) {
+                    return;
+                }
+
+                throw e;
+            }
 
             return labels.map(label => label.name);
         };
 
+        const searchLinks = async (term) => {
+            // when no term is present we should show latest 5 posts
+            if (!term) {
+                // we cache the default links to avoid fetching them every time
+                if (this.defaultLinks) {
+                    return this.defaultLinks;
+                }
+
+                const posts = await this.store.query('post', {filter: 'status:published', fields: 'id,url,title,visibility,published_at', order: 'published_at desc', limit: 5});
+                // NOTE: these posts are Ember Data models, not plain objects like the search results
+                const results = posts.toArray().map(post => ({
+                    groupName: 'Latest posts',
+                    id: post.id,
+                    title: post.title,
+                    url: post.url,
+                    visibility: post.visibility,
+                    publishedAt: post.publishedAtUTC.toISOString()
+                }));
+
+                results.forEach(item => decoratePostSearchResult(item, this.settings));
+
+                this.defaultLinks = [{
+                    label: 'Latest posts',
+                    items: results
+                }];
+                return this.defaultLinks;
+            }
+
+            let results = [];
+
+            try {
+                results = await this.search.searchTask.perform(term);
+            } catch (error) {
+                // don't surface task cancellation errors
+                if (!didCancel(error)) {
+                    throw error;
+                }
+                return;
+            }
+
+            // only published posts/pages and staff with posts have URLs
+            const filteredResults = [];
+            results.forEach((group) => {
+                let items = group.options;
+
+                if (group.groupName === 'Posts' || group.groupName === 'Pages') {
+                    items = items.filter(i => i.status === 'published');
+                }
+
+                if (group.groupName === 'Staff') {
+                    items = items.filter(i => !/\/404\//.test(i.url));
+                }
+
+                if (items.length === 0) {
+                    return;
+                }
+
+                // update the group items with metadata
+                if (group.groupName === 'Posts' || group.groupName === 'Pages') {
+                    items.forEach(item => decoratePostSearchResult(item, this.settings));
+                }
+
+                filteredResults.push({
+                    label: group.groupName,
+                    items
+                });
+            });
+
+            return filteredResults;
+        };
+
         const unsplashConfig = {
             defaultHeaders: {
                 Authorization: `Client-ID 8672af113b0a8573edae3aa3713886265d9bb741d707f6c01a486cde8c278980`,
@@ -283,24 +441,38 @@ export default class KoenigLexicalEditor extends Component {
             }
         };
 
+        const checkStripeEnabled = () => {
+            const hasDirectKeys = !!(this.settings.stripeSecretKey && this.settings.stripePublishableKey);
+            const hasConnectKeys = !!(this.settings.stripeConnectSecretKey && this.settings.stripeConnectPublishableKey);
+
+            if (this.config.stripeDirect) {
+                return hasDirectKeys;
+            }
+            return hasDirectKeys || hasConnectKeys;
+        };
+
         const defaultCardConfig = {
-            unsplash: this.settings.unsplash ? unsplashConfig : null,
+            unsplash: this.settings.unsplash ? unsplashConfig.defaultHeaders : null,
             tenor: this.config.tenor?.googleApiKey ? this.config.tenor : null,
-            fetchEmbed,
-            fetchCollectionPosts,
             fetchAutocompleteLinks,
+            fetchCollectionPosts,
+            fetchEmbed,
             fetchLabels,
+            renderLabels: !this.session.user.isContributor,
             feature: {
-                collectionsCard: this.feature.get('collectionsCard'),
-                collections: this.feature.get('collections'),
-                emojiPicker: this.feature.get('editorEmojiPicker')
+                collectionsCard: this.feature.collectionsCard,
+                collections: this.feature.collections,
+                contentVisibility: this.feature.contentVisibility
             },
-            depreciated: {
+            deprecated: { // todo fix typo
                 headerV1: true // if false, shows header v1 in the menu
             },
-            membersEnabled: this.settings.get('membersSignupAccess') === 'all',
+            membersEnabled: this.settings.membersSignupAccess === 'all',
+            searchLinks,
             siteTitle: this.settings.title,
-            siteDescription: this.settings.description
+            siteDescription: this.settings.description,
+            siteUrl: this.config.getSiteUrl('/'),
+            stripeEnabled: checkStripeEnabled() // returns a boolean
         };
         const cardConfig = Object.assign({}, defaultCardConfig, props.cardConfig, {pinturaConfig: this.pinturaConfig});
 
@@ -506,32 +678,43 @@ export default class KoenigLexicalEditor extends Component {
         const multiplayerDocId = cardConfig.post.id;
         const multiplayerUsername = this.session.user.name;
 
+        const KGEditorComponent = ({isInitInstance}) => {
+            return (
+                <div data-secondary-instance={isInitInstance ? true : false} style={isInitInstance ? {display: 'none'} : {}}>
+                    <KoenigComposer
+                        editorResource={this.editorResource}
+                        cardConfig={cardConfig}
+                        enableMultiplayer={enableMultiplayer}
+                        fileUploader={{useFileUpload, fileTypes}}
+                        initialEditorState={this.args.lexical}
+                        multiplayerUsername={multiplayerUsername}
+                        multiplayerDocId={multiplayerDocId}
+                        multiplayerEndpoint={multiplayerEndpoint}
+                        onError={this.onError}
+                        darkMode={this.feature.nightShift}
+                        isTKEnabled={true}
+                    >
+                        <KoenigEditor
+                            editorResource={this.editorResource}
+                            cursorDidExitAtTop={isInitInstance ? null : this.args.cursorDidExitAtTop}
+                            placeholderText={isInitInstance ? null : this.args.placeholderText}
+                            darkMode={isInitInstance ? null : this.feature.nightShift}
+                            onChange={isInitInstance ? this.args.updateSecondaryInstanceModel : this.args.onChange}
+                            registerAPI={isInitInstance ? this.args.registerSecondaryAPI : this.args.registerAPI}
+                        />
+                        <WordCountPlugin editorResource={this.editorResource} onChange={isInitInstance ? () => {} : this.args.updateWordCount} />
+                        <TKCountPlugin editorResource={this.editorResource} onChange={isInitInstance ? () => {} : this.args.updatePostTkCount} />
+                    </KoenigComposer>
+                </div>
+            );
+        };
+
         return (
             <div className={['koenig-react-editor', 'koenig-lexical', this.args.className].filter(Boolean).join(' ')}>
-                <ErrorHandler>
+                <ErrorHandler config={this.config}>
                     <Suspense fallback={<p className="koenig-react-editor-loading">Loading editor...</p>}>
-                        <KoenigComposer
-                            editorResource={this.editorResource}
-                            cardConfig={cardConfig}
-                            enableMultiplayer={enableMultiplayer}
-                            fileUploader={{useFileUpload, fileTypes}}
-                            initialEditorState={this.args.lexical}
-                            multiplayerUsername={multiplayerUsername}
-                            multiplayerDocId={multiplayerDocId}
-                            multiplayerEndpoint={multiplayerEndpoint}
-                            onError={this.onError}
-                            darkMode={this.feature.nightShift}
-                        >
-                            <KoenigEditor
-                                editorResource={this.editorResource}
-                                cursorDidExitAtTop={this.args.cursorDidExitAtTop}
-                                placeholderText={this.args.placeholder}
-                                darkMode={this.feature.nightShift}
-                                onChange={this.args.onChange}
-                                registerAPI={this.args.registerAPI}
-                            />
-                            <WordCountPlugin editorResource={this.editorResource} onChange={this.args.updateWordCount} />
-                        </KoenigComposer>
+                        <KGEditorComponent />
+                        <KGEditorComponent isInitInstance={true} />
                     </Suspense>
                 </ErrorHandler>
             </div>
diff --git a/ghost/admin/app/components/members-activity/event-type-filter.hbs b/ghost/admin/app/components/members-activity/event-type-filter.hbs
index 112e84bfda2..9a3a1419c83 100644
--- a/ghost/admin/app/components/members-activity/event-type-filter.hbs
+++ b/ghost/admin/app/components/members-activity/event-type-filter.hbs
@@ -1,5 +1,5 @@
 <GhBasicDropdown @verticalPosition="below" as |dd|>
-    <dd.Trigger class="gh-btn gh-btn-icon gh-btn-action-icon">
+    <dd.Trigger class="gh-btn gh-btn-icon gh-btn-action-icon" data-test-id="filter-events-button">
         <span class={{if @excludedEvents "gh-btn-label-green"}}>
             {{svg-jar "filter"}}
             Filter events
@@ -13,7 +13,7 @@
                 {{#if type.divider}}
                     <li class="gh-member-activity-actions-menu-divider"></li>
                 {{/if}}
-                <li class="ember-power-select-option mb0 gh-member-activity-actions-menu-item">
+                <li  class="ember-power-select-option mb0 gh-member-activity-actions-menu-item">
                     <label for="type-{{idx}}">
                         {{svg-jar type.icon class="gh-member-activity-actions-menu-icon"}}
                         <span>{{type.name}}</span>
@@ -21,6 +21,7 @@
                     <div class="for-switch x-small">
                         <label class="switch" for="type-{{idx}}">
                             <input
+                                data-test-id="event-type-filter-checkbox-{{type.event}}"
                                 type="checkbox"
                                 checked={{type.isSelected}}
                                 id="type-{{idx}}"
diff --git a/ghost/admin/app/components/members-activity/event-type-filter.js b/ghost/admin/app/components/members-activity/event-type-filter.js
index 957eafeec0c..f10c19d5962 100644
--- a/ghost/admin/app/components/members-activity/event-type-filter.js
+++ b/ghost/admin/app/components/members-activity/event-type-filter.js
@@ -1,41 +1,14 @@
 import Component from '@glimmer/component';
 import {action} from '@ember/object';
+import {getAvailableEventTypes, needDivider, toggleEventType} from 'ghost-admin/utils/member-event-types';
 import {inject as service} from '@ember/service';
 
-const ALL_EVENT_TYPES = [
-    {event: 'signup_event', icon: 'filter-dropdown-signups', name: 'Signups', group: 'auth'},
-    {event: 'login_event', icon: 'filter-dropdown-logins', name: 'Logins', group: 'auth'},
-    {event: 'subscription_event', icon: 'filter-dropdown-paid-subscriptions', name: 'Paid subscriptions', group: 'payments'},
-    {event: 'payment_event', icon: 'filter-dropdown-payments', name: 'Payments', group: 'payments'},
-    {event: 'newsletter_event', icon: 'filter-dropdown-email-subscriptions', name: 'Email subscriptions', group: 'emails'},
-    {event: 'email_opened_event', icon: 'filter-dropdown-email-opened', name: 'Email opened', group: 'emails'},
-    {event: 'email_delivered_event', icon: 'filter-dropdown-email-received', name: 'Email received', group: 'emails'},
-    {event: 'email_complaint_event', icon: 'filter-dropdown-email-flagged-as-spam', name: 'Email flagged as spam', group: 'emails'},
-    {event: 'email_failed_event', icon: 'filter-dropdown-email-bounced', name: 'Email bounced', group: 'emails'}
-];
-
 export default class MembersActivityEventTypeFilter extends Component {
     @service settings;
     @service feature;
 
     getAvailableEventTypes() {
-        const extended = [...ALL_EVENT_TYPES];
-
-        if (this.settings.commentsEnabled !== 'off') {
-            extended.push({event: 'comment_event', icon: 'filter-dropdown-comments', name: 'Comments', group: 'others'});
-        }
-        if (this.feature.audienceFeedback) {
-            extended.push({event: 'feedback_event', icon: 'filter-dropdown-feedback', name: 'Feedback', group: 'others'});
-        }
-        if (this.settings.emailTrackClicks) {
-            extended.push({event: 'click_event', icon: 'filter-dropdown-clicked-in-email', name: 'Clicked link in email', group: 'others'});
-        }
-
-        if (this.args.hiddenEvents?.length) {
-            return extended.filter(t => !this.args.hiddenEvents.includes(t.event));
-        } else {
-            return extended;
-        }
+        return getAvailableEventTypes(this.settings, this.feature, this.args.hiddenEvents);
     }
 
     get eventTypes() {
@@ -46,30 +19,14 @@ export default class MembersActivityEventTypeFilter extends Component {
             event: type.event,
             icon: type.icon,
             name: type.name,
-            divider: this.needDivider(type, availableEventTypes[i - 1]),
+            divider: needDivider(type, availableEventTypes[i - 1]),
             isSelected: !excludedEvents.includes(type.event)
         }));
     }
 
-    needDivider(event, prevEvent) {
-        if (!event?.group || !prevEvent?.group) {
-            return false;
-        }
-        return event.group !== prevEvent.group;
-    }
-
     @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);
-        }
-
-        const excludeString = Array.from(excludedEvents).join(',');
-
-        this.args.onChange(excludeString || null);
+        const newExcludedEvents = toggleEventType(eventType, this.eventTypes);
+        this.args.onChange(newExcludedEvents || null);
     }
 }
diff --git a/ghost/admin/app/components/members-activity/table-row.hbs b/ghost/admin/app/components/members-activity/table-row.hbs
index 8360724bfae..dfa50c234de 100644
--- a/ghost/admin/app/components/members-activity/table-row.hbs
+++ b/ghost/admin/app/components/members-activity/table-row.hbs
@@ -28,8 +28,10 @@
                             <span class="gh-members-activity-event-join">{{event.join}}</span>
                             <LinkTo class="gh-members-activity-object-link" @route={{event.route.name}} @model={{event.route.model}}>{{event.object}}</LinkTo>
                         {{else if event.url}}
-                            <span class="gh-members-activity-event-join">{{event.join}}</span>
-                            <a class="ghost-members-activity-object-link" href="{{event.url}}" target="_blank" rel="noopener noreferrer">{{event.object}}</a>
+                            {{#if event.object}}
+                                <span data-test-id="event-join-row" class="gh-members-activity-event-join">{{event.join}}</span>
+                                <a class="ghost-members-activity-object-link" href="{{event.url}}" target="_blank" rel="noopener noreferrer">{{event.object}}</a>
+                            {{/if}}
                         {{else if event.email}}
                             <span class="gh-members-activity-event-dash">–</span>
                             <GhEmailPreviewLink @data={{event.email}} />
diff --git a/ghost/admin/app/components/members/filter-value.hbs b/ghost/admin/app/components/members/filter-value.hbs
index 139c530805f..e6b4358395e 100644
--- a/ghost/admin/app/components/members/filter-value.hbs
+++ b/ghost/admin/app/components/members/filter-value.hbs
@@ -118,7 +118,7 @@
     <GhDatePicker
         @value={{@filter.value}}
         @maxDate={{now}}
-        @maxDateError="Must be in the past"
+        @maxDateError="Please choose a past date."
         @onChange={{fn @setFilterValue @filter}}
         data-test-input="members-filter-value"
     />
diff --git a/ghost/admin/app/components/members/filter.js b/ghost/admin/app/components/members/filter.js
index febad7c7152..46da839176b 100644
--- a/ghost/admin/app/components/members/filter.js
+++ b/ghost/admin/app/components/members/filter.js
@@ -1,11 +1,11 @@
 import Component from '@glimmer/component';
 import moment from 'moment-timezone';
 import nql from '@tryghost/nql-lang';
-import {AUDIENCE_FEEDBACK_FILTER, CREATED_AT_FILTER, EMAIL_CLICKED_FILTER, EMAIL_COUNT_FILTER, EMAIL_FILTER, EMAIL_OPENED_COUNT_FILTER, EMAIL_OPENED_FILTER, EMAIL_OPEN_RATE_FILTER, EMAIL_SENT_FILTER, LABEL_FILTER, LAST_SEEN_FILTER, NAME_FILTER, NEWSLETTERS_FILTER, NEXT_BILLING_DATE_FILTER, OFFERS_FILTER, PLAN_INTERVAL_FILTER, SIGNUP_ATTRIBUTION_FILTER, STATUS_FILTER, SUBSCRIBED_FILTER, SUBSCRIPTION_ATTRIBUTION_FILTER, SUBSCRIPTION_START_DATE_FILTER, SUBSCRIPTION_STATUS_FILTER, TIER_FILTER} from './filters';
+import {AUDIENCE_FEEDBACK_FILTER, CREATED_AT_FILTER, EMAIL_CLICKED_FILTER, EMAIL_COUNT_FILTER, EMAIL_FILTER, EMAIL_OPENED_COUNT_FILTER, EMAIL_OPENED_FILTER, EMAIL_OPEN_RATE_FILTER, EMAIL_SENT_FILTER, LABEL_FILTER, LAST_SEEN_FILTER, NAME_FILTER, NEWSLETTERS_FILTERS, NEXT_BILLING_DATE_FILTER, OFFERS_FILTER, PLAN_INTERVAL_FILTER, SIGNUP_ATTRIBUTION_FILTER, STATUS_FILTER, SUBSCRIBED_FILTER, SUBSCRIPTION_ATTRIBUTION_FILTER, SUBSCRIPTION_START_DATE_FILTER, SUBSCRIPTION_STATUS_FILTER, TIER_FILTER} from './filters';
 import {TrackedArray} from 'tracked-built-ins';
 import {action} from '@ember/object';
+import {didCancel, task} from 'ember-concurrency';
 import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
 function escapeNqlString(value) {
@@ -25,6 +25,12 @@ const FILTER_GROUPS = [
             SIGNUP_ATTRIBUTION_FILTER
         ]
     },
+    {
+        name: 'Newsletters',
+        filters: [
+            NEWSLETTERS_FILTERS
+        ]
+    },
     {
         name: 'Subscription',
         filters: [
@@ -52,6 +58,15 @@ const FILTER_GROUPS = [
 ];
 
 const FILTER_PROPERTIES = FILTER_GROUPS.flatMap(group => group.filters.map((f) => {
+    if (typeof f === 'function') {
+        return (options) => {
+            return f({
+                ...options,
+                group: group.name
+            });
+        };
+    }
+
     f.group = group.name;
     return f;
 }));
@@ -122,6 +137,10 @@ class Filter {
         return this.properties.options ?? [];
     }
 
+    get group() {
+        return this.properties.group;
+    }
+
     get isValid() {
         if (Array.isArray(this.value)) {
             return !!this.value.length;
@@ -148,16 +167,21 @@ export default class MembersFilter extends Component {
     get filterProperties() {
         let availableFilters = FILTER_PROPERTIES;
 
-        // find list of newsletters from store and add them to filter list if there are more than one newsletter
-        // it also removes the 'subscribed' filter from the list as that would unsubscribe members from all newsletters, instead replace it with a filter for each newsletter
-        if (this.newsletters?.length > 1) {
-            // remove the 'subscribed' filter from the list
-            availableFilters = availableFilters.filter(prop => prop.name !== 'subscribed');
-            // find the index of the 'basic' group and insert the 'multiple newsletters' filter after it
-            const indexes = availableFilters.map((obj, index) => (obj.group === 'Basic' ? index : null)).filter(i => i !== null);
-            const lastIndex = indexes.pop();
-            availableFilters.splice(lastIndex + 1, 0, ...NEWSLETTERS_FILTER(this.newsletters));
-        }
+        // Convert the method filters to properties
+        availableFilters = availableFilters.flatMap((filter) => {
+            if (typeof filter === 'function') {
+                const filters = filter({
+                    newsletters: this.newsletters ?? [],
+                    feature: this.feature
+                });
+                if (Array.isArray(filters)) {
+                    return filters;
+                }
+                return [filters];
+            }
+            return [filter];
+        });
+
         // only add the offers filter if there are any offers
         if (this.offers.length > 0) {
             availableFilters = availableFilters.concat(OFFERS_FILTER);
@@ -214,9 +238,19 @@ export default class MembersFilter extends Component {
     async parseDefaultFilters() {
         // we need to make sure all the filters are loaded before parsing the default filter
         // otherwise the filter will be parsed with the wrong properties
-        await this.fetchTiers.perform();
-        await this.fetchNewsletters.perform();
-        await this.fetchOffers.perform();
+        try {
+            await this.fetchTiers.perform();
+            await this.fetchNewsletters.perform();
+            await this.fetchOffers.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
+        }
+
         if (this.args.defaultFilterParam) {
             // check if it is different before parsing
             const validFilters = this.validFilters;
@@ -322,9 +356,6 @@ export default class MembersFilter extends Component {
 
         if (filter.$and) {
             parsedFilters.push(...this.parseNqlFilters(filter.$and));
-        } else if (filter.yg) {
-            // Single filter grouped in backets
-            parsedFilters.push(...this.parseNqlFilter(filter.yg));
         } else {
             const filterKeys = Object.keys(filter);
             const validKeys = this.filterProperties.map(prop => prop.name);
@@ -596,7 +627,7 @@ export default class MembersFilter extends Component {
 
     @task({drop: true})
     *fetchOffers() {
-        const response = yield this.store.query('offer', {filter: 'status:active'});
+        const response = yield this.store.query('offer', {limit: 'all'});
         this.offers = response;
         return response;
     }
diff --git a/ghost/admin/app/components/members/filters/audience-feedback.js b/ghost/admin/app/components/members/filters/audience-feedback.js
index 3551f13563a..f149eccb217 100644
--- a/ghost/admin/app/components/members/filters/audience-feedback.js
+++ b/ghost/admin/app/components/members/filters/audience-feedback.js
@@ -4,15 +4,15 @@ const FEEDBACK_RELATION_OPTIONS = [
 ];
 
 export const AUDIENCE_FEEDBACK_FILTER = {
-    label: 'Responded with feedback', 
-    name: 'newsletter_feedback', 
-    valueType: 'string', 
-    resource: 'email', 
+    label: 'Responded with feedback',
+    name: 'newsletter_feedback',
+    valueType: 'string',
+    resource: 'email',
     relationOptions: FEEDBACK_RELATION_OPTIONS,
-    feature: 'audienceFeedback', 
+    feature: 'audienceFeedback',
     buildNqlFilter: (filter) => {
         // Added brackets to make sure we can parse as a single AND filter
-        return `(feedback.post_id:${filter.value}+feedback.score:${filter.relation})`;
+        return `(feedback.post_id:'${filter.value}'+feedback.score:${filter.relation})`;
     },
     parseNqlFilter: (filter) => {
         if (!filter.$and) {
diff --git a/ghost/admin/app/components/members/filters/created-at.js b/ghost/admin/app/components/members/filters/created-at.js
index 9ded43af78d..f8577711157 100644
--- a/ghost/admin/app/components/members/filters/created-at.js
+++ b/ghost/admin/app/components/members/filters/created-at.js
@@ -1,8 +1,8 @@
 import {DATE_RELATION_OPTIONS} from './relation-options';
 
 export const CREATED_AT_FILTER = {
-    label: 'Created', 
-    name: 'created_at', 
-    valueType: 'date', 
+    label: 'Created',
+    name: 'created_at',
+    valueType: 'date',
     relationOptions: DATE_RELATION_OPTIONS
 };
diff --git a/ghost/admin/app/components/members/filters/email-clicked.js b/ghost/admin/app/components/members/filters/email-clicked.js
index d24798b1975..c78dae0c410 100644
--- a/ghost/admin/app/components/members/filters/email-clicked.js
+++ b/ghost/admin/app/components/members/filters/email-clicked.js
@@ -1,10 +1,10 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const EMAIL_CLICKED_FILTER = {
-    label: 'Clicked email', 
-    name: 'clicked_links.post_id', 
-    valueType: 'string', 
-    resource: 'email', 
+    label: 'Clicked email',
+    name: 'clicked_links.post_id',
+    valueType: 'string',
+    resource: 'email',
     relationOptions: MATCH_RELATION_OPTIONS,
     columnLabel: 'Clicked email',
     setting: 'emailTrackClicks',
diff --git a/ghost/admin/app/components/members/filters/email-count.js b/ghost/admin/app/components/members/filters/email-count.js
index ef8396c574d..03a0a4242f7 100644
--- a/ghost/admin/app/components/members/filters/email-count.js
+++ b/ghost/admin/app/components/members/filters/email-count.js
@@ -2,10 +2,10 @@ import {NUMBER_RELATION_OPTIONS} from './relation-options';
 import {formatNumber} from 'ghost-admin/helpers/format-number';
 
 export const EMAIL_COUNT_FILTER = {
-    label: 'Emails sent (all time)', 
-    name: 'email_count', 
-    columnLabel: 'Email count', 
-    valueType: 'number', 
+    label: 'Emails sent (all time)',
+    name: 'email_count',
+    columnLabel: 'Email count',
+    valueType: 'number',
     relationOptions: NUMBER_RELATION_OPTIONS,
     getColumnValue: (member) => {
         return {
diff --git a/ghost/admin/app/components/members/filters/email-open-rate.js b/ghost/admin/app/components/members/filters/email-open-rate.js
index 5990199a4de..6361239b057 100644
--- a/ghost/admin/app/components/members/filters/email-open-rate.js
+++ b/ghost/admin/app/components/members/filters/email-open-rate.js
@@ -1,9 +1,9 @@
 import {NUMBER_RELATION_OPTIONS} from './relation-options';
 
 export const EMAIL_OPEN_RATE_FILTER = {
-    label: 'Open rate (all time)', 
-    name: 'email_open_rate', 
-    valueType: 'number', 
+    label: 'Open rate (all time)',
+    name: 'email_open_rate',
+    valueType: 'number',
     setting: 'emailTrackOpens',
     relationOptions: NUMBER_RELATION_OPTIONS
 };
diff --git a/ghost/admin/app/components/members/filters/email-opened-count.js b/ghost/admin/app/components/members/filters/email-opened-count.js
index ff4d2e3363b..dece4042add 100644
--- a/ghost/admin/app/components/members/filters/email-opened-count.js
+++ b/ghost/admin/app/components/members/filters/email-opened-count.js
@@ -2,10 +2,10 @@ import {NUMBER_RELATION_OPTIONS} from './relation-options';
 import {formatNumber} from 'ghost-admin/helpers/format-number';
 
 export const EMAIL_OPENED_COUNT_FILTER = {
-    label: 'Emails opened (all time)', 
-    name: 'email_opened_count', 
-    columnLabel: 'Email opened count', 
-    valueType: 'number', 
+    label: 'Emails opened (all time)',
+    name: 'email_opened_count',
+    columnLabel: 'Email opened count',
+    valueType: 'number',
     relationOptions: NUMBER_RELATION_OPTIONS,
     getColumnValue: (member) => {
         return {
diff --git a/ghost/admin/app/components/members/filters/email-opened.js b/ghost/admin/app/components/members/filters/email-opened.js
index 5f284e16a51..d9535523aa1 100644
--- a/ghost/admin/app/components/members/filters/email-opened.js
+++ b/ghost/admin/app/components/members/filters/email-opened.js
@@ -1,10 +1,10 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const EMAIL_OPENED_FILTER = {
-    label: 'Opened email', 
-    name: 'opened_emails.post_id', 
-    valueType: 'string', 
-    resource: 'email', 
+    label: 'Opened email',
+    name: 'opened_emails.post_id',
+    valueType: 'string',
+    resource: 'email',
     relationOptions: MATCH_RELATION_OPTIONS,
     columnLabel: 'Opened email',
     setting: 'emailTrackOpens',
diff --git a/ghost/admin/app/components/members/filters/email.js b/ghost/admin/app/components/members/filters/email.js
index 3645374c343..1aa094a3953 100644
--- a/ghost/admin/app/components/members/filters/email.js
+++ b/ghost/admin/app/components/members/filters/email.js
@@ -1,8 +1,8 @@
 import {CONTAINS_RELATION_OPTIONS} from './relation-options';
 
 export const EMAIL_FILTER = {
-    label: 'Email', 
+    label: 'Email',
     name: 'email',
-    valueType: 'string', 
+    valueType: 'string',
     relationOptions: CONTAINS_RELATION_OPTIONS
 };
diff --git a/ghost/admin/app/components/members/filters/label.js b/ghost/admin/app/components/members/filters/label.js
index 7538d60df54..857845a2dbe 100644
--- a/ghost/admin/app/components/members/filters/label.js
+++ b/ghost/admin/app/components/members/filters/label.js
@@ -1,10 +1,10 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const LABEL_FILTER = {
-    label: 'Label', 
-    name: 'label', 
-    valueType: 'array', 
-    columnLabel: 'Label', 
+    label: 'Label',
+    name: 'label',
+    valueType: 'array',
+    columnLabel: 'Label',
     relationOptions: MATCH_RELATION_OPTIONS,
     getColumnValue: (member) => {
         return {
diff --git a/ghost/admin/app/components/members/filters/last-seen.js b/ghost/admin/app/components/members/filters/last-seen.js
index 22eb950daf3..d0667dbda3f 100644
--- a/ghost/admin/app/components/members/filters/last-seen.js
+++ b/ghost/admin/app/components/members/filters/last-seen.js
@@ -2,10 +2,10 @@ import {DATE_RELATION_OPTIONS} from './relation-options';
 import {getDateColumnValue} from './columns/date-column';
 
 export const LAST_SEEN_FILTER = {
-    label: 'Last seen', 
-    name: 'last_seen_at', 
-    valueType: 'date', 
-    columnLabel: 'Last seen at', 
+    label: 'Last seen',
+    name: 'last_seen_at',
+    valueType: 'date',
+    columnLabel: 'Last seen at',
     relationOptions: DATE_RELATION_OPTIONS,
     getColumnValue: (member, filter) => {
         return getDateColumnValue(member.lastSeenAtUTC, filter);
diff --git a/ghost/admin/app/components/members/filters/name.js b/ghost/admin/app/components/members/filters/name.js
index 875d50e5fa6..c5571d55679 100644
--- a/ghost/admin/app/components/members/filters/name.js
+++ b/ghost/admin/app/components/members/filters/name.js
@@ -1,8 +1,8 @@
 import {CONTAINS_RELATION_OPTIONS} from './relation-options';
 
 export const NAME_FILTER = {
-    label: 'Name', 
-    name: 'name', 
-    valueType: 'string', 
+    label: 'Name',
+    name: 'name',
+    valueType: 'string',
     relationOptions: CONTAINS_RELATION_OPTIONS
 };
diff --git a/ghost/admin/app/components/members/filters/next-billing-date.js b/ghost/admin/app/components/members/filters/next-billing-date.js
index 2d6aad1de99..621d8393652 100644
--- a/ghost/admin/app/components/members/filters/next-billing-date.js
+++ b/ghost/admin/app/components/members/filters/next-billing-date.js
@@ -1,15 +1,15 @@
 import {DATE_RELATION_OPTIONS} from './relation-options';
 import {getDateColumnValue} from './columns/date-column';
-import {mostRecentlyUpdated} from 'ghost-admin/helpers/most-recently-updated';
+import {mostRelevantSubscription} from 'ghost-admin/helpers/most-relevant-subscription';
 
 export const NEXT_BILLING_DATE_FILTER = {
-    label: 'Next billing date', 
-    name: 'subscriptions.current_period_end', 
-    valueType: 'date', 
-    columnLabel: 'Next billing date', 
+    label: 'Next billing date',
+    name: 'subscriptions.current_period_end',
+    valueType: 'date',
+    columnLabel: 'Next billing date',
     relationOptions: DATE_RELATION_OPTIONS,
     getColumnValue: (member, filter) => {
-        const subscription = mostRecentlyUpdated(member.subscriptions);
+        const subscription = mostRelevantSubscription(member.subscriptions);
         return getDateColumnValue(subscription?.current_period_end, filter);
     }
 };
diff --git a/ghost/admin/app/components/members/filters/offers.js b/ghost/admin/app/components/members/filters/offers.js
index 0039f04c19b..854c46e4e78 100644
--- a/ghost/admin/app/components/members/filters/offers.js
+++ b/ghost/admin/app/components/members/filters/offers.js
@@ -1,7 +1,7 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const OFFERS_FILTER = {
-    label: 'Offers', 
+    label: 'Offers',
     name: 'offer_redemptions',
     group: 'Subscription',
     relationOptions: MATCH_RELATION_OPTIONS,
diff --git a/ghost/admin/app/components/members/filters/plan-interval.js b/ghost/admin/app/components/members/filters/plan-interval.js
index 9ad8df9ec68..79c3cc18992 100644
--- a/ghost/admin/app/components/members/filters/plan-interval.js
+++ b/ghost/admin/app/components/members/filters/plan-interval.js
@@ -1,11 +1,11 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 import {capitalizeFirstLetter} from 'ghost-admin/helpers/capitalize-first-letter';
-import {mostRecentlyUpdated} from 'ghost-admin/helpers/most-recently-updated';
+import {mostRelevantSubscription} from 'ghost-admin/helpers/most-relevant-subscription';
 
 export const PLAN_INTERVAL_FILTER = {
-    label: 'Billing period', 
-    name: 'subscriptions.plan_interval', 
-    columnLabel: 'Billing period', 
+    label: 'Billing period',
+    name: 'subscriptions.plan_interval',
+    columnLabel: 'Billing period',
     relationOptions: MATCH_RELATION_OPTIONS,
     valueType: 'options',
     options: [
@@ -13,7 +13,7 @@ export const PLAN_INTERVAL_FILTER = {
         {label: 'Yearly', name: 'year'}
     ],
     getColumnValue: (member) => {
-        const subscription = mostRecentlyUpdated(member.subscriptions);
+        const subscription = mostRelevantSubscription(member.subscriptions);
         if (!subscription) {
             return null;
         }
diff --git a/ghost/admin/app/components/members/filters/signup-attribution.js b/ghost/admin/app/components/members/filters/signup-attribution.js
index 49a396e0717..6bcf2b27626 100644
--- a/ghost/admin/app/components/members/filters/signup-attribution.js
+++ b/ghost/admin/app/components/members/filters/signup-attribution.js
@@ -1,10 +1,10 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const SIGNUP_ATTRIBUTION_FILTER = {
-    label: 'Signed up on post/page', 
-    name: 'signup', 
-    valueType: 'string', 
-    resource: 'post', 
+    label: 'Signed up on post/page',
+    name: 'signup',
+    valueType: 'string',
+    resource: 'post',
     relationOptions: MATCH_RELATION_OPTIONS,
     columnLabel: 'Signed up on',
     setting: 'membersTrackSources',
diff --git a/ghost/admin/app/components/members/filters/status.js b/ghost/admin/app/components/members/filters/status.js
index e6d31dd697f..08cbbef1a97 100644
--- a/ghost/admin/app/components/members/filters/status.js
+++ b/ghost/admin/app/components/members/filters/status.js
@@ -1,8 +1,8 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const STATUS_FILTER = {
-    label: 'Member status', 
-    name: 'status', 
+    label: 'Member status',
+    name: 'status',
     relationOptions: MATCH_RELATION_OPTIONS,
     valueType: 'options',
     options: [
diff --git a/ghost/admin/app/components/members/filters/subscribed.js b/ghost/admin/app/components/members/filters/subscribed.js
index 883434624fd..9a4d143e841 100644
--- a/ghost/admin/app/components/members/filters/subscribed.js
+++ b/ghost/admin/app/components/members/filters/subscribed.js
@@ -1,61 +1,108 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
-export const SUBSCRIBED_FILTER = {
-    label: 'Newsletter subscription',
-    name: 'subscribed',
-    columnLabel: 'Subscribed',
-    relationOptions: MATCH_RELATION_OPTIONS,
-    valueType: 'options',
-    buildNqlFilter: (flt) => {
-        const relation = flt.relation;
-        const value = flt.value;
-
-        return (relation === 'is' && value === 'true') || (relation === 'is-not' && value === 'false')
-            ? '(subscribed:true+email_disabled:0)'
-            : '(subscribed:false,email_disabled:1)';
-    },
-    parseNqlFilter: (flt) => {
-        const comparator = flt.$and || flt.$or;
-
-        if (!comparator || comparator.length !== 2) {
-            return;
-        }
+export const SUBSCRIBED_FILTER = ({newsletters, group}) => {
+    return {
+        label: newsletters.length > 1 ? 'All newsletters' : 'Newsletter subscription',
+        name: 'subscribed',
+        columnLabel: 'Subscribed',
+        relationOptions: MATCH_RELATION_OPTIONS,
+        valueType: 'options',
+        group: newsletters.length > 1 ? 'Newsletters' : group,
+        buildNqlFilter: (flt) => {
+            const relation = flt.relation;
+            const value = flt.value;
 
-        if (comparator[0].subscribed === undefined || comparator[1].email_disabled === undefined) {
-            return;
-        }
+            if (value === 'email-disabled') {
+                if (relation === 'is') {
+                    return '(email_disabled:1)';
+                }
+                return '(email_disabled:0)';
+            }
 
-        const subscribed = comparator[0].subscribed;
+            if (relation === 'is') {
+                if (value === 'subscribed') {
+                    return '(subscribed:true+email_disabled:0)';
+                }
+                return '(subscribed:false+email_disabled:0)';
+            }
 
-        return {
-            value: subscribed ? 'true' : 'false',
-            relation: 'is'
-        };
-    },
-    options: [
-        {label: 'Subscribed', name: 'true'},
-        {label: 'Unsubscribed', name: 'false'}
-    ],
-    getColumnValue: (member, flt) => {
-        const relation = flt.relation;
-        const value = flt.value;
+            // relation === 'is-not'
+            if (value === 'subscribed') {
+                return '(subscribed:false,email_disabled:1)';
+            }
+            return '(subscribed:true,email_disabled:1)';
+        },
+        parseNqlFilter: (flt) => {
+            const comparator = flt.$and || flt.$or; // $or for legacy filter backwards compatibility
 
-        return {
-            text: (relation === 'is' && value === 'true') || (relation === 'is-not' && value === 'false')
-                ? 'Subscribed'
-                : 'Unsubscribed'
-        };
-    }
+            if (!comparator || comparator.length !== 2) {
+                const filter = flt;
+                if (filter && filter.email_disabled !== undefined) {
+                    if (filter.email_disabled) {
+                        return {
+                            value: 'email-disabled',
+                            relation: 'is'
+                        };
+                    }
+                    return {
+                        value: 'email-disabled',
+                        relation: 'is-not'
+                    };
+                }
+                return;
+            }
+
+            if (comparator[0].subscribed === undefined || comparator[1].email_disabled === undefined) {
+                return;
+            }
+
+            const usedOr = flt.$or !== undefined;
+            const subscribed = comparator[0].subscribed;
+
+            if (usedOr) {
+                // Is not
+                return {
+                    value: !subscribed ? 'subscribed' : 'unsubscribed',
+                    relation: 'is-not'
+                };
+            }
+
+            return {
+                value: subscribed ? 'subscribed' : 'unsubscribed',
+                relation: 'is'
+            };
+        },
+        options: [
+            {label: newsletters.length > 1 ? 'Subscribed to at least one' : 'Subscribed', name: 'subscribed'},
+            {label: newsletters.length > 1 ? 'Unsubscribed from all' : 'Unsubscribed', name: 'unsubscribed'},
+            {label: 'Email disabled', name: 'email-disabled'}
+        ],
+        getColumnValue: (member) => {
+            if (member.emailSuppression && member.emailSuppression.suppressed) {
+                return {
+                    text: 'Email disabled'
+                };
+            }
+
+            return member.newsletters.length > 0 ? {
+                text: 'Subscribed'
+            } : {
+                text: 'Unsubscribed'
+            };
+        }
+    };
 };
 
-export const NEWSLETTERS_FILTER = (newsletterList) => {
-    let newsletters = [];
-    newsletterList.forEach((newsletter) => {
-        const filter = {
+export const NEWSLETTERS_FILTERS = ({newsletters, group}) => {
+    if (newsletters.length <= 1) {
+        return [];
+    }
+    return newsletters.map((newsletter) => {
+        return {
             label: newsletter.name,
             name: `newsletters.slug:${newsletter.slug}`,
             relationOptions: MATCH_RELATION_OPTIONS,
-            group: 'Newsletters',
+            group,
             valueType: 'options',
             buildNqlFilter: (flt) => {
                 const relation = flt.relation;
@@ -98,9 +145,24 @@ export const NEWSLETTERS_FILTER = (newsletterList) => {
             options: [
                 {label: 'Subscribed', name: 'true'},
                 {label: 'Unsubscribed', name: 'false'}
-            ]
+            ],
+            columnLabel: newsletter.name,
+            getColumnValue: (member, flt) => {
+                const relation = flt.relation;
+                const value = flt.value;
+
+                if (member.emailSuppression && member.emailSuppression.suppressed) {
+                    return {
+                        text: 'Email disabled'
+                    };
+                }
+
+                return {
+                    text: (relation === 'is' && value === 'true') || (relation === 'is-not' && value === 'false')
+                        ? 'Subscribed'
+                        : 'Unsubscribed'
+                };
+            }
         };
-        newsletters.push(filter);
     });
-    return newsletters;
 };
diff --git a/ghost/admin/app/components/members/filters/subscription-attribution.js b/ghost/admin/app/components/members/filters/subscription-attribution.js
index 84688dac5da..373b51c0b34 100644
--- a/ghost/admin/app/components/members/filters/subscription-attribution.js
+++ b/ghost/admin/app/components/members/filters/subscription-attribution.js
@@ -1,10 +1,10 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const SUBSCRIPTION_ATTRIBUTION_FILTER = {
-    label: 'Subscription started on post/page', 
-    name: 'conversion', 
-    valueType: 'string', 
-    resource: 'post', 
+    label: 'Subscription started on post/page',
+    name: 'conversion',
+    valueType: 'string',
+    resource: 'post',
     relationOptions: MATCH_RELATION_OPTIONS,
     columnLabel: 'Subscription started on',
     setting: 'membersTrackSources',
diff --git a/ghost/admin/app/components/members/filters/subscription-start-date.js b/ghost/admin/app/components/members/filters/subscription-start-date.js
index 42740304e9d..771c1e52ecd 100644
--- a/ghost/admin/app/components/members/filters/subscription-start-date.js
+++ b/ghost/admin/app/components/members/filters/subscription-start-date.js
@@ -1,15 +1,15 @@
 import {DATE_RELATION_OPTIONS} from './relation-options';
 import {getDateColumnValue} from './columns/date-column';
-import {mostRecentlyUpdated} from 'ghost-admin/helpers/most-recently-updated';
+import {mostRelevantSubscription} from 'ghost-admin/helpers/most-relevant-subscription';
 
 export const SUBSCRIPTION_START_DATE_FILTER = {
-    label: 'Paid start date', 
-    name: 'subscriptions.start_date', 
-    valueType: 'date', 
-    columnLabel: 'Paid start date', 
+    label: 'Paid start date',
+    name: 'subscriptions.start_date',
+    valueType: 'date',
+    columnLabel: 'Paid start date',
     relationOptions: DATE_RELATION_OPTIONS,
     getColumnValue: (member, filter) => {
-        const subscription = mostRecentlyUpdated(member.subscriptions);
+        const subscription = mostRelevantSubscription(member.subscriptions);
         return getDateColumnValue(subscription?.start_date, filter);
     }
 };
diff --git a/ghost/admin/app/components/members/filters/subscription-status.js b/ghost/admin/app/components/members/filters/subscription-status.js
index 750fffdf991..d6266932062 100644
--- a/ghost/admin/app/components/members/filters/subscription-status.js
+++ b/ghost/admin/app/components/members/filters/subscription-status.js
@@ -1,11 +1,11 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 import {capitalizeFirstLetter} from 'ghost-admin/helpers/capitalize-first-letter';
-import {mostRecentlyUpdated} from 'ghost-admin/helpers/most-recently-updated';
+import {mostRelevantSubscription} from 'ghost-admin/helpers/most-relevant-subscription';
 
 export const SUBSCRIPTION_STATUS_FILTER = {
-    label: 'Stripe subscription status', 
-    name: 'subscriptions.status', 
-    columnLabel: 'Subscription Status', 
+    label: 'Stripe subscription status',
+    name: 'subscriptions.status',
+    columnLabel: 'Subscription Status',
     relationOptions: MATCH_RELATION_OPTIONS,
     valueType: 'options',
     options: [
@@ -18,7 +18,7 @@ export const SUBSCRIPTION_STATUS_FILTER = {
         {label: 'Incomplete - Expired', name: 'incomplete_expired'}
     ],
     getColumnValue: (member) => {
-        const subscription = mostRecentlyUpdated(member.subscriptions);
+        const subscription = mostRelevantSubscription(member.subscriptions);
         if (!subscription) {
             return null;
         }
diff --git a/ghost/admin/app/components/members/filters/tier.js b/ghost/admin/app/components/members/filters/tier.js
index b219d0fc4fb..bbd1c00e2d7 100644
--- a/ghost/admin/app/components/members/filters/tier.js
+++ b/ghost/admin/app/components/members/filters/tier.js
@@ -1,10 +1,10 @@
 import {MATCH_RELATION_OPTIONS} from './relation-options';
 
 export const TIER_FILTER = {
-    label: 'Membership tier', 
-    name: 'tier_id', 
-    valueType: 'array', 
-    columnLabel: 'Membership tier', 
+    label: 'Membership tier',
+    name: 'tier_id',
+    valueType: 'array',
+    columnLabel: 'Membership tier',
     relationOptions: MATCH_RELATION_OPTIONS,
     getColumnValue: (member) => {
         return {
diff --git a/ghost/admin/app/components/members/list-item-loading.hbs b/ghost/admin/app/components/members/list-item-loading.hbs
index f50fc4011e1..bf4d6680ded 100644
--- a/ghost/admin/app/components/members/list-item-loading.hbs
+++ b/ghost/admin/app/components/members/list-item-loading.hbs
@@ -1,4 +1,4 @@
-<tr data-test-list="members-list-item">
+<tr data-test-list="members-list-item" class="gh-members-list-row">
     <div class="gh-list-data gh-members-list-basic gh-list-loadingcell">
         <div class="gh-list-loading-title"></div>
         <div class="gh-list-loading-detail"></div>
diff --git a/ghost/admin/app/components/members/list-item.hbs b/ghost/admin/app/components/members/list-item.hbs
index ea0f892eaa2..3f34e29cddd 100644
--- a/ghost/admin/app/components/members/list-item.hbs
+++ b/ghost/admin/app/components/members/list-item.hbs
@@ -1,6 +1,6 @@
-<tr data-test-list='members-list-item' data-test-member={{@member.id}}>
+<tr data-test-list='members-list-item' data-test-member={{@member.id}} class="gh-members-list-row">
     <LinkTo @route="member" @model={{@member}} @query={{@query}} class="gh-list-data" data-test-table-data="details">
-        <div class="flex items-center">
+        <div class="flex items-center gh-members-list-name-container">
             <GhMemberAvatar @member={{@member}} @containerClass="w9 h9 mr3 flex-shrink-0" />
             <div class="w-80">
                 <h3 class="ma0 pa0 gh-members-list-name {{unless @member.name "gh-members-name-noname"}}">{{or @member.name @member.email}}</h3>
diff --git a/ghost/admin/app/components/members/modals/logout-member.hbs b/ghost/admin/app/components/members/modals/logout-member.hbs
new file mode 100644
index 00000000000..824fd5615ac
--- /dev/null
+++ b/ghost/admin/app/components/members/modals/logout-member.hbs
@@ -0,0 +1,30 @@
+<div class="modal-content" data-test-modal="logout-member">
+    <header class="modal-header">
+        <h1>Sign out member from all devices?</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 class="mb6">
+            <strong>{{or @data.member.name @data.member.email}}</strong> will be signed out of all active sessions, and will need to sign in again upon return.
+        </p>
+    </div>
+
+    <div class="modal-footer">
+        <button
+            type="button"
+            class="gh-btn"
+            {{on "click" (fn @close false)}}
+            data-test-button="cancel"
+        >
+            <span>Cancel</span>
+        </button>
+        <GhTaskButton
+            @buttonText="Sign out"
+            @successText="Signed out"
+            @task={{this.logoutMemberTask}}
+            @class="gh-btn gh-btn-red gh-btn-icon"
+            data-test-button="confirm"
+        />
+    </div>
+</div>
diff --git a/ghost/admin/app/components/members/modals/logout-member.js b/ghost/admin/app/components/members/modals/logout-member.js
new file mode 100644
index 00000000000..f07de06de55
--- /dev/null
+++ b/ghost/admin/app/components/members/modals/logout-member.js
@@ -0,0 +1,31 @@
+import Component from '@glimmer/component';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+
+export default class LogoutMemberModal extends Component {
+    @service notifications;
+    @service ajax;
+    @service ghostPaths;
+
+    get member() {
+        return this.args.data.member;
+    }
+
+    @task({drop: true})
+    *logoutMemberTask() {
+        try {
+            const url = this.ghostPaths.url.api('/members/', this.member.id, '/sessions/');
+            const options = {};
+            yield this.ajax.delete(url, options);
+
+            this.args.data.afterLogout?.();
+            this.notifications.showNotification(`${this.member.name || this.member.email} has been signed out from all devices.`, {type: 'success'});
+            this.args.close(true);
+            return true;
+        } catch (e) {
+            this.notifications.showAPIError(e, {key: 'member.logout'});
+            this.args.close(false);
+            throw e;
+        }
+    }
+}
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-member-tier.js b/ghost/admin/app/components/modal-member-tier.js
index bc94dc2d1ee..733d08e3e6b 100644
--- a/ghost/admin/app/components/modal-member-tier.js
+++ b/ghost/admin/app/components/modal-member-tier.js
@@ -1,8 +1,8 @@
 import ModalComponent from 'ghost-admin/components/modal-base';
 import moment from 'moment-timezone';
 import {action} from '@ember/object';
+import {didCancel, task} from 'ember-concurrency';
 import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
 export default class ModalMemberTier extends ModalComponent {
@@ -77,7 +77,16 @@ export default class ModalMemberTier extends ModalComponent {
     @action
     setup() {
         this.loadingTiers = true;
-        this.fetchTiers.perform();
+        try {
+            this.fetchTiers.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
+        }
     }
 
     @action
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-post-history.hbs b/ghost/admin/app/components/modal-post-history.hbs
index 4795ea81032..f7f8ab1261c 100644
--- a/ghost/admin/app/components/modal-post-history.hbs
+++ b/ghost/admin/app/components/modal-post-history.hbs
@@ -1,6 +1,6 @@
 {{!-- template-lint-disable no-invalid-interactive --}}
 <div class="gh-post-history" {{did-insert this.onInsert}}>
-    <div class="gh-post-history-main">
+    <div class="gh-post-history-main" data-test-post-history-preview>
         <div class="gh-koenig-editor-pane flex flex-column mih-100">
             {{#if this.selectedHTML}}
                 {{{this.selectedHTML}}}
@@ -9,15 +9,32 @@
                 <div class="gh-editor-feature-image-container">
                     <div class="gh-editor-feature-image">
                         {{#if this.selectedRevision.feature_image}}
-                            <img src="{{this.selectedRevision.feature_image}}">
+                            <img
+                                src={{this.selectedRevision.feature_image}}
+                                alt={{this.selectedRevision.feature_image_alt}}
+                                data-test-post-history-preview-feature-image
+                            >
                         {{/if}}
                         {{#if this.selectedRevision.feature_image_caption}}
-                            <p>{{{this.selectedRevision.feature_image_caption}}}</p>
+                            <p data-test-post-history-preview-feature-image-caption>{{{this.selectedRevision.feature_image_caption}}}</p>
                         {{/if}}
                     </div>
                 </div>
-                <div class="gh-editor-title">{{this.currentTitle}}</div>
-                <KoenigLexicalEditor @lexical={{this.selectedRevision.lexical}} @cardConfig={{this.cardConfig}} @registerAPI={{action "registerSelectedEditorApi"}}/>
+                <div class="gh-editor-title" data-test-post-history-preview-title>
+                    {{this.currentTitle}}
+                </div>
+                {{#if (feature "editorExcerpt")}}
+                    <div class="gh-editor-excerpt" data-test-post-history-preview-excerpt>
+                        {{this.selectedRevision.custom_excerpt}}
+                    </div>
+                    <hr class="gh-editor-title-divider">
+                {{/if}}
+                <KoenigLexicalEditor
+                    @lexical={{this.selectedRevision.lexical}}
+                    @cardConfig={{this.cardConfig}}
+                    @registerAPI={{this.registerSelectedEditorApi}}
+                    @registerSecondaryAPI={{this.registerSecondarySelectedEditorApi}}
+                />
             </div>
         </div>
     </div>
@@ -28,7 +45,8 @@
                     aria-label="Close meta data panel"
                     class="back settings-menu-header-action"
                     data-test-button="close-psm-subview"
-                    type="button" {{action "closeModal"}}
+                    type="button"
+                    {{on "click" this.closeModal}}
                     {{on "mousedown" (optional this.noop)}}
                 >
                     {{svg-jar "arrow-left"}}
@@ -39,19 +57,19 @@
             <div class="settings-menu-content">
                 <ul class="nav-list">
                     {{#each this.revisionList as |revision index|}}
-                    <li class="nav-list-item {{if revision.selected "selected" ""}}">
-                        <button type="button" {{action "handleClick" index}}>
+                    <li class="nav-list-item {{if revision.selected "selected" ""}}" data-test-revision-item={{index}}>
+                        <button type="button" {{on "click" (fn this.handleClick index)}} data-test-button="preview-revision">
                             <div class="flex items-center">
                                 <span class="gh-post-history-version">{{gh-format-post-time revision.createdAt format="D MMM YYYY, HH:mm"}}{{this.timezone}}</span>
                                 {{#if revision.latest}}
-                                    <span class="gh-post-history-version-tag current">Latest</span>
+                                    <span class="gh-post-history-version-tag current" data-test-revision-latest>Latest</span>
                                 {{/if}}
 
                                 {{#if revision.new_publish}}
-                                    <span class="gh-post-history-version-tag published">Published</span>
+                                    <span class="gh-post-history-version-tag published" data-test-revision-published>Published</span>
                                 {{/if}}
                                 {{#if (eq revision.reason "unpublished")}}
-                                    <span class="gh-post-history-version-tag unpublished">Unpublished</span>
+                                    <span class="gh-post-history-version-tag unpublished" data-test-revision-unpublished>Unpublished</span>
                                 {{/if}}
 
                             </div>
@@ -67,6 +85,7 @@
                                 type="button"
                                 class="gh-post-history-version-restore"
                                 {{on "click" (fn this.restoreRevision index)}}
+                                data-test-button="restore-revision"
                             >
                                 <span>Restore</span>
                             </button>
diff --git a/ghost/admin/app/components/modal-post-history.js b/ghost/admin/app/components/modal-post-history.js
index 54b546ed639..4dfa987e2e7 100644
--- a/ghost/admin/app/components/modal-post-history.js
+++ b/ghost/admin/app/components/modal-post-history.js
@@ -3,6 +3,7 @@ import RestoreRevisionModal from '../components/modals/restore-revision';
 import {action, set} from '@ember/object';
 import {inject as service} from '@ember/service';
 import {tracked} from '@glimmer/tracking';
+import {waitFor} from '@ember/test-waiters';
 
 function checkFinishedRendering(element, done) {
     let last = element.innerHTML;
@@ -30,6 +31,7 @@ export default class ModalPostHistory extends Component {
         super(...arguments);
         this.post = this.args.model.post;
         this.editorAPI = this.args.model.editorAPI;
+        this.secondaryEditorAPI = this.args.model.secondaryEditorAPI;
         this.toggleSettingsMenu = this.args.model.toggleSettingsMenu;
     }
 
@@ -50,6 +52,10 @@ export default class ModalPostHistory extends Component {
                 latest: index === 0,
                 createdAt: revision.get('createdAt'),
                 title: revision.get('title'),
+                // custom_excerpt is a new field that was added to the post-revision model
+                // that may not have been populated for older revisions. To cover that case
+                // we revert to the current post's customExcerpt to avoid losing data when restoring.
+                custom_excerpt: revision.get('customExcerpt') ?? this.post.customExcerpt,
                 feature_image: revision.get('featureImage'),
                 feature_image_alt: revision.get('featureImageAlt'),
                 feature_image_caption: revision.get('featureImageCaption'),
@@ -84,9 +90,11 @@ export default class ModalPostHistory extends Component {
     }
 
     @action
-    handleClick(index) {
+    @waitFor
+    async handleClick(index) {
         this.selectedRevisionIndex = index;
-        this.updateSelectedHTML();
+        // async with @waitFor so tests will wait for the action to complete
+        await this.updateSelectedHTML();
     }
 
     @action
@@ -94,6 +102,11 @@ export default class ModalPostHistory extends Component {
         this.selectedEditor = api;
     }
 
+    @action
+    registerSecondarySelectedEditorApi(api) {
+        this.secondarySelectedEditor = api;
+    }
+
     @action
     registerComparisonEditorApi(api) {
         this.comparisonEditor = api;
@@ -123,6 +136,7 @@ export default class ModalPostHistory extends Component {
             updateEditor: () => {
                 const state = this.editorAPI.editorInstance.parseEditorState(revision.lexical);
                 this.editorAPI.editorInstance.setEditorState(state);
+                this.secondaryEditorAPI.editorInstance.setEditorState(state);
             },
             closePostHistoryModal: () => {
                 this.closeModal();
@@ -138,28 +152,31 @@ export default class ModalPostHistory extends Component {
     }
 
     updateSelectedHTML() {
-        if (this.selectedEditor) {
-            let selectedState = this.selectedEditor.editorInstance.parseEditorState(this.selectedRevision.lexical);
+        return new Promise((resolve) => {
+            if (this.selectedEditor) {
+                let selectedState = this.selectedEditor.editorInstance.parseEditorState(this.selectedRevision.lexical);
 
-            this.selectedEditor.editorInstance.setEditorState(selectedState);
-        }
+                this.selectedEditor.editorInstance.setEditorState(selectedState);
+            }
 
-        let current = document.querySelector('.gh-post-history-hidden-lexical.current');
+            let current = document.querySelector('.gh-post-history-hidden-lexical.current');
 
-        let currentDone = false;
+            let currentDone = false;
 
-        let updateIfDone = () => {
-            if (currentDone) {
-                this.selectedHTML = this.stripInitialPlaceholder(current.innerHTML);
-            }
-        };
+            let updateIfDone = () => {
+                if (currentDone) {
+                    this.selectedHTML = this.stripInitialPlaceholder(current.innerHTML);
+                }
+                resolve();
+            };
 
-        checkFinishedRendering(current, () => {
-            current.querySelectorAll('[contenteditable]').forEach((el) => {
-                el.setAttribute('contenteditable', false);
+            checkFinishedRendering(current, () => {
+                current.querySelectorAll('[contenteditable]').forEach((el) => {
+                    el.setAttribute('contenteditable', false);
+                });
+                currentDone = true;
+                updateIfDone();
             });
-            currentDone = true;
-            updateIfDone();
         });
     }
 }
diff --git a/ghost/admin/app/components/modal-post-success.hbs b/ghost/admin/app/components/modal-post-success.hbs
new file mode 100644
index 00000000000..91b5c17a290
--- /dev/null
+++ b/ghost/admin/app/components/modal-post-success.hbs
@@ -0,0 +1,197 @@
+<div class="modal-content" data-test-publish-flow="complete">
+    <header class="modal-header">
+        <h1 data-test-complete-title>
+            {{#if this.post.isScheduled}}
+                <span>All set!</span>
+            {{else}}
+                <span>
+                    {{if this.showPostCount "Boom! It's out there." "Your post is published."}}
+                </span>
+                <span>
+                    {{#if this.post.isPost}}
+                        {{#if this.post.emailOnly}}
+                            Your email has been sent.
+                        {{else if this.showPostCount}}
+                            That's {{format-number this.postCount}} {{gh-pluralize this.postCount "post" without-count=true}} published.
+                        {{else}}
+                            Spread the word!
+                        {{/if}}
+                    {{else}}
+                        Your page is published.
+                    {{/if}}
+                </span>
+            {{/if}}
+        </h1>
+    </header>
+
+    {{#if (or (not this.post.isPublished) this.post.emailOnly (or this.post.hasEmail this.post.willEmail))}}
+        <div class="modal-body email">
+            {{#if this.post.isSent}}
+                It
+            {{else if this.post.emailOnly}}
+                Your email
+            {{else}}
+                Your {{this.post.displayName}}
+            {{/if}}
+            {{if this.post.isScheduled "will be" "was"}}
+            {{#if this.post.emailOnly}}
+                sent to
+            {{else if (or this.post.hasEmail this.post.willEmail)}}
+                published on your site and sent to
+            {{else}}
+                published on your site
+            {{/if}}
+
+            {{#if (or this.post.hasEmail this.post.willEmail)}}
+                {{#let (members-count-fetcher query=(hash filter=this.post.fullRecipientFilter)) as |countFetcher|}}
+                    <strong class="nowrap">
+                        {{if (eq @recipientType "all") "all"}}
+                        {{format-number countFetcher.count}}
+                        {{if (not-eq @recipientType "all") @recipientType}}
+                        {{gh-pluralize countFetcher.count "subscriber" without-count=true}}
+                    </strong>
+                    of <strong>{{this.post.newsletter.name}}</strong>,
+                {{/let}}
+            {{/if}}
+
+            {{#let (moment-site-tz this.post.publishedAtUTC) as |scheduledAt|}}
+                {{#if (is-moment-today scheduledAt)}}
+                    <strong class="nowrap">today</strong>
+                {{else}}
+                    on <strong class="nowrap">{{moment-format scheduledAt "MMMM Do"}}</strong>
+                {{/if}}
+                at <strong class="nowrap">{{moment-format scheduledAt "HH:mm"}}.</strong>
+            {{/let}}
+        </div>
+    {{/if}}
+
+    {{#if this.post.emailOnly}}
+        <div class="gh-post-card">
+            {{#if (or this.post.featureImage this.post.twitterImage this.post.ogImage)}}
+                <figure class="modal-image">
+                    <img src="{{or this.post.featureImage this.post.twitterImage this.post.ogImage}}" alt="{{this.post.title}}">
+                </figure>
+            {{/if}}
+
+            <div class="modal-body">
+                <h2>{{this.post.title}}</h2>
+                {{#if this.post.excerpt}}
+                    <p class="post-excerpt">{{this.post.excerpt}}</p>
+                {{/if}}
+
+                <div class="gh-post-details">
+                {{#if (get-setting "icon")}}
+                    <div class="gh-post-bookmark-site-icon">
+                        <img src={{get-setting "icon"}} alt="" role="presentation" />
+                    </div>
+                {{/if}}
+
+                {{#if (get-setting "title")}}
+                    <div class="gh-post-bookmark-site-name">{{get-setting "title"}}</div>
+                {{/if}}
+                    <div class="gh-post-bookmark-authors">{{post-author-names this.post}}</div>
+                </div>
+            </div>
+        </div>
+        <footer class="modal-footer">
+            <button
+                class="gh-btn gh-btn-primary dismiss"
+                type="button"
+                {{on "click" @close}}
+                {{on "mousedown" (optional this.noop)}}
+            >
+                <span>Close</span>
+            </button>
+        </footer>
+    {{/if}}
+
+    <button type="button" class="close" title="Close" {{on "click" @close}} data-test-button="close-publish-flow">{{svg-jar "close"}}<span class="hidden">Close</span></button>
+
+    {{#unless this.post.emailOnly}}
+    <a href="{{this.post.url}}" target="_blank" rel="noopener noreferrer" title="View post: {{this.post.title}}" data-test-complete-bookmark>
+        <div class="gh-post-card">
+            {{#if this.post.featureImage}}
+                <figure class="modal-image">
+                    <img src="{{this.post.featureImage}}" alt="{{this.post.title}}">
+                </figure>
+            {{else if this.post.twitterImage}}
+                <figure class="modal-image">
+                    <img src="{{this.post.twitterImage}}" alt="{{this.post.title}}">
+                </figure>
+            {{else if this.post.ogImage}}
+                <figure class="modal-image">
+                    <img src="{{this.post.ogImage}}" alt="{{this.post.title}}">
+                </figure>
+            {{/if}}
+
+            <div class="modal-body">
+                <h2>{{this.post.title}}</h2>
+                {{#if this.post.excerpt}}
+                    <p class="post-excerpt">{{this.post.excerpt}}</p>
+                {{/if}}
+
+                <div class="gh-post-details">
+                {{#if (get-setting "icon")}}
+                    <div class="gh-post-bookmark-site-icon">
+                        <img src={{get-setting "icon"}} alt="" role="presentation" />
+                    </div>
+                {{/if}}
+
+                {{#if (get-setting "title")}}
+                    <div class="gh-post-bookmark-site-name">{{get-setting "title"}}</div>
+                {{/if}}
+                    <div class="gh-post-bookmark-authors">{{post-author-names this.post}}</div>
+                </div>
+            </div>
+        </div>
+    </a>
+
+    <footer class="modal-footer">
+        {{#if (and this.post.isPublished (not this.post.emailOnly))}}
+            <div class="share-buttons">
+                <a href="https://twitter.com/intent/tweet?text={{this.encodedTitle}}%0A{{this.encodedUrl}}" class="gh-btn twitter" target="_blank" rel="noopener noreferrer" title="Share on Twitter">
+                    <span>{{svg-jar "social-x"}}</span>
+                </a>
+                <a href="https://threads.net/intent/post?text={{this.encodedTitleAndUrl}}" class="gh-btn threads" target="_blank" rel="noopener noreferrer" title="Share on Threads">
+                    <span>{{svg-jar "social-threads"}}</span>
+                </a>
+                <a href="https://www.facebook.com/sharer/sharer.php?u={{this.encodedUrl}}" class="gh-btn facebook" target="_blank" rel="noopener noreferrer" title="Share on Facebook">
+                    <span>{{svg-jar "social-facebook"}}</span>
+                </a>
+                <a href="http://www.linkedin.com/shareArticle?mini=true&title={{this.encodedTitle}}&url={{this.encodedUrl}}" class="gh-btn linkedin" target="_blank" rel="noopener noreferrer" title="Share on LinkedIn">
+                    <span>{{svg-jar "social-linkedin"}}</span>
+                </a>
+            </div>
+                <GhTaskButton
+                    @showIcon={{true}}
+                    @idleIcon="link"
+                    @buttonText="Copy link"
+                    @title="Copy link"
+                    @task={{this.handleCopyLink}}
+                    @successText="Link copied"
+                    @class="gh-btn gh-btn-primary gh-btn-icon copy-link" />
+        {{else}}
+            {{#if (or this.post.isScheduled this.post.emailOnly)}}
+                {{#if this.post.isScheduled}}
+                    <GhTaskButton
+                        @buttonText="Copy preview link"
+                        @task={{this.handleCopyPreviewLink}}
+                        @showIcon={{true}}
+                        @idleIcon="link"
+                        @successText="Preview link copied"
+                        @class="gh-btn gh-btn-icon copy-preview-link" />
+                {{/if}}
+                <button
+                    class="gh-btn gh-btn-primary dismiss"
+                    type="button"
+                    {{on "click" @close}}
+                    {{on "mousedown" (optional this.noop)}}
+                >
+                    <span>Close</span>
+                </button>
+            {{/if}}
+        {{/if}}
+    </footer>
+    {{/unless}}
+</div>
+
diff --git a/ghost/admin/app/components/modal-post-success.js b/ghost/admin/app/components/modal-post-success.js
new file mode 100644
index 00000000000..0e58369a293
--- /dev/null
+++ b/ghost/admin/app/components/modal-post-success.js
@@ -0,0 +1,82 @@
+import Component from '@glimmer/component';
+import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
+import {capitalize} from '@ember/string';
+import {inject as service} from '@ember/service';
+import {task, timeout} from 'ember-concurrency';
+
+export default class PostSuccessModal extends Component {
+    @service store;
+    @service router;
+    @service notifications;
+
+    static modalOptions = {
+        className: 'fullscreen-modal-wide fullscreen-modal-action modal-post-success',
+        backgroundBlur: true
+    };
+
+    get post() {
+        return this.args.data.post;
+    }
+
+    get postCount() {
+        return this.args.data.postCount;
+    }
+
+    get showPostCount() {
+        return this.args.data.showPostCount;
+    }
+
+    get encodedTitle() {
+        return encodeURIComponent(this.post.title);
+    }
+
+    get encodedUrl() {
+        return encodeURIComponent(this.post.url);
+    }
+
+    get encodedTitleAndUrl() {
+        return encodeURIComponent(`${this.post.title} ${this.post.url}`);
+    }
+
+    @task
+    *handleCopyLink() {
+        copyTextToClipboard(this.post.url);
+        yield timeout(1000);
+        return true;
+    }
+
+    @task
+    *handleCopyPreviewLink() {
+        copyTextToClipboard(this.post.previewUrl);
+        yield timeout(1000);
+        return true;
+    }
+
+    @task
+    *revertToDraftTask() {
+        const currentPost = this.post;
+        const originalStatus = currentPost.status;
+        const originalPublishedAtUTC = currentPost.publishedAtUTC;
+
+        try {
+            if (currentPost.isScheduled) {
+                currentPost.publishedAtUTC = null;
+            }
+
+            currentPost.status = 'draft';
+            currentPost.emailOnly = false;
+
+            yield currentPost.save();
+            this.router.transitionTo('lexical-editor.edit', 'post', currentPost.id);
+
+            const postType = capitalize(currentPost.displayName);
+            this.notifications.showNotification(`${postType} reverted to a draft.`, {type: 'success'});
+
+            return true;
+        } catch (e) {
+            currentPost.status = originalStatus;
+            currentPost.publishedAtUTC = originalPublishedAtUTC;
+            throw e;
+        }
+    }
+}
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/delete-post.hbs b/ghost/admin/app/components/modals/delete-post.hbs
index 4adf86b6d2b..8985821157b 100644
--- a/ghost/admin/app/components/modals/delete-post.hbs
+++ b/ghost/admin/app/components/modals/delete-post.hbs
@@ -18,6 +18,7 @@
             @successText="Deleted"
             @task={{this.deletePostTask}}
             @class="gh-btn gh-btn-red gh-btn-icon"
+            data-test-button="delete-post-confirm"
         />
     </div>
 </div>
\ No newline at end of file
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/editor/confirm-leave.hbs b/ghost/admin/app/components/modals/editor/confirm-leave.hbs
index b41d9098576..dc088fb052e 100644
--- a/ghost/admin/app/components/modals/editor/confirm-leave.hbs
+++ b/ghost/admin/app/components/modals/editor/confirm-leave.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content" data-test-modal="unsaved-post-changes">
     <header class="modal-header">
         <h1>Are you sure you want to leave this page?</h1>
     </header>
@@ -14,8 +14,8 @@
     </div>
 
     <div class="modal-footer">
-        <button class="gh-btn" type="button" {{on "click" @close}}><span>Stay</span></button>
-        <button class="gh-btn gh-btn-red" type="button" {{on "click" (fn @close true)}}><span>Leave</span></button>
+        <button class="gh-btn" data-test-stay-button type="button" {{on "click" @close}}><span>Stay</span></button>
+        <button class="gh-btn gh-btn-red" data-test-leave-button type="button" {{on "click" (fn @close true)}}><span>Leave</span></button>
     </div>
 
 </div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/email-preview.hbs b/ghost/admin/app/components/modals/email-preview.hbs
index 1b14a01e920..62b8b697a67 100644
--- a/ghost/admin/app/components/modals/email-preview.hbs
+++ b/ghost/admin/app/components/modals/email-preview.hbs
@@ -20,7 +20,7 @@
                 <div class="gh-pe-mobile-screen">
                     <div class="gh-pe-emailclient-sender">
                         <p>
-                            <span class="strong">{{or this.newsletter.senderName this.settings.title}}</span> &lt;{{full-email-address (or this.newsletter.senderEmail "noreply")}}&gt;
+                            <span class="strong">{{or this.newsletter.senderName this.settings.title}}</span> &lt;{{sender-email-address this.newsletter.senderEmail}}&gt;
                         </p>
                         <p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
                     </div>
@@ -35,7 +35,7 @@
             <div class="gh-pe-emailclient-mockup">
                 <div class="gh-pe-emailclient-sender">
                     <p>
-                        <span class="strong">{{or this.newsletter.senderName this.settings.title}}</span> &lt;{{full-email-address (or this.newsletter.senderEmail "noreply")}}&gt;
+                        <span class="strong">{{or this.newsletter.senderName this.settings.title}}</span> &lt;{{sender-email-address this.newsletter.senderEmail}}&gt;
                     </p>
                     <p><span class="dark">To:</span> Jamie Larson &lt;jamie@example.com&gt;</p>
                 </div>
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/restore-revision.hbs b/ghost/admin/app/components/modals/restore-revision.hbs
index d9b319c219e..01e7336dfbc 100644
--- a/ghost/admin/app/components/modals/restore-revision.hbs
+++ b/ghost/admin/app/components/modals/restore-revision.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content" {{on-key "Enter" (perform this.restoreRevisionTask)}}>
+<div class="modal-content" {{on-key "Enter" (perform this.restoreRevisionTask)}} data-test-modal="restore-revision">
     <header class="modal-header">
         <h1>{{this.title}}</h1>
     </header>
@@ -15,6 +15,7 @@
             @successText="Restored"
             @task={{this.restoreRevisionTask}}
             @class="gh-btn gh-btn-black gh-btn-icon"
+            data-test-button="restore"
         />
     </div>
 </div>
diff --git a/ghost/admin/app/components/modals/restore-revision.js b/ghost/admin/app/components/modals/restore-revision.js
index fcb576b2ea9..81981d2eb14 100644
--- a/ghost/admin/app/components/modals/restore-revision.js
+++ b/ghost/admin/app/components/modals/restore-revision.js
@@ -4,6 +4,7 @@ import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default class RestoreRevisionModal extends Component {
+    @service feature;
     @service notifications;
 
     get title() {
@@ -34,13 +35,20 @@ export default class RestoreRevisionModal extends Component {
 
             post.lexical = revision.lexical;
             post.title = revision.title;
+            post.featureImage = revision.feature_image;
+            post.featureImageAlt = revision.feature_image_alt;
+            post.featureImageCaption = revision.feature_image_caption;
+
+            if (this.feature.editorExcerpt) {
+                post.customExcerpt = revision.custom_excerpt;
+            }
 
             yield post.save({adapterOptions: {saveRevision: true}});
 
             updateTitle();
             updateEditor();
 
-            this.notifications.showNotification('Revision successfully restored.', {type: 'success'});
+            this.notifications.showNotification('Revision restored.', {type: 'success'});
 
             closePostHistoryModal();
 
diff --git a/ghost/admin/app/components/modals/search.hbs b/ghost/admin/app/components/modals/search.hbs
index 9b2a32ece81..f10c91864f9 100644
--- a/ghost/admin/app/components/modals/search.hbs
+++ b/ghost/admin/app/components/modals/search.hbs
@@ -1,4 +1,4 @@
-<div class="modal-content">
+<div class="modal-content" data-test-modal="search">
     <div class="gh-nav-search-modal" {{on "click" this.focusFirstInput}}>
         <GhSearchInput class="gh-nav-search-input" @onSelected={{@close}} />
         <div class="gh-search-tips">Open with Ctrl/⌘ + K</div>
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/modals/whats-new.hbs b/ghost/admin/app/components/modals/whats-new.hbs
new file mode 100644
index 00000000000..7a027d0f65e
--- /dev/null
+++ b/ghost/admin/app/components/modals/whats-new.hbs
@@ -0,0 +1,24 @@
+<div class="modal-content">
+    <h1 class="gh-whasnew-modal-title">What's new?</h1>
+    <section class="gh-whatsnew-modal-entries" {{did-insert (perform this.whatsNew.updateLastSeen)}}>
+        {{#each this.whatsNew.entries as |entry|}}
+            <a class="gh-whatsnew-modal-entry" href={{entry.url}} target="_blank" rel="noopener noreferrer">
+                {{#if entry.feature_image}}
+                    <img class="gh-whatsnew-modal-entry-featureimage" src={{entry.feature_image}} alt={{entry.title}}>
+                {{/if}}
+                <div class="gh-whatsnew-modal-entrycontent">
+                    <h2>{{entry.title}}</h2>
+                    {{#if entry.custom_excerpt}}
+                        <p>{{entry.custom_excerpt}}</p>
+                    {{/if}}
+                    <span>{{moment-format entry.published_at "DD MMMM YYYY"}}</span>
+                </div>
+            </a>
+        {{/each}}
+    </section>
+
+    <div class="gh-whatsnew-modal-footer">
+        <a href="https://ghost.org/changelog/#/portal/signup" class="gh-btn" type="button" target="_blank" rel="noopener noreferrer"><span>Turn on notifications</span></a>
+        <a class="gh-btn gh-btn-primary" href="https://ghost.org/changelog" target="_blank" rel="noopener noreferrer"><span>All updates &rarr;</span></a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/modals/whats-new.js b/ghost/admin/app/components/modals/whats-new.js
new file mode 100644
index 00000000000..c82ae6d62ac
--- /dev/null
+++ b/ghost/admin/app/components/modals/whats-new.js
@@ -0,0 +1,15 @@
+import Component from '@glimmer/component';
+import {inject as service} from '@ember/service';
+
+export default class WhatsNewFeatured extends Component {
+    @service whatsNew;
+
+    static modalOptions = {
+        className: 'fullscreen-modal-action fullscreen-modal-wide fullscreen-modal-whatsnew'
+    };
+
+    willDestroy() {
+        super.willDestroy(...arguments);
+        this.whatsNew.seen();
+    }
+}
diff --git a/ghost/admin/app/components/offers/segment-select.js b/ghost/admin/app/components/offers/segment-select.js
index fa535d9177b..4adb35a740c 100644
--- a/ghost/admin/app/components/offers/segment-select.js
+++ b/ghost/admin/app/components/offers/segment-select.js
@@ -69,7 +69,7 @@ export default class OffersSegmentSelect extends Component {
 
         // fetch all offers with count
         // TODO: add `include: 'count.members` to query once API supports
-        const offers = yield this.store.query('offer', {filter: 'status:active'});
+        const offers = yield this.store.query('offer', {limit: 'all'});
         this.offers = offers;
         if (offers.length > 0) {
             const offersGroup = {
diff --git a/ghost/admin/app/components/posts-list/context-menu.hbs b/ghost/admin/app/components/posts-list/context-menu.hbs
index 36e8077e695..a7277b4161c 100644
--- a/ghost/admin/app/components/posts-list/context-menu.hbs
+++ b/ghost/admin/app/components/posts-list/context-menu.hbs
@@ -1,11 +1,26 @@
 <ul class="gh-posts-context-menu dropdown-menu dropdown-triangle-top-left">
 
     {{#if this.canUnpublishSelection}}
+        {{#if this.canCopySelection}}
+            <li>
+                <button class="mr2" type="button" {{on "click" this.copyPostLink}}>
+                    <span>{{svg-jar "link"}}Copy link to post</span>
+                </button>
+            </li>
+        {{/if}}
         <li>
             <button class="mr2" type="button" {{on "click" this.unpublishPosts}}>
                 <span>{{svg-jar "undo"}}Unpublish</span>
             </button>
         </li>
+    {{else}}
+        {{#if this.canCopySelection}}
+            <li>
+                <button class="mr2" type="button" {{on "click" this.copyPreviewLink}}>
+                    <span>{{svg-jar "link"}}Copy preview link</span>
+                </button>
+            </li>
+        {{/if}}
     {{/if}}
     {{#if this.canFeatureSelection}}
         {{#if this.shouldFeatureSelection }}
diff --git a/ghost/admin/app/components/posts-list/context-menu.js b/ghost/admin/app/components/posts-list/context-menu.js
index 3faa8bc56de..8bac60d8b53 100644
--- a/ghost/admin/app/components/posts-list/context-menu.js
+++ b/ghost/admin/app/components/posts-list/context-menu.js
@@ -3,11 +3,12 @@ import Component from '@glimmer/component';
 import DeletePostsModal from './modals/delete-posts';
 import EditPostsAccessModal from './modals/edit-posts-access';
 import UnpublishPostsModal from './modals/unpublish-posts';
+import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
 import nql from '@tryghost/nql';
 import {action} from '@ember/object';
 import {capitalizeFirstLetter} from 'ghost-admin/helpers/capitalize-first-letter';
 import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
+import {task, timeout} from 'ember-concurrency';
 
 /**
  * @tryghost/tpl doesn't work in admin yet (Safari)
@@ -21,28 +22,34 @@ function tpl(str, data) {
 
 const messages = {
     deleted: {
-        single: '{Type} deleted successfully',
-        multiple: '{count} {type}s deleted successfully'
+        single: '{Type} deleted',
+        multiple: '{count} {type}s deleted'
     },
     unpublished: {
-        single: '{Type} successfully reverted to a draft',
-        multiple: '{count} {type}s successfully reverted to drafts'
+        single: '{Type} reverted to a draft',
+        multiple: '{count} {type}s reverted to drafts'
     },
     accessUpdated: {
-        single: '{Type} access successfully updated',
-        multiple: '{Type} access successfully updated for {count} {type}s'
+        single: '{Type} access updated',
+        multiple: '{Type} access updated for {count} {type}s'
     },
     tagsAdded: {
-        single: 'Tags added successfully',
-        multiple: 'Tags added successfully to {count} {type}s'
+        single: 'Tags added',
+        multiple: 'Tags added to {count} {type}s'
     },
     tagAdded: {
-        single: 'Tag added successfully',
-        multiple: 'Tag added successfully to {count} {type}s'
+        single: 'Tag added',
+        multiple: 'Tag added to {count} {type}s'
     },
     duplicated: {
-        single: '{Type} duplicated successfully',
-        multiple: '{count} {type}s duplicated successfully'
+        single: '{Type} duplicated',
+        multiple: '{count} {type}s duplicated'
+    },
+    copiedPostUrl: {
+        single: 'Post link copied'
+    },
+    copiedPreviewUrl: {
+        single: 'Preview link copied'
     }
 };
 
@@ -74,6 +81,16 @@ export default class PostsContextMenu extends Component {
         return tpl(messages[type].multiple, {count: this.selectionList.count, type: this.type, Type: capitalizeFirstLetter(this.type)});
     }
 
+    @action
+    async copyPostLink() {
+        this.menu.performTask(this.copyPostLinkTask);
+    }
+
+    @action
+    async copyPreviewLink() {
+        this.menu.performTask(this.copyPreviewLinkTask);
+    }
+
     @action
     async featurePosts() {
         this.menu.performTask(this.featurePostsTask);
@@ -216,11 +233,14 @@ export default class PostsContextMenu extends Component {
         yield this.performBulkDestroy();
         this.notifications.showNotification(this.#getToastMessage('deleted'), {type: 'success'});
 
-        const remainingModels = this.selectionList.infinityModel.content.filter((model) => {
-            return !deletedModels.includes(model);
-        });
-        // Deleteobjects method from infintiymodel is broken for all models except the first page, so we cannot use this
-        this.infinity.replace(this.selectionList.infinityModel, remainingModels);
+        for (const key in this.selectionList.infinityModel) {
+            const remainingModels = this.selectionList.infinityModel[key].content.filter((model) => {
+                return !deletedModels.includes(model);
+            });
+            // Deleteobjects method from infintiymodel is broken for all models except the first page, so we cannot use this
+            this.infinity.replace(this.selectionList.infinityModel[key], remainingModels);
+        }
+        
         this.selectionList.clearSelection({force: true});
         return true;
     }
@@ -247,9 +267,7 @@ export default class PostsContextMenu extends Component {
             }
         }
 
-        // Remove posts that no longer match the filter
         this.updateFilteredPosts();
-
         return true;
     }
 
@@ -282,14 +300,16 @@ export default class PostsContextMenu extends Component {
             ]
         });
 
-        const remainingModels = this.selectionList.infinityModel.content.filter((model) => {
-            if (!updatedModels.find(u => u.id === model.id)) {
-                return true;
-            }
-            return filterNql.queryJSON(model.serialize({includeId: true}));
-        });
-        // Deleteobjects method from infintiymodel is broken for all models except the first page, so we cannot use this
-        this.infinity.replace(this.selectionList.infinityModel, remainingModels);
+        for (const key in this.selectionList.infinityModel) {
+            const remainingModels = this.selectionList.infinityModel[key].content.filter((model) => {
+                if (!updatedModels.find(u => u.id === model.id)) {
+                    return true;
+                }
+                return filterNql.queryJSON(model.serialize({includeId: true}));
+            });
+            // Deleteobjects method from infintiymodel is broken for all models except the first page, so we cannot use this
+            this.infinity.replace(this.selectionList.infinityModel[key], remainingModels);
+        }
 
         this.selectionList.clearUnavailableItems();
     }
@@ -386,8 +406,10 @@ export default class PostsContextMenu extends Component {
             const data = result[this.type === 'post' ? 'posts' : 'pages'][0];
             const model = this.store.peekRecord(this.type, data.id);
 
-            // Update infinity list
-            this.selectionList.infinityModel.content.unshiftObject(model);
+            // Update infinity draft posts content - copied posts are always drafts
+            if (this.selectionList.infinityModel.draftInfinityModel) {
+                this.selectionList.infinityModel.draftInfinityModel.content.unshiftObject(model);
+            }
 
             // Show notification
             this.notifications.showNotification(this.#getToastMessage('duplicated'), {type: 'success'});
@@ -398,6 +420,22 @@ export default class PostsContextMenu extends Component {
         return true;
     }
 
+    @task
+    *copyPostLinkTask() {
+        copyTextToClipboard(this.selectionList.availableModels[0].url);
+        this.notifications.showNotification(this.#getToastMessage('copiedPostUrl'), {type: 'success'});
+        yield timeout(1000);
+        return true;
+    }
+
+    @task
+    *copyPreviewLinkTask() {
+        copyTextToClipboard(this.selectionList.availableModels[0].url);
+        this.notifications.showNotification(this.#getToastMessage('copiedPreviewUrl'), {type: 'success'});
+        yield timeout(1000);
+        return true;
+    }
+
     async performBulkDestroy() {
         const filter = this.selectionList.filter;
         let bulkUpdateUrl = this.ghostPaths.url.api(this.type === 'post' ? 'posts' : 'pages') + `?filter=${encodeURIComponent(filter)}`;
diff --git a/ghost/admin/app/components/posts-list/list-item.hbs b/ghost/admin/app/components/posts-list/list-item.hbs
index a3a21b58db7..fa1e1f54249 100644
--- a/ghost/admin/app/components/posts-list/list-item.hbs
+++ b/ghost/admin/app/components/posts-list/list-item.hbs
@@ -22,15 +22,17 @@
 
                         -
                     </span>
-                    <span class="gh-content-entry-date">
-                        {{#if this.isHovered}}
-                            {{gh-format-post-time @post.updatedAtUTC format="D MMM YYYY"}}
-                        {{else}}
-                            {{gh-format-post-time @post.updatedAtUTC draft=true}}
-                        {{/if}}
-                    </span>
+                    {{#if (or @post.isDraft @post.isScheduled)}}
+                        <span class="gh-content-entry-date" title="Updated {{gh-format-post-time @post.updatedAtUTC absolute=true}}">
+                            {{gh-format-post-time @post.updatedAtUTC absolute=true short=true}}
+                        </span>
+                    {{else}}
+                        <span class="gh-content-entry-date" title="Published {{gh-format-post-time @post.publishedAtUTC absolute=true}}">
+                            {{gh-format-post-time @post.publishedAtUTC absolute=true short=true}}
+                        </span>
+                    {{/if}}
                 </p>
-                <p class="gh-content-entry-status">
+                <p class="gh-content-entry-status" data-test-editor-post-status>
                     <span class="published">
                         Published
                         {{#if @post.hasEmail}}
@@ -72,17 +74,20 @@
                         {{/if}}
                         -
                     </span>
-                    <span class="gh-content-entry-date" {{on "mouseover" (fn (mut this.isDateHovered) true)}} {{on "mouseleave" (fn (mut this.isDateHovered) false)}}>
-                        {{gh-format-post-time @post.updatedAtUTC draft=true}}
-                        {{#if this.isDateHovered}}
-                            <span {{css-transition "anim-fade-in-scale"}}>on {{gh-format-post-time @post.updatedAtUTC format="D MMM YYYY"}}</span>
-                        {{/if}}
-                    </span>
+                    {{#if (or @post.isDraft @post.isScheduled)}}
+                        <span class="gh-content-entry-date" title="Updated {{gh-format-post-time @post.updatedAtUTC absolute=true}}">
+                            {{gh-format-post-time @post.updatedAtUTC absolute=true short=true}}
+                        </span>
+                    {{else}}
+                        <span class="gh-content-entry-date" title="Published {{gh-format-post-time @post.publishedAtUTC absolute=true}}">
+                            {{gh-format-post-time @post.publishedAtUTC absolute=true short=true}}
+                        </span>
+                    {{/if}}
                     {{!-- {{#if @post.lexical}}
                         <span class="gh-content-entry-date">– Lexical</span>
                     {{/if}} --}}
                 </p>
-                <p class="gh-content-entry-status">
+                <p class="gh-content-entry-status" data-test-editor-post-status>
                     {{#if @post.isScheduled}}
                         <span class="scheduled">
                             Scheduled
@@ -90,10 +95,14 @@
                                 <span class="schedule-details" {{css-transition "anim-fade-in-scale"}}>
                                     {{#if @post.emailOnly}}
                                         to be sent
+                                        {{this.scheduledText}} to {{humanize-recipient-filter @post.emailSegment}}
                                     {{else}}
                                         to be published {{if @post.newsletter "and sent "}}
+                                        {{this.scheduledText}}
+                                        {{#if @post.newsletter}}
+                                            to {{humanize-recipient-filter @post.emailSegment}}
+                                        {{/if}}
                                     {{/if}}
-                                    {{this.scheduledText}} to {{humanize-recipient-filter @post.emailSegment}}
                                 </span>
                             {{/if}}
                         </span>
diff --git a/ghost/admin/app/components/posts-list/list.hbs b/ghost/admin/app/components/posts-list/list.hbs
index 4755c76d624..c9cf59e3312 100644
--- a/ghost/admin/app/components/posts-list/list.hbs
+++ b/ghost/admin/app/components/posts-list/list.hbs
@@ -1,14 +1,39 @@
 <MultiList::List @model={{@list}} class="posts-list gh-list {{unless @model "no-posts"}} feature-memberAttribution" as |list| >
-    {{#each @model as |post|}}
-        <list.item @id={{post.id}} class="gh-posts-list-item-group">
-            <PostsList::ListItem
-                @post={{post}}
-                data-test-post-id={{post.id}}
-            />
-        </list.item>
+    {{!-- always order as scheduled, draft, remainder --}}
+    {{#if (or @model.scheduledInfinityModel (or @model.draftInfinityModel @model.publishedAndSentInfinityModel))}}
+        {{#if @model.scheduledInfinityModel}}
+            {{#each @model.scheduledInfinityModel as |post|}}
+                <list.item @id={{post.id}} class="gh-posts-list-item-group">
+                    <PostsList::ListItem
+                        @post={{post}}
+                        data-test-post-id={{post.id}}
+                    />
+                </list.item>
+            {{/each}}
+        {{/if}}
+        {{#if (and @model.draftInfinityModel (or (not @model.scheduledInfinityModel) (and @model.scheduledInfinityModel @model.scheduledInfinityModel.reachedInfinity)))}}
+            {{#each @model.draftInfinityModel as |post|}}
+                <list.item @id={{post.id}} class="gh-posts-list-item-group">
+                    <PostsList::ListItem
+                        @post={{post}}
+                        data-test-post-id={{post.id}}
+                    />
+                </list.item>
+            {{/each}}
+        {{/if}}
+        {{#if (and @model.publishedAndSentInfinityModel (and (or (not @model.scheduledInfinityModel) @model.scheduledInfinityModel.reachedInfinity) (or (not @model.draftInfinityModel) @model.draftInfinityModel.reachedInfinity)))}}
+            {{#each @model.publishedAndSentInfinityModel as |post|}}
+                <list.item @id={{post.id}} class="gh-posts-list-item-group">
+                    <PostsList::ListItem
+                        @post={{post}}
+                        data-test-post-id={{post.id}}
+                    />
+                </list.item>
+            {{/each}}
+        {{/if}}
     {{else}}
         {{yield}}
-    {{/each}}
+    {{/if}}
 </MultiList::List>
 
 {{!-- The currently selected item or items are passed to the context menu --}}
@@ -17,4 +42,4 @@
     as |menu|
 >
     <PostsList::ContextMenu @menu={{menu}} />
-</GhContextMenu>
+</GhContextMenu>
\ No newline at end of file
diff --git a/ghost/admin/app/components/posts-list/list.js b/ghost/admin/app/components/posts-list/list.js
index acf7d306878..84a730de21d 100644
--- a/ghost/admin/app/components/posts-list/list.js
+++ b/ghost/admin/app/components/posts-list/list.js
@@ -1,7 +1,66 @@
 import Component from '@glimmer/component';
+import PostSuccessModal from '../modal-post-success';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+import {tracked} from '@glimmer/tracking';
 
 export default class PostsList extends Component {
+    @service store;
+    @service modals;
+    @service feature;
+
+    @tracked postCount = 0;
+
+    latestScheduledPost = null;
+    latestPublishedPost = null;
+
+    constructor() {
+        super(...arguments);
+        this.checkPublishFlowModal();
+    }
+
+    async checkPublishFlowModal() {
+        if (localStorage.getItem('ghost-last-scheduled-post')) {
+            await this.getLatestScheduledPost.perform();
+            this.modals.open(PostSuccessModal, {
+                post: this.latestScheduledPost
+            });
+            localStorage.removeItem('ghost-last-scheduled-post');
+        }
+
+        if (localStorage.getItem('ghost-last-published-post')) {
+            await this.getlatestPublishedPost.perform();
+            await this.getPostCount.perform();
+            this.modals.open(PostSuccessModal, {
+                post: this.latestPublishedPost,
+                postCount: this.postCount,
+                showPostCount: true
+            });
+            localStorage.removeItem('ghost-last-published-post');
+        }
+    }
+
     get list() {
         return this.args.list;
     }
+
+    @task
+    *getLatestScheduledPost() {
+        const post = JSON.parse(localStorage.getItem('ghost-last-scheduled-post'));
+        const result = yield this.store.query(post.type, {filter: `id:${post.id}`, limit: 1});
+        this.latestScheduledPost = result.toArray()[0];
+    }
+
+    @task
+    *getlatestPublishedPost() {
+        const post = JSON.parse(localStorage.getItem('ghost-last-published-post'));
+        const result = yield this.store.query(post.type, {filter: `id:${post.id}`, limit: 1});
+        this.latestPublishedPost = result.toArray()[0];
+    }
+
+    @task
+    *getPostCount() {
+        const result = yield this.store.query('post', {filter: 'status:published', limit: 1, page: 1});
+        this.postCount = result.meta.pagination.total;
+    }
 }
diff --git a/ghost/admin/app/components/posts-list/selection-list.js b/ghost/admin/app/components/posts-list/selection-list.js
new file mode 100644
index 00000000000..c55f51d3a18
--- /dev/null
+++ b/ghost/admin/app/components/posts-list/selection-list.js
@@ -0,0 +1,263 @@
+import {tracked} from '@glimmer/tracking';
+
+export default class SelectionList {
+    @tracked selectedIds = new Set();
+    @tracked inverted = false;
+    @tracked lastSelectedId = null;
+    @tracked lastShiftSelectionGroup = new Set();
+
+    enabled = true;
+
+    /**
+     * The infinity model containing the list of posts.
+     * @type {Object}
+     * @property {InfinityModel} scheduledInfinityModel - The infinity model for scheduled posts.
+     * @property {InfinityModel} draftInfinityModel - The infinity model for draft posts.
+     * @property {InfinityModel} publishedAndSentInfinityModel - The infinity model for published and sent posts.
+     */
+    infinityModel;
+
+    #frozen = false;
+
+    /**
+     * When doing right click on an item, we temporarily select it, but want to clear it as soon as we close the context menu.
+     */
+    #clearOnNextUnfreeze = false;
+
+    constructor(infinityModel) {
+        this.infinityModel = infinityModel ?? {
+            draftInfinityModel: {
+                content: []
+            }
+        };
+    }
+
+    freeze() {
+        this.#frozen = true;
+    }
+
+    unfreeze() {
+        this.#frozen = false;
+        if (this.#clearOnNextUnfreeze) {
+            this.clearSelection();
+            this.#clearOnNextUnfreeze = false;
+        }
+    }
+
+    clearOnNextUnfreeze() {
+        this.#clearOnNextUnfreeze = true;
+    }
+
+    /**
+     * Returns an NQL filter for all items, not the selection
+     */
+    get allFilter() {
+        const models = this.infinityModel;
+        // grab filter from the first key in the infinityModel object (they should all be identical)
+        for (const key in models) {
+            return models[key].extraParams?.allFilter ?? '';
+        }
+        return '';
+    }
+
+    /**
+     * Returns an NQL filter for the current selection
+     */
+    get filter() {
+        if (this.inverted) {
+            if (this.allFilter) {
+                if (this.selectedIds.size === 0) {
+                    return this.allFilter;
+                }
+                return `(${this.allFilter})+id:-['${[...this.selectedIds].join('\',\'')}']`;
+            }
+            if (this.selectedIds.size === 0) {
+                // Select all
+                return '';
+            }
+            return `id:-['${[...this.selectedIds].join('\',\'')}']`;
+        }
+        if (this.selectedIds.size === 0) {
+            // Select nothing
+            return 'id:nothing';
+        }
+        // Only based on the ids
+        return `id:['${[...this.selectedIds].join('\',\'')}']`;
+    }
+
+    /**
+     * Create an empty copy
+     */
+    cloneEmpty() {
+        return new SelectionList(this.infinityModel);
+    }
+
+    /**
+     * Return a list of models that are already loaded in memory.
+     * Keep in mind that when using CMD + A, we don't have all items in memory!
+     */
+    get availableModels() {
+        const models = this.infinityModel;
+        const arr = [];
+        for (const key in models) {
+            for (const item of models[key].content) {
+                if (this.isSelected(item.id)) {
+                    arr.push(item);
+                }
+            }
+        }
+        return arr;
+    }
+
+    get first() {
+        return this.availableModels[0];
+    }
+
+    get isSingle() {
+        return this.selectedIds.size === 1 && !this.inverted;
+    }
+
+    get count() {
+        if (!this.inverted) {
+            return this.selectedIds.size;
+        }
+        
+        const models = this.infinityModel;
+        let total;
+        for (const key in models) {
+            total += models[key].meta?.pagination?.total;
+        }   
+        return Math.max((total ?? 0) - this.selectedIds.size, 1);
+    }
+
+    isSelected(id) {
+        if (this.inverted) {
+            return !this.selectedIds.has(id);
+        }
+        return this.selectedIds.has(id);
+    }
+
+    toggleItem(id) {
+        if (this.#frozen) {
+            return;
+        }
+        this.lastShiftSelectionGroup = new Set();
+
+        if (this.selectedIds.has(id)) {
+            this.selectedIds.delete(id);
+
+            if (!this.inverted) {
+                if (this.lastSelectedId === id) {
+                    this.lastSelectedId = null;
+                }
+            } else {
+                // Shift behaviour in inverted mode needs a review
+                this.lastSelectedId = id;
+            }
+        } else {
+            this.selectedIds.add(id);
+
+            if (!this.inverted) {
+                this.lastSelectedId = id;
+            } else {
+                // Shift behaviour in inverted mode needs a review
+                this.lastSelectedId = id;
+            }
+        }
+
+        // Force update
+        // eslint-disable-next-line no-self-assign
+        this.selectedIds = this.selectedIds;
+    }
+
+    clearUnavailableItems() {
+        const newSelection = new Set();
+        const models = this.infinityModel;
+        for (const key in models) {
+            for (const item of models[key].content) {
+                if (this.selectedIds.has(item.id)) {
+                    newSelection.add(item.id);
+                }
+            }
+        }
+        this.selectedIds = newSelection;
+    }
+
+    /**
+     * Select all items between the last selection or the first one if none
+     */
+    shiftItem(id) {
+        if (this.#frozen) {
+            return;
+        }
+        if (this.lastSelectedId === null) {
+            // Do a normal toggle
+            this.toggleItem(id);
+            return;
+        }
+
+        // Unselect last selected items
+        for (const item of this.lastShiftSelectionGroup) {
+            if (this.inverted) {
+                this.selectedIds.add(item);
+            } else {
+                this.selectedIds.delete(item);
+            }
+        }
+        this.lastShiftSelectionGroup = new Set();
+
+        let running = false;
+        const modelOrder = ['scheduledInfinityModel', 'draftInfinityModel', 'publishedAndSentInfinityModel'];
+        const models = this.infinityModel;
+
+        for (const modelKey of modelOrder) {
+            const model = models[modelKey];
+            if (!model?.content || model.content.length === 0) {
+                continue;
+            }
+
+            for (const item of model.content) {
+                if (item.id === this.lastSelectedId || item.id === id) {
+                    if (!running) {
+                        running = true;
+                        if (item.id === this.lastSelectedId) {
+                            continue;
+                        }
+                    } else {
+                        this.lastShiftSelectionGroup.add(item.id);
+                        this.inverted ? this.selectedIds.delete(item.id) : this.selectedIds.add(item.id);
+                        running = false;
+                        break;
+                    }
+                }
+
+                if (running) {
+                    this.lastShiftSelectionGroup.add(item.id);
+                    this.inverted ? this.selectedIds.delete(item.id) : this.selectedIds.add(item.id);
+                }
+            }
+        }
+
+        // Force update
+        // eslint-disable-next-line no-self-assign
+        this.selectedIds = this.selectedIds;
+    }
+
+    selectAll() {
+        if (this.#frozen) {
+            return;
+        }
+        this.selectedIds = new Set();
+        this.inverted = !this.inverted;
+        this.lastSelectedId = null;
+    }
+
+    clearSelection(options = {}) {
+        if (this.#frozen && !options.force) {
+            return;
+        }
+        this.selectedIds = new Set();
+        this.inverted = false;
+        this.lastSelectedId = null;
+    }
+}
\ No newline at end of file
diff --git a/ghost/admin/app/components/posts/analytics.hbs b/ghost/admin/app/components/posts/analytics.hbs
index c08e6aeb711..3901c6978d5 100644
--- a/ghost/admin/app/components/posts/analytics.hbs
+++ b/ghost/admin/app/components/posts/analytics.hbs
@@ -34,9 +34,58 @@
                         {{moment-format publishedAt "HH:mm"}}
                     {{/let}}
                 </div>
-                <LinkTo @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}} class="gh-post-list-cta edit" title="">
-                    {{svg-jar "pen" title=""}}<span>Edit post</span>
-                </LinkTo>
+                <div style="display: flex; gap: 8px;">
+                    <GhTaskButton
+                        @buttonText="Refresh"
+                        @task={{this.fetchPostTask}}
+                        @showIcon={{true}}
+                        @idleIcon="reload"
+                        @successText="Refreshed"
+                        @class="gh-btn gh-btn-icon refresh"
+                        @successClass="gh-btn gh-btn-icon refresh" />
+                    {{#unless this.post.emailOnly}}
+                        <button type="button" class="gh-post-list-cta share" {{on "click" this.togglePublishFlowModal}}>
+                            {{svg-jar "share" title="Share post"}}<span>Share</span>
+                        </button>
+                    {{/unless}}
+
+                    <span class="dropdown">
+                        <GhDropdownButton
+                            @dropdownName="analytics-actions-menu"
+                            @classNames="gh-post-list-cta gh-btn-icon icon-only gh-btn-action-icon"
+                            @title="Analytics Actions"
+                            data-test-button="analytics-actions"
+                        >
+                            <span>
+                                {{svg-jar "dotdotdot"}}
+                                <span class="hidden">Actions</span>
+                            </span>
+                        </GhDropdownButton>
+                        <GhDropdown
+                            @name="analytics-actions-menu"
+                            @tagName="ul"
+                            @classNames="gh-analytics-actions-menu dropdown-menu dropdown-triangle-top-right"
+                            @closeOnClick={{true}}
+                        >
+                            <li>
+                                <LinkTo class="edit-post" @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}}>Edit post</LinkTo>
+                            </li>
+                            <li>
+                                <a class="view-browser" href="{{this.post.url}}" target="_blank" rel="noopener noreferrer">View in browser</a>
+                            </li>
+                            <li>
+                                <button
+                                    type="button"
+                                    class="delete-post mr2"
+                                    {{on "click" this.confirmDeleteMember}}
+                                    data-test-button="delete-post"
+                                >
+                                    <span class="red">Delete post</span>
+                                </button>
+                            </li>
+                        </GhDropdown>
+                    </span>
+                </div>
             </div>
         </div>
     </GhCanvasHeader>
@@ -44,7 +93,10 @@
     <Tabs::Tabs class="gh-tabs-analytics {{if (eq this.post.hasBeenEmailed null) "no-tabs"}}" @forceRender={{true}} as |tabs|>
         {{#if this.post.hasBeenEmailed}}
             <tabs.tab>
-                <h3>{{svg-jar "analytics-tab-sent-large"}}{{format-number this.post.email.emailCount}}</h3>
+                <h3>
+                    {{svg-jar "analytics-tab-sent-large"}}
+                    <span class="animated-number sent" {{did-update this.applyClasses this.post.email.emailCount}}>{{split-number this.post.email.emailCount this.previousSentCount}}</span>
+                </h3>
                 <p>{{svg-jar "analytics-tab-sent"}}<span class="analytics-tab-label">Sent</span></p>
             </tabs.tab>
 
@@ -58,7 +110,10 @@
 
             {{#if this.post.showEmailOpenAnalytics }}
                 <tabs.tab>
-                    <h3>{{svg-jar "analytics-tab-opened-large"}}{{format-number this.post.email.openedCount}}</h3>
+                    <h3>
+                        {{svg-jar "analytics-tab-opened-large"}}
+                        <span class="animated-number opened" {{did-update this.applyClasses this.post.email.openedCount}}>{{split-number this.post.email.openedCount this.previousOpenedCount}}</span>
+                    </h3>
                     <p>{{svg-jar "analytics-tab-opened"}}<span class="analytics-tab-label">Opened<span class="analytics-tab-percentage">&nbsp;— {{this.post.email.openRate}}%</span></span></p>
                 </tabs.tab>
 
@@ -73,7 +128,10 @@
 
             {{#if this.post.showEmailClickAnalytics }}
                 <tabs.tab>
-                    <h3>{{svg-jar "analytics-tab-clicked-large"}}{{format-number this.post.count.clicks}}</h3>
+                    <h3>
+                        {{svg-jar "analytics-tab-clicked-large"}}
+                        <span class="animated-number clicked" {{did-update this.applyClasses this.post.count.clicks}}>{{split-number this.post.count.clicks this.previousClickedCount}}</span>
+                    </h3>
                     <p>{{svg-jar "analytics-tab-clicked"}}<span class="analytics-tab-label">Clicked<span class="analytics-tab-percentage">&nbsp;— {{this.post.clickRate}}%</span></span></p>
                 </tabs.tab>
 
@@ -88,7 +146,10 @@
 
             {{#if this.post.isFeedbackEnabledForEmail }}
                 <tabs.tab>
-                    <h3>{{svg-jar "analytics-tab-feedback-large"}}{{format-number this.totalFeedback}}</h3>
+                    <h3>
+                        {{svg-jar "analytics-tab-feedback-large"}}
+                        <span class="animated-number feedback" {{did-update this.applyClasses this.totalFeedback}}>{{split-number this.totalFeedback this.previousFeedbackCount}}</span>
+                    </h3>
                     <p>{{svg-jar "analytics-tab-feedback"}}<span class="analytics-tab-label">Feedback<span class="analytics-tab-percentage">&nbsp;— {{this.post.sentiment}}%</span></span></p>
                 </tabs.tab>
 
@@ -107,7 +168,7 @@
                 <h3>
                     {{svg-jar "analytics-tab-conversions-large"}}
                     {{#if this.post.hasBeenEmailed}}
-                        {{format-number this.post.count.conversions}}
+                        <span class="animated-number conversions" {{did-update this.applyClasses this.post.count.conversions}}>{{split-number this.post.count.conversions this.previousConversionsCount}}</span>
                     {{else}}
                         Conversions
                     {{/if}}
@@ -201,4 +262,4 @@
             </div>
         </div>
     {{/if}}
-</section>
+</section>
\ No newline at end of file
diff --git a/ghost/admin/app/components/posts/analytics.js b/ghost/admin/app/components/posts/analytics.js
index 4ea73454221..d95f3359a62 100644
--- a/ghost/admin/app/components/posts/analytics.js
+++ b/ghost/admin/app/components/posts/analytics.js
@@ -1,4 +1,7 @@
 import Component from '@glimmer/component';
+import DeletePostModal from '../modals/delete-post';
+import PostSuccessModal from '../modal-post-success';
+import anime from 'animejs/lib/anime.es.js';
 import {action} from '@ember/object';
 import {didCancel, task} from 'ember-concurrency';
 import {inject as service} from '@ember/service';
@@ -24,6 +27,9 @@ export default class Analytics extends Component {
     @service utils;
     @service feature;
     @service store;
+    @service router;
+    @service modals;
+    @service notifications;
 
     @tracked sources = null;
     @tracked links = null;
@@ -31,10 +37,45 @@ export default class Analytics extends Component {
     @tracked sortColumn = 'signups';
     @tracked showSuccess;
     @tracked updateLinkId;
+    @tracked _post = null;
+    @tracked postCount = null;
+    @tracked showPostCount = false;
+    @tracked shouldAnimate = false;
+    @tracked previousSentCount = this.post.email?.emailCount;
+    @tracked previousOpenedCount = this.post.email?.openedCount;
+    @tracked previousClickedCount = this.post.count.clicks;
+    @tracked previousFeedbackCount = this.totalFeedback;
+    @tracked previousConversionsCount = this.post.count.conversions;
     displayOptions = DISPLAY_OPTIONS;
 
+    constructor() {
+        super(...arguments);
+        this.checkPublishFlowModal();
+    }
+
+    openPublishFlowModal() {
+        this.modals.open(PostSuccessModal, {
+            post: this.post,
+            postCount: this.postCount,
+            showPostCount: this.showPostCount
+        });
+    }
+
+    async checkPublishFlowModal() {
+        if (localStorage.getItem('ghost-last-published-post')) {
+            await this.fetchPostCountTask.perform();
+            this.showPostCount = true;
+            this.openPublishFlowModal();
+            localStorage.removeItem('ghost-last-published-post');
+        }
+    }
+
     get post() {
-        return this.args.post;
+        return this._post ?? this.args.post;
+    }
+
+    set post(value) {
+        this._post = value;
     }
 
     get allowedDisplayOptions() {
@@ -96,8 +137,8 @@ export default class Analytics extends Component {
         const values = [this.post.count.positive_feedback, this.post.count.negative_feedback];
         const labels = ['More like this', 'Less like this'];
         const links = [
-            {filterParam: '(feedback.post_id:' + this.post.id + '+feedback.score:1)'},
-            {filterParam: '(feedback.post_id:' + this.post.id + '+feedback.score:0)'}
+            {filterParam: '(feedback.post_id:\'' + this.post.id + '\'+feedback.score:1)'},
+            {filterParam: '(feedback.post_id:\'' + this.post.id + '\'+feedback.score:0)'}
         ];
         const colors = ['#F080B2', '#8452f633'];
         return {values, labels, links, colors};
@@ -142,6 +183,19 @@ export default class Analytics extends Component {
         }
     }
 
+    @action
+    togglePublishFlowModal() {
+        this.showPostCount = false;
+        this.openPublishFlowModal();
+    }
+
+    @action
+    confirmDeleteMember() {
+        this.modals.open(DeletePostModal, {
+            post: this.post
+        });
+    }
+
     updateLinkData(linksData) {
         let updatedLinks;
         if (this.links?.length) {
@@ -201,18 +255,30 @@ export default class Analytics extends Component {
             }
             return this._fetchReferrersStats.perform();
         } catch (e) {
-            if (!didCancel(e)) {
-                // re-throw the non-cancelation error
-                throw e;
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
             }
+
+            throw e;
         }
     }
 
     async fetchLinks() {
-        if (this._fetchLinks.isRunning) {
-            return this._fetchLinks.last;
+        try {
+            if (this._fetchLinks.isRunning) {
+                return this._fetchLinks.last;
+            }
+
+            return this._fetchLinks.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
         }
-        return this._fetchLinks.perform();
     }
 
     @task
@@ -234,7 +300,7 @@ export default class Analytics extends Component {
             return link;
         });
 
-        const filter = `post_id:${this.post.id}+to:'${currentLink}'`;
+        const filter = `post_id:'${this.post.id}'+to:'${currentLink}'`;
         let bulkUpdateUrl = this.ghostPaths.url.api(`links/bulk`) + `?filter=${encodeURIComponent(filter)}`;
         yield this.ajax.put(bulkUpdateUrl, {
             data: {
@@ -246,7 +312,7 @@ export default class Analytics extends Component {
         });
 
         // Refresh links data
-        const linksFilter = `post_id:${this.post.id}`;
+        const linksFilter = `post_id:'${this.post.id}'`;
         let statsUrl = this.ghostPaths.url.api(`links/`) + `?filter=${encodeURIComponent(linksFilter)}`;
         let result = yield this.ajax.request(statsUrl);
         this.updateLinkData(result.links);
@@ -271,7 +337,7 @@ export default class Analytics extends Component {
 
     @task
     *_fetchLinks() {
-        const filter = `post_id:${this.post.id}`;
+        const filter = `post_id:'${this.post.id}'`;
         let statsUrl = this.ghostPaths.url.api(`links/`) + `?filter=${encodeURIComponent(filter)}`;
         let result = yield this.ajax.request(statsUrl);
         this.updateLinkData(result.links);
@@ -286,10 +352,77 @@ export default class Analytics extends Component {
 
     @task
     *_fetchMentions() {
-        const filter = `resource_id:${this.post.id}+resource_type:post`;
+        const filter = `resource_id:'${this.post.id}'+resource_type:post`;
         this.mentions = yield this.store.query('mention', {limit: 5, order: 'created_at desc', filter});
     }
 
+    @task
+    *fetchPostCountTask() {
+        if (!this.post.emailOnly) {
+            const result = yield this.store.query('post', {filter: 'status:published', limit: 1});
+            let count = result.meta.pagination.total;
+
+            this.postCount = count;
+        }
+    }
+
+    @task
+    *fetchPostTask() {
+        const currentSentCount = this.post.email?.emailCount;
+        const currentOpenedCount = this.post.email?.openedCount;
+        const currentClickedCount = this.post.count.clicks;
+        const currentFeedbackCount = this.totalFeedback;
+        const currentConversionsCount = this.post.count.conversions;
+
+        this.shouldAnimate = true;
+
+        const result = yield this.store.query('post', {filter: `id:${this.post.id}`, include: 'email,count.clicks,count.conversions,count.positive_feedback,count.negative_feedback,sentiment', limit: 1});
+        this.post = result.toArray()[0];
+
+        this.previousSentCount = currentSentCount;
+        this.previousOpenedCount = currentOpenedCount;
+        this.previousClickedCount = currentClickedCount;
+        this.previousFeedbackCount = currentFeedbackCount;
+        this.previousConversionsCount = currentConversionsCount;
+
+        yield this.fetchLinks();
+
+        return true;
+    }
+
+    @action
+    applyClasses(element) {
+        if (!this.shouldAnimate ||
+            (element.classList.contains('sent') && this.post.email.emailCount === this.previousSentCount) ||
+            (element.classList.contains('opened') && this.post.email.openedCount === this.previousOpenedCount) ||
+            (element.classList.contains('clicked') && this.post.count.clicks === this.previousClickedCount) ||
+            (element.classList.contains('feedback') && this.totalFeedback === this.previousFeedbackCount) ||
+            (element.classList.contains('conversions') && this.post.count.conversions === this.previousConversionsCount)
+        ) {
+            return;
+        }
+
+        anime({
+            targets: `${Array.from(element.classList).map(className => `.${className}`).join('')} .new-number span`,
+            translateY: [10,0],
+            // translateZ: 0,
+            opacity: [0,1],
+            easing: 'easeOutElastic',
+            elasticity: 650,
+            duration: 1000,
+            delay: (el, i) => 100 + 30 * i
+        });
+
+        anime({
+            targets: `${Array.from(element.classList).map(className => `.${className}`).join('')} .old-number span`,
+            translateY: [0,-10],
+            opacity: [1,0],
+            easing: 'easeOutExpo',
+            duration: 400,
+            delay: (el, i) => 100 + 10 * i
+        });
+    }
+
     get showLinks() {
         return this.post.showEmailClickAnalytics;
     }
diff --git a/ghost/admin/app/components/posts/old-analytics.js b/ghost/admin/app/components/posts/old-analytics.js
index 5213bd364e7..a57bfb37062 100644
--- a/ghost/admin/app/components/posts/old-analytics.js
+++ b/ghost/admin/app/components/posts/old-analytics.js
@@ -171,18 +171,30 @@ export default class Analytics extends Component {
             }
             return this._fetchReferrersStats.perform();
         } catch (e) {
-            if (!didCancel(e)) {
-                // re-throw the non-cancelation error
-                throw e;
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
             }
+
+            throw e;
         }
     }
 
     async fetchLinks() {
-        if (this._fetchLinks.isRunning) {
-            return this._fetchLinks.last;
+        try {
+            if (this._fetchLinks.isRunning) {
+                return this._fetchLinks.last;
+            }
+
+            return this._fetchLinks.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
         }
-        return this._fetchLinks.perform();
     }
 
     @task
@@ -204,7 +216,7 @@ export default class Analytics extends Component {
             return link;
         });
 
-        const filter = `post_id:${this.post.id}+to:'${currentLink}'`;
+        const filter = `post_id:'${this.post.id}'+to:'${currentLink}'`;
         let bulkUpdateUrl = this.ghostPaths.url.api(`links/bulk`) + `?filter=${encodeURIComponent(filter)}`;
         yield this.ajax.put(bulkUpdateUrl, {
             data: {
@@ -216,7 +228,7 @@ export default class Analytics extends Component {
         });
 
         // Refresh links data
-        const linksFilter = `post_id:${this.post.id}`;
+        const linksFilter = `post_id:'${this.post.id}'`;
         let statsUrl = this.ghostPaths.url.api(`links/`) + `?filter=${encodeURIComponent(linksFilter)}`;
         let result = yield this.ajax.request(statsUrl);
         this.updateLinkData(result.links);
@@ -226,7 +238,7 @@ export default class Analytics extends Component {
         }, 2000);
     }
 
-    @task
+    @task({drop: true})
     *_fetchReferrersStats() {
         let statsUrl = this.ghostPaths.url.api(`stats/referrers/posts/${this.post.id}`);
         let result = yield this.ajax.request(statsUrl);
@@ -239,9 +251,9 @@ export default class Analytics extends Component {
         });
     }
 
-    @task
+    @task({drop: true})
     *_fetchLinks() {
-        const filter = `post_id:${this.post.id}`;
+        const filter = `post_id:'${this.post.id}'`;
         let statsUrl = this.ghostPaths.url.api(`links/`) + `?filter=${encodeURIComponent(filter)}`;
         let result = yield this.ajax.request(statsUrl);
         this.updateLinkData(result.links);
diff --git a/ghost/admin/app/components/posts/post-activity-feed.hbs b/ghost/admin/app/components/posts/post-activity-feed.hbs
index 54834785cf2..d7aa70fb79e 100644
--- a/ghost/admin/app/components/posts/post-activity-feed.hbs
+++ b/ghost/admin/app/components/posts/post-activity-feed.hbs
@@ -1,5 +1,7 @@
 <div class="gh-post-activity-feed">
     {{#let (activity-feed-fetcher filter=(members-event-filter post=@post.id includeEvents=this.getEventTypes) pageSize=this.pageSize) as |eventsFetcher|}}
+        {{compute (fn this.saveEvents eventsFetcher)}}
+
         {{#if eventsFetcher.isError}}
             <div class="gh-dashboard-list-body">
                 <div class="gh-dashboard-list-error">
@@ -11,128 +13,231 @@
             </div>
         {{/if}}
 
-        {{#if (and (not eventsFetcher.data) (not eventsFetcher.isLoading))}}
-            <div class="gh-dashboard-list-body">
+        {{#if eventsFetcher.isLoading}}
+            {{#if this.savedEventsFetcher.data}}
+                <div class="gh-dashboard-list-body gh-dashboard-list-cols-{{this.eventType}}">
+                    {{#each this.savedEventsFetcher.data as |event|}}
+                        {{#let (parse-member-event event) as |parsedEvent|}}
+                            <div class="gh-dashboard-list-item">
+                                <div class="gh-dashboard-list-item-sub">
+                                    {{#if parsedEvent.member}}
+                                        <GhMemberAvatar @member={{parsedEvent.member}} @containerClass="w6 h6 mr3 flex-shrink-0" />
+                                        <LinkTo class="gh-dashboard-list-text" @route="member" @model="{{parsedEvent.memberId}}" @query={{hash postAnalytics=@post.id}}>{{parsedEvent.subject}}</LinkTo>
+                                    {{else}}
+                                        {{#if parsedEvent.email}}
+                                            <GhMemberAvatar @name={{parsedEvent.subject}} @containerClass="w6 h6 mr3 flex-shrink-0" />
+                                            <a class="gh-dashboard-list-text" href="mailto:{{parsedEvent.email}}" target="_blank" rel="noopener noreferrer" title="{{parsedEvent.email}}">{{parsedEvent.subject}}</a>
+                                        {{else}}
+                                            <GhMemberAvatar @name={{parsedEvent.subject}} @containerClass="w6 h6 mr3 flex-shrink-0" />
+                                            <span class="gh-dashboard-list-text">{{parsedEvent.subject}}</span>
+                                        {{/if}}
+                                    {{/if}}
+                                </div>
+                                <div class="gh-dashboard-list-item-sub">
+                                    {{svg-jar parsedEvent.icon }}
+                                    <span class="gh-dashboard-list-subtext">
+                                        <span class="gh-members-activity-description">
+                                            <span class="gh-members-activity-event-text">{{capitalize-first-letter parsedEvent.action}}</span>
+                                            {{#if parsedEvent.info}}
+                                                <span class="highlight">&nbsp;({{parsedEvent.info}})</span>
+                                            {{/if}}
+                                        </span>
+                                    </span>
+                                </div>
+                                {{#if (eq this.eventType "conversion")}}
+                                    <div class="gh-dashboard-list-item-sub">
+                                        {{#if parsedEvent.source}}
+                                            <span title="Source" class="gh-members-activity-description">{{svg-jar "event-extras-source"}}<span class="gh-members-activity-event-text">{{parsedEvent.source.name}}</span></span>
+                                        {{else}}
+                                            <span class="midlightgrey">&mdash;</span>
+                                        {{/if}}
+                                    </div>
+                                {{/if}}
+                                <div class="gh-dashboard-list-item-sub">
+                                    <span class="gh-dashboard-list-subtext">{{moment-from-now parsedEvent.timestamp}}</span>
+                                </div>
+                            </div>
+                        {{/let}}
+                    {{/each}}
+
+                    {{#if (compute (fn this.areStubsNeeded eventsFetcher))}}
+                        {{#let (compute (fn this.getAmountOfStubs eventsFetcher)) as |stubs|}}
+                            {{#each stubs}}
+                                <div class="gh-dashboard-list-item gh-dashboard-list-item-stub"></div>
+                            {{/each}}
+                        {{/let}}
+                    {{/if}}
+
+                    <div class="gh-post-activity-feed-footer">
+                        <Posts::PostActivityFeed::FooterLinks
+                            @eventType={{this.eventType}}
+                            @post={{@post}}
+                        />
+
+                        <div class="gh-post-activity-feed-pagination">
+                            {{#if (compute (fn this.isPaginationNotNeeded this.savedEventsFetcher))}}
+                                Showing {{this.savedEventsFetcher.totalEvents}} in total
+                            {{else}}
+                                Showing {{this.savedEventsFetcher.previousEvents}}-{{this.savedEventsFetcher.shownEvents}} of {{this.savedEventsFetcher.totalEvents}}
+
+                                <div class="gh-post-activity-feed-pagination-group">
+                                    <button
+                                        class="gh-post-activity-feed-pagination-button gh-post-activity-feed-prev-button"
+                                        type="button"
+                                        title="Previous page"
+                                        disabled={{compute (fn this.isPreviousButtonDisabled this.savedEventsFetcher)}}
+                                        {{on "click" this.savedEventsFetcher.loadPreviousPage}}
+                                    >
+                                        {{svg-jar "arrow-left-pagination"}}
+                                    </button>
+
+                                    <button
+                                        class="gh-post-activity-feed-pagination-button gh-post-activity-feed-next-button"
+                                        type="button"
+                                        title="Next page"
+                                        disabled={{compute (fn this.isNextButtonDisabled this.savedEventsFetcher)}}
+                                        {{on "click" this.savedEventsFetcher.loadNextPage}}
+                                    >
+                                        {{svg-jar "arrow-right-pagination"}}
+                                    </button>
+                                </div>
+                            {{/if}}
+                        </div>
+                    </div>
+                </div>
+            {{else}}
                 <div class="gh-post-activity-feed-empty">
-                    <div class="attribution-list-empty">
-                        {{#if (eq this.eventType "sent")}}
-                            {{svg-jar "empty-sent"}}
-                            <h4>No members have received your email yet</h4>
-                            <p>Once someone receives your email, you'll be able to see the member activity here.</p>
-                        {{else if (eq this.eventType "opened")}}
-                            {{svg-jar "empty-opened"}}
-                            <h4>No members have opened your newsletter</h4>
-                            <p>Once someone opens, you'll see them listed here.</p>
-                        {{else if (eq this.eventType "clicked")}}
-                            {{svg-jar "empty-clicked"}}
-                            <h4>No links have been clicked in your newsletter</h4>
-                            <p>Once a member clicks a link, you'll see them listed here.</p>
-                        {{else if (eq this.eventType "feedback")}}
-                            {{svg-jar "empty-feedback"}}
-                            <h4>No members have given feedback yet</h4>
-                            <p>When someone does, you'll see their response here.</p>
-                        {{else if (eq this.eventType "conversion")}}
-                            {{svg-jar "empty-conversion"}}
-                            <h4>No members have signed up on this post</h4>
-                            <p>When someone new signs up, you'll see them here.</p>
-                        {{/if}}
+                    <div class="gh-post-analytics-loading">
+                        <div class="gh-loading-spinner-outer">
+                            <div class="gh-loading-spinner"></div>
+                        </div>
                     </div>
                 </div>
-            </div>
+            {{/if}}
         {{else}}
-            <div class="gh-dashboard-list-body gh-dashboard-list-cols-{{this.eventType}}">
-                {{#each eventsFetcher.data as |event|}}
-                    {{#let (parse-member-event event) as |parsedEvent|}}
-                        <div class="gh-dashboard-list-item">
-                            <div class="gh-dashboard-list-item-sub">
-                                {{#if parsedEvent.member}}
-                                    <GhMemberAvatar @member={{parsedEvent.member}} @containerClass="w6 h6 mr3 flex-shrink-0" />
-                                    <LinkTo class="gh-dashboard-list-text" @route="member" @model="{{parsedEvent.memberId}}" @query={{hash postAnalytics=@post.id}}>{{parsedEvent.subject}}</LinkTo>
-                                {{else}}
-                                    {{#if parsedEvent.email}}
-                                        <GhMemberAvatar @name={{parsedEvent.subject}} @containerClass="w6 h6 mr3 flex-shrink-0" />
-                                        <a class="gh-dashboard-list-text" href="mailto:{{parsedEvent.email}}" target="_blank" rel="noopener noreferrer" title="{{parsedEvent.email}}">{{parsedEvent.subject}}</a>
+            {{#if eventsFetcher.data}}
+                <div class="gh-dashboard-list-body gh-dashboard-list-cols-{{this.eventType}}">
+                    {{#each eventsFetcher.data as |event|}}
+                        {{#let (parse-member-event event) as |parsedEvent|}}
+                            <div class="gh-dashboard-list-item">
+                                <div class="gh-dashboard-list-item-sub">
+                                    {{#if parsedEvent.member}}
+                                        <GhMemberAvatar @member={{parsedEvent.member}} @containerClass="w6 h6 mr3 flex-shrink-0" />
+                                        <LinkTo class="gh-dashboard-list-text" @route="member" @model="{{parsedEvent.memberId}}" @query={{hash postAnalytics=@post.id}}>{{parsedEvent.subject}}</LinkTo>
                                     {{else}}
-                                        <GhMemberAvatar @name={{parsedEvent.subject}} @containerClass="w6 h6 mr3 flex-shrink-0" />
-                                        <span class="gh-dashboard-list-text">{{parsedEvent.subject}}</span>
-                                    {{/if}}
-                                {{/if}}
-                            </div>
-                            <div class="gh-dashboard-list-item-sub">
-                                {{svg-jar parsedEvent.icon }}
-                                <span class="gh-dashboard-list-subtext">
-                                    <span class="gh-members-activity-description">
-                                        <span class="gh-members-activity-event-text">{{capitalize-first-letter parsedEvent.action}}</span>
-                                        {{#if parsedEvent.info}}
-                                            <span class="highlight">&nbsp;({{parsedEvent.info}})</span>
+                                        {{#if parsedEvent.email}}
+                                            <GhMemberAvatar @name={{parsedEvent.subject}} @containerClass="w6 h6 mr3 flex-shrink-0" />
+                                            <a class="gh-dashboard-list-text" href="mailto:{{parsedEvent.email}}" target="_blank" rel="noopener noreferrer" title="{{parsedEvent.email}}">{{parsedEvent.subject}}</a>
+                                        {{else}}
+                                            <GhMemberAvatar @name={{parsedEvent.subject}} @containerClass="w6 h6 mr3 flex-shrink-0" />
+                                            <span class="gh-dashboard-list-text">{{parsedEvent.subject}}</span>
                                         {{/if}}
+                                    {{/if}}
+                                </div>
+                                <div class="gh-dashboard-list-item-sub">
+                                    {{svg-jar parsedEvent.icon }}
+                                    <span class="gh-dashboard-list-subtext">
+                                        <span class="gh-members-activity-description">
+                                            <span class="gh-members-activity-event-text">{{capitalize-first-letter parsedEvent.action}}</span>
+                                            {{#if parsedEvent.info}}
+                                                <span class="highlight">&nbsp;({{parsedEvent.info}})</span>
+                                            {{/if}}
+                                        </span>
                                     </span>
-                                </span>
-                            </div>
-                            {{#if (eq this.eventType "conversion")}}
+                                </div>
+                                {{#if (eq this.eventType "conversion")}}
+                                    <div class="gh-dashboard-list-item-sub">
+                                        {{#if parsedEvent.source}}
+                                            <span title="Source" class="gh-members-activity-description">{{svg-jar "event-extras-source"}}<span class="gh-members-activity-event-text">{{parsedEvent.source.name}}</span></span>
+                                        {{else}}
+                                            <span class="midlightgrey">&mdash;</span>
+                                        {{/if}}
+                                    </div>
+                                {{/if}}
                                 <div class="gh-dashboard-list-item-sub">
-                                    {{#if parsedEvent.source}}
-                                        <span title="Source" class="gh-members-activity-description">{{svg-jar "event-extras-source"}}<span class="gh-members-activity-event-text">{{parsedEvent.source.name}}</span></span>
-                                    {{else}}
-                                        <span class="midlightgrey">&mdash;</span>
-                                    {{/if}}
+                                    <span class="gh-dashboard-list-subtext">{{moment-from-now parsedEvent.timestamp}}</span>
                                 </div>
-                            {{/if}}
-                            <div class="gh-dashboard-list-item-sub">
-                                <span class="gh-dashboard-list-subtext">{{moment-from-now parsedEvent.timestamp}}</span>
                             </div>
-                        </div>
-                    {{/let}}
-                {{/each}}
+                        {{/let}}
+                    {{/each}}
 
-                {{#if (compute (fn this.areStubsNeeded eventsFetcher))}}
-                    {{#let (compute (fn this.getAmountOfStubs eventsFetcher)) as |stubs|}}
-                        {{#each stubs}}
-                            <div class="gh-dashboard-list-item gh-dashboard-list-item-stub"></div>
-                        {{/each}}
-                    {{/let}}
-                {{/if}}
+                    {{#if (compute (fn this.areStubsNeeded eventsFetcher))}}
+                        {{#let (compute (fn this.getAmountOfStubs eventsFetcher)) as |stubs|}}
+                            {{#each stubs}}
+                                <div class="gh-dashboard-list-item gh-dashboard-list-item-stub"></div>
+                            {{/each}}
+                        {{/let}}
+                    {{/if}}
 
-                <div class="gh-post-activity-feed-footer">
-                    <Posts::PostActivityFeed::FooterLinks
-                        @eventType={{this.eventType}}
-                        @post={{@post}}
-                    />
+                    <div class="gh-post-activity-feed-footer">
+                        <Posts::PostActivityFeed::FooterLinks
+                            @eventType={{this.eventType}}
+                            @post={{@post}}
+                        />
 
-                    <div class="gh-post-activity-feed-pagination">
-                        {{#if (compute (fn this.isPaginationNotNeeded eventsFetcher))}}
-                            Showing {{eventsFetcher.totalEvents}} in total
-                        {{else}}
-                            Showing {{eventsFetcher.previousEvents}}-{{eventsFetcher.shownEvents}} of {{eventsFetcher.totalEvents}}
+                        <div class="gh-post-activity-feed-pagination">
+                            {{#if (compute (fn this.isPaginationNotNeeded eventsFetcher))}}
+                                Showing {{eventsFetcher.totalEvents}} in total
+                            {{else}}
+                                Showing {{eventsFetcher.previousEvents}}-{{eventsFetcher.shownEvents}} of {{eventsFetcher.totalEvents}}
 
-                            <div class="gh-post-activity-feed-pagination-group">
-                                <button
-                                    class="gh-post-activity-feed-pagination-button gh-post-activity-feed-prev-button"
-                                    type="button"
-                                    title="Previous page"
-                                    disabled={{compute (fn this.isPreviousButtonDisabled eventsFetcher)}}
-                                    {{on "click" eventsFetcher.loadPreviousPage}}
-                                >
-                                    {{svg-jar "arrow-left-pagination"}}
-                                </button>
+                                <div class="gh-post-activity-feed-pagination-group">
+                                    <button
+                                        class="gh-post-activity-feed-pagination-button gh-post-activity-feed-prev-button"
+                                        type="button"
+                                        title="Previous page"
+                                        disabled={{compute (fn this.isPreviousButtonDisabled eventsFetcher)}}
+                                        {{on "click" eventsFetcher.loadPreviousPage}}
+                                    >
+                                        {{svg-jar "arrow-left-pagination"}}
+                                    </button>
 
-                                <button
-                                    class="gh-post-activity-feed-pagination-button gh-post-activity-feed-next-button"
-                                    type="button"
-                                    title="Next page"
-                                    disabled={{compute (fn this.isNextButtonDisabled eventsFetcher)}}
-                                    {{on "click" eventsFetcher.loadNextPage}}
-                                >
-                                    {{svg-jar "arrow-right-pagination"}}
-                                </button>
-                            </div>
-                        {{/if}}
+                                    <button
+                                        class="gh-post-activity-feed-pagination-button gh-post-activity-feed-next-button"
+                                        type="button"
+                                        title="Next page"
+                                        disabled={{compute (fn this.isNextButtonDisabled eventsFetcher)}}
+                                        {{on "click" eventsFetcher.loadNextPage}}
+                                    >
+                                        {{svg-jar "arrow-right-pagination"}}
+                                    </button>
+                                </div>
+                            {{/if}}
+                        </div>
                     </div>
                 </div>
-            </div>
 
-            {{#if (eq @eventType 'feedback')}}
-                <Posts::FeedbackEventsChart @data={{@data}} />
+                {{#if (eq @eventType 'feedback')}}
+                    <Posts::FeedbackEventsChart @data={{@data}} />
+                {{/if}}
+            {{else}}
+                <div class="gh-dashboard-list-body">
+                    <div class="gh-post-activity-feed-empty">
+                        <div class="attribution-list-empty">
+                            {{#if (eq this.eventType "sent")}}
+                                {{svg-jar "empty-sent"}}
+                                <h4>No members have received your email yet</h4>
+                                <p>Once someone receives your email, you'll be able to see the member activity here.</p>
+                            {{else if (eq this.eventType "opened")}}
+                                {{svg-jar "empty-opened"}}
+                                <h4>No members have opened your newsletter</h4>
+                                <p>Once someone opens, you'll see them listed here.</p>
+                            {{else if (eq this.eventType "clicked")}}
+                                {{svg-jar "empty-clicked"}}
+                                <h4>No links have been clicked in your newsletter</h4>
+                                <p>Once a member clicks a link, you'll see them listed here.</p>
+                            {{else if (eq this.eventType "feedback")}}
+                                {{svg-jar "empty-feedback"}}
+                                <h4>No members have given feedback yet</h4>
+                                <p>When someone does, you'll see their response here.</p>
+                            {{else if (eq this.eventType "conversion")}}
+                                {{svg-jar "empty-conversion"}}
+                                <h4>No members have signed up on this post</h4>
+                                <p>When someone new signs up, you'll see them here.</p>
+                            {{/if}}
+                        </div>
+                    </div>
+                </div>
             {{/if}}
         {{/if}}
     {{/let}}
diff --git a/ghost/admin/app/components/posts/post-activity-feed.js b/ghost/admin/app/components/posts/post-activity-feed.js
index 937123a2d7a..75814d88e6b 100644
--- a/ghost/admin/app/components/posts/post-activity-feed.js
+++ b/ghost/admin/app/components/posts/post-activity-feed.js
@@ -1,6 +1,7 @@
 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 PostActivityFeed extends Component {
     @service feature;
@@ -14,6 +15,16 @@ export default class PostActivityFeed extends Component {
         conversion: ['subscription_event', 'signup_event']
     };
 
+    @tracked savedEventsFetcher = null;
+
+    @action
+    saveEvents(fetcher) {
+        if (fetcher && fetcher.data && fetcher.data.length > 0) {
+            this.savedEventsFetcher = fetcher;
+        }
+        return null;
+    }
+
     get getEventTypes() {
         return this._eventTypes[this.args.eventType];
     }
diff --git a/ghost/admin/app/components/posts/post-activity-feed/footer-links.js b/ghost/admin/app/components/posts/post-activity-feed/footer-links.js
index 076b63ed41a..c0ed565b403 100644
--- a/ghost/admin/app/components/posts/post-activity-feed/footer-links.js
+++ b/ghost/admin/app/components/posts/post-activity-feed/footer-links.js
@@ -3,8 +3,8 @@ import Component from '@glimmer/component';
 export default class FooterLinks extends Component {
     get feedbackLinks() {
         const post = this.args.post;
-        const positiveLink = {filterParam: '(feedback.post_id:' + post.id + '+feedback.score:1)', label: 'More like this'};
-        const negativeLink = {filterParam: '(feedback.post_id:' + post.id + '+feedback.score:0)', label: 'Less like this'};
+        const positiveLink = {filterParam: '(feedback.post_id:\'' + post.id + '\'+feedback.score:1)', label: 'More like this'};
+        const negativeLink = {filterParam: '(feedback.post_id:\'' + post.id + '\'+feedback.score:0)', label: 'Less like this'};
 
         const data = [
             {link: positiveLink, hidden: !post.count.positive_feedback},
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/components/stats/charts/kpis.hbs b/ghost/admin/app/components/stats/charts/kpis.hbs
new file mode 100644
index 00000000000..4b93ed6b223
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/kpis.hbs
@@ -0,0 +1 @@
+<div {{react-render this.ReactComponent props=(hash chartDays=@chartDays audience=@audience selected=@selected)}}></div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/charts/kpis.js b/ghost/admin/app/components/stats/charts/kpis.js
new file mode 100644
index 00000000000..2e8a7da5104
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/kpis.js
@@ -0,0 +1,167 @@
+'use client';
+
+import Component from '@glimmer/component';
+import React from 'react';
+import moment from 'moment-timezone';
+import {AreaChart, useQuery} from '@tinybirdco/charts';
+import {inject} from 'ghost-admin/decorators/inject';
+
+export default class KpisComponent extends Component {
+    @inject config;
+
+    ReactComponent = (props) => {
+        let chartDays = props.chartDays;
+        let audience = props.audience;
+
+        // @TODO: ATM there's a two day worth gap (padding) on the right side
+        // of the chart. endDate needs to be adjusted to get rid of it
+        const endDate = moment().endOf('day');
+        const startDate = moment().subtract(chartDays - 1, 'days').startOf('day');
+
+        /**
+         * @typedef {Object} Params
+         * @property {string} cid
+         * @property {string} [date_from]
+         * @property {string} [date_to]
+         * @property {string} [member_status]
+         * @property {number} [limit]
+         * @property {number} [skip]
+         */
+
+        const params = {
+            site_uuid: this.config.stats.id,
+            date_from: startDate.format('YYYY-MM-DD'),
+            date_to: endDate.format('YYYY-MM-DD'),
+            member_status: audience.length === 0 ? null : audience.join(',')
+        };
+
+        const LINE_COLOR = '#8E42FF';
+        const INDEX = 'date';
+        const CATEGORY = props.selected;
+
+        const {data, meta, error, loading} = useQuery({
+            endpoint: `${this.config.stats.endpoint}/v0/pipes/kpis.json`,
+            token: this.config.stats.token,
+            params
+        });
+
+        return (
+            <AreaChart
+                data={data}
+                meta={meta}
+                loading={loading}
+                error={error}
+                index={INDEX}
+                categories={[CATEGORY]}
+                colorPalette={[LINE_COLOR, '#008060', '#0EB1B9', '#9263AF', '#5A6FC0']}
+                backgroundColor="transparent"
+                fontSize="13px"
+                textColor="#AEB7C1"
+                height="300px"
+                params={params}
+                options={{
+                    grid: {
+                        left: '0%',
+                        right: '0%',
+                        top: '10%',
+                        bottom: 0,
+                        containLabel: true
+                    },
+                    xAxis: {
+                        type: 'time',
+                        // min: startDate.toISOString(),
+                        // max: endDate.toISOString(),
+                        boundaryGap: ['0%', '0.5%'],
+                        axisLabel: {
+                            formatter: chartDays <= 7 ? '{ee}' : '{dd} {MMM}'
+                        },
+                        axisTick: {
+                            alignWithLabel: true
+                        },
+                        axisPointer: {
+                            snap: true
+                        },
+                        splitNumber: chartDays <= 7 ? 7 : 5,
+                        splitLine: {
+                            show: false
+                        },
+                        axisLine: {
+                            lineStyle: {
+                                color: '#DDE1E5'
+                            }
+                        }
+                    },
+                    yAxis: {
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                type: 'dashed',
+                                color: '#DDE1E5' // Adjust color as needed
+                            }
+                        }
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        backgroundColor: '#fff',
+                        textStyle: {
+                            color: '#15171A'
+                        },
+                        axisPointer: {
+                            type: 'line',
+                            z: 1
+                        },
+                        extraCssText: 'box-shadow: 0px 100px 80px 0px rgba(0, 0, 0, 0.07), 0px 41.778px 33.422px 0px rgba(0, 0, 0, 0.05), 0px 22.336px 17.869px 0px rgba(0, 0, 0, 0.04), 0px 12.522px 10.017px 0px rgba(0, 0, 0, 0.04), 0px 6.65px 5.32px 0px rgba(0, 0, 0, 0.03), 0px 2.767px 2.214px 0px rgba(0, 0, 0, 0.02);',
+                        formatter: function (fparams) {
+                            return `<div><div>${moment(fparams[0].value[0]).format('DD MMM, YYYY')}</div><div><span style="display: inline-block; margin-right: 16px; font-weight: 600;">Pageviews</span> ${fparams[0].value[1]}</div></div>`;
+                        }
+                    },
+                    series: [
+                        {
+                            itemStyle: {
+                                color: LINE_COLOR
+                            },
+                            type: 'line',
+                            areaStyle: {
+                                opacity: 0.6,
+                                // color: 'rgba(198, 220, 255, 1)'
+                                color: {
+                                    type: 'linear',
+                                    x: 0,
+                                    y: 0,
+                                    x2: 0,
+                                    y2: 1,
+                                    colorStops: [{
+                                        offset: 0, color: 'rgba(142, 66, 255, 0.3)' // color at 0%
+                                    }, {
+                                        offset: 1, color: 'rgba(142, 66, 255, 0.0)' // color at 100%
+                                    }],
+                                    global: false // default is false
+                                }
+                            },
+                            lineStyle: {
+                                width: 2,
+                                cap: 'square'
+                            },
+                            emphasis: {
+                                itemStyle: {
+                                    opacity: 1,
+                                    borderWidth: 3
+                                }
+                            },
+                            showSymbol: false,
+                            symbol: 'circle',
+                            symbolSize: 10,
+                            z: 8,
+                            smooth: false,
+                            name: props.selected,
+                            data: (data ?? []).map(row => [
+                                String(row[INDEX]),
+                                row[props.selected]
+                            ])
+                        }
+                    ]
+                }}
+            />
+        );
+    };
+}
diff --git a/ghost/admin/app/components/stats/charts/technical.hbs b/ghost/admin/app/components/stats/charts/technical.hbs
new file mode 100644
index 00000000000..4b93ed6b223
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/technical.hbs
@@ -0,0 +1 @@
+<div {{react-render this.ReactComponent props=(hash chartDays=@chartDays audience=@audience selected=@selected)}}></div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/charts/technical.js b/ghost/admin/app/components/stats/charts/technical.js
new file mode 100644
index 00000000000..e5129fb3014
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/technical.js
@@ -0,0 +1,164 @@
+'use client';
+
+import Component from '@glimmer/component';
+import React from 'react';
+import moment from 'moment-timezone';
+import {DonutChart, useQuery} from '@tinybirdco/charts';
+import {inject} from 'ghost-admin/decorators/inject';
+
+export default class KpisComponent extends Component {
+    @inject config;
+
+    ReactComponent = (props) => {
+        let chartDays = props.chartDays;
+        let audience = props.audience;
+        const endDate = moment().endOf('day');
+        const startDate = moment().subtract(chartDays - 1, 'days').startOf('day');
+
+        /**
+         * @typedef {Object} Params
+         * @property {string} cid
+         * @property {string} [date_from]
+         * @property {string} [date_to]
+         * @property {string} [member_status]
+         * @property {number} [limit]
+         * @property {number} [skip]
+         */
+        const params = {
+            site_uuid: this.config.stats.id,
+            date_from: startDate.format('YYYY-MM-DD'),
+            date_to: endDate.format('YYYY-MM-DD'),
+            member_status: audience.length === 0 ? null : audience.join(','),
+            limit: 5
+        };
+
+        let endpoint;
+
+        switch (props.selected) {
+        case 'browsers':
+            endpoint = `${this.config.stats.endpoint}/v0/pipes/top_browsers.json`;
+            break;
+        default:
+            endpoint = `${this.config.stats.endpoint}/v0/pipes/top_devices.json`;
+        }
+
+        const {data, meta, error, loading} = useQuery({
+            endpoint: endpoint,
+            token: this.config.stats.token,
+            params
+        });
+
+        const colorPalette = ['#B78AFB', '#7FDE8A', '#FBCE75', '#F97DB7', '#6ED0FB'];
+
+        let transformedData;
+        let indexBy;
+        let tableHead;
+
+        switch (props.selected) {
+        case 'browsers':
+            transformedData = (data ?? []).map((item, index) => ({
+                name: item.browser.charAt(0).toUpperCase() + item.browser.slice(1),
+                value: item.hits,
+                color: colorPalette[index % colorPalette.length]
+            }));
+            indexBy = 'browser';
+            tableHead = 'Browser';
+            break;
+        default:
+            transformedData = (data ?? []).map((item, index) => ({
+                name: item.device.charAt(0).toUpperCase() + item.device.slice(1),
+                value: item.hits,
+                color: colorPalette[index % colorPalette.length]
+            }));
+            indexBy = 'device';
+            tableHead = 'Device';
+        }
+
+        return (
+            <div className="gh-stats-piechart-container">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>{tableHead}</th>
+                            <th>Hits</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {transformedData.map((item, index) => (
+                            <tr key={index}>
+                                <td>
+                                    <span style={{backgroundColor: item.color, display: 'inline-block', width: '10px', height: '10px', marginRight: '5px', borderRadius: '2px'}}></span>
+                                    {item.name}
+                                </td>
+                                <td>{item.value}</td>
+                            </tr>
+                        ))}
+                    </tbody>
+                </table>
+                <div className="gh-stats-piechart">
+                    <DonutChart
+                        data={data}
+                        meta={meta}
+                        loading={loading}
+                        error={error}
+                        index={indexBy}
+                        categories={['hits']}
+                        colorPalette={colorPalette}
+                        backgroundColor="transparent"
+                        fontSize="13px"
+                        textColor="#AEB7C1"
+                        showLegend={true}
+                        params={params}
+                        height="210px"
+                        options={{
+                            color: colorPalette,
+                            tooltip: {
+                                show: true,
+                                trigger: 'item',
+                                backgroundColor: '#fff',
+                                textStyle: {
+                                    color: '#15171A'
+                                },
+                                extraCssText: 'border: none !important; box-shadow: 0px 100px 80px 0px rgba(0, 0, 0, 0.07), 0px 41.778px 33.422px 0px rgba(0, 0, 0, 0.05), 0px 22.336px 17.869px 0px rgba(0, 0, 0, 0.04), 0px 12.522px 10.017px 0px rgba(0, 0, 0, 0.04), 0px 6.65px 5.32px 0px rgba(0, 0, 0, 0.03), 0px 2.767px 2.214px 0px rgba(0, 0, 0, 0.02);',
+                                formatter: function (fparams) {
+                                    return `<span style="background-color: ${fparams.color}; display: inline-block; width: 10px; height: 10px; margin-right: 5px; border-radius: 2px;"></span> ${fparams.name}: ${fparams.value}`;
+                                }
+                            },
+                            legend: {
+                                show: false,
+                                orient: 'vertical',
+                                left: 'left',
+                                textStyle: {
+                                    color: '#AEB7C1'
+                                }
+                            },
+                            series: [
+                                {
+                                    animation: true,
+                                    name: 'Browser',
+                                    type: 'pie',
+                                    radius: ['60%', '90%'],
+                                    center: ['50%', '50%'], // Adjusted to align the chart to the top
+                                    data: transformedData,
+                                    label: {
+                                        show: false,
+                                        formatter: '{b}: {c}'
+                                    },
+                                    labelLine: {
+                                        lineStyle: {
+                                            color: '#DDE1E5'
+                                        },
+                                        smooth: 0.2,
+                                        length: 10,
+                                        length2: 20
+                                    },
+                                    padding: 0
+                                }
+                            ]
+                        }}
+                    />
+                </div>
+            </div>
+        );
+    };
+}
diff --git a/ghost/admin/app/components/stats/charts/top-locations.hbs b/ghost/admin/app/components/stats/charts/top-locations.hbs
new file mode 100644
index 00000000000..8f87e39f03c
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/top-locations.hbs
@@ -0,0 +1 @@
+<div {{react-render this.ReactComponent props=(hash chartDays=@chartDays audience=@audience)}}></div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/charts/top-locations.js b/ghost/admin/app/components/stats/charts/top-locations.js
new file mode 100644
index 00000000000..9157f690e1f
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/top-locations.js
@@ -0,0 +1,52 @@
+import Component from '@glimmer/component';
+import React from 'react';
+import moment from 'moment-timezone';
+import {BarList, useQuery} from '@tinybirdco/charts';
+import {inject} from 'ghost-admin/decorators/inject';
+
+export default class TopLocations extends Component {
+    @inject config;
+
+    ReactComponent = (props) => {
+        let chartDays = props.chartDays;
+        let audience = props.audience;
+
+        const endDate = moment().endOf('day');
+        const startDate = moment().subtract(chartDays - 1, 'days').startOf('day');
+
+        /**
+         * @typedef {Object} Params
+         * @property {string} site_uuid
+         * @property {string} [date_from]
+         * @property {string} [date_to]
+         * @property {string} [member_status]
+         * @property {number} [limit]
+         * @property {number} [skip]
+         */
+        const params = {
+            site_uuid: this.config.stats.id,
+            date_from: startDate.format('YYYY-MM-DD'),
+            date_to: endDate.format('YYYY-MM-DD'),
+            member_status: audience.length === 0 ? null : audience.join(','),
+            limit: 6
+        };
+
+        const {data, meta, error, loading} = useQuery({
+            endpoint: `${this.config.stats.endpoint}/v0/pipes/top_locations.json`,
+            token: this.config.stats.token,
+            params
+        });
+
+        return (
+            <BarList
+                data={data}
+                meta={meta}
+                error={error}
+                loading={loading}
+                index="location"
+                categories={['hits']}
+                colorPalette={['#E8D9FF']}
+            />
+        );
+    };
+}
diff --git a/ghost/admin/app/components/stats/charts/top-pages.hbs b/ghost/admin/app/components/stats/charts/top-pages.hbs
new file mode 100644
index 00000000000..8f87e39f03c
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/top-pages.hbs
@@ -0,0 +1 @@
+<div {{react-render this.ReactComponent props=(hash chartDays=@chartDays audience=@audience)}}></div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/charts/top-pages.js b/ghost/admin/app/components/stats/charts/top-pages.js
new file mode 100644
index 00000000000..8529a419c17
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/top-pages.js
@@ -0,0 +1,55 @@
+'use client';
+
+import Component from '@glimmer/component';
+import React from 'react';
+import moment from 'moment-timezone';
+import {BarList, useQuery} from '@tinybirdco/charts';
+import {inject} from 'ghost-admin/decorators/inject';
+
+export default class TopPages extends Component {
+    @inject config;
+
+    ReactComponent = (props) => {
+        let chartDays = props.chartDays;
+        let audience = props.audience;
+
+        const endDate = moment().endOf('day');
+        const startDate = moment().subtract(chartDays - 1, 'days').startOf('day');
+
+        /**
+         * @typedef {Object} Params
+         * @property {string} cid
+         * @property {string} [date_from]
+         * @property {string} [date_to]
+         * @property {string} [member_status]
+         * @property {number} [limit]
+         * @property {number} [skip]
+         */
+        const params = {
+            site_uuid: this.config.stats.id,
+            date_from: startDate.format('YYYY-MM-DD'),
+            date_to: endDate.format('YYYY-MM-DD'),
+            member_status: audience.length === 0 ? null : audience.join(','),
+            limit: 6
+        };
+
+        const {data, meta, error, loading} = useQuery({
+            endpoint: `${this.config.stats.endpoint}/v0/pipes/top_pages.json`,
+            token: this.config.stats.token,
+            params
+        });
+
+        return (
+            <BarList
+                data={data}
+                meta={meta}
+                error={error}
+                loading={loading}
+                index="pathname"
+                categories={['hits']}
+                colorPalette={['#E8D9FF']}
+                height="300px"
+            />
+        );
+    };
+}
diff --git a/ghost/admin/app/components/stats/charts/top-sources.hbs b/ghost/admin/app/components/stats/charts/top-sources.hbs
new file mode 100644
index 00000000000..8f87e39f03c
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/top-sources.hbs
@@ -0,0 +1 @@
+<div {{react-render this.ReactComponent props=(hash chartDays=@chartDays audience=@audience)}}></div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/charts/top-sources.js b/ghost/admin/app/components/stats/charts/top-sources.js
new file mode 100644
index 00000000000..635d75806e7
--- /dev/null
+++ b/ghost/admin/app/components/stats/charts/top-sources.js
@@ -0,0 +1,55 @@
+'use client';
+
+import Component from '@glimmer/component';
+import React from 'react';
+import moment from 'moment-timezone';
+import {BarList, useQuery} from '@tinybirdco/charts';
+import {inject} from 'ghost-admin/decorators/inject';
+
+export default class TopPages extends Component {
+    @inject config;
+
+    ReactComponent = (props) => {
+        let chartDays = props.chartDays;
+        let audience = props.audience;
+
+        const endDate = moment().endOf('day');
+        const startDate = moment().subtract(chartDays - 1, 'days').startOf('day');
+
+        /**
+         * @typedef {Object} Params
+         * @property {string} cid
+         * @property {string} [date_from]
+         * @property {string} [date_to]
+         * @property {string} [member_status]
+         * @property {number} [limit]
+         * @property {number} [skip]
+         */
+        const params = {
+            site_uuid: this.config.stats.id,
+            date_from: startDate.format('YYYY-MM-DD'),
+            date_to: endDate.format('YYYY-MM-DD'),
+            member_status: audience.length === 0 ? null : audience.join(',')
+        };
+
+        const {data, meta, error, loading} = useQuery({
+            endpoint: `${this.config.stats.endpoint}/v0/pipes/top_sources.json`,
+            token: this.config.stats.token,
+            params,
+            limit: 6
+        });
+
+        return (
+            <BarList
+                data={data}
+                meta={meta}
+                error={error}
+                loading={loading}
+                index="referrer"
+                categories={['hits']}
+                colorPalette={['#E8D9FF']}
+                height="300px"
+            />
+        );
+    };
+}
diff --git a/ghost/admin/app/components/stats/kpis-overview.hbs b/ghost/admin/app/components/stats/kpis-overview.hbs
new file mode 100644
index 00000000000..71f65874649
--- /dev/null
+++ b/ghost/admin/app/components/stats/kpis-overview.hbs
@@ -0,0 +1,26 @@
+<div class="gh-stats-tabs">
+    <button type="button" class="gh-stats-tab min-width {{if this.visitsTabSelected 'is-selected'}}" {{on "click" this.changeTabToVisits}}>
+        <Stats::Parts::Metric
+            @label="Unique visitors"
+            @value={{this.totals.visits}} />
+    </button>
+
+    <button type="button" class="gh-stats-tab min-width {{if this.pageviewsTabSelected 'is-selected'}}" {{on "click" this.changeTabToPageviews}}>
+        <Stats::Parts::Metric
+            @label="Site Pageviews"
+            @value={{this.totals.pageviews}} />
+    </button>
+
+    <button type="button" class="gh-stats-tab min-width {{if this.avgVisitTimeTabSelected 'is-selected'}}" {{on "click" this.changeTabToAvgVisitTime}}>
+        <Stats::Parts::Metric
+            @label="Avg Visit Time"
+            @value="{{this.totals.avg_session_sec}}m" />
+    </button>
+
+    <button type="button" class="gh-stats-tab min-width {{if this.bounceRateTabSelected 'is-selected'}}" {{on "click" this.changeTabToBounceRate}}>
+        <Stats::Parts::Metric
+            @label="Bounce Rate"
+            @value="{{this.totals.bounce_rate}}%" />
+    </button>
+</div>
+<Stats::Charts::Kpis @chartDays={{@chartDays}} @audience={{@audience}} @selected={{this.selected}} />
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/kpis-overview.js b/ghost/admin/app/components/stats/kpis-overview.js
new file mode 100644
index 00000000000..96794d2026d
--- /dev/null
+++ b/ghost/admin/app/components/stats/kpis-overview.js
@@ -0,0 +1,111 @@
+import Component from '@glimmer/component';
+import fetch from 'fetch';
+import {action} from '@ember/object';
+import {inject} from 'ghost-admin/decorators/inject';
+import {task} from 'ember-concurrency';
+import {tracked} from '@glimmer/tracking';
+
+export default class KpisOverview extends Component {
+    @inject config;
+    @tracked selected = 'visits';
+    @tracked totals = null;
+
+    constructor() {
+        super(...arguments);
+        this.fetchData.perform();
+    }
+
+    setupFocusListener() {
+        document.addEventListener('visibilitychange', () => {
+            if (!document.hidden) {
+                this.fetchData.perform();
+            }
+        });
+    }
+
+    @task
+    *fetchData() {
+        try {
+            const response = yield fetch(`${this.config.stats.endpoint}/v0/pipes/kpis.json?site_uuid=${this.config.stats.id}`, {
+                method: 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${this.config.stats.token}`
+                }
+            });
+
+            if (!response.ok) {
+                throw new Error('Network response was not ok');
+            }
+
+            const rawData = yield response.json();
+
+            this.totals = this.processData(rawData.data);
+        } catch (error) {
+            // console.error('Error fetching KPI data:', error);
+            // Handle error (e.g., set an error state, show a notification)
+        }
+    }
+
+    processData(data) {
+        const queryData = data;
+
+        // Sum total KPI value from the trend
+        const _KPITotal = kpi => queryData.reduce((prev, curr) => (curr[kpi] ?? 0) + prev, 0);
+
+        // Get total number of sessions
+        const totalVisits = _KPITotal('visits');
+
+        // Sum total KPI value from the trend, ponderating using sessions
+        const _ponderatedKPIsTotal = kpi => queryData.reduce((prev, curr) => prev + ((curr[kpi] ?? 0) * curr.visits / totalVisits), 0);
+
+        return {
+            avg_session_sec: Math.floor(_ponderatedKPIsTotal('avg_session_sec') / 60),
+            pageviews: _KPITotal('pageviews'),
+            visits: totalVisits,
+            bounce_rate: _ponderatedKPIsTotal('bounce_rate').toFixed(2)
+        };
+    }
+
+    willDestroy() {
+        super.willDestroy();
+        // Remove the event listener when the component is destroyed
+        document.removeEventListener('visibilitychange', this.fetchData.perform);
+    }
+
+    @action
+    changeTabToVisits() {
+        this.selected = 'visits';
+    }
+
+    @action
+    changeTabToPageviews() {
+        this.selected = 'pageviews';
+    }
+
+    @action
+    changeTabToAvgVisitTime() {
+        this.selected = 'avg_session_sec';
+    }
+
+    @action
+    changeTabToBounceRate() {
+        this.selected = 'bounce_rate';
+    }
+
+    get visitsTabSelected() {
+        return (this.selected === 'visits');
+    }
+
+    get pageviewsTabSelected() {
+        return (this.selected === 'pageviews');
+    }
+
+    get avgVisitTimeTabSelected() {
+        return (this.selected === 'avg_session_sec');
+    }
+
+    get bounceRateTabSelected() {
+        return (this.selected === 'bounce_rate');
+    }
+}
diff --git a/ghost/admin/app/components/stats/parts/audience-filter.hbs b/ghost/admin/app/components/stats/parts/audience-filter.hbs
new file mode 100644
index 00000000000..a40cad8d919
--- /dev/null
+++ b/ghost/admin/app/components/stats/parts/audience-filter.hbs
@@ -0,0 +1,33 @@
+<GhBasicDropdown @verticalPosition="below" as |dd|>
+    <dd.Trigger class="gh-btn gh-btn-icon gh-btn-action-icon" data-test-id="filter-events-button">
+        <span class={{if @excludedAudiences "gh-btn-label-green"}}>
+            {{svg-jar "members"}}
+            Audience
+        </span>
+    </dd.Trigger>
+
+    <dd.Content class="gh-member-activity-actions-menu dropdown-menu dropdown-triangle-top-right gh-member-activity-actions-menu--suppression">
+        <ul class="ember-power-select-options" role="listbox">
+            {{#each this.audienceTypes as |type idx|}}
+                <li  class="ember-power-select-option mb0 gh-member-activity-actions-menu-item">
+                    <label for="type-{{idx}}">
+                        <span>{{type.name}}</span>
+                    </label>
+                    <div class="for-switch x-small">
+                        <label class="switch" for="type-{{idx}}">
+                            <input
+                                data-test-id="audience-type-filter-checkbox-{{type.value}}"
+                                type="checkbox"
+                                checked={{type.isSelected}}
+                                id="type-{{idx}}"
+                                name="audiences"
+                                class="gh-input post-settings-featured"
+                                {{on "input" (fn this.toggleAudienceType type.value)}}>
+                            <span class="input-toggle-component"></span>
+                        </label>
+                    </div>
+                </li>
+            {{/each}}
+        </ul>
+    </dd.Content>
+</GhBasicDropdown>
diff --git a/ghost/admin/app/components/stats/parts/audience-filter.js b/ghost/admin/app/components/stats/parts/audience-filter.js
new file mode 100644
index 00000000000..8827e89b38e
--- /dev/null
+++ b/ghost/admin/app/components/stats/parts/audience-filter.js
@@ -0,0 +1,41 @@
+import Component from '@glimmer/component';
+import {action} from '@ember/object';
+import {inject as service} from '@ember/service';
+
+export const AUDIENCE_TYPES = [
+    {name: 'Logged out visitors', value: 'undefined'},
+    {name: 'Free members', value: 'free'},
+    {name: 'Paid members', value: 'paid'}
+];
+
+function toggleAudienceType(audicenceType, audicenceTypes) {
+    const excludedAudiences = new Set(audicenceTypes.filter(type => !type.isSelected).map(type => type.value));
+    if (excludedAudiences.has(audicenceType)) {
+        excludedAudiences.delete(audicenceType);
+    } else {
+        excludedAudiences.add(audicenceType);
+    }
+    return Array.from(excludedAudiences).join(',');
+}
+
+export default class MembersActivityEventTypeFilter extends Component {
+    @service settings;
+    @service feature;
+
+    get audienceTypes() {
+        const excludedAudiences = (this.args.excludedAudiences || '').split(',');
+        const availableAudiences = AUDIENCE_TYPES;
+
+        return availableAudiences.map(type => ({
+            name: type.name,
+            value: type.value,
+            isSelected: !excludedAudiences.includes(type.value)
+        }));
+    }
+
+    @action
+    toggleAudienceType(audicenceType) {
+        const newExcludedAudiences = toggleAudienceType(audicenceType, this.audienceTypes);
+        this.args.onChange(newExcludedAudiences || null);
+    }
+}
diff --git a/ghost/admin/app/components/stats/parts/metric.hbs b/ghost/admin/app/components/stats/parts/metric.hbs
new file mode 100644
index 00000000000..b5c7eaa7454
--- /dev/null
+++ b/ghost/admin/app/components/stats/parts/metric.hbs
@@ -0,0 +1,12 @@
+<div class="gh-stats-metric">
+    <div class="gh-stats-metric-data">
+        <h5 class="gh-stats-metric-label">
+            {{@label}}
+        </h5>
+        {{#if @value}}
+            <div class="gh-stats-metric-value">
+                <span class="value">{{@value}}</span>
+            </div>
+        {{/if}}
+    </div>
+</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/technical-overview.hbs b/ghost/admin/app/components/stats/technical-overview.hbs
new file mode 100644
index 00000000000..c5a908c07a6
--- /dev/null
+++ b/ghost/admin/app/components/stats/technical-overview.hbs
@@ -0,0 +1,18 @@
+<div class="gh-stats-tabs">
+    <button type="button" class="gh-stats-tab {{if this.devicesTabSelected 'is-selected'}}" {{on "click" this.changeTabToDevices}}>
+        <Stats::Parts::Metric
+            @label="Devices" />
+    </button>
+
+    <button type="button" class="gh-stats-tab {{if this.browsersTabSelected 'is-selected'}}" {{on "click" this.changeTabToBrowsers}}>
+        <Stats::Parts::Metric
+            @label="Browsers" />
+    </button>
+
+    {{!-- <button type="button" class="gh-stats-tab {{if this.osTabSelected 'is-selected'}}" {{on "click" this.changeTabToOSs}}>
+        <Stats::Parts::Metric
+            @label="Operating systems" />
+    </button> --}}
+</div>
+
+<Stats::Charts::Technical @chartDays={{@chartDays}} @audience={{@audience}} @selected={{this.selected}} />
\ No newline at end of file
diff --git a/ghost/admin/app/components/stats/technical-overview.js b/ghost/admin/app/components/stats/technical-overview.js
new file mode 100644
index 00000000000..8c7b836cc6a
--- /dev/null
+++ b/ghost/admin/app/components/stats/technical-overview.js
@@ -0,0 +1,43 @@
+import Component from '@glimmer/component';
+import {action} from '@ember/object';
+import {tracked} from '@glimmer/tracking';
+
+export default class KpisOverview extends Component {
+    @tracked selected = 'devices';
+    @tracked totals = null;
+
+    constructor() {
+        super(...arguments);
+    }
+
+    willDestroy() {
+        super.willDestroy();
+    }
+
+    @action
+    changeTabToDevices() {
+        this.selected = 'devices';
+    }
+
+    @action
+    changeTabToBrowsers() {
+        this.selected = 'browsers';
+    }
+
+    @action
+    changeTabToOSs() {
+        this.selected = 'os';
+    }
+
+    get devicesTabSelected() {
+        return (this.selected === 'devices');
+    }
+
+    get browsersTabSelected() {
+        return (this.selected === 'browsers');
+    }
+
+    get osTabSelected() {
+        return (this.selected === 'os');
+    }
+}
diff --git a/ghost/admin/app/components/websockets.hbs b/ghost/admin/app/components/websockets.hbs
deleted file mode 100644
index ff7065798d8..00000000000
--- a/ghost/admin/app/components/websockets.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="gh-expandable-header">
-    <div>
-        <h4 class="gh-expandable-title">Counter</h4>
-        <p class="gh-expandable-description">Current counter value: <strong>{{this.counter}}</strong></p>
-        <p class="gh-expandable-description">This counter will reset when Ghost reboots.</p>
-    </div>
-    <button type="button" class="gh-btn" {{on "click" this.handleClick}} data-test-button="delete-all"><span>Add One</span></button>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/components/websockets.js b/ghost/admin/app/components/websockets.js
deleted file mode 100644
index 5dc9a025fe1..00000000000
--- a/ghost/admin/app/components/websockets.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 {tracked} from '@glimmer/tracking';
-
-export default class Websockets extends Component {
-    @service('socket-io') socketIOService;
-
-    constructor(...args) {
-        super(...args);
-        // initialize connection
-
-        // TODO: ensure this works with subdirectories
-        let origin = window.location.origin; // this gives us host:port
-        let socket = this.socketIOService.socketFor(origin);
-        // add listener
-        socket.on('addCount', (value) => {
-            this.counter = value;
-        });
-    }
-
-    // button counter
-    @tracked counter = 0;
-
-    // handle button/event
-    @action handleClick() {
-        let socket = this.socketIOService.socketFor(origin);
-        this.counter = 1 + this.counter;
-        socket.emit('addCount', this.counter);
-    }
-}
diff --git a/ghost/admin/app/controllers/activitypub-x.js b/ghost/admin/app/controllers/activitypub-x.js
new file mode 100644
index 00000000000..dd48c0620a9
--- /dev/null
+++ b/ghost/admin/app/controllers/activitypub-x.js
@@ -0,0 +1,6 @@
+import Controller from '@ember/controller';
+import {inject as service} from '@ember/service';
+
+export default class ActivitypubXController extends Controller {
+    @service upgradeStatus;
+}
diff --git a/ghost/admin/app/controllers/dashboard.js b/ghost/admin/app/controllers/dashboard.js
index b1da2f0005f..9e4ec17dfd6 100644
--- a/ghost/admin/app/controllers/dashboard.js
+++ b/ghost/admin/app/controllers/dashboard.js
@@ -18,10 +18,11 @@ const DAYS_OPTIONS = [{
 
 export default class DashboardController extends Controller {
     @service dashboardStats;
+    @service feature;
     @service membersUtils;
-    @service store;
     @service mentionUtils;
-    @service feature;
+    @service onboarding;
+    @service store;
 
     @tracked mentions = [];
     @tracked hasNewMentions = false;
diff --git a/ghost/admin/app/controllers/demo-x.js b/ghost/admin/app/controllers/demo-x.js
new file mode 100644
index 00000000000..74bb41563e0
--- /dev/null
+++ b/ghost/admin/app/controllers/demo-x.js
@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class DemoXController extends Controller {}
diff --git a/ghost/admin/app/controllers/lexical-editor.js b/ghost/admin/app/controllers/lexical-editor.js
index 7d89311fd12..a57dff23362 100644
--- a/ghost/admin/app/controllers/lexical-editor.js
+++ b/ghost/admin/app/controllers/lexical-editor.js
@@ -15,8 +15,7 @@ import moment from 'moment-timezone';
 import {GENERIC_ERROR_MESSAGE} from '../services/notifications';
 import {action, computed} from '@ember/object';
 import {alias, mapBy} from '@ember/object/computed';
-import {capitalize} from '@ember/string';
-import {captureMessage} from '@sentry/ember';
+import {capitalizeFirstLetter} from '../helpers/capitalize-first-letter';
 import {dropTask, enqueueTask, restartableTask, task, taskGroup, timeout} from 'ember-concurrency';
 import {htmlSafe} from '@ember/template';
 import {inject} from 'ghost-admin/decorators/inject';
@@ -26,15 +25,21 @@ import {isHostLimitError, isServerUnreachableError, isVersionMismatchError} from
 import {isInvalidError} from 'ember-ajax/errors';
 import {mobiledocToLexical} from '@tryghost/kg-converters';
 import {inject as service} from '@ember/service';
+import {slugify} from '@tryghost/string';
+import {tracked} from '@glimmer/tracking';
 
 const DEFAULT_TITLE = '(Untitled)';
 // suffix that is applied to the title of a post when it has been duplicated
 const DUPLICATED_POST_TITLE_SUFFIX = '(Copy)';
+
 // time in ms to save after last content edit
 const AUTOSAVE_TIMEOUT = 3000;
 // time in ms to force a save if the user is continuously typing
 const TIMEDSAVE_TIMEOUT = 60000;
 
+const TK_REGEX = new RegExp(/(^|.)([^\p{L}\p{N}\s]*(TK)+[^\p{L}\p{N}\s]*)(.)?/u);
+const WORD_CHAR_REGEX = new RegExp(/\p{L}|\p{N}/u);
+
 // this array will hold properties we need to watch for this.hasDirtyAttributes
 let watchedProps = [
     'post.lexicalScratch',
@@ -99,6 +104,45 @@ const messageMap = {
     }
 };
 
+function textHasTk(text) {
+    let matchArr = TK_REGEX.exec(text);
+
+    if (matchArr === null) {
+        return false;
+    }
+
+    function isValidMatch(match) {
+        // negative lookbehind isn't supported before Safari 16.4
+        // so we capture the preceding char and test it here
+        if (match[1] && match[1].trim() && WORD_CHAR_REGEX.test(match[1])) {
+            return false;
+        }
+
+        // we also check any following char in code to avoid an overly
+        // complex regex when looking for word-chars following the optional
+        // trailing symbol char
+        if (match[4] && match[4].trim() && WORD_CHAR_REGEX.test(match[4])) {
+            return false;
+        }
+
+        return true;
+    }
+
+    // our regex will match invalid TKs because we can't use negative lookbehind
+    // so we need to loop through the matches discarding any that are invalid
+    // and moving on to any subsequent matches
+    while (matchArr !== null && !isValidMatch(matchArr)) {
+        text = text.slice(matchArr.index + matchArr[0].length - 1);
+        matchArr = TK_REGEX.exec(text);
+    }
+
+    if (matchArr === null) {
+        return false;
+    }
+
+    return true;
+}
+
 @classic
 export default class LexicalEditorController extends Controller {
     @controller application;
@@ -109,12 +153,15 @@ export default class LexicalEditorController extends Controller {
     @service notifications;
     @service router;
     @service slugGenerator;
+    @service search;
     @service session;
     @service settings;
     @service ui;
 
     @inject config;
 
+    @tracked excerptErrorMessage = '';
+
     /* public properties -----------------------------------------------------*/
 
     shouldFocusTitle = false;
@@ -127,10 +174,13 @@ export default class LexicalEditorController extends Controller {
 
     // koenig related properties
     wordCount = 0;
+    postTkCount = 0;
+    featureImageTkCount = 0;
 
     /* private properties ----------------------------------------------------*/
 
     _leaveConfirmed = false;
+    _saveOnLeavePerformed = false;
     _previousTagNames = null; // set by setPost and _postSaved, used in hasDirtyAttributes
 
     /* computed properties ---------------------------------------------------*/
@@ -213,6 +263,30 @@ export default class LexicalEditorController extends Controller {
         return config.environment !== 'test' && this.get('post.isDraft');
     }
 
+    TK_REGEX = new RegExp(/(^|.)([^\p{L}\p{N}\s]*(TK)+[^\p{L}\p{N}\s]*)(.)?/u);
+    WORD_CHAR_REGEX = new RegExp(/\p{L}|\p{N}/u);
+
+    @computed('post.titleScratch')
+    get titleHasTk() {
+        return textHasTk(this.post.titleScratch);
+    }
+
+    @computed('post.customExcerpt')
+    get excerptHasTk() {
+        if (!this.feature.editorExcerpt) {
+            return false;
+        }
+
+        return textHasTk(this.post.customExcerpt || '');
+    }
+
+    @computed('titleHasTk', 'excerptHasTk', 'postTkCount', 'featureImageTkCount')
+    get tkCount() {
+        const titleTk = this.titleHasTk ? 1 : 0;
+        const excerptTk = (this.feature.editorExcerpt && this.excerptHasTk) ? 1 : 0;
+        return titleTk + excerptTk + this.postTkCount + this.featureImageTkCount;
+    }
+
     @action
     updateScratch(lexical) {
         this.set('post.lexicalScratch', JSON.stringify(lexical));
@@ -223,11 +297,39 @@ export default class LexicalEditorController extends Controller {
         this._timedSaveTask.perform();
     }
 
+    @action
+    updateSecondaryInstanceModel(lexical) {
+        this.set('post.secondaryLexicalState', JSON.stringify(lexical));
+    }
+
     @action
     updateTitleScratch(title) {
         this.set('post.titleScratch', title);
     }
 
+    @action
+    async updateExcerpt(excerpt) {
+        this.post.customExcerpt = excerpt;
+        try {
+            await this.post.validate({property: 'customExcerpt'});
+            this.excerptErrorMessage = '';
+        } catch (e) {
+            // validator throws undefined on validation error
+            if (e === undefined) {
+                this.excerptErrorMessage = this.post.errors.errorsFor('customExcerpt')?.[0]?.message;
+                return;
+            }
+            throw e;
+        }
+    }
+
+    @task
+    *saveExcerptTask() {
+        if (this.post.status === 'draft') {
+            yield this.autosaveTask.perform();
+        }
+    }
+
     // updates local willPublish/Schedule values, does not get applied to
     // the post's `status` value until a save is triggered
     @action
@@ -309,6 +411,16 @@ export default class LexicalEditorController extends Controller {
         this.set('wordCount', count);
     }
 
+    @action
+    updatePostTkCount(count) {
+        this.set('postTkCount', count);
+    }
+
+    @action
+    updateFeatureImageTkCount(count) {
+        this.set('featureImageTkCount', count);
+    }
+
     @action
     setFeatureImage(url) {
         this.post.set('featureImage', url);
@@ -323,6 +435,11 @@ export default class LexicalEditorController extends Controller {
         this.editorAPI = API;
     }
 
+    @action
+    registerSecondaryEditorAPI(API) {
+        this.secondaryEditorAPI = API;
+    }
+
     @action
     clearFeatureImage() {
         this.post.set('featureImage', null);
@@ -346,6 +463,13 @@ export default class LexicalEditorController extends Controller {
     @action
     setFeatureImageCaption(html) {
         this.post.set('featureImageCaption', html);
+    }
+
+    @action
+    handleFeatureImageCaptionBlur() {
+        if (!this.post || this.post.isDestroyed || this.post.isDestroying) {
+            return;
+        }
 
         if (this.post.isDraft) {
             this.autosaveTask.perform();
@@ -431,9 +555,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 +569,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 +613,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 +634,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);
                 }
             }
 
@@ -526,8 +661,7 @@ export default class LexicalEditorController extends Controller {
             if (!options.silent) {
                 let errorOrMessages = error || this.get('post.errors.messages');
                 this._showErrorAlert(prevStatus, this.get('post.status'), errorOrMessages);
-                // simulate a validation error for upstream tasks
-                throw undefined;
+                return;
             }
 
             return this.post;
@@ -536,6 +670,10 @@ export default class LexicalEditorController extends Controller {
 
     @task
     *beforeSaveTask(options = {}) {
+        if (this.post?.isDestroyed || this.post?.isDestroying) {
+            return;
+        }
+
         // ensure we remove any blank cards when performing a full save
         if (!options.backgroundSave) {
             // TODO: not yet implemented in react editor
@@ -672,28 +810,15 @@ export default class LexicalEditorController extends Controller {
 
         try {
             yield post.save(options);
-
-            // log if a save is slow
-            if (this.config.sentry_dsn && (Date.now() - startTime > 2000)) {
-                captureMessage('Successful Lexical save took > 2s', (scope) => {
-                    scope.setTag('save_time', Math.ceil((Date.now() - startTime) / 1000));
-                    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);
-                });
-            }
         } catch (error) {
             this.post.set('emailOnly', previousEmailOnlyValue);
 
             if (this.config.sentry_dsn && (Date.now() - startTime > 2000)) {
-                captureMessage('Failed Lexical save took > 2s', (scope) => {
+                Sentry.captureException('Failed Lexical save took > 2s', (scope) => {
                     scope.setTag('save_time', Math.ceil((Date.now() - startTime) / 1000));
                     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);
                 });
             }
@@ -754,39 +879,44 @@ export default class LexicalEditorController extends Controller {
         // this is necessary to force a save when the title is blank
         this.set('hasDirtyAttributes', true);
 
-        // generate slug if post
-        //  - is new and doesn't have a title yet
-        //  - still has the default title
-        //  - previously had a title that ended with the duplicated post title suffix
-        if (
-            (post.get('isNew') && !currentTitle) ||
-            (currentTitle === DEFAULT_TITLE) ||
-            currentTitle?.endsWith(DUPLICATED_POST_TITLE_SUFFIX)
-        ) {
-            yield this.generateSlugTask.perform();
-        }
-
+        // always save updates automatically for drafts
         if (this.get('post.isDraft')) {
+            yield this.generateSlugTask.perform();
             yield this.autosaveTask.perform();
         }
 
         this.ui.updateDocumentTitle();
     }
 
+    /*
+        // sync the post slug with the post title, except when:
+        // - the user has already typed a custom slug, which should not be overwritten
+        // - the post has been published, so that published URLs are not broken
+    */
     @enqueueTask
     *generateSlugTask() {
-        let title = this.get('post.titleScratch');
+        const currentTitle = this.get('post.title');
+        const newTitle = this.get('post.titleScratch');
+        const currentSlug = this.get('post.slug');
 
         // Only set an "untitled" slug once per post
-        if (title === DEFAULT_TITLE && this.get('post.slug')) {
+        if (newTitle === DEFAULT_TITLE && currentSlug) {
+            return;
+        }
+
+        // Update the slug unless the slug looks to be a custom slug or the title is a default/has been cleared out
+        if (
+            (currentSlug && slugify(currentTitle) !== currentSlug)
+            && !(currentTitle === DEFAULT_TITLE || currentTitle?.endsWith(DUPLICATED_POST_TITLE_SUFFIX))
+        ) {
             return;
         }
 
         try {
-            let slug = yield this.slugGenerator.generateSlug('post', title);
+            const newSlug = yield this.slugGenerator.generateSlug('post', newTitle);
 
-            if (!isBlank(slug)) {
-                this.set('post.slug', slug);
+            if (!isBlank(newSlug)) {
+                this.set('post.slug', newSlug);
             }
         } catch (error) {
             // Nothing to do (would be nice to log this somewhere though),
@@ -802,9 +932,12 @@ export default class LexicalEditorController extends Controller {
     @restartableTask
     *backgroundLoaderTask() {
         yield this.store.query('snippet', {limit: 'all'});
-        if (this.post.displayName === 'page' && this.feature.get('collections') && this.feature.get('collectionsCard')) {
+
+        if (this.post?.displayName === 'page' && this.feature.get('collections') && this.feature.get('collectionsCard')) {
             yield this.store.query('collection', {limit: 'all'});
         }
+
+        this.search.refreshContentTask.perform();
         this.syncMobiledocSnippets();
     }
 
@@ -938,21 +1071,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 +1079,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 +1092,31 @@ 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 leaving the editor and the post has changed since we last saved a revision (and it's not deleted), always save a new revision
+        //  but we should never autosave when leaving published or soon-to-be published content (scheduled); this should require the user to intervene
+        if (!this._saveOnLeavePerformed && hasChangedSinceLastRevision && hasDirtyAttributes && !state.isDeleted && post.get('status') === 'draft') {
             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 +1137,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();
             }
 
@@ -1023,6 +1148,7 @@ export default class LexicalEditorController extends Controller {
             if (this.post) {
                 Object.assign(this._leaveModalReason, {status: this.post.status});
             }
+            Sentry.captureMessage('showing leave editor modal', {extra: this._leaveModalReason});
             console.log('showing leave editor modal', this._leaveModalReason); // eslint-disable-line
 
             const reallyLeave = await this.modals.open(ConfirmEditorLeaveModal);
@@ -1065,12 +1191,15 @@ export default class LexicalEditorController extends Controller {
 
         this._previousTagNames = [];
         this._leaveConfirmed = false;
+        this._saveOnLeavePerformed = false;
 
         this.set('post', null);
         this.set('hasDirtyAttributes', false);
         this.set('shouldFocusTitle', false);
         this.set('showSettingsMenu', false);
-        this.set('wordCount', null);
+        this.set('wordCount', 0);
+        this.set('postTkCount', 0);
+        this.set('featureImageTkCount', 0);
 
         // remove the onbeforeunload handler as it's only relevant whilst on
         // the editor route
@@ -1117,8 +1246,7 @@ export default class LexicalEditorController extends Controller {
             return false;
         }
 
-        // if the Adapter failed to save the post isError will be true
-        // and we should consider the post still dirty.
+        // If the Adapter failed to save the post, isError will be true, and we should consider the post still dirty.
         if (post.get('isError')) {
             this._leaveModalReason = {reason: 'isError', context: post.errors.messages};
             return true;
@@ -1133,40 +1261,53 @@ export default class LexicalEditorController extends Controller {
             return true;
         }
 
-        // titleScratch isn't an attr so needs a manual dirty check
-        if (post.titleScratch !== post.title) {
+        // Title scratch comparison
+        if (post.titleScratch.trim() !== post.title.trim()) {
             this._leaveModalReason = {reason: 'title is different', context: {current: post.title, scratch: post.titleScratch}};
             return true;
         }
 
-        // scratch isn't an attr so needs a manual dirty check
+        // Lexical and scratch comparison
         let lexical = post.get('lexical');
         let scratch = post.get('lexicalScratch');
-        // additional guard in case we are trying to compare null with undefined
-        if (scratch || lexical) {
-            if (scratch !== lexical) {
-                this._leaveModalReason = {reason: 'lexical is different', context: {current: lexical, scratch}};
-                return true;
-            }
+        let secondaryLexical = post.get('secondaryLexicalState');
+
+        let lexicalChildNodes = lexical ? JSON.parse(lexical).root?.children : [];
+        let scratchChildNodes = scratch ? JSON.parse(scratch).root?.children : [];
+        let secondaryLexicalChildNodes = secondaryLexical ? JSON.parse(secondaryLexical).root?.children : [];
+
+        lexicalChildNodes.forEach(child => child.direction = null);
+        scratchChildNodes.forEach(child => child.direction = null);
+        secondaryLexicalChildNodes.forEach(child => child.direction = null);
+
+        // Compare initLexical with scratch
+        let isSecondaryDirty = secondaryLexical && scratch && JSON.stringify(secondaryLexicalChildNodes) !== JSON.stringify(scratchChildNodes);
+
+        // Compare lexical with scratch
+        let isLexicalDirty = lexical && scratch && JSON.stringify(lexicalChildNodes) !== JSON.stringify(scratchChildNodes);
+
+        // If both comparisons are dirty, consider the post dirty
+        if (isSecondaryDirty && isLexicalDirty) {
+            this._leaveModalReason = {reason: 'initLexical and lexical are different from scratch', context: {secondaryLexical, lexical, scratch}};
+            return true;
         }
 
-        // new+unsaved posts always return `hasDirtyAttributes: true`
+        // New+unsaved posts always return `hasDirtyAttributes: true`
         // so we need a manual check to see if any
         if (post.get('isNew')) {
-            let changedAttributes = Object.keys(post.changedAttributes());
-
+            let changedAttributes = Object.keys(post.changedAttributes() || {});
             if (changedAttributes.length) {
                 this._leaveModalReason = {reason: 'post.changedAttributes.length > 0', context: post.changedAttributes()};
             }
             return changedAttributes.length ? true : false;
         }
 
-        // we've covered all the non-tracked cases we care about so fall
+        // We've covered all the non-tracked cases we care about so fall
         // back on Ember Data's default dirty attribute checks
         let {hasDirtyAttributes} = post;
-
         if (hasDirtyAttributes) {
             this._leaveModalReason = {reason: 'post.hasDirtyAttributes === true', context: post.changedAttributes()};
+            return true;
         }
 
         return hasDirtyAttributes;
@@ -1181,13 +1322,15 @@ export default class LexicalEditorController extends Controller {
         let notifications = this.notifications;
         let message = messageMap.success.post[prevStatus][status];
         let actions, type, path;
+        type = this.get('post.displayName');
 
         if (status === 'published' || status === 'scheduled') {
-            type = capitalize(this.get('post.displayName'));
             path = this.get('post.url');
-            actions = `<a href="${path}" target="_blank">View ${type}</a>`;
+            actions = `<a href="${path}" target="_blank">View on site</a>`;
         }
 
+        message = capitalizeFirstLetter(type) + ' ' + message.toLowerCase();
+
         notifications.showNotification(message, {type: 'success', actions: (actions && htmlSafe(actions)), delayed});
     }
 
@@ -1196,11 +1339,12 @@ export default class LexicalEditorController extends Controller {
             publishedAtUTC,
             previewUrl,
             emailOnly,
-            newsletter
+            newsletter,
+            displayName
         } = this.post;
         let publishedAtBlogTZ = moment.tz(publishedAtUTC, this.settings.timezone);
 
-        let title = 'Scheduled';
+        let title = capitalizeFirstLetter(displayName) + ' scheduled';
         let description = emailOnly ? ['Will be sent'] : ['Will be published'];
 
         if (newsletter) {
@@ -1208,17 +1352,18 @@ export default class LexicalEditorController extends Controller {
             description.push(`${!emailOnly ? 'and delivered ' : ''}to <span><strong>${recipientCount}</strong></span>`);
         }
 
-        description.push(`on <span><strong>${publishedAtBlogTZ.format('MMM Do')}</strong></span>`);
-        description.push(`at <span><strong>${publishedAtBlogTZ.format('HH:mm')}</strong>`);
+        description.push(`on <span><strong>${publishedAtBlogTZ.format('D MMM YYYY')}</strong></span>`);
+        let timeZoneLabel = '';
         if (publishedAtBlogTZ.utcOffset() === 0) {
-            description.push('(UTC)</span>');
+            timeZoneLabel = '(UTC)</span>';
         } else {
-            description.push(`(UTC${publishedAtBlogTZ.format('Z').replace(/([+-])0/, '$1').replace(/:00/, '')})</span>`);
+            timeZoneLabel = `(UTC${publishedAtBlogTZ.format('Z').replace(/([+-])0/, '$1').replace(/:00/, '')})</span>`;
         }
+        description.push(`at <span><strong>${publishedAtBlogTZ.format('HH:mm')}</strong>&nbsp;${timeZoneLabel}`);
 
         description = htmlSafe(description.join(' '));
 
-        let actions = htmlSafe(`<a href="${previewUrl}" target="_blank">View Preview</a>`);
+        let actions = htmlSafe(`<a href="${previewUrl}" target="_blank">Show preview</a>`);
 
         return this.notifications.showNotification(title, {description, actions, type: 'success', delayed});
     }
diff --git a/ghost/admin/app/controllers/member.js b/ghost/admin/app/controllers/member.js
index f64cf52edb9..0978126d089 100644
--- a/ghost/admin/app/controllers/member.js
+++ b/ghost/admin/app/controllers/member.js
@@ -1,6 +1,7 @@
 import Controller, {inject as controller} from '@ember/controller';
 import DeleteMemberModal from '../components/members/modals/delete-member';
 import EmberObject, {action, defineProperty} from '@ember/object';
+import LogoutMemberModal from '../components/members/modals/logout-member';
 import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import moment from 'moment-timezone';
 import {inject as service} from '@ember/service';
@@ -14,6 +15,7 @@ export default class MemberController extends Controller {
     @service session;
     @service dropdown;
     @service membersStats;
+    @service membersCountCache;
     @service modals;
     @service notifications;
     @service router;
@@ -138,11 +140,22 @@ export default class MemberController extends Controller {
             afterDelete: () => {
                 this.membersStats.invalidate();
                 this.members.refreshData();
+                this.membersCountCache.clear();
                 this.transitionToRoute('members');
             }
         });
     }
 
+    @action
+    confirmLogoutMember() {
+        this.modals.open(LogoutMemberModal, {
+            member: this.member,
+            afterLogout: () => {
+                this.members.refreshData();
+            }
+        });
+    }
+
     @action
     toggleImpersonateMemberModal() {
         this.showImpersonateMemberModal = !this.showImpersonateMemberModal;
@@ -170,12 +183,18 @@ export default class MemberController extends Controller {
         Object.assign(member, scratchProps);
 
         try {
+            const clearCountCache = member.isNew; // clear cache for adding new members so the count is updated without waiting for a refresh
+
             yield member.save();
             member.updateLabels();
             this.members.refreshData();
 
             this.setInitialRelationshipValues();
 
+            if (clearCountCache) {
+                this.membersCountCache.clear();
+            }
+
             // replace 'member.new' route with 'member' route
             this.replaceRoute('member', member);
 
@@ -193,6 +212,7 @@ export default class MemberController extends Controller {
                         member.hasValidated.pushObject(payloadError.property);
                     }
                 }
+                return;
             }
 
             throw error;
diff --git a/ghost/admin/app/controllers/members.js b/ghost/admin/app/controllers/members.js
index 0149df9f62b..9279418d233 100644
--- a/ghost/admin/app/controllers/members.js
+++ b/ghost/admin/app/controllers/members.js
@@ -7,11 +7,11 @@ import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import moment from 'moment-timezone';
 import {A} from '@ember/array';
 import {action} from '@ember/object';
+import {didCancel, task, timeout} from 'ember-concurrency';
 import {ghPluralize} from 'ghost-admin/helpers/gh-pluralize';
 import {inject} from 'ghost-admin/decorators/inject';
 import {resetQueryParams} from 'ghost-admin/helpers/reset-query-params';
 import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
 const PAID_PARAMS = [{
@@ -209,6 +209,46 @@ export default class MembersController extends Controller {
         return uniqueColumns.splice(0, 2); // Maximum 2 columns
     }
 
+    /* Due to a limitation with NQL when multiple member filters are used in combination, we currently have a safeguard around member bulk deletion.
+     * Member bulk deletion is not permitted when:
+     *   1) Multiple newsletters exist, and 2 or more newsletter filters are in use
+     *   2) If any of the following Stripe filters are used, even once:
+     *     - Billing period
+     *     - Stripe subscription status
+     *     - Paid start date
+     *     - Next billing date
+     *     - Subscription started on post/page
+     *     - Offers
+     *
+     * See issue https://linear.app/tryghost/issue/ENG-1484 for more context
+     */
+    get isBulkDeletePermitted() {
+        if (!this.isFiltered) {
+            return false;
+        }
+
+        const newsletterFilters = this.filters.filter(f => f.group === 'Newsletters');
+
+        if (newsletterFilters && newsletterFilters.length >= 2) {
+            return false;
+        }
+
+        const stripeFilters = this.filters.filter(f => [
+            'subscriptions.plan_interval',
+            'subscriptions.status',
+            'subscriptions.start_date',
+            'subscriptions.current_period_end',
+            'conversion',
+            'offer_redemptions'
+        ].includes(f.type));
+
+        if (stripeFilters && stripeFilters.length >= 1) {
+            return false;
+        }
+
+        return true;
+    }
+
     includeTierQuery() {
         const availableFilters = this.filters.length ? this.filters : this.softFilters;
         return availableFilters.some((f) => {
@@ -222,10 +262,10 @@ export default class MembersController extends Controller {
         if (filterParam) {
             // If the provided filter param is a single filter related to newsletter subscription status
             // remove the surrounding brackets to prevent https://github.com/TryGhost/NQL/issues/16
-            const NEWSLETTER_SUBSCRIPTION_STATUS_RE = /^\(subscribed:(?:true|false)[+,]email_disabled:[01]\)$/;
-            const SPECIFIC_NEWSLETTER_SUBSCRIPTION_STATUS_RE = /^\(newsletters\.slug:[^()]+[+,]email_disabled:[01]\)$/;
+            const BRACKETS_SURROUNDED_RE = /^\(.*\)$/;
+            const MULTIPLE_GROUPS_RE = /\).*\(/;
 
-            if (NEWSLETTER_SUBSCRIPTION_STATUS_RE.test(filterParam) || SPECIFIC_NEWSLETTER_SUBSCRIPTION_STATUS_RE.test(filterParam)) {
+            if (BRACKETS_SURROUNDED_RE.test(filterParam) && !MULTIPLE_GROUPS_RE.test(filterParam)) {
                 filterParam = filterParam.slice(1, -1);
             }
         }
@@ -258,8 +298,18 @@ export default class MembersController extends Controller {
 
     @action
     refreshData() {
-        this.fetchMembersTask.perform();
-        this.fetchLabelsTask.perform();
+        try {
+            this.fetchMembersTask.perform();
+            this.fetchLabelsTask.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
+        }
+
         this.membersStats.invalidate();
         this.membersStats.fetchCounts();
         this.membersStats.fetchMemberCount();
@@ -415,7 +465,7 @@ export default class MembersController extends Controller {
         this.searchParam = query;
     }
 
-    @task
+    @task({restartable: true})
     *fetchLabelsTask() {
         yield this.store.query('label', {limit: 'all'});
     }
diff --git a/ghost/admin/app/controllers/migrate.js b/ghost/admin/app/controllers/migrate.js
index f08060bfde5..4aa0628652b 100644
--- a/ghost/admin/app/controllers/migrate.js
+++ b/ghost/admin/app/controllers/migrate.js
@@ -12,6 +12,6 @@ export default class MigrateController extends Controller {
 
     @action
     closeMigrate() {
-        this.router.transitionTo('/settings/labs');
+        this.router.transitionTo('/settings/migration');
     }
 }
diff --git a/ghost/admin/app/controllers/offer.js b/ghost/admin/app/controllers/offer.js
index 3fe7e73c226..5949efe9f84 100644
--- a/ghost/admin/app/controllers/offer.js
+++ b/ghost/admin/app/controllers/offer.js
@@ -4,11 +4,11 @@ import UnarchiveOfferModal from '../components/modals/offers/unarchive';
 import config from 'ghost-admin/config/environment';
 import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
 import {action} from '@ember/object';
+import {didCancel, task} from 'ember-concurrency';
 import {getSymbol} from 'ghost-admin/utils/currency';
 import {inject} from 'ghost-admin/decorators/inject';
 import {inject as service} from '@ember/service';
 import {slugify} from '@tryghost/string';
-import {task} from 'ember-concurrency';
 import {timeout} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
@@ -258,7 +258,16 @@ export default class OffersController extends Controller {
 
     @action
     setup() {
-        this.fetchTiers.perform();
+        try {
+            this.fetchTiers.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
+        }
     }
 
     @action
diff --git a/ghost/admin/app/controllers/offers.js b/ghost/admin/app/controllers/offers.js
index 9da62411f4e..62927f710b0 100644
--- a/ghost/admin/app/controllers/offers.js
+++ b/ghost/admin/app/controllers/offers.js
@@ -36,12 +36,18 @@ export default class MembersController extends Controller {
             const tier = this.tiers.find((p) => {
                 return p.id === offer.tier.id;
             });
+            if (!tier) {
+                return false;
+            }
             const price = offer.cadence === 'month' ? tier.monthlyPrice : tier.yearlyPrice;
             return !!tier && tier.active && offer.status === this.type && !!price;
         }).map((offer) => {
             const tier = this.tiers.find((p) => {
                 return p.id === offer.tier.id;
             });
+            if (!tier) {
+                return offer;
+            }
             const price = offer.cadence === 'month' ? tier.monthlyPrice : tier.yearlyPrice;
             offer.finalCurrency = offer.currency || tier.currency;
             offer.originalPrice = price;
diff --git a/ghost/admin/app/controllers/pages.js b/ghost/admin/app/controllers/pages.js
index 6a011d15647..cd62cc80b57 100644
--- a/ghost/admin/app/controllers/pages.js
+++ b/ghost/admin/app/controllers/pages.js
@@ -40,4 +40,4 @@ export default class PagesController extends PostsController {
     openEditor(page) {
         this.router.transitionTo('lexical-editor.edit', 'page', page.get('id'));
     }
-}
+}
\ No newline at end of file
diff --git a/ghost/admin/app/controllers/posts.js b/ghost/admin/app/controllers/posts.js
index 014cad0f472..8f48fca2dbd 100644
--- a/ghost/admin/app/controllers/posts.js
+++ b/ghost/admin/app/controllers/posts.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import SelectionList from 'ghost-admin/utils/selection-list';
+import SelectionList from 'ghost-admin/components/posts-list/selection-list';
 import {DEFAULT_QUERY_PARAMS} from 'ghost-admin/helpers/reset-query-params';
 import {action} from '@ember/object';
 import {inject} from 'ghost-admin/decorators/inject';
@@ -85,14 +85,6 @@ export default class PostsController extends Controller {
         Object.assign(this, DEFAULT_QUERY_PARAMS.posts);
     }
 
-    get postsInfinityModel() {
-        return this.model;
-    }
-
-    get totalPosts() {
-        return this.model.meta?.pagination?.total ?? 0;
-    }
-
     get showingAll() {
         const {type, author, tag, visibility} = this;
 
diff --git a/ghost/admin/app/controllers/reset.js b/ghost/admin/app/controllers/reset.js
index 0c045c9762a..2ce6090ee82 100644
--- a/ghost/admin/app/controllers/reset.js
+++ b/ghost/admin/app/controllers/reset.js
@@ -62,7 +62,10 @@ export default class ResetController extends Controller.extend(ValidationEngine)
                         password_reset: [{newPassword, ne2Password, token}]
                     }
                 });
-                this.notifications.showAlert(resp.password_reset[0].message, {type: 'warn', delayed: true, key: 'password.reset'});
+                this.notifications.showNotification(
+                    resp.password_reset[0].message,
+                    {type: 'info', delayed: true, key: 'password.reset'}
+                );
                 this.session.authenticate('authenticator:cookie', email, newPassword);
                 return true;
             } catch (error) {
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/controllers/setup.js b/ghost/admin/app/controllers/setup.js
index ec5386b8a5f..7a63fe71a85 100644
--- a/ghost/admin/app/controllers/setup.js
+++ b/ghost/admin/app/controllers/setup.js
@@ -61,6 +61,11 @@ export default class SetupController extends Controller.extend(ValidationEngine)
 
             return true;
         } catch (error) {
+            // handle setup/done route redirecting to dashboard
+            if (error.message === 'TransitionAborted') {
+                return true;
+            }
+
             if (error && error.payload && error.payload.errors) {
                 if (isVersionMismatchError(error)) {
                     return this.notifications.showAPIError(error);
@@ -141,6 +146,11 @@ export default class SetupController extends Controller.extend(ValidationEngine)
             let [apiError] = error.payload.errors;
             this.set('flowErrors', [apiError.message, apiError.context].join(' '));
         } else {
+            // ignore setup/done route redirecting to dashboard
+            if (error.message === 'TransitionAborted') {
+                return true;
+            }
+
             // Connection errors don't return proper status message, only req.body
             this.notifications.showAlert('There was a problem on the server.', {type: 'error', key: 'setup.authenticate.failed'});
         }
diff --git a/ghost/admin/app/controllers/setup/done.js b/ghost/admin/app/controllers/setup/done.js
deleted file mode 100644
index bd2480fc79b..00000000000
--- a/ghost/admin/app/controllers/setup/done.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import Controller from '@ember/controller';
-import {isEmpty} from '@ember/utils';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-const THEME_PROPERTIES = {
-    casper: ['description', 'color', 'coverImage'],
-    source: ['description', 'color', 'coverImage'],
-    edition: ['description', 'color', 'coverImage'],
-    dawn: ['description', 'color', 'icon'],
-    dope: ['description', 'color', 'logo'],
-    bulletin: ['description', 'color', 'logo'],
-    alto: ['description', 'color', 'logo'],
-    journal: ['description', 'color', 'logo'],
-    wave: ['description', 'color', 'logo', 'coverImage'],
-    edge: ['description', 'color', 'logo'],
-    ease: ['description', 'color', 'logo', 'coverImage'],
-    ruby: ['description', 'color', 'logo', 'coverImage'],
-    london: ['description', 'color', 'logo'],
-    digest: ['description', 'color', 'logo']
-};
-
-export default class SetupFinishingTouchesController extends Controller {
-    @service modals;
-    @service router;
-    @service settings;
-    @service store;
-    @service themeManagement;
-
-    @tracked descriptionVisible;
-    @tracked colorVisible;
-    @tracked logoVisible;
-    @tracked iconVisible;
-    @tracked coverImageVisible;
-
-    themes = null;
-
-    // Default properties to display
-    themeProperties = ['description', 'color', 'coverImage'];
-
-    constructor() {
-        super(...arguments);
-        this.initThemeProperties.perform();
-    }
-
-    @task({drop: true})
-    *initThemeProperties() {
-        this.themes = yield this.store.peekAll('theme');
-        if (isEmpty(this.themes)) {
-            this.themes = yield this.store.findAll('theme');
-        }
-
-        const activeTheme = this.themes.findBy('active', true);
-
-        if (activeTheme && THEME_PROPERTIES[activeTheme.name]) {
-            this.themeProperties = THEME_PROPERTIES[activeTheme.name];
-        }
-
-        this.descriptionVisible = this.themeProperties.includes('description');
-        this.logoVisible = this.themeProperties.includes('logo');
-        this.iconVisible = this.themeProperties.includes('icon');
-        this.colorVisible = this.themeProperties.includes('color');
-        this.coverImageVisible = this.themeProperties.includes('coverImage');
-    }
-
-    @task
-    *saveAndContinueTask() {
-        yield this.settings.save();
-        this.router.transitionTo('home');
-    }
-}
diff --git a/ghost/admin/app/controllers/signin.js b/ghost/admin/app/controllers/signin.js
index 3ef67c25695..1c4531cf3a5 100644
--- a/ghost/admin/app/controllers/signin.js
+++ b/ghost/admin/app/controllers/signin.js
@@ -25,6 +25,7 @@ export default class SigninController extends Controller.extend(ValidationEngine
 
     @tracked submitting = false;
     @tracked loggingIn = false;
+    @tracked flowNotification = '';
     @tracked flowErrors = '';
     @tracked passwordResetEmailSent = false;
 
@@ -123,21 +124,19 @@ export default class SigninController extends Controller.extend(ValidationEngine
         let notifications = this.notifications;
 
         this.flowErrors = '';
+        this.flowNotification = '';
         // This is a bit dirty, but there's no other way to ensure the properties are set as well as 'forgotPassword'
         this.hasValidated.addObject('identification');
 
         try {
             yield this.validate({property: 'forgotPassword'});
             yield this.ajax.post(forgottenUrl, {data: {password_reset: [{email}]}});
-            notifications.showAlert(
-                'Please check your email for instructions.',
-                {type: 'info', key: 'forgot-password.send.success'}
-            );
+            this.flowNotification = 'An email with password reset instructions has been sent.';
             return true;
         } catch (error) {
             // ValidationEngine throws "undefined" for failed validation
             if (!error) {
-                return this.flowErrors = 'We need your email address to reset your password!';
+                return this.flowErrors = 'We need your email address to reset your password.';
             }
 
             if (isVersionMismatchError(error)) {
diff --git a/ghost/admin/app/controllers/stats.js b/ghost/admin/app/controllers/stats.js
new file mode 100644
index 00000000000..b51aa2880ad
--- /dev/null
+++ b/ghost/admin/app/controllers/stats.js
@@ -0,0 +1,56 @@
+import Controller from '@ember/controller';
+import {AUDIENCE_TYPES} from 'ghost-admin/components/stats/parts/audience-filter';
+import {action} from '@ember/object';
+import {tracked} from '@glimmer/tracking';
+
+// Options 30 and 90 need an extra day to be able to distribute ticks/gridlines evenly
+const DAYS_OPTIONS = [{
+    name: '7 Days',
+    value: 7
+}, {
+    name: '30 Days',
+    value: 30 + 1
+}, {
+    name: '90 Days',
+    value: 90 + 1
+}];
+
+export default class StatsController extends Controller {
+    daysOptions = DAYS_OPTIONS;
+    audienceOptions = AUDIENCE_TYPES;
+
+    /**
+     * @type {number|'all'}
+     * Amount of days to load for member count and MRR related charts
+     */
+    @tracked chartDays = 30 + 1;
+    /**
+     * @type {array}
+     * Filter by audience
+     */
+    @tracked audience = [];
+    @tracked excludedAudiences = '';
+
+    @action
+    onDaysChange(selected) {
+        this.chartDays = selected.value;
+    }
+
+    @action
+    onAudienceChange(newExcludedAudiences) {
+        if (newExcludedAudiences !== null) {
+            this.excludedAudiences = newExcludedAudiences;
+            this.audience = this.audienceOptions
+                .filter(a => !this.excludedAudiences.includes(a.value))
+                .map(a => a.value);
+            // this.audience = this.audienceOptions.filter(a => !this.excludedAudiences.includes(a.value));
+        } else {
+            this.excludedAudiences = '';
+            this.audience = this.audienceOptions.map(a => a.value);
+        }
+    }
+
+    get selectedDaysOption() {
+        return this.daysOptions.find(d => d.value === this.chartDays);
+    }
+}
diff --git a/ghost/admin/app/controllers/websockets.js b/ghost/admin/app/controllers/websockets.js
deleted file mode 100644
index 148a7209624..00000000000
--- a/ghost/admin/app/controllers/websockets.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Controller from '@ember/controller';
-/* eslint-disable ghost/ember/alias-model-in-controller */
-import classic from 'ember-classic-decorator';
-import {inject as service} from '@ember/service';
-
-@classic
-export default class WebsocketsController extends Controller {
-    @service feature;
-    
-    init() {
-        super.init(...arguments);
-    }
-}
\ No newline at end of file
diff --git a/ghost/admin/app/helpers/feature.js b/ghost/admin/app/helpers/feature.js
index b9ce868fff7..ea79e4c0b11 100644
--- a/ghost/admin/app/helpers/feature.js
+++ b/ghost/admin/app/helpers/feature.js
@@ -1,7 +1,7 @@
 import Helper from '@ember/component/helper';
 import {inject as service} from '@ember/service';
 
-export default class EnableDeveloperExperimentsHelper extends Helper {
+export default class FeatureHelper extends Helper {
     @service feature;
 
     compute([featureFlag]) {
diff --git a/ghost/admin/app/helpers/gh-format-post-time.js b/ghost/admin/app/helpers/gh-format-post-time.js
index c9f4c108ee0..c2a499b75dd 100644
--- a/ghost/admin/app/helpers/gh-format-post-time.js
+++ b/ghost/admin/app/helpers/gh-format-post-time.js
@@ -3,9 +3,9 @@ import moment from 'moment-timezone';
 import {assert} from '@ember/debug';
 import {inject as service} from '@ember/service';
 
-export function formatPostTime(timeago, {timezone = 'etc/UTC', format, draft, scheduled, published}) {
-    if (draft) {
-        // No special handling for drafts, just use moment.from
+export function formatPostTime(timeago, {timezone = 'etc/UTC', format, relative, absolute, scheduled, short}) {
+    if (relative) {
+        // No special handling, just use moment.from
         return moment(timeago).from(moment.utc());
     }
 
@@ -24,7 +24,8 @@ export function formatPostTime(timeago, {timezone = 'etc/UTC', format, draft, sc
         utcOffset = `(UTC${time.format('Z').replace(/([+-])0/, '$1').replace(/:00/, '')})`;
     }
 
-    // If not a draft and post was published <= 12 hours ago
+    // If draft was edited <= 12 hours ago
+    // or post was published <= 12 hours ago
     // or scheduled to be published <= 12 hours from now, use moment.from
     if (Math.abs(now.diff(time, 'hours')) <= 12) {
         return time.from(now);
@@ -36,11 +37,16 @@ export function formatPostTime(timeago, {timezone = 'etc/UTC', format, draft, sc
         return scheduled ? `at ${formatted}` : formatted;
     }
 
-    // if published yesterday, render time + yesterday
+    // if draft was edited yesterday, render time + yesterday
+    // if post was published yesterday, render time + yesterday
+    // if short format, just render Yesterday (without time)
     // This check comes before scheduled, because there are likely to be more published
     // posts than scheduled posts.
-    if (published && time.isSame(now.clone().subtract(1, 'days').startOf('day'), 'day')) {
-        return time.format(`HH:mm [${utcOffset}] [Yesterday]`);
+    if (absolute && time.isSame(now.clone().subtract(1, 'days').startOf('day'), 'day')) {
+        if (short) {
+            return time.format(`[Yesterday]`);
+        }
+        return time.format(`HH:mm [${utcOffset}] [yesterday]`);
     }
 
     // if scheduled for tomorrow, render the time + tomorrow
@@ -48,8 +54,8 @@ export function formatPostTime(timeago, {timezone = 'etc/UTC', format, draft, sc
         return time.format(`[at] HH:mm [${utcOffset}] [tomorrow]`);
     }
 
-    // Else, render just the date if published, or the time & date if scheduled
-    let f = scheduled ? `[at] HH:mm [${utcOffset}] [on] DD MMM YYYY` : 'DD MMM YYYY';
+    // Else, render just the date if edited or published, or the time & date if scheduled
+    let f = scheduled ? `[at] HH:mm [${utcOffset}] [on] DD MMM YYYY` : (short ? `DD MMM YYYY` : `HH:mm [${utcOffset}] DD MMM YYYY`);
     return time.format(f);
 }
 
diff --git a/ghost/admin/app/helpers/history-event-filter.js b/ghost/admin/app/helpers/history-event-filter.js
index 5be85ad665c..2b09acdaace 100644
--- a/ghost/admin/app/helpers/history-event-filter.js
+++ b/ghost/admin/app/helpers/history-event-filter.js
@@ -33,7 +33,7 @@ export default class HistoryEventFilter extends Helper {
         }
 
         if (user) {
-            filterParts.push(`actor_id:${user}`);
+            filterParts.push(`actor_id:'${user}'`);
         }
 
         return filterParts.join('+');
diff --git a/ghost/admin/app/helpers/is-onboarding-step-completed.js b/ghost/admin/app/helpers/is-onboarding-step-completed.js
new file mode 100644
index 00000000000..5942598f455
--- /dev/null
+++ b/ghost/admin/app/helpers/is-onboarding-step-completed.js
@@ -0,0 +1,10 @@
+import Helper from '@ember/component/helper';
+import {inject as service} from '@ember/service';
+
+export default class IsOnboardingStepCompleted extends Helper {
+    @service onboarding;
+
+    compute([step]) {
+        return this.onboarding.isStepCompleted(step);
+    }
+}
diff --git a/ghost/admin/app/helpers/members-event-filter.js b/ghost/admin/app/helpers/members-event-filter.js
index cd66d0c5147..15dc531204a 100644
--- a/ghost/admin/app/helpers/members-event-filter.js
+++ b/ghost/admin/app/helpers/members-event-filter.js
@@ -45,11 +45,11 @@ export default class MembersEventFilter extends Helper {
         }
 
         if (member) {
-            filterParts.push(`data.member_id:${member}`);
+            filterParts.push(`data.member_id:'${member}'`);
         }
 
         if (post) {
-            filterParts.push(`data.post_id:${post}`);
+            filterParts.push(`data.post_id:'${post}'`);
         }
 
         return filterParts.join('+');
diff --git a/ghost/admin/app/helpers/most-relevant-subscription.js b/ghost/admin/app/helpers/most-relevant-subscription.js
new file mode 100644
index 00000000000..654888cbb44
--- /dev/null
+++ b/ghost/admin/app/helpers/most-relevant-subscription.js
@@ -0,0 +1,39 @@
+import moment from 'moment-timezone';
+import {helper} from '@ember/component/helper';
+
+export function mostRelevantSubscription(subs) {
+    // Ignore comped subscriptions (without id)
+    const items = [...(subs || []).filter(sub => !!sub.id)];
+
+    // Find active subscription if any, then sort by latest current_period_end if needed
+    items.sort((a, b) => {
+        const isActiveA = ['active', 'trialing', 'unpaid', 'past_due'].includes(a.status);
+        const isActiveB = ['active', 'trialing', 'unpaid', 'past_due'].includes(b.status);
+
+        // Sort by status, active first
+        if (isActiveA && !isActiveB) {
+            return -1;
+        } else if (!isActiveA && isActiveB) {
+            return 1;
+        }
+
+        // Sort by current_period_end, latest first
+        const endDateA = moment(a.current_period_end);
+        const endDateB = moment(b.current_period_end);
+
+        if (!endDateA.isValid()) {
+            return 1;
+        } else if (!endDateB.isValid()) {
+            return -1;
+        }
+
+        return endDateB.valueOf() - endDateA.valueOf();
+    });
+
+    return items[0] || null;
+}
+
+export default helper(function ([items = []]) {
+    return mostRelevantSubscription(items);
+});
+
diff --git a/ghost/admin/app/helpers/onboarding-step-class.js b/ghost/admin/app/helpers/onboarding-step-class.js
new file mode 100644
index 00000000000..bef2a49bd8b
--- /dev/null
+++ b/ghost/admin/app/helpers/onboarding-step-class.js
@@ -0,0 +1,16 @@
+import Helper from '@ember/component/helper';
+import {inject as service} from '@ember/service';
+
+export default class OnboardingStepClasses extends Helper {
+    @service onboarding;
+
+    compute([step]) {
+        if (this.onboarding.isStepCompleted(step)) {
+            return 'gh-onboarding-item--completed';
+        }
+
+        if (this.onboarding.nextStep === step) {
+            return 'gh-onboarding-item--next';
+        }
+    }
+}
diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js
index ddf8369d0be..8a3a0456333 100644
--- a/ghost/admin/app/helpers/parse-member-event.js
+++ b/ghost/admin/app/helpers/parse-member-event.js
@@ -114,6 +114,10 @@ export default class ParseMemberEventHelper extends Helper {
             icon = 'subscriptions';
         }
 
+        if (event.type === 'email_change_event') {
+            icon = 'email-changed';
+        }
+
         return 'event-' + icon;
     }
 
@@ -208,8 +212,15 @@ export default class ParseMemberEventHelper extends Helper {
             return 'less like this';
         }
 
+        if (event.type === 'email_change_event') {
+            if (event.data.from_email && event.data.to_email) {
+                return `Email address changed from ${event.data.from_email} to ${event.data.to_email}`;
+            }
+            return 'Email address changed';
+        }
+
         if (event.type === 'donation_event') {
-            return `Made a one-time payment`;
+            return 'Made a one-time payment';
         }
     }
 
@@ -220,7 +231,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 '–';
@@ -330,7 +341,7 @@ export default class ParseMemberEventHelper extends Helper {
      * Get internal route props for a clickable object
      */
     getRoute(event) {
-        if (['comment_event', 'click_event', 'feedback_event'].includes(event.type)) {
+        if (['click_event', 'feedback_event'].includes(event.type)) {
             if (event.data.post) {
                 return {
                     name: 'posts.analytics',
diff --git a/ghost/admin/app/helpers/publish-options.js b/ghost/admin/app/helpers/publish-options.js
index 1efe6965897..9281524f289 100644
--- a/ghost/admin/app/helpers/publish-options.js
+++ b/ghost/admin/app/helpers/publish-options.js
@@ -9,6 +9,7 @@ export default class PublishOptionsResource extends Resource {
     @service session;
     @service settings;
     @service store;
+    @service membersCountCache;
 
     @inject config;
 
@@ -35,7 +36,7 @@ export default class PublishOptionsResource extends Resource {
     }
 
     _createPublishOptions(post) {
-        const {config, limit, settings, store} = this;
+        const {config, limit, settings, store, membersCountCache} = this;
 
         return new PublishOptions({
             config,
@@ -43,6 +44,7 @@ export default class PublishOptionsResource extends Resource {
             post,
             settings,
             store,
+            membersCountCache,
             user: this.session.user
         });
     }
diff --git a/ghost/admin/app/helpers/sender-email-address.js b/ghost/admin/app/helpers/sender-email-address.js
new file mode 100644
index 00000000000..6d6ea1f7dd3
--- /dev/null
+++ b/ghost/admin/app/helpers/sender-email-address.js
@@ -0,0 +1,42 @@
+import Helper from '@ember/component/helper';
+import {inject} from 'ghost-admin/decorators/inject';
+import {inject as service} from '@ember/service';
+
+export default class SenderEmailAddressHelper extends Helper {
+    @inject config;
+    @service settings;
+
+    compute([senderEmail]) {
+        const defaultEmail = this.settings.defaultEmailAddress;
+
+        if (isManagedEmail(this.config) && !hasSendingDomain(this.config)) {
+            // Not changeable: sender_email is ignored
+            return defaultEmail;
+        }
+
+        if (isManagedEmail(this.config) && hasSendingDomain(this.config)) {
+            // Only return sender_email if the domain names match
+            if (senderEmail?.split('@')[1] === sendingDomain(this.config)) {
+                return senderEmail;
+            } else {
+                return defaultEmail;
+            }
+        }
+
+        return senderEmail || defaultEmail;
+    }
+}
+
+const isManagedEmail = (config) => {
+    return !!config?.hostSettings?.managedEmail?.enabled;
+};
+
+const hasSendingDomain = (config) => {
+    const sendingDomain = config?.hostSettings?.managedEmail?.sendingDomain;
+    return typeof sendingDomain === 'string' && sendingDomain.length > 0;
+};
+
+const sendingDomain = (config) => {
+    return config?.hostSettings?.managedEmail?.sendingDomain;
+};
+
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/helpers/split-number.js b/ghost/admin/app/helpers/split-number.js
new file mode 100644
index 00000000000..27c5d0bda75
--- /dev/null
+++ b/ghost/admin/app/helpers/split-number.js
@@ -0,0 +1,23 @@
+import {formatNumber} from './format-number';
+import {helper} from '@ember/component/helper';
+import {htmlSafe} from '@ember/template';
+
+export function splitNumber([number, previousNumber]) {
+    if (number === undefined || previousNumber === undefined) {
+        return 0;
+    }
+
+    let formattedNewNumber = formatNumber(number);
+    let formattedOldNumber = formatNumber(previousNumber);
+
+    let oldChars = formattedOldNumber.split('').map(char => `<span class="old-char">${char}</span>`).join('');
+
+    let newChars = formattedNewNumber.split('').map(char => `<span class="new-char">${char}</span>`).join('');
+
+    return htmlSafe(`
+        <div class="number-group old-number">${oldChars}</div>
+        <div class="number-group new-number">${newChars}</div>
+    `);
+}
+
+export default helper(splitNumber);
diff --git a/ghost/admin/app/models/member.js b/ghost/admin/app/models/member.js
index 06945044ed8..a965705df99 100644
--- a/ghost/admin/app/models/member.js
+++ b/ghost/admin/app/models/member.js
@@ -49,5 +49,10 @@ export default Model.extend(ValidationEngine, {
         let response = yield this.ajax.request(url);
 
         return response.member_signin_urls[0];
+    }).drop(),
+
+    logoutAllDevices: task(function* () {
+        let url = this.get('ghostPaths.url').api('members', this.id, 'signout');
+        yield this.ajax.post(url);
     }).drop()
 });
diff --git a/ghost/admin/app/models/newsletter.js b/ghost/admin/app/models/newsletter.js
index 4c725c03996..041b10f500f 100644
--- a/ghost/admin/app/models/newsletter.js
+++ b/ghost/admin/app/models/newsletter.js
@@ -24,6 +24,7 @@ export default class Newsletter extends Model.extend(ValidationEngine) {
     @attr({defaultValue: true}) showHeaderTitle;
     @attr({defaultValue: true}) showHeaderName;
     @attr({defaultValue: true}) showPostTitleSection;
+    @attr({defaultValue: false}) showExcerpt;
     @attr({defaultValue: true}) showCommentCta;
     @attr({defaultValue: false}) showSubscriptionDetails;
     @attr({defaultValue: false}) showLatestPosts;
diff --git a/ghost/admin/app/models/post-revision.js b/ghost/admin/app/models/post-revision.js
index 689811f8c89..c0a42b2e971 100644
--- a/ghost/admin/app/models/post-revision.js
+++ b/ghost/admin/app/models/post-revision.js
@@ -3,6 +3,7 @@ import Model, {attr, belongsTo} from '@ember-data/model';
 export default class PostRevisionModel extends Model {
   @attr('string') lexical;
   @attr('string') title;
+  @attr('string') customExcerpt;
   @attr('string') featureImage;
   @attr('string') featureImageAlt;
   @attr('string') featureImageCaption;
diff --git a/ghost/admin/app/models/post.js b/ghost/admin/app/models/post.js
index 9f6ec1bccb1..835d24d0a2f 100644
--- a/ghost/admin/app/models/post.js
+++ b/ghost/admin/app/models/post.js
@@ -71,6 +71,7 @@ export default Model.extend(Comparable, ValidationEngine, {
     feature: service(),
     ghostPaths: service(),
     clock: service(),
+    search: service(),
     settings: service(),
     membersUtils: service(),
 
@@ -135,10 +136,9 @@ export default Model.extend(Comparable, ValidationEngine, {
     scratch: null,
     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,
+    //This is used to store the initial lexical state from the
+    // secondary editor to get the schema up to date in case its outdated
+    secondaryLexicalState: null,
 
     // For use by date/time pickers - will be validated then converted to UTC
     // on save. Updated by an observer whenever publishedAtUTC changes.
@@ -443,5 +443,18 @@ export default Model.extend(Comparable, ValidationEngine, {
         let publishedAtBlogTZ = this.publishedAtBlogTZ;
         let publishedAtUTC = publishedAtBlogTZ ? publishedAtBlogTZ.utc() : null;
         this.set('publishedAtUTC', publishedAtUTC);
+    },
+
+    // when a published post is updated, unpublished, or deleted we expire the search content cache
+    save() {
+        const [oldStatus] = this.changedAttributes().status || [];
+
+        return this._super(...arguments).then((res) => {
+            if (this.status === 'published' || oldStatus === 'published') {
+                this.search.expireContent();
+            }
+
+            return res;
+        });
     }
 });
diff --git a/ghost/admin/app/models/setting.js b/ghost/admin/app/models/setting.js
index a7a719e2f0b..8bd80b85240 100644
--- a/ghost/admin/app/models/setting.js
+++ b/ghost/admin/app/models/setting.js
@@ -110,6 +110,12 @@ export default Model.extend(ValidationEngine, {
      */
     recommendationsEnabled: attr('boolean'),
 
+    /**
+     * Newsletter emails
+     */
+    defaultEmailAddress: attr('string'),
+    supportEmailAddress: attr('string'),
+
     // HACK - not a real model attribute but a workaround for Ember Data not
     //        exposing meta from save responses
     _meta: attr()
diff --git a/ghost/admin/app/models/tag.js b/ghost/admin/app/models/tag.js
index 62bb9485536..fdbef01c9dd 100644
--- a/ghost/admin/app/models/tag.js
+++ b/ghost/admin/app/models/tag.js
@@ -4,10 +4,13 @@ import {equal} from '@ember/object/computed';
 import {inject as service} from '@ember/service';
 
 export default Model.extend(ValidationEngine, {
+    search: service(),
+
     validationType: 'tag',
 
     name: attr('string'),
     slug: attr('string'),
+    url: attr('string'),
     description: attr('string'),
     metaTitle: attr('string'),
     metaDescription: attr('string'),
@@ -40,9 +43,22 @@ export default Model.extend(ValidationEngine, {
     },
 
     save() {
-        if (this.get('changedAttributes.name') && !this.isDeleted) {
+        const nameChanged = !!this.changedAttributes().name;
+
+        if (nameChanged && !this.isDeleted) {
             this.updateVisibility();
         }
-        return this._super(...arguments);
+
+        const {url} = this;
+
+        return this._super(...arguments).then((savedModel) => {
+            const urlChanged = url !== savedModel.url;
+
+            if (nameChanged || urlChanged || this.isDeleted) {
+                this.search.expireContent();
+            }
+
+            return savedModel;
+        });
     }
 });
diff --git a/ghost/admin/app/models/user.js b/ghost/admin/app/models/user.js
index 8374974d933..a2c3b2f96ad 100644
--- a/ghost/admin/app/models/user.js
+++ b/ghost/admin/app/models/user.js
@@ -10,10 +10,19 @@ import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default BaseModel.extend(ValidationEngine, {
+    ajax: service(),
+    ghostPaths: service(),
+    notifications: service(),
+    search: service(),
+    session: service(),
+
+    config: inject(),
+
     validationType: 'user',
 
     name: attr('string'),
     slug: attr('string'),
+    url: attr('string'),
     email: attr('string'),
     profileImage: attr('string'),
     coverImage: attr('string'),
@@ -44,12 +53,6 @@ export default BaseModel.extend(ValidationEngine, {
     mentionNotifications: attr(),
     milestoneNotifications: attr(),
     donationNotifications: attr(),
-    ghostPaths: service(),
-    ajax: service(),
-    session: service(),
-    notifications: service(),
-
-    config: inject(),
 
     // TODO: Once client-side permissions are in place,
     // remove the hard role check.
@@ -141,5 +144,21 @@ export default BaseModel.extend(ValidationEngine, {
         } catch (error) {
             this.notifications.showAPIError(error, {key: 'user.change-password'});
         }
-    }).drop()
+    }).drop(),
+
+    save() {
+        const nameChanged = !!this.changedAttributes().name;
+
+        const {url} = this;
+
+        return this._super(...arguments).then((savedModel) => {
+            const urlChanged = url !== savedModel.url;
+
+            if (nameChanged || urlChanged || this.isDeleted) {
+                this.search.expireContent();
+            }
+
+            return savedModel;
+        });
+    }
 });
diff --git a/ghost/admin/app/modifiers/autoplay.js b/ghost/admin/app/modifiers/autoplay.js
new file mode 100644
index 00000000000..26842121888
--- /dev/null
+++ b/ghost/admin/app/modifiers/autoplay.js
@@ -0,0 +1,6 @@
+import {modifier} from 'ember-modifier';
+
+export default modifier((element) => {
+    element.muted = true;
+    element.play();
+}, {eager: false});
diff --git a/ghost/admin/app/router.js b/ghost/admin/app/router.js
index 2cd1878eea8..843a86b2e5c 100644
--- a/ghost/admin/app/router.js
+++ b/ghost/admin/app/router.js
@@ -23,6 +23,7 @@ Router.map(function () {
     this.route('site');
     this.route('dashboard');
     this.route('launch');
+    this.route('stats');
 
     this.route('pro', function () {
         this.route('pro-sub', {path: '/*sub'});
@@ -48,12 +49,17 @@ Router.map(function () {
     this.route('collection.new', {path: '/collections/new'});
     this.route('collection', {path: '/collections/:collection_slug'});
 
+    this.route('demo-x', function () {
+        this.route('demo-x', {path: '/*sub'});
+    });
+
     this.route('settings-x', {path: '/settings'}, function () {
         this.route('settings-x', {path: '/*sub'});
     });
 
-    // testing websockets
-    this.route('websockets');
+    this.route('activitypub-x',{path: '/activitypub'}, function () {
+        this.route('activitypub-x', {path: '/*sub'});
+    });
 
     this.route('explore', function () {
         // actual Ember route, not rendered in iframe
@@ -67,7 +73,9 @@ Router.map(function () {
         });
     });
 
-    this.route('migrate');
+    this.route('migrate', function () {
+        this.route('migrate', {path: '/*platform'});
+    });
 
     this.route('members', function () {
         this.route('import');
@@ -76,10 +84,10 @@ Router.map(function () {
     this.route('member', {path: '/members/:member_id'});
     this.route('members-activity');
 
-    this.route('offers');
+    // this.route('offers');
 
-    this.route('offer.new', {path: '/offers/new'});
-    this.route('offer', {path: '/offers/:offer_id'});
+    // this.route('offer.new', {path: '/offers/new'});
+    // this.route('offer', {path: '/offers/:offer_id'});
 
     this.route('error404', {path: '/*path'});
 
diff --git a/ghost/admin/app/routes/activitypub-x.js b/ghost/admin/app/routes/activitypub-x.js
new file mode 100644
index 00000000000..72481e7df17
--- /dev/null
+++ b/ghost/admin/app/routes/activitypub-x.js
@@ -0,0 +1,3 @@
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+
+export default class AcitvitypubXRoute extends AuthenticatedRoute {}
diff --git a/ghost/admin/app/routes/application.js b/ghost/admin/app/routes/application.js
index 9e8899d91d1..49a3362a03c 100644
--- a/ghost/admin/app/routes/application.js
+++ b/ghost/admin/app/routes/application.js
@@ -1,3 +1,5 @@
+import * as Sentry from '@sentry/ember';
+import AdminXSettings from '../components/admin-x/settings';
 import AuthConfiguration from 'ember-simple-auth/configuration';
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -5,8 +7,10 @@ import Route from '@ember/routing/route';
 import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
 import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
 import windowProxy from 'ghost-admin/utils/window-proxy';
-import {InitSentryForEmber} from '@sentry/ember';
-import {importSettings} from '../components/admin-x/settings';
+import {Debug} from '@sentry/integrations';
+import {Replay} from '@sentry/replay';
+import {beforeSend} from 'ghost-admin/utils/sentry';
+import {importComponent} from '../components/admin-x/admin-x-component';
 import {inject} from 'ghost-admin/decorators/inject';
 import {
     isAjaxError,
@@ -18,6 +22,7 @@ import {
     isMaintenanceError,
     isVersionMismatchError
 } from 'ghost-admin/services/ajax';
+import {later} from '@ember/runloop';
 import {inject as service} from '@ember/service';
 
 function K() {
@@ -86,6 +91,11 @@ export default Route.extend(ShortcutsRoute, {
         didTransition() {
             this.session.appLoadTransition = null;
             this.send('closeMenus');
+
+            // Need a tiny delay here to allow the router to update to the current route
+            later(() => {
+                Sentry.setTag('route', this.router.currentRouteName);
+            }, 2);
         },
 
         authorizationFailed() {
@@ -169,20 +179,62 @@ export default Route.extend(ShortcutsRoute, {
         // init Sentry here rather than app.js so that we can use API-supplied
         // sentry_dsn and sentry_env rather than building it into release assets
         if (this.config.sentry_dsn) {
-            InitSentryForEmber({
+            const sentryConfig = {
                 dsn: this.config.sentry_dsn,
                 environment: this.config.sentry_env,
                 release: `ghost@${this.config.version}`,
-                beforeSend(event) {
-                    event.tags = event.tags || {};
-                    event.tags.shown_to_user = event.tags.shown_to_user || false;
-                    event.tags.grammarly = !!document.querySelector('[data-gr-ext-installed]');
-                    return event;
-                },
-                // TransitionAborted errors surface from normal application behaviour
-                // - https://github.com/emberjs/ember.js/issues/12505
-                ignoreErrors: [/^TransitionAborted$/]
-            });
+                beforeSend,
+                ignoreErrors: [
+                    // Browser autoplay policies (this regex covers a few)
+                    /The play\(\) request was interrupted.*/,
+                    /The request is not allowed by the user agent or the platform in the current context/,
+
+                    // Network errors that we don't control
+                    /Server was unreachable/,
+                    /NetworkError when attempting to fetch resource./,
+                    /Failed to fetch/,
+                    /Load failed/,
+                    /The operation was aborted./,
+
+                    // TransitionAborted errors surface from normal application behaviour
+                    // - https://github.com/emberjs/ember.js/issues/12505
+                    /^TransitionAborted$/,
+                    // ResizeObserver loop errors occur often from extensions and
+                    // embedded content, generally harmless and not useful to report
+                    /^ResizeObserver loop completed with undelivered notifications/,
+                    /^ResizeObserver loop limit exceeded/,
+                    // When tasks in ember-concurrency are canceled, they sometimes lead to unhandled Promise rejections
+                    // This doesn't affect the application and is not useful to report
+                    // - http://ember-concurrency.com/docs/cancelation
+                    'TaskCancelation'
+                ],
+                integrations: []
+            };
+
+            try {
+                // Session Replay on errors
+                // Docs: https://docs.sentry.io/platforms/javascript/session-replay
+                sentryConfig.replaysOnErrorSampleRate = 0.5;
+                sentryConfig.integrations.push(
+                    // Replace with `Sentry.replayIntegration()` once we've migrated to @sentry/ember 8.x
+                    // Docs: https://docs.sentry.io/platforms/javascript/migration/v7-to-v8/#removal-of-sentryreplay-package
+                    new Replay({
+                        mask: ['.koenig-lexical', '.gh-dashboard'],
+                        unmask: ['[role="menu"]', '[data-testid="settings-panel"]', '.gh-nav'],
+                        maskAllText: false,
+                        maskAllInputs: true,
+                        blockAllMedia: true
+                    })
+                );
+            } catch (e) {
+                // no-op, Session Replay is not critical
+                console.error('Error enabling Sentry Replay:', e); // eslint-disable-line no-console
+            }
+
+            if (this.config.sentry_env === 'development') {
+                sentryConfig.integrations.push(new Debug());
+            }
+            Sentry.init(sentryConfig);
         }
 
         if (this.session.isAuthenticated) {
@@ -201,7 +253,9 @@ export default Route.extend(ShortcutsRoute, {
         }
 
         // Preload settings to avoid a delay when opening
-        setTimeout(importSettings, 1000);
+        setTimeout(() => {
+            importComponent(AdminXSettings.packageName);
+        }, 1000);
     }
 
 });
diff --git a/ghost/admin/app/routes/collection.js b/ghost/admin/app/routes/collection.js
index 7110da473f5..f19f609f766 100644
--- a/ghost/admin/app/routes/collection.js
+++ b/ghost/admin/app/routes/collection.js
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/ember';
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import ConfirmUnsavedChangesModal from '../components/modals/confirm-unsaved-changes';
 import {action} from '@ember/object';
@@ -77,6 +78,7 @@ export default class CollectionRoute extends AuthenticatedRoute {
 
     async confirmUnsavedChanges() {
         if (this.controller.model?.hasDirtyAttributes) {
+            Sentry.captureMessage('showing unsaved changes modal for collections route');
             this.confirmModal = this.modals
                 .open(ConfirmUnsavedChangesModal)
                 .finally(() => {
diff --git a/ghost/admin/app/routes/demo-x.js b/ghost/admin/app/routes/demo-x.js
new file mode 100644
index 00000000000..ce53c9e0b2a
--- /dev/null
+++ b/ghost/admin/app/routes/demo-x.js
@@ -0,0 +1,3 @@
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+
+export default class DemoXRoute extends AuthenticatedRoute {}
diff --git a/ghost/admin/app/routes/lexical-editor/edit.js b/ghost/admin/app/routes/lexical-editor/edit.js
index 2a6079b699d..d4cf6417865 100644
--- a/ghost/admin/app/routes/lexical-editor/edit.js
+++ b/ghost/admin/app/routes/lexical-editor/edit.js
@@ -37,7 +37,7 @@ export default class EditRoute extends AuthenticatedRoute {
         const records = await this.store.query(modelName, query);
         let post = records.firstObject;
 
-        // CASE: Post is in mobiledoc — convert to lexical or redirect
+        // CASE: Post is in mobiledoc — convert to lexical
         if (post.mobiledoc) {
             post = await post.save({adapterOptions: {convertToLexical: 1}});
         }
diff --git a/ghost/admin/app/routes/member.js b/ghost/admin/app/routes/member.js
index b0b245376b9..ab9bdc8c757 100644
--- a/ghost/admin/app/routes/member.js
+++ b/ghost/admin/app/routes/member.js
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/ember';
 import AdminRoute from 'ghost-admin/routes/admin';
 import ConfirmUnsavedChangesModal from '../components/modals/confirm-unsaved-changes';
 import {action} from '@ember/object';
@@ -96,6 +97,7 @@ export default class MembersRoute extends AdminRoute {
     }
 
     async confirmUnsavedChanges() {
+        Sentry.captureMessage('showing unsaved changes modal for members route');
         this.confirmModal = this.modals
             .open(ConfirmUnsavedChangesModal)
             .finally(() => {
diff --git a/ghost/admin/app/routes/members.js b/ghost/admin/app/routes/members.js
index 67207e26206..235ed2d67d8 100644
--- a/ghost/admin/app/routes/members.js
+++ b/ghost/admin/app/routes/members.js
@@ -1,4 +1,5 @@
 import AdminRoute from 'ghost-admin/routes/admin';
+import {didCancel} from 'ember-concurrency';
 import {inject as service} from '@ember/service';
 
 export default class MembersRoute extends AdminRoute {
@@ -27,7 +28,17 @@ export default class MembersRoute extends AdminRoute {
     // trigger a background load of members plus labels for filter dropdown
     setupController(controller) {
         super.setupController(...arguments);
-        controller.fetchLabelsTask.perform();
+
+        try {
+            controller.fetchLabelsTask.perform();
+        } catch (e) {
+            // Do not throw cancellation errors
+            if (didCancel(e)) {
+                return;
+            }
+
+            throw e;
+        }
     }
 
     resetController(controller, _isExiting, transition) {
diff --git a/ghost/admin/app/routes/mentions.js b/ghost/admin/app/routes/mentions.js
index bb078c56ef1..cff4f3d8efe 100644
--- a/ghost/admin/app/routes/mentions.js
+++ b/ghost/admin/app/routes/mentions.js
@@ -39,7 +39,7 @@ export default class MentionsRoute extends AuthenticatedRoute {
         let extension = undefined;
 
         if (params.post_id) {
-            paginationSettings.filter = `resource_id:${params.post_id}+resource_type:post`;
+            paginationSettings.filter = `resource_id:'${params.post_id}'+resource_type:post`;
         } else {
             // Only return mentions with the same source once
             paginationSettings.unique = true;
diff --git a/ghost/admin/app/routes/offer.js b/ghost/admin/app/routes/offer.js
index d90111cffae..29516d72991 100644
--- a/ghost/admin/app/routes/offer.js
+++ b/ghost/admin/app/routes/offer.js
@@ -1,80 +1,80 @@
-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 OffersRoute extends AdminRoute {
-    @service modals;
-    @service router;
-
-    _requiresBackgroundRefresh = true;
-
-    model(params) {
-        this._requiresBackgroundRefresh = false;
-
-        if (params.offer_id) {
-            return this.store.queryRecord('offer', {id: params.offer_id});
-        } else {
-            return this.store.createRecord('offer');
-        }
-    }
-
-    setupController(controller, offer) {
-        super.setupController(...arguments);
-
-        if (this._requiresBackgroundRefresh) {
-            controller.fetchOfferTask.perform(offer.id);
-        }
-    }
-
-    deactivate() {
-        // clean up newly created records and revert unsaved changes to existing
-        this.controller.offer.rollbackAttributes();
-        this._requiresBackgroundRefresh = true;
-    }
-
-    @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.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.save();
-    }
-
-    titleToken() {
-        return this.controller.offer.name;
-    }
-}
+// 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 OffersRoute extends AdminRoute {
+//     @service modals;
+//     @service router;
+
+//     _requiresBackgroundRefresh = true;
+
+//     model(params) {
+//         this._requiresBackgroundRefresh = false;
+
+//         if (params.offer_id) {
+//             return this.store.queryRecord('offer', {id: params.offer_id});
+//         } else {
+//             return this.store.createRecord('offer');
+//         }
+//     }
+
+//     setupController(controller, offer) {
+//         super.setupController(...arguments);
+
+//         if (this._requiresBackgroundRefresh) {
+//             controller.fetchOfferTask.perform(offer.id);
+//         }
+//     }
+
+//     deactivate() {
+//         // clean up newly created records and revert unsaved changes to existing
+//         this.controller.offer.rollbackAttributes();
+//         this._requiresBackgroundRefresh = true;
+//     }
+
+//     @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.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.save();
+//     }
+
+//     titleToken() {
+//         return this.controller.offer.name;
+//     }
+// }
diff --git a/ghost/admin/app/routes/offer/new.js b/ghost/admin/app/routes/offer/new.js
index 50a7bb739a4..43bf12f1037 100644
--- a/ghost/admin/app/routes/offer/new.js
+++ b/ghost/admin/app/routes/offer/new.js
@@ -1,18 +1,18 @@
-import OfferRoute from '../offer';
-import {inject as service} from '@ember/service';
+// import OfferRoute from '../offer';
+// import {inject as service} from '@ember/service';
 
-export default class NewOfferRoute extends OfferRoute {
-    @service membersUtils;
+// export default class NewOfferRoute extends OfferRoute {
+//     @service membersUtils;
 
-    controllerName = 'offer';
-    templateName = 'offer';
+//     controllerName = 'offer';
+//     templateName = 'offer';
 
-    /**
-     * First check if we have active tiers
-     */
-    beforeModel() {
-        if (!this.membersUtils.hasActiveTiers) {
-            return this.replaceWith('offers');
-        }
-    }
-}
+//     /**
+//      * First check if we have active tiers
+//      */
+//     beforeModel() {
+//         if (!this.membersUtils.hasActiveTiers) {
+//             return this.replaceWith('offers');
+//         }
+//     }
+// }
diff --git a/ghost/admin/app/routes/offers.js b/ghost/admin/app/routes/offers.js
index 152ba3386ea..bbb67cbbcb5 100644
--- a/ghost/admin/app/routes/offers.js
+++ b/ghost/admin/app/routes/offers.js
@@ -1,31 +1,31 @@
-import AdminRoute from 'ghost-admin/routes/admin';
-import {inject as service} from '@ember/service';
+// import AdminRoute from 'ghost-admin/routes/admin';
+// import {inject as service} from '@ember/service';
 
-export default class offersRoute extends AdminRoute {
-    @service store;
-    @service feature;
+// export default class offersRoute extends AdminRoute {
+//     @service store;
+//     @service feature;
 
-    queryParams = {
-        type: {refreshModel: true}
-    };
+//     queryParams = {
+//         type: {refreshModel: true}
+//     };
 
-    beforeModel() {
-        super.beforeModel(...arguments);
-        // TODO: redirect if members is disabled?
-    }
+//     beforeModel() {
+//         super.beforeModel(...arguments);
+//         // TODO: redirect if members is disabled?
+//     }
 
-    model(params) {
-        return this.controllerFor('offers').fetchOffersTask.perform(params);
-    }
+//     model(params) {
+//         return this.controllerFor('offers').fetchOffersTask.perform(params);
+//     }
 
-    // trigger a background load of members plus labels for filter dropdown
-    setupController() {
-        super.setupController(...arguments);
-    }
+//     // trigger a background load of members plus labels for filter dropdown
+//     setupController() {
+//         super.setupController(...arguments);
+//     }
 
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Offers'
-        };
-    }
-}
+//     buildRouteInfoMetadata() {
+//         return {
+//             titleToken: 'Offers'
+//         };
+//     }
+// }
diff --git a/ghost/admin/app/routes/posts.js b/ghost/admin/app/routes/posts.js
index 93e7d5d4abe..a1c11aac275 100644
--- a/ghost/admin/app/routes/posts.js
+++ b/ghost/admin/app/routes/posts.js
@@ -1,4 +1,5 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import RSVP from 'rsvp';
 import {action} from '@ember/object';
 import {assign} from '@ember/polyfills';
 import {isBlank} from '@ember/utils';
@@ -39,43 +40,54 @@ export default class PostsRoute extends AuthenticatedRoute {
 
     model(params) {
         const user = this.session.user;
-        let queryParams = {};
         let filterParams = {tag: params.tag, visibility: params.visibility};
         let paginationParams = {
             perPageParam: 'limit',
             totalPagesParam: 'meta.pagination.pages'
         };
-
+        
+        // type filters are actually mapping statuses
         assign(filterParams, this._getTypeFilters(params.type));
-
+        
         if (params.type === 'featured') {
             filterParams.featured = true;
         }
-
+        
+        // authors and contributors can only view their own posts
         if (user.isAuthor) {
-            // authors can only view their own posts
             filterParams.authors = user.slug;
         } else if (user.isContributor) {
-            // Contributors can only view their own draft posts
             filterParams.authors = user.slug;
-            // filterParams.status = 'draft';
+            // otherwise we need to filter by author if present
         } else if (params.author) {
             filterParams.authors = params.author;
         }
-
-        let filter = this._filterString(filterParams);
-        if (!isBlank(filter)) {
-            queryParams.filter = filter;
+        
+        let perPage = this.perPage;
+        
+        const filterStatuses = filterParams.status;
+        let queryParams = {allFilter: this._filterString({...filterParams})}; // pass along the parent filter so it's easier to apply the params filter to each infinity model
+        let models = {};
+
+        if (filterStatuses.includes('scheduled')) {
+            let scheduledInfinityModelParams = {...queryParams, order: params.order || 'published_at desc', filter: this._filterString({...filterParams, status: 'scheduled'})};
+            models.scheduledInfinityModel = this.infinity.model(this.modelName, assign({perPage, startingPage: 1}, paginationParams, scheduledInfinityModelParams));
         }
-
-        if (!isBlank(params.order)) {
-            queryParams.order = params.order;
+        if (filterStatuses.includes('draft')) {
+            let draftInfinityModelParams = {...queryParams, order: params.order || 'updated_at desc', filter: this._filterString({...filterParams, status: 'draft'})};
+            models.draftInfinityModel = this.infinity.model(this.modelName, assign({perPage, startingPage: 1}, paginationParams, draftInfinityModelParams));
+        }
+        if (filterStatuses.includes('published') || filterStatuses.includes('sent')) {
+            let publishedAndSentInfinityModelParams;
+            if (filterStatuses.includes('published') && filterStatuses.includes('sent')) {
+                publishedAndSentInfinityModelParams = {...queryParams, order: params.order || 'published_at desc', filter: this._filterString({...filterParams, status: '[published,sent]'})};
+            } else {
+                publishedAndSentInfinityModelParams = {...queryParams, order: params.order || 'published_at desc', filter: this._filterString({...filterParams, status: filterStatuses.includes('published') ? 'published' : 'sent'})};
+            }
+            models.publishedAndSentInfinityModel = this.infinity.model(this.modelName, assign({perPage, startingPage: 1}, paginationParams, publishedAndSentInfinityModelParams));
         }
 
-        let perPage = this.perPage;
-        let paginationSettings = assign({perPage, startingPage: 1}, paginationParams, queryParams);
-
-        return this.infinity.model(this.modelName, paginationSettings);
+        return RSVP.hash(models);
     }
 
     // trigger a background load of all tags and authors for use in filter dropdowns
@@ -120,6 +132,12 @@ export default class PostsRoute extends AuthenticatedRoute {
         };
     }
 
+    /**
+     * Returns an object containing the status filter based on the given type.
+     *
+     * @param {string} type - The type of filter to generate (draft, published, scheduled, sent).
+     * @returns {Object} - An object containing the status filter.
+     */
     _getTypeFilters(type) {
         let status = '[draft,scheduled,published,sent]';
 
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/routes/setup/done.js b/ghost/admin/app/routes/setup/done.js
index 540273c3baa..caca0c63e98 100644
--- a/ghost/admin/app/routes/setup/done.js
+++ b/ghost/admin/app/routes/setup/done.js
@@ -1,17 +1,21 @@
-import Route from '@ember/routing/route';
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import {inject as service} from '@ember/service';
 
-export default class SetupFinishingTouchesRoute extends Route {
+export default class SetupFinishingTouchesRoute extends AuthenticatedRoute {
+    @service feature;
+    @service onboarding;
+    @service router;
+    @service session;
     @service settings;
     @service themeManagement;
 
-    model() {
-        this.themeManagement.setPreviewType('homepage');
-        this.themeManagement.updatePreviewHtmlTask.perform();
-    }
+    beforeModel() {
+        super.beforeModel(...arguments);
+
+        if (this.session.user.isOwnerOnly) {
+            this.onboarding.startChecklist();
+        }
 
-    deactivate() {
-        // rollback any unsaved setting changes when leaving
-        this.settings.rollbackAttributes();
+        return this.router.transitionTo('dashboard');
     }
 }
diff --git a/ghost/admin/app/routes/setup/index.js b/ghost/admin/app/routes/setup/index.js
index 827eb3d8afe..9bc7190de91 100644
--- a/ghost/admin/app/routes/setup/index.js
+++ b/ghost/admin/app/routes/setup/index.js
@@ -1,8 +1,11 @@
 import Route from '@ember/routing/route';
+import {inject as service} from '@ember/service';
 
 export default class IndexRoute extends Route {
+    @service router;
+
     beforeModel() {
         super.beforeModel(...arguments);
-        this.transitionTo('setup.one');
+        this.router.transitionTo('setup.one');
     }
 }
diff --git a/ghost/admin/app/routes/stats.js b/ghost/admin/app/routes/stats.js
new file mode 100644
index 00000000000..db04e502a0a
--- /dev/null
+++ b/ghost/admin/app/routes/stats.js
@@ -0,0 +1,28 @@
+import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
+import {inject} from 'ghost-admin/decorators/inject';
+
+export default class StatsRoute extends AuthenticatedRoute {
+    @inject config;
+
+    beforeModel() {
+        super.beforeModel(...arguments);
+
+        // This is based on the logic for the dashboard
+        if (this.session.user.isContributor) {
+            return this.transitionTo('posts');
+        } else if (!this.session.user.isAdmin) {
+            return this.transitionTo('site');
+        }
+
+        // This ensures that we don't load this page if the stats config is not set
+        if (!this.config.stats) {
+            return this.transitionTo('home');
+        }
+    }
+
+    buildRouteInfoMetadata() {
+        return {
+            titleToken: 'Stats'
+        };
+    }
+}
diff --git a/ghost/admin/app/routes/tag.js b/ghost/admin/app/routes/tag.js
index ada63bba91f..17443be1dc2 100644
--- a/ghost/admin/app/routes/tag.js
+++ b/ghost/admin/app/routes/tag.js
@@ -1,3 +1,4 @@
+import * as Sentry from '@sentry/ember';
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import ConfirmUnsavedChangesModal from '../components/modals/confirm-unsaved-changes';
 import {action} from '@ember/object';
@@ -77,6 +78,7 @@ export default class TagRoute extends AuthenticatedRoute {
 
     async confirmUnsavedChanges() {
         if (this.controller.model?.hasDirtyAttributes) {
+            Sentry.captureMessage('showing unsaved changes modal for tags route');
             this.confirmModal = this.modals
                 .open(ConfirmUnsavedChangesModal)
                 .finally(() => {
diff --git a/ghost/admin/app/routes/websockets.js b/ghost/admin/app/routes/websockets.js
deleted file mode 100644
index a01ad7a8242..00000000000
--- a/ghost/admin/app/routes/websockets.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import AuthenticatedRoute from './authenticated';
-import {inject as service} from '@ember/service';
-
-// need this to be authenticated
-export default class WebsocketRoute extends AuthenticatedRoute {
-    @service session;
-    @service router;
-
-    beforeModel() {
-        super.beforeModel(...arguments);
-
-        const user = this.session.user;
-
-        if (!user.isAdmin) {
-            return this.router.transitionTo('settings-x.settings-x', `staff/${user.slug}`);
-        }
-    }
-}
diff --git a/ghost/admin/app/serializers/post-revision.js b/ghost/admin/app/serializers/post-revision.js
index ff94d1e54c6..7b281fdd585 100644
--- a/ghost/admin/app/serializers/post-revision.js
+++ b/ghost/admin/app/serializers/post-revision.js
@@ -5,15 +5,6 @@ import {EmbeddedRecordsMixin} from '@ember-data/serializer/rest';
 export default class PostRevisionSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
     // settings for the EmbeddedRecordsMixin.
     attrs = {
-        author: {embedded: 'always'},
-        lexical: {key: 'lexical'},
-        title: {key: 'title'},
-        createdAt: {key: 'created_at'},
-        postStatus: {key: 'post_status'},
-        reason: {key: 'reason'},
-        featureImage: {key: 'feature_image'},
-        featureImageAlt: {key: 'feature_image_alt'},
-        featureImageCaption: {key: 'feature_image_caption'},
-        postIdLocal: {key: 'post_id'}
+        author: {embedded: 'always'}
     };
 }
diff --git a/ghost/admin/app/serializers/tag.js b/ghost/admin/app/serializers/tag.js
index 49ba8efa452..b8074519871 100644
--- a/ghost/admin/app/serializers/tag.js
+++ b/ghost/admin/app/serializers/tag.js
@@ -13,6 +13,7 @@ export default class TagSerializer extends ApplicationSerializer {
 
         // Properties that exist on the model but we don't want sent in the payload
         delete json.count;
+        delete json.url;
 
         return json;
     }
diff --git a/ghost/admin/app/serializers/user.js b/ghost/admin/app/serializers/user.js
index 04bfd38a435..bd7bde45694 100644
--- a/ghost/admin/app/serializers/user.js
+++ b/ghost/admin/app/serializers/user.js
@@ -19,4 +19,13 @@ export default class UserSerializer extends ApplicationSerializer.extend(Embedde
 
         return super.extractSingle(...arguments);
     }
+
+    serialize() {
+        const json = super.serialize(...arguments);
+
+        // Read-only virtual properties
+        delete json.url;
+
+        return json;
+    }
 }
diff --git a/ghost/admin/app/services/ajax.js b/ghost/admin/app/services/ajax.js
index aec7a81c48d..a98bb159547 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.slice(0, 200)); // the max length of a tag value is 200 characters
+        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..c55d5f53634 100644
--- a/ghost/admin/app/services/dashboard-stats.js
+++ b/ghost/admin/app/services/dashboard-stats.js
@@ -3,6 +3,8 @@ import moment from 'moment-timezone';
 import {task} from 'ember-concurrency';
 import {tracked} from '@glimmer/tracking';
 
+import mergeStatsByDate from 'ghost-admin/utils/merge-stats-by-date';
+
 /**
  * @typedef MrrStat
  * @type {Object}
@@ -57,8 +59,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
  */
 
 /**
@@ -85,6 +87,7 @@ export default class DashboardStatsService extends Service {
     @service membersCountCache;
     @service settings;
     @service membersUtils;
+    @service membersStats;
 
     /**
      * @type {?SiteStatus} Contains information on what graphs need to be shown
@@ -240,14 +243,16 @@ export default class DashboardStatsService extends Service {
             return [];
         }
 
+        const firstChartDay = moment().add(-this.chartDays, 'days').format('YYYY-MM-DD');
+
         return this.memberAttributionStats.filter((stat) => {
             if (this.chartDays === 'all') {
                 return true;
             }
-            return stat.date >= moment().add(-this.chartDays, 'days').format('YYYY-MM-DD');
+            return stat.date >= firstChartDay;
         }).reduce((acc, stat) => {
             const statSource = stat.source ?? '';
-            const existingSource = acc.find(s => s.source === statSource);
+            const existingSource = acc.find(s => s.source.toLowerCase() === statSource.toLowerCase());
             if (existingSource) {
                 existingSource.signups += stat.signups || 0;
                 existingSource.paidConversions += stat.paidConversions || 0;
@@ -460,39 +465,7 @@ export default class DashboardStatsService extends Service {
             }
         }
 
-        function mergeDates(list, entry) {
-            const [current, ...rest] = list;
-
-            if (!current) {
-                return entry ? [entry] : [];
-            }
-
-            if (!entry) {
-                return mergeDates(rest, {
-                    date: current.date,
-                    count: current.count,
-                    positiveDelta: current.positive_delta,
-                    negativeDelta: current.negative_delta,
-                    signups: current.signups,
-                    cancellations: current.cancellations
-                });
-            }
-
-            if (current.date === entry.date) {
-                return mergeDates(rest, {
-                    date: entry.date,
-                    count: entry.count + current.count,
-                    positiveDelta: entry.positiveDelta + current.positive_delta,
-                    negativeDelta: entry.negativeDelta + current.negative_delta,
-                    signups: entry.signups + current.signups,
-                    cancellations: entry.cancellations + current.cancellations
-                });
-            }
-
-            return [entry].concat(mergeDates(list));
-        }
-
-        const subscriptionCountStats = mergeDates(result.stats);
+        const subscriptionCountStats = mergeStatsByDate(result.stats);
 
         this.paidMembersByCadence = paidMembersByCadence;
         this.paidMembersByTier = paidMembersByTier;
@@ -524,8 +497,7 @@ export default class DashboardStatsService extends Service {
             return;
         }
 
-        let statsUrl = this.ghostPaths.url.api('stats/member_count');
-        let stats = yield this.ajax.request(statsUrl);
+        const stats = yield this.membersStats.fetchMemberCount();
         this.memberCountStats = stats.stats.map((d) => {
             return {
                 ...d,
@@ -723,7 +695,7 @@ export default class DashboardStatsService extends Service {
         }
 
         const start30d = new Date(Date.now() - 30 * 86400 * 1000);
-        const result = yield this.store.query('email', {limit: 100, filter: 'submitted_at:>' + start30d.toISOString()});
+        const result = yield this.store.query('email', {limit: 100, filter: `submitted_at:>'${start30d.toISOString()}'`});
         this.emailsSent30d = result.reduce((c, email) => c + email.emailCount, 0);
     }
 
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index 64fab9b9ade..fb8a9882596 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -63,21 +63,20 @@ export default class FeatureService extends Service {
     @feature('lexicalMultiplayer') lexicalMultiplayer;
     @feature('audienceFeedback') audienceFeedback;
     @feature('webmentions') webmentions;
-    @feature('websockets') websockets;
     @feature('stripeAutomaticTax') stripeAutomaticTax;
     @feature('emailCustomization') emailCustomization;
     @feature('i18n') i18n;
     @feature('announcementBar') announcementBar;
     @feature('signupCard') signupCard;
-    @feature('signupForm') signupForm;
     @feature('collections') collections;
     @feature('mailEvents') mailEvents;
     @feature('collectionsCard') collectionsCard;
     @feature('importMemberTier') importMemberTier;
-    @feature('tipsAndDonations') tipsAndDonations;
-    @feature('recommendations') recommendations;
     @feature('lexicalIndicators') lexicalIndicators;
-    @feature('editorEmojiPicker') editorEmojiPicker;
+    @feature('adminXDemo') adminXDemo;
+    @feature('ActivityPub') ActivityPub;
+    @feature('editorExcerpt') editorExcerpt;
+    @feature('contentVisibility') contentVisibility;
 
     _user = null;
 
diff --git a/ghost/admin/app/services/limit.js b/ghost/admin/app/services/limit.js
index 12b16024bc9..15c6f4218a0 100644
--- a/ghost/admin/app/services/limit.js
+++ b/ghost/admin/app/services/limit.js
@@ -27,6 +27,7 @@ class HostLimitError extends LimitError {
 export default class LimitsService extends Service {
     @service store;
     @service membersStats;
+    @service membersCountCache;
 
     @inject config;
 
@@ -93,10 +94,7 @@ export default class LimitsService extends Service {
     }
 
     async getMembersCount() {
-        const members = await this.store.query('member', {limit: 1});
-        const total = members.meta.pagination.total;
-
-        return total;
+        return this.membersCountCache.count({});
     }
 
     async getNewslettersCount() {
diff --git a/ghost/admin/app/services/members-count-cache.js b/ghost/admin/app/services/members-count-cache.js
index 574326d7306..b5b3facc7d9 100644
--- a/ghost/admin/app/services/members-count-cache.js
+++ b/ghost/admin/app/services/members-count-cache.js
@@ -93,7 +93,7 @@ export default class MembersCountCacheService extends Service {
         }
 
         try {
-            const result = yield this.store.query('member', {...query, limit: 1, page: 1});
+            const result = yield this.store.query('member', {...query, order: 'id', limit: 1, page: 1});
             return result.meta.pagination.total;
         } catch (e) {
             console.error(e); // eslint-disable-line
diff --git a/ghost/admin/app/services/members-stats.js b/ghost/admin/app/services/members-stats.js
index c29aa08433b..f7c646fd275 100644
--- a/ghost/admin/app/services/members-stats.js
+++ b/ghost/admin/app/services/members-stats.js
@@ -52,9 +52,13 @@ export default class MembersStatsService extends Service {
     }
 
     fetchMemberCount() {
-        let staleData = this._lastFetchedMemberCounts && (new Date() - this._lastFetchedMemberCounts) > ONE_MINUTE;
+        // if already running, return existing promise
+        if (this._fetchMemberCountsTask.isRunning) {
+            return this._fetchMemberCountsTask.last;
+        }
 
         // return existing stats unless data is > 1 min old
+        let staleData = this._lastFetchedMemberCounts && (new Date() - this._lastFetchedMemberCounts) > ONE_MINUTE;
         if (this.totalMemberCount && !this._forceRefresh && !staleData && this._fetchMemberCountsTask.last) {
             return this._fetchMemberCountsTask.last;
         }
diff --git a/ghost/admin/app/services/migrate.js b/ghost/admin/app/services/migrate.js
index b4a692b2601..279fda636a1 100644
--- a/ghost/admin/app/services/migrate.js
+++ b/ghost/admin/app/services/migrate.js
@@ -1,4 +1,5 @@
 import Service, {inject as service} from '@ember/service';
+import config from 'ghost-admin/config/environment';
 import {SignJWT} from 'jose';
 import {tracked} from '@glimmer/tracking';
 
@@ -15,6 +16,7 @@ export default class MigrateService extends Service {
     @tracked siteData = null;
     @tracked previousRoute = null;
     @tracked isIframeTransition = false;
+    @tracked platform = null;
 
     get apiUrl() {
         const origin = window.location.origin;
@@ -65,12 +67,20 @@ export default class MigrateService extends Service {
         return (this.settings.stripeConnectAccountId && this.settings.stripeConnectPublishableKey && this.settings.stripeConnectLivemode) ? true : false;
     }
 
+    get ghostVersion() {
+        return config.APP.version;
+    }
+
     constructor() {
         super(...arguments);
     }
 
     getIframeURL() {
         let url = this.migrateUrl;
+        const params = this.router.currentRoute.params;
+        if (params.platform) {
+            url = url + '?platform=' + params.platform;
+        }
 
         return url;
     }
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/onboarding.js b/ghost/admin/app/services/onboarding.js
new file mode 100644
index 00000000000..d5a8d5ce3a5
--- /dev/null
+++ b/ghost/admin/app/services/onboarding.js
@@ -0,0 +1,122 @@
+import Service, {inject as service} from '@ember/service';
+import {action} from '@ember/object';
+
+const EMPTY_SETTINGS = {
+    completedSteps: [],
+    checklistState: 'pending' // pending, started, completed, dismissed
+};
+
+export default class OnboardingService extends Service {
+    @service session;
+
+    ONBOARDING_STEPS = [
+        'customize-design',
+        'first-post',
+        'build-audience',
+        'share-publication'
+    ];
+
+    get settings() {
+        const userSettings = JSON.parse(this.session.user.accessibility || '{}');
+
+        return userSettings.onboarding || JSON.parse(JSON.stringify(EMPTY_SETTINGS));
+    }
+
+    get isChecklistShown() {
+        return this.session.user.isOwnerOnly
+            && this.checklistStarted
+            && !this.checklistCompleted
+            && !this.checklistDismissed;
+    }
+
+    get checklistState() {
+        return this.settings.checklistState;
+    }
+
+    get checklistStarted() {
+        return this.settings.checklistState === 'started';
+    }
+
+    get checklistCompleted() {
+        return this.settings.checklistState === 'completed';
+    }
+
+    get checklistDismissed() {
+        return this.settings.checklistState === 'dismissed';
+    }
+
+    get completedSteps() {
+        const settings = this.settings;
+
+        return settings.completedSteps || [];
+    }
+
+    get nextStep() {
+        return this.ONBOARDING_STEPS.find(step => !this.isStepCompleted(step));
+    }
+
+    get allStepsCompleted() {
+        return this.ONBOARDING_STEPS.every(step => this.isStepCompleted(step));
+    }
+
+    @action
+    async startChecklist() {
+        const settings = this.settings;
+
+        settings.completedSteps = [];
+        settings.checklistState = 'started';
+
+        await this._saveSettings(settings);
+    }
+
+    @action
+    async completeChecklist() {
+        const settings = this.settings;
+
+        settings.checklistState = 'completed';
+
+        await this._saveSettings(settings);
+    }
+
+    @action
+    async dismissChecklist() {
+        const settings = this.settings;
+
+        settings.checklistState = 'dismissed';
+
+        await this._saveSettings(settings);
+    }
+
+    @action
+    isStepCompleted(step) {
+        return this.completedSteps.includes(step);
+    }
+
+    @action
+    async markStepCompleted(step) {
+        if (this.isStepCompleted(step)) {
+            return;
+        }
+
+        const settings = this.settings;
+        settings.completedSteps.push(step);
+
+        await this._saveSettings(settings);
+    }
+
+    @action
+    async reset() {
+        await this._saveSettings(undefined);
+    }
+
+    /* private */
+
+    async _saveSettings(settings) {
+        const userSettings = JSON.parse(this.session.user.accessibility || '{}');
+
+        userSettings.onboarding = settings;
+
+        this.session.user.accessibility = JSON.stringify(userSettings);
+        await this.session.user.save();
+    }
+}
diff --git a/ghost/admin/app/services/search-provider-basic.js b/ghost/admin/app/services/search-provider-basic.js
new file mode 100644
index 00000000000..cb73ee2820d
--- /dev/null
+++ b/ghost/admin/app/services/search-provider-basic.js
@@ -0,0 +1,116 @@
+import RSVP from 'rsvp';
+import Service from '@ember/service';
+import {isEmpty} from '@ember/utils';
+import {pluralize} from 'ember-inflector';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+
+export const SEARCHABLES = [
+    {
+        name: 'Staff',
+        model: 'user',
+        fields: ['id', 'slug', 'url', 'name'], // id not used but required for API to have correct url
+        idField: 'slug',
+        titleField: 'name'
+    },
+    {
+        name: 'Tags',
+        model: 'tag',
+        fields: ['slug', 'url', 'name'],
+        idField: 'slug',
+        titleField: 'name'
+    },
+    {
+        name: 'Posts',
+        model: 'post',
+        fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'],
+        idField: 'id',
+        titleField: 'title'
+    },
+    {
+        name: 'Pages',
+        model: 'page',
+        fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'],
+        idField: 'id',
+        titleField: 'title'
+    }
+];
+
+export default class SearchProviderBasicService extends Service {
+    @service ajax;
+    @service notifications;
+    @service store;
+
+    content = [];
+
+    /* eslint-disable require-yield */
+    @task
+    *searchTask(term) {
+        const normalizedTerm = term.toString().toLowerCase();
+        const results = [];
+
+        SEARCHABLES.forEach((searchable) => {
+            const matchedContent = this.content.filter((item) => {
+                const normalizedTitle = item.title.toString().toLowerCase();
+                return (
+                    item.groupName === searchable.name &&
+                    normalizedTitle.indexOf(normalizedTerm) >= 0
+                );
+            });
+
+            if (!isEmpty(matchedContent)) {
+                results.push({
+                    groupName: searchable.name,
+                    options: matchedContent
+                });
+            }
+        });
+
+        return results;
+    }
+    /* eslint-enable require-yield */
+
+    @task
+    *refreshContentTask() {
+        const content = [];
+        const promises = SEARCHABLES.map(searchable => this._loadSearchable(searchable, content));
+
+        try {
+            yield RSVP.all(promises);
+            this.content = content;
+        } catch (error) {
+            // eslint-disable-next-line
+            console.error(error);
+        }
+    }
+
+    async _loadSearchable(searchable, content) {
+        const url = `${this.store.adapterFor(searchable.model).urlForQuery({}, searchable.model)}/`;
+        const maxSearchableLimit = '10000';
+        const query = {fields: searchable.fields, limit: maxSearchableLimit};
+
+        try {
+            const response = await this.ajax.request(url, {data: query});
+
+            const items = response[pluralize(searchable.model)].map(
+                item => ({
+                    id: `${searchable.model}.${item[searchable.idField]}`,
+                    url: item.url,
+                    title: item[searchable.titleField],
+                    groupName: searchable.name,
+                    status: item.status,
+                    visibility: item.visibility,
+                    publishedAt: item.published_at
+                })
+            );
+
+            content.push(...items);
+        } catch (error) {
+            console.error(error); // eslint-disable-line
+
+            this.notifications.showAPIError(error, {
+                key: `search.load${searchable.name}.error`
+            });
+        }
+    }
+}
diff --git a/ghost/admin/app/services/search-provider-flex.js b/ghost/admin/app/services/search-provider-flex.js
new file mode 100644
index 00000000000..92a1b5e6d1d
--- /dev/null
+++ b/ghost/admin/app/services/search-provider-flex.js
@@ -0,0 +1,139 @@
+import RSVP from 'rsvp';
+import Service from '@ember/service';
+import {default as Flexsearch} from 'flexsearch';
+import {isEmpty} from '@ember/utils';
+import {pluralize} from 'ember-inflector';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+
+const {Document} = Flexsearch;
+
+export const SEARCHABLES = [
+    {
+        name: 'Staff',
+        model: 'user',
+        fields: ['id', 'slug', 'url', 'name', 'profile_image'],
+        pathField: 'slug',
+        titleField: 'name',
+        index: ['name']
+    },
+    {
+        name: 'Tags',
+        model: 'tag',
+        fields: ['id', 'slug', 'url', 'name'],
+        pathField: 'slug',
+        titleField: 'name',
+        index: ['name']
+    },
+    {
+        name: 'Posts',
+        model: 'post',
+        fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'],
+        order: 'updated_at desc', // ensure we use a simple rather than default order for faster response
+        pathField: 'id',
+        titleField: 'title',
+        index: ['title']
+    },
+    {
+        name: 'Pages',
+        model: 'page',
+        fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'],
+        order: 'updated_at desc', // ensure we use a simple rather than default order for faster response
+        pathField: 'id',
+        titleField: 'title',
+        index: ['title']
+    }
+];
+
+export default class SearchProviderFlexService extends Service {
+    @service ajax;
+    @service notifications;
+    @service store;
+
+    indexes = SEARCHABLES.reduce((indexes, searchable) => {
+        indexes[searchable.model] = new Document({
+            tokenize: 'forward',
+            document: {
+                id: 'id',
+                index: searchable.index,
+                store: true
+            }
+        });
+
+        return indexes;
+    }, {});
+
+    /* eslint-disable require-yield */
+    @task
+    *searchTask(term) {
+        const results = [];
+
+        SEARCHABLES.forEach((searchable) => {
+            const searchResults = this.indexes[searchable.model].search(term, {enrich: true});
+            const usedIds = new Set();
+            const groupResults = [];
+
+            searchResults.forEach((field) => {
+                field.result.forEach((searchResult) => {
+                    const {id, doc} = searchResult;
+
+                    if (usedIds.has(id)) {
+                        return;
+                    }
+
+                    usedIds.add(id);
+
+                    groupResults.push({
+                        groupName: searchable.name,
+                        id: `${searchable.model}.${doc[searchable.pathField]}`,
+                        title: doc[searchable.titleField],
+                        url: doc.url,
+                        status: doc.status,
+                        visibility: doc.visibility,
+                        publishedAt: doc.published_at
+                    });
+                });
+            });
+
+            if (!isEmpty(groupResults)) {
+                results.push({
+                    groupName: searchable.name,
+                    options: groupResults
+                });
+            }
+        });
+
+        return results;
+    }
+    /* eslint-enable require-yield */
+
+    @task
+    *refreshContentTask() {
+        try {
+            const promises = SEARCHABLES.map(searchable => this.#loadSearchable(searchable));
+            yield RSVP.all(promises);
+        } catch (error) {
+            // eslint-disable-next-line
+            console.error(error);
+        }
+    }
+
+    async #loadSearchable(searchable) {
+        const url = `${this.store.adapterFor(searchable.model).urlForQuery({}, searchable.model)}/`;
+        const query = {fields: searchable.fields, limit: 10000, order: searchable.order};
+
+        try {
+            const response = await this.ajax.request(url, {data: query});
+
+            response[pluralize(searchable.model)].forEach((item) => {
+                this.indexes[searchable.model].add(item);
+            });
+        } catch (error) {
+            console.error(error); // eslint-disable-line
+
+            this.notifications.showAPIError(error, {
+                key: `search.load${searchable.name}.error`
+            });
+        }
+    }
+}
diff --git a/ghost/admin/app/services/search.js b/ghost/admin/app/services/search.js
new file mode 100644
index 00000000000..f8e3f9e5009
--- /dev/null
+++ b/ghost/admin/app/services/search.js
@@ -0,0 +1,60 @@
+import Service from '@ember/service';
+import {action} from '@ember/object';
+import {isBlank} from '@ember/utils';
+import {inject as service} from '@ember/service';
+import {task, timeout} from 'ember-concurrency';
+
+export default class SearchService extends Service {
+    @service ajax;
+    @service feature;
+    @service notifications;
+    @service searchProviderBasic;
+    @service searchProviderFlex;
+    @service settings;
+    @service store;
+
+    isContentStale = true;
+
+    get provider() {
+        const isEnglish = this.settings.locale?.toLowerCase().startsWith('en') ?? true;
+        return isEnglish ? this.searchProviderFlex : this.searchProviderBasic;
+    }
+
+    @action
+    expireContent() {
+        this.isContentStale = true;
+    }
+
+    @task({restartable: true})
+    *searchTask(term) {
+        if (isBlank(term)) {
+            return [];
+        }
+
+        // start loading immediately in the background
+        this.refreshContentTask.perform();
+
+        // debounce searches to 200ms to avoid thrashing CPU
+        yield timeout(200);
+
+        // wait for any on-going refresh to finish
+        if (this.refreshContentTask.isRunning) {
+            yield this.refreshContentTask.lastRunning;
+        }
+
+        return yield this.provider.searchTask.perform(term);
+    }
+
+    @task({drop: true})
+    *refreshContentTask({forceRefresh = false} = {}) {
+        if (!forceRefresh && !this.isContentStale) {
+            return true;
+        }
+
+        this.isContentStale = true;
+
+        yield this.provider.refreshContentTask.perform();
+
+        this.isContentStale = false;
+    }
+}
diff --git a/ghost/admin/app/services/session.js b/ghost/admin/app/services/session.js
index 53b387717b3..360930a73d6 100644
--- a/ghost/admin/app/services/session.js
+++ b/ghost/admin/app/services/session.js
@@ -2,6 +2,7 @@ import ESASessionService from 'ember-simple-auth/services/session';
 import RSVP from 'rsvp';
 import {configureScope} from '@sentry/ember';
 import {getOwner} from '@ember/application';
+import {identifyUser, resetUser} from '../utils/analytics';
 import {inject} from 'ghost-admin/decorators/inject';
 import {run} from '@ember/runloop';
 import {inject as service} from '@ember/service';
@@ -47,6 +48,9 @@ export default class SessionService extends ESASessionService {
             this.membersUtils.fetch()
         ]);
 
+        // Identify the user to our analytics service upon successful login
+        await identifyUser(this.user);
+
         // Theme management requires features to be loaded
         this.themeManagement.fetch().catch(console.error); // eslint-disable-line no-console
 
@@ -100,12 +104,17 @@ export default class SessionService extends ESASessionService {
      * If failed, it will be handled by the redirect to sign in.
      */
     async requireAuthentication(transition, route) {
+        if (this.isAuthenticated && this.user) {
+            identifyUser(this.user);
+        }
+
         // Only when ember session invalidated
         if (!this.isAuthenticated) {
             transition.abort();
 
             if (this.user) {
                 await this.setup();
+                identifyUser(this.user);
                 this.notifications.clearAll();
                 transition.retry();
             }
@@ -117,6 +126,9 @@ export default class SessionService extends ESASessionService {
     handleInvalidation() {
         let transition = this.appLoadTransition;
 
+        // Reset the PostHog user when the session is invalidated (e.g. signout, token expiry, etc.)
+        resetUser();
+
         if (transition) {
             transition.send('authorizationFailed');
         } else {
diff --git a/ghost/admin/app/services/ui.js b/ghost/admin/app/services/ui.js
index 0af3285704a..987becf3a48 100644
--- a/ghost/admin/app/services/ui.js
+++ b/ghost/admin/app/services/ui.js
@@ -6,7 +6,6 @@ import {
 } from '@tryghost/color-utils';
 import {action, get} from '@ember/object';
 import {inject} from 'ghost-admin/decorators/inject';
-import {isEmpty} from '@ember/utils';
 import {tracked} from '@glimmer/tracking';
 
 function collectMetadataClasses(transition, prop) {
@@ -48,7 +47,6 @@ export default class UiService extends Service {
 
     @inject config;
 
-    @tracked contextualNavMenu = null;
     @tracked isFullScreen = false;
     @tracked mainClass = '';
     @tracked showMobileMenu = false;
@@ -148,11 +146,7 @@ export default class UiService extends Service {
 
         let blogTitle = this.config.blogTitle;
 
-        if (!isEmpty(tokens)) {
-            window.document.title = `${tokens.join(' - ')} - ${blogTitle}`;
-        } else {
-            window.document.title = blogTitle;
-        }
+        window.document.title = `Ghost Admin - ${blogTitle}`;
     }
 
     @action
diff --git a/ghost/admin/app/services/whats-new.js b/ghost/admin/app/services/whats-new.js
index 777c64258ec..6b2ffb6831b 100644
--- a/ghost/admin/app/services/whats-new.js
+++ b/ghost/admin/app/services/whats-new.js
@@ -7,6 +7,8 @@ import {task} from 'ember-concurrency';
 
 export default Service.extend({
     session: service(),
+    store: service(),
+    response: null,
 
     entries: null,
     changelogUrl: 'https://ghost.org/blog/',
@@ -39,32 +41,47 @@ export default Service.extend({
         return latestMoment.isAfter(lastSeenMoment);
     }),
 
-    showModal: action(function () {
+    hasNewFeatured: computed('entries.[]', function () {
+        if (!this.hasNew) {
+            return false;
+        }
+
+        let [latestEntry] = this.entries;
+        return latestEntry.featured;
+    }),
+
+    seen: action(function () {
+        this.updateLastSeen.perform();
+    }),
+
+    openFeaturedModal: action(function () {
         this.set('isShowingModal', true);
     }),
 
-    closeModal: action(function () {
+    closeFeaturedModal: action(function () {
         this.set('isShowingModal', false);
-        this.updateLastSeen.perform();
+        this.seen();
     }),
 
     fetchLatest: task(function* () {
         try {
-            // we should already be logged in at this point so lets grab the user
-            // record and store it locally so that we don't have to deal with
-            // session.user being a promise and causing issues with CPs
-            let user = yield this.session.user;
-            this.set('_user', user);
-
-            let response = yield fetch('https://ghost.org/changelog.json');
-            if (!response.ok) {
-                // eslint-disable-next-line
-                return console.error('Failed to fetch changelog', {response});
+            if (!this.response) {
+                // we should already be logged in at this point so lets grab the user
+                // record and store it locally so that we don't have to deal with
+                // session.user being a promise and causing issues with CPs
+                let user = yield this.session.user;
+                this.set('_user', user);
+
+                this.response = yield fetch('https://ghost.org/changelog.json');
+                if (!this.response.ok) {
+                    // eslint-disable-next-line
+                    return console.error('Failed to fetch changelog', {response});
+                }
+
+                let result = yield this.response.json();
+                this.set('entries', result.posts || []);
+                this.set('changelogUrl', result.changelogUrl);
             }
-
-            let result = yield response.json();
-            this.set('entries', result.posts || []);
-            this.set('changelogUrl', result.changelogUrl);
         } catch (e) {
             console.error(e); // eslint-disable-line
         }
diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css
index 18342e2cc80..a6f40e77ff3 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,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/whatsnew-modal.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 +523,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 +548,6 @@ input:focus,
     background: #fff;
 }
 
-.user-cover-edit {
-    color: #fff;
-}
-
 .gh-unsplash-search:focus {
     background-color: color-mod(var(--lightgrey));
 }
@@ -583,33 +574,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 +598,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 +622,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 +654,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 +707,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;
 }
@@ -833,6 +744,11 @@ input:focus,
 
 /* Editor  */
 
+.gh-editor-title,
+.gh-editor-excerpt {
+    background: var(--white);
+}
+
 .gh-editor-title::placeholder {
     color: var(--midlightgrey-d2);
 }
@@ -979,7 +895,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 +906,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 +918,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);
 }
@@ -1131,13 +1037,13 @@ input:focus,
     background: var(--lightgrey);
 }
 
-/* Opacity needed to display correctly in Safari */
-::selection {
-    background: rgb(55, 59, 67, 0.99);
+.gh-notification-close:hover svg {
+    stroke: #FFF;
 }
 
-.user-image {
-    border-color: var(--dark-main-bg-color);
+/* Opacity needed to display correctly in Safari */
+::selection {
+    background: rgba(88, 101, 116, 0.99);
 }
 
 .gh-whats-new-badge-account {
@@ -1146,11 +1052,11 @@ input:focus,
 }
 
 .gh-list-scrolling thead th:first-child {
-    background: linear-gradient(90deg, rgba(16,17,20,1) 90%, rgba(16,17,20,0) 100%);
+    background: linear-gradient(90deg, rgba(21,23,26,1) 90%, rgba(21,23,26,0) 100%);
 }
 
 .gh-list-scrolling tbody .gh-list-data:first-child {
-    background: linear-gradient(90deg, rgba(16,17,20,1) 90%, rgba(16,17,20,0) 100%);
+    background: linear-gradient(90deg, rgba(21,23,26,1) 90%, rgba(21,23,26,0) 100%);
 }
 
 .gh-filter-builder .gh-filters {
@@ -1326,18 +1232,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 {
@@ -1477,8 +1371,68 @@ kbd {
     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);
+/* ---------------------------------
+Onboarding checklist */
+
+.gh-onboarding-wrapper {
+    background: none;
+}
+
+.gh-onboarding-items {
+    border-color: var(--lightgrey);
+}
+
+.gh-onboarding-item {
+    border-color: var(--lightgrey);
+}
+
+.gh-onboarding-item--next {
+    background: #1c1e21;
+}
+
+.gh-onboarding-help a:hover {
+    color: var(--black);
+}
+
+.gh-onboarding-skip {
+    color: var(--middarkgrey);
+    border: 1px solid var(--lightgrey);
+}
+
+.gh-onboarding-ghost-logo-overlay {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background: hsl(216deg 11% 70% / 1%);
+}
+
+/* ---------------------------------
+Onboarding checklist: Share publication modal */
+
+.gh-share-card-container {
+    border: 1px solid #394047;
+}
+
+.gh-copy-publication-link {
+    background: #394047;
+    border: none;
+}
+
+.gh-copy-publication-link:hover {
+    border: none;
+    opacity: .8;
+}
+
+.gh-share-links li a {
+    border: 1px solid #394047;
+}
+
+.gh-share-links li a:hover {
+    background: #394047;
+}
+
+.gh-sidebar-banner.gh-error-banner {
+    background: var(--lightgrey-d1);
 }
diff --git a/ghost/admin/app/styles/app.css b/ghost/admin/app/styles/app.css
index 1d8de82c86c..d3224f8923c 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,14 @@
 @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/whatsnew-modal.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";
@@ -76,6 +72,7 @@
 @import "layouts/explore.css";
 @import "layouts/mentions.css";
 @import "layouts/migrate.css";
+@import "layouts/stats.css";
 
 
 /* ---------------------------✈️----------------------------- */
diff --git a/ghost/admin/app/styles/components/dropdowns.css b/ghost/admin/app/styles/components/dropdowns.css
index 099644e81d8..96a1b808a13 100644
--- a/ghost/admin/app/styles/components/dropdowns.css
+++ b/ghost/admin/app/styles/components/dropdowns.css
@@ -393,7 +393,8 @@ Post context menu
     stroke-width: 1.8px;
 }
 
-.gh-posts-context-menu li:last-child::before {
+.gh-posts-context-menu li:last-child::before,
+.gh-analytics-actions-menu li:last-child::before {
     display: block;
     position: relative;
     content: "";
diff --git a/ghost/admin/app/styles/components/koenig.css b/ghost/admin/app/styles/components/koenig.css
index b0fe69b499a..0ee47a28032 100644
--- a/ghost/admin/app/styles/components/koenig.css
+++ b/ghost/admin/app/styles/components/koenig.css
@@ -18,15 +18,9 @@
     padding: 11vw 92px;
 }
 
-@media (min-width: 500px) and (max-width: 960px) {
+@media (max-width: 768px) {
     .gh-koenig-editor-pane {
-        padding: 15vw 92px;
-    }
-}
-
-@media (max-width: 500px) {
-    .gh-koenig-editor-pane {
-        padding: 20vw 32px;
+        padding: 56px 32px;
     }
 }
 
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-new.css b/ghost/admin/app/styles/components/modals-new.css
index 3f63b5d0a37..84909400f16 100644
--- a/ghost/admin/app/styles/components/modals-new.css
+++ b/ghost/admin/app/styles/components/modals-new.css
@@ -1,17 +1,17 @@
 :root {
     /* The named -duration and -delay variables will be lowered to near zero when using the setupPromiseModals test helper  */
-    --epm-animation-backdrop-in-duration: 0.15s;
-    --epm-animation-backdrop-out-duration: 0.15s;
+    --epm-animation-backdrop-in-duration: 0.2s;
+    --epm-animation-backdrop-out-duration: 0.2s;
     --epm-animation-modal-in-duration: 0.15s;
     --epm-animation-modal-out-duration: 0.15s;
     --epm-animation-backdrop-in-delay: 0s;
     --epm-animation-backdrop-out-delay: 0s;
     --epm-animation-modal-in-delay: 0s;
     --epm-animation-modal-out-delay: 0s;
-    --epm-animation-backdrop-in: var(--epm-animation-backdrop-in-duration) ease
+    --epm-animation-backdrop-in: var(--epm-animation-backdrop-in-duration) ease-in-out
         var(--epm-animation-backdrop-in-delay) forwards epm-backdrop-in;
     --epm-animation-backdrop-out: var(--epm-animation-backdrop-out-duration)
-        ease var(--epm-animation-backdrop-out-delay) forwards epm-backdrop-out;
+        ease-in-out var(--epm-animation-backdrop-out-delay) forwards epm-backdrop-out;
     --epm-animation-modal-in: var(--epm-animation-modal-in-duration) ease-out
         var(--epm-animation-modal-in-delay) forwards epm-modal-in;
     --epm-animation-modal-out: var(--epm-animation-modal-out-duration) ease-out
@@ -133,9 +133,11 @@
 
 @keyframes epm-modal-in {
     0% {
+        transform: translateY(-16px);
         opacity: 0;
     }
     100% {
+        transform: translateY(0);
         opacity: 1;
     }
 }
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/notifications.css b/ghost/admin/app/styles/components/notifications.css
index 1ed6f453356..20fcb6e6daf 100644
--- a/ghost/admin/app/styles/components/notifications.css
+++ b/ghost/admin/app/styles/components/notifications.css
@@ -5,7 +5,7 @@
 .gh-notifications {
     position: absolute;
     bottom: 30px;
-    left: 30px;
+    left: 24px;
     z-index: 7000;
     display: flex;
     flex-direction: column;
@@ -14,26 +14,33 @@
 /* Base notification style */
 .gh-notification {
     position: relative;
-    display: flex;
     margin-top: 8px;
-    padding: 4px 8px;
-    width: 286px;
-    background: var(--black);
-    border-radius: 6px;
-    box-shadow:
-        0 1.1px 2.3px rgba(0, 0, 0, 0.028),
-        0 3.8px 7.8px rgba(0, 0, 0, 0.042),
-        0 17px 35px -7px rgba(0, 0, 0, 0.11)
-    ;
-    color: #fff;
+    min-width: 272px;
+    max-width: 320px;
+    background: var(--white);
+    border-radius: 8px;
+    box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.28), 0px 100px 80px rgba(0, 0, 0, 0.0112458), 0px 41.7776px 33.4221px rgba(0, 0, 0, 0.0161557), 0px 22.3363px 17.869px rgba(0, 0, 0, 0.02), 0px 12.5216px 10.0172px rgba(0, 0, 0, 0.0238443), 0px 6.6501px 5.32008px rgba(0, 0, 0, 0.0287542), 0px 2.76726px 2.21381px rgba(0, 0, 0, 0.04);
+    color: var(--black);
     font-size: 1.3rem;
     line-height: 1.25em;
     opacity: 1.0;
     min-height: 44px;
 }
 
+@media (max-width: 1240px) {
+    .gh-notification {
+        min-width: 232px;
+    }
+}
+
 .gh-notification-icon {
-    margin: 10px 0 0 6px;
+    margin-top: 1px;
+    line-height: 0;
+    color: #30CF43;
+}
+
+:is(.gh-notification-error, .gh-notification-warn) .gh-notification-icon {
+    color: #F50B23;
 }
 
 .gh-notification-icon svg {
@@ -41,24 +48,24 @@
     height: 16px;
 }
 
-.gh-notification-icon svg path {
-    stroke-width: 1.5px;
-    stroke: #fff;
-}
-
 .gh-notification-content {
     flex-grow: 1;
     display: flex;
     flex-direction: column;
-    padding: 9px 15px 10px 10px;
+    padding: 16px;
     border-radius: 3px;
-    max-width: 215px;
+    margin-right: 28px;
 }
 
 .gh-notification-content p span {
     white-space: nowrap;
 }
 
+.gh-notification-header {
+    display: flex;
+    gap: 10px;
+}
+
 .gh-notification-title {
     display: block;
     margin-top: 1px;
@@ -66,14 +73,18 @@
     font-size: 1.4rem;
 }
 
+.gh-notification-details {
+    margin: -18px 16px 16px 42px;
+}
+
 .gh-notification p {
-    margin: 6px 0 0;
+    margin: 8px 0 0;
     padding: 0;
     line-height: 1.35em;
 }
 
 .gh-notification a {
-    color: #fff;
+    color: inherit;
     text-decoration: underline;
     font-weight: 400;
 }
@@ -84,7 +95,7 @@
 }
 
 .gh-notification-actions {
-    margin-top: 6px;
+    margin-top: 10px;
     margin-bottom: 2px;
     display: flex;
 }
@@ -92,12 +103,17 @@
 .gh-notification-actions a {
     display: inline-block;
     margin-right: 10px;
+    color: var(--darkgrey);
+}
+
+.gh-notification-actions a:hover {
+    color: var(--black);
 }
 
 .gh-notification-close {
     position: absolute;
-    top: 10px;
-    right: 10px;
+    top: 14px;
+    right: 14px;
     padding: 8px;
     background: none;
     border-radius: 999px;
@@ -109,16 +125,20 @@
 .gh-notification-close svg {
     height: 8px;
     width: 8px;
-    stroke: #fff;
+    stroke: #7C8B9A;
+}
+
+.gh-notification-close:hover svg {
+    stroke: #394047;
 }
 
 .gh-notification-close svg path {
     stroke-width: 2px;
 }
 
-.gh-notification-close:hover {
+/* .gh-notification-close:hover {
     background: rgba(255, 255, 255, 0.3);
-}
+} */
 
 .gh-notification-passive {
     animation: notification-fade-in-spring, fade-out;
@@ -134,19 +154,16 @@
 
 @keyframes notification-fade-in-spring {
     0.00% {
-        opacity: 0;
-        transform: translateX(-232.05px);
+        transform: translateY(100%);
     }
     26.52% {
-        opacity: 0.5;
-        transform: translateX(5.90px);
+        transform: translateY(-3.90px);
     }
     63.26% {
-        transform: translateX(-1.77px);
-        opacity: 1;
+        transform: translateY(1.2px);
     }
     100.00% {
-        transform: translateX(0px);
+        transform: translateY(0px);
     }
 }
 
@@ -295,8 +312,8 @@
 /* ---------------------------------------------------------- */
 
 .gh-alert-black {
-    border-bottom: color-mod(var(--darkgrey) lightness(-10%)) 1px solid;
-    background: var(--darkgrey);
+    border-bottom: 1px solid var(--black);
+    background: var(--black);
     color: #fff;
 }
 .gh-alert-black a {
@@ -332,9 +349,10 @@
     background: var(--black);
     color: #fff;
     font-size: 1.45rem;
+    z-index: 30;
 }
 
 .gh-update-banner a {
     font-weight: 700;
     color: var(--green-l2);
-}
\ No newline at end of file
+}
diff --git a/ghost/admin/app/styles/components/power-select.css b/ghost/admin/app/styles/components/power-select.css
index 4df322891fa..f4de5724081 100644
--- a/ghost/admin/app/styles/components/power-select.css
+++ b/ghost/admin/app/styles/components/power-select.css
@@ -5,11 +5,22 @@
     background: transparent;
 }
 
+.ember-power-select-trigger.gh-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-right: 12px;
+}
+
+.ember-power-select-trigger.gh-btn span {
+    padding: 0 6px 0 8px;
+}
+
 .ember-power-select-trigger:focus, .ember-power-select-trigger--active {
     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 +28,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/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css
index 05e7c080922..7df3f6515fc 100644
--- a/ghost/admin/app/styles/components/publishmenu.css
+++ b/ghost/admin/app/styles/components/publishmenu.css
@@ -18,6 +18,13 @@
     outline: 0;
 }
 
+@media (max-width: 500px) {
+    .publish-modal .gh-publish-trigger,
+    .publish-modal .gh-unpublish-trigger {
+        display: none;
+    }
+}
+
 .gh-date-time-picker {
     position: relative;
     display: flex;
@@ -92,17 +99,16 @@
 
 .gh-date-time-picker-timezone {
     font-size: 1.1rem;
-    font-weight: 300;
-    color: color-mod(var(--midgrey) l(+17%));
+    color: var(--midgrey);
     margin-left: -30px;
 }
 
 .gh-date-time-picker-error {
     display: block;
+    padding-top: 4px;
     font-size: 1.3rem;
     line-height: 1.4em;
-    font-weight: 300;
-    color: var(--red);
+    color: var(--red-d1);
 }
 
 .gh-publish-send-to {
@@ -350,12 +356,18 @@
     line-height: 1.2em;
 }
 
-@media (max-width: 560px) {
+@media (max-width: 1024px) {
     .gh-publish-title {
         font-size: 3.6rem;
     }
 }
 
+@media (max-width: 500px) {
+    .gh-publish-title {
+        font-size: 3rem;
+    }
+}
+
 .gh-publish-settings {
     margin: 1rem 0 5.2rem;
     width: 100%;
@@ -631,12 +643,8 @@
 
 .gh-publish-cta {
     display: flex;
-    flex-direction: column;
     width: max-content;
-}
-
-.gh-update-flow .gh-publish-cta {
-    flex-direction: row;
+    gap: 3.2rem;
 }
 
 .gh-publish-cta .gh-btn {
@@ -696,12 +704,8 @@
 .gh-publish-cta-secondary {
     display: block;
     overflow: hidden;
-    margin-top: 1rem;
-    height: 40px;
     color: var(--midgrey);
-    font-size: 1.35rem;
     font-weight: 400;
-    line-height: 40px;
     letter-spacing: .4px;
     text-align: left;
     white-space: nowrap;
@@ -725,6 +729,16 @@
     line-height: 1.6em;
 }
 
+.gh-publish-confirmation strong {
+    white-space: nowrap;
+}
+
+@media (max-width: 500px) {
+    .gh-publish-confirmation {
+        font-size: 1.6rem;
+    }
+}
+
 .gh-publish-confirmation + .gh-box-error {
     margin: -4rem 0 4.8rem;
     padding: 16px 20px;
@@ -866,3 +880,234 @@
     height: 20px;
     margin-right: 6px;
 }
+
+/* Publish flow modal
+/* ---------------------------------------------------------- */
+
+.modal-post-success {
+    max-width: 600px;
+    --padding: 36px;
+    --radius: 12px;
+}
+
+.modal-post-success .modal-content {
+    padding: var(--padding);
+    border-radius: var(--radius);
+}
+
+.modal-post-success a {
+    text-decoration: none;
+    color: inherit;
+}
+
+.modal-post-success a:hover .gh-post-card {
+    background: var(--whitegrey-l2);
+}
+
+.modal-post-success .gh-post-card {
+    border-radius: 8px;
+    border: 1px solid var(--lightgrey-l1);
+    box-sizing: border-box;
+    margin: 24px 0 0 0;
+}
+
+.modal-post-success .modal-image {
+    aspect-ratio: 16 / 7.55;
+    overflow: hidden;
+}
+
+.modal-post-success .modal-image img {
+    display: block;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    border-radius: 7px 7px 0 0;
+    box-sizing: border-box;
+}
+
+.modal-post-success .modal-header {
+    margin: 0;
+}
+
+.modal-post-success .modal-header h1 {
+    display: flex;
+    flex-direction: column;
+    margin: 0;
+    font-size: 3.2rem;
+    font-weight: 700;
+    letter-spacing: -0.03em;
+}
+
+.modal-post-success .modal-header h1 span:has(+ span) {
+    color: var(--green);
+}
+
+.modal-post-success .modal-body {
+    margin-top: 10px;
+    font-size: 1.6rem;
+    line-height: 1.4;
+    letter-spacing: -0.01em;
+    text-wrap: pretty;
+    padding: 16px 24px 16px 24px;
+}
+
+.modal-post-success .modal-body p {
+    font-size: 1.6rem;
+    line-height: 1.5em;
+}
+
+.modal-post-success .modal-body p.post-excerpt {
+    -webkit-line-clamp: 2;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    margin: 0 0 16px 0;
+}
+
+.modal-post-success .email {
+    font-size: 1.6rem;
+    padding: 0;
+}
+
+.modal-post-success .modal-body .gh-post-details {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    margin-bottom: 16px;
+    font-size: 1.4rem;
+}
+
+.modal-post-success .modal-body .gh-post-details .gh-post-bookmark-site-name {
+    font-weight: 600;
+    flex-shrink: 0;
+    max-width: 200px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.modal-post-success .modal-body .gh-post-bookmark-authors::before {
+    margin-left: 4px;
+}
+
+.modal-post-success .modal-body .gh-post-bookmark-site-icon {
+    width: 24px;
+    height: 24px;
+}
+
+.modal-post-success .modal-body strong.nowrap {
+    text-wrap: nowrap;
+}
+
+.modal-post-success .modal-footer {
+    margin-top: 16px;
+    gap: 16px;
+    padding: 0;
+}
+
+
+.modal-post-success .modal-footer-email {
+    background: var(--white);
+    margin-top: 36px;
+    gap: 16px;
+    padding: 0;
+    border: none;
+    border-radius: 0;
+    text-align: right;
+}
+
+.modal-post-success .modal-footer .share-buttons {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    align-items: center;
+    gap: 16px;
+}
+
+.modal-post-success .modal-footer .gh-btn {
+    min-width: 64px;
+    height: 40px;
+    border-radius: 4px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.modal-post-success .modal-footer .copy-preview-link {
+    background: var(--whitegrey-l1);
+}
+
+.modal-post-success .modal-footer .gh-btn:not(:first-child) {
+    margin: 0;
+}
+
+.modal-post-success .modal-footer .gh-btn span {
+    padding-inline: 18px;
+    font-size: 1.4rem;
+    height: 100%;
+    align-content: center;
+}
+
+.modal-post-success .modal-footer .gh-btn-primary {
+    min-width: 80px;
+}
+
+.modal-post-success .modal-footer:has(.twitter) .gh-btn-primary {
+    flex-grow: 1;
+}
+
+.modal-post-success .modal-footer .gh-btn:is(.twitter, .threads, .facebook, .linkedin) {
+    width: 56px;
+    background: var(--whitegrey-l1);
+}
+
+.modal-post-success .modal-footer .gh-btn:is(.twitter, .threads, .facebook, .linkedin, .copy-link, .copy-preview-link):hover {
+    background: var(--whitegrey);
+}
+
+.modal-post-success .modal-footer .gh-btn:is(.twitter, .threads, .facebook, .linkedin) span {
+    font-size: 0;
+}
+
+.modal-post-success .modal-footer .gh-btn svg {
+    width: 18px;
+    height: 18px;
+}
+
+.modal-post-success .modal-footer .gh-btn.twitter svg path {
+    fill: black;
+}
+
+.modal-post-success .close {
+    top: 24px;
+    right: 24px;
+}
+
+@media (max-width: 500px) {
+    .modal-post-success .modal-header h1 {
+        font-size: 2.4rem;
+    }
+
+    .modal-post-success .modal-footer {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .modal-post-success .modal-footer .share-buttons {
+        grid-template-columns: repeat(2, 1fr);
+    }
+
+    .modal-post-success .modal-footer .copy-link,
+    .modal-post-success .modal-footer .copy-preview-link {
+        width: 100%!important;
+    }
+}
+
+@media (max-width: 600px) {
+    .modal-post-success .modal-footer:has(.share-buttons) {
+        flex-direction: column;
+    }
+
+    .modal-post-success .modal-footer .gh-btn:is(.twitter, .threads, .facebook, .linkedin) {
+        width: auto;
+    }
+}
diff --git a/ghost/admin/app/styles/components/settings-menu.css b/ghost/admin/app/styles/components/settings-menu.css
index cbba8de544c..fa2e25f10fa 100644
--- a/ghost/admin/app/styles/components/settings-menu.css
+++ b/ghost/admin/app/styles/components/settings-menu.css
@@ -18,13 +18,13 @@
 
 @media (min-width: 500px) and (max-width: 1024px) {
     .settings-menu-toggle {
-        top: 16px;
+        top: 12px;
     }
 }
 
 @media (max-width: 500px) {
     .settings-menu-toggle {
-        top: 15px;
+        top: 11px;
         right: 20px;
     }
 }
@@ -70,12 +70,6 @@
     }
 }
 
-@media (max-width: 800px) {
-    .settings-menu-container {
-        padding-bottom: 64px;
-    }
-}
-
 @media (max-width: 500px) {
     .settings-menu-container {
         width: 100vw;
@@ -123,7 +117,6 @@
     position: fixed;
     display: flex;
     width: 100%;
-    max-width: 364px;
     padding: 36px 24px 24px;
     justify-content: space-between;
     align-items: center;
@@ -131,15 +124,9 @@
     background: var(--white);
 }
 
-@media (min-width: 500px) and (max-width: 1024px) {
-    .settings-menu-header {
-        padding-top: 17px;
-    }
-}
-
-@media (max-width: 500px) {
+@media (max-width: 1024px) {
     .settings-menu-header {
-        padding-top: 19px;
+        padding-top: 15px;
     }
 }
 
@@ -535,13 +522,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/auth.css b/ghost/admin/app/styles/layouts/auth.css
index 4fb92f2e4d1..899985962a8 100644
--- a/ghost/admin/app/styles/layouts/auth.css
+++ b/ghost/admin/app/styles/layouts/auth.css
@@ -1,3 +1,13 @@
+/* Flow
+/* ---------------------------------------------------------- */
+.gh-flow:has(form:is(.gh-signin, .gh-signup)) {
+    background: #fff;
+}
+
+.gh-flow:has(form:is(.gh-signin, .gh-signup)) .gh-flow-content {
+    max-width: 500px;
+}
+
 /* Sign in
 /* ---------------------------------------------------------- */
 .gh-signin, .gh-auth-email {
@@ -47,12 +57,12 @@
 .gh-signin .gh-btn-reset,
 .gh-setup .gh-btn-signup,
 .gh-signup .gh-btn-signup {
-    height: 54px;
+    height: 52px;
     border-radius: 8px;
-    line-height: 54px;
+    line-height: 52px;
     margin-top: 40px;
     max-width: unset;
-    font-weight: 300;
+    font-weight: 400;
     transition: all 0.4s ease;
     -webkit-font-smoothing: subpixel-antialiased;
 }
@@ -63,6 +73,7 @@
 .gh-signup .gh-btn-signup span {
     font-size: 1.8rem;
     color: #fff;
+    letter-spacing: -0.01em;
 }
 
 .gh-signin .gh-btn-reset {
@@ -105,7 +116,7 @@
     height: 19px;
     font-size: 1.4rem;
     line-height: 19px;
-    padding: 0 15px 0 16px;
+    padding: 0 16px;
     margin-top: -1px;
     color: var(--midlightgrey);
 }
@@ -124,6 +135,20 @@
     text-decoration: underline;
 }
 
+:is(.gh-signin, .gh-signup) .form-group label {
+    font-size: 1.5rem;
+}
+
+:is(.gh-signin, .gh-signup) .gh-input {
+    height: auto;
+    padding: 1.4rem 1.6rem;
+    border: 1px solid #f3f6f7;
+    background: #f3f6f7;
+    color: var(--black);
+    letter-spacing: -0.006em;
+    transition: border-color .15s linear;
+}
+
 .gh-signin input,
 .gh-signin input:-webkit-autofill::first-line {
     padding: 12px 16px;
@@ -134,8 +159,9 @@
 
 .gh-signin .gh-input:focus:not(.gh-signin .gh-input.reset-password:focus),
 .gh-signup .gh-input:focus {
-    border-color: var(--midgrey) !important;
-    box-shadow: none !important;
+    background-color: #fff;
+    border-color: #30cf43;
+    box-shadow: 0 0 0 3px rgba(48,207,67,.25);
 }
 
 /* Email notification */
@@ -147,4 +173,4 @@
 
 .gh-auth-email p {
     color: var(--midgrey);
-}
\ No newline at end of file
+}
diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css
index 5dabcf8bfaa..fce010544ae 100644
--- a/ghost/admin/app/styles/layouts/content.css
+++ b/ghost/admin/app/styles/layouts/content.css
@@ -271,6 +271,7 @@
 }
 
 .gh-post-list-title .gh-featured-post {
+    flex-shrink: 0;
     width: 11px;
     height: 11px;
     margin: -2px 6px 0 0;
@@ -724,8 +725,9 @@
 
 .gh-canvas-title.gh-post-title {
     max-width: 880px;
-    padding: 12px 0 8px;
+    padding: 20px 0 0 0;
     font-size: 3.2rem;
+    line-height: 1.2em;
     overflow: inherit;
     white-space: inherit;
 }
@@ -774,6 +776,17 @@
     border-radius: var(--border-radius);
 }
 
+.gh-analytics-actions-menu {
+    top: calc(100% + 6px);
+    left: auto;
+    right: 0;
+}
+
+.gh-analytics-actions-menu.fade-out {
+    animation-duration: .001s;
+    pointer-events: none;
+}
+
 .feature-audienceFeedback .gh-post-analytics-box.gh-post-analytics-newsletter-clicks,
 .feature-audienceFeedback .gh-post-analytics-box.gh-post-analytics-source-attribution,
 .gh-post-analytics-box.gh-post-analytics-mentions {
@@ -840,13 +853,12 @@
     background: var(--white);
     border-radius: var(--border-radius);
     box-shadow: 0 1px 4px -1px rgba(0,0,0,.1);
-}
-
-.gh-post-analytics-resource {
     flex: 1;
+    align-items: flex-start;
     display: grid;
     grid-template-columns: 2fr 3fr;
     grid-gap: 24px;
+    min-width: 0;
 }
 
 .gh-post-analytics-resource .thumbnail {
@@ -864,6 +876,7 @@
 .gh-post-analytics-resource h3 {
     font-size: 1.8rem;
     font-weight: 700;
+    text-wrap: pretty;
 }
 
 .gh-post-analytics-box h4.gh-main-section-header.small {
@@ -1468,16 +1481,40 @@
     transition: all .1s linear;
 }
 
+.gh-post-list-cta:hover {
+    border-color: var(--lightgrey-l2);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
+}
+
 .gh-list-data .gh-post-list-cta {
     justify-content: center;
     width: 56px;
 }
 
-.gh-post-analytics-header .gh-post-list-cta {
+.gh-post-analytics-header .gh-post-list-cta.edit {
     margin-top: -14px;
     margin-right: 0;
 }
 
+.gh-post-analytics-header .share svg {
+    margin-top: -2px;
+}
+
+.gh-post-analytics-header .gh-btn.refresh {
+    border: 1px solid var(--whitegrey-d1);
+    background: var(--white);
+    color: var(--darkgrey);
+}
+
+.gh-post-analytics-header .gh-btn.refresh:hover {
+    border-color: var(--lightgrey-l2);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
+}
+
+.gh-post-analytics-header .gh-btn.refresh svg path {
+    stroke-width: 2.25;
+}
+
 .gh-post-list-cta.is-hovered {
     border-color: var(--whitegrey-d2);
 }
@@ -1510,7 +1547,7 @@
 }
 
 .gh-post-list-cta > svg path {
-    stroke-width: 2;
+    stroke-width: 1.75;
 }
 
 .gh-post-list-cta > span {
@@ -1521,6 +1558,10 @@
     transition: all .1s linear;
 }
 
+span.dropdown .gh-post-list-cta > span {
+    padding: 0;
+}
+
 .gh-post-list-cta.edit.is-hovered > *,
 .gh-post-list-cta.edit.is-hovered:hover > *,
 .gh-post-list-cta.edit:not(.is-hovered):hover > *  {
@@ -1532,7 +1573,7 @@
     color: var(--green-d1);
 }
 
-@media screen and (max-width: 1080px) {
+@media screen and (max-width: 1200px) {
     .gh-post-analytics-box.resources {
         flex-direction: column;
     }
@@ -1701,6 +1742,26 @@
     height: 16px;
 }
 
+.gh-tabs-analytics .animated-number {
+    position: relative;
+}
+
+.gh-tabs-analytics .animated-number .new-number {
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+.gh-tabs-analytics .animated-number .new-char,
+.gh-tabs-analytics .animated-number .old-char {
+    display: inline-block;
+}
+
+.gh-tabs-analytics .animated-number .new-char {
+    opacity: 0;
+    transform: translateY(10px);
+}
+
 .gh-tabs-analytics .gh-dashboard-list-item {
     grid-template-columns: 40% 40% 20%;
 }
diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css
index e3bac39849a..fbb58efd483 100644
--- a/ghost/admin/app/styles/layouts/dashboard.css
+++ b/ghost/admin/app/styles/layouts/dashboard.css
@@ -1059,7 +1059,7 @@ Dashboard Attribution */
 }
 
 .gh-dashboard .gh-canvas-header.sticky .gh-dashboard-select {
-    top: 8px !important;
+    top: 0px !important;
     right: -6px !important;
 }
 
@@ -2759,4 +2759,478 @@ Dashboard Mentions */
     padding: 0;
     font-size: 1.4rem;
     font-weight: 500;
+}
+
+/* ---------------------------------
+Onboarding checklist */
+
+.gh-onboarding-wrapper {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    min-height: 100vh;
+    margin-bottom: -48px;
+    position: relative;
+    padding: 32px 0;
+}
+
+.gh-onboarding-header {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+    margin-bottom: 32px;
+}
+
+.gh-onboarding-ghost-logo-wrapper {
+    position: relative;
+    width: 80px;
+    height: 80px;
+    margin-bottom: 24px;
+}
+
+.gh-onboarding-header h2 {
+     justify-content: center;
+}
+
+.gh-onboarding-header p {
+    margin-top: 8px;
+    margin-bottom: 0;
+    color: var(--midgrey);
+    font-size: 1.5rem;
+}
+
+@media screen and (max-width: 480px) {
+    .gh-onboarding-header h2 {
+        font-size: 2.4rem;
+    }
+
+    .gh-onboarding-header p {
+        font-size: 1.4rem;
+        margin: 0;
+    }
+}
+
+.gh-onboarding-items {
+    max-width: 540px;
+    width: 100%;
+    border-radius: 6px;
+    padding: 16px 24px;
+    border: 1px solid var(--whitegrey);
+    background: var(--white);
+}
+
+.gh-onboarding-item {
+    padding: 24px 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid var(--whitegrey);
+}
+
+.gh-onboarding-item:first-child {
+    margin-top: -12px;
+}
+
+.gh-onboarding-item:last-child {
+    border-bottom: 0 none;
+    margin-bottom: -12px;
+}
+
+.gh-onboarding-item:last-child.gh-onboarding-item--next {
+    margin-bottom: -18px;
+}
+
+.gh-onboarding-item:not(:first-child):hover {
+    cursor: pointer;
+}
+
+.gh-onboarding-item:not(:first-child):hover .gh-onboarding-item-content {
+    opacity: .9;
+}
+
+.gh-onboarding-item--completed:not(:first-child):hover .gh-onboarding-item-content {
+    opacity: .24;
+}
+
+.gh-onboarding-item--next {
+    margin: 0px -32px 6px;
+    background: var(--white);
+    padding: 24px 32px;
+    box-shadow: 0px 1px 0px rgba(17,17,26,0.05), 0px 0px 8px rgba(17,17,26,0.1);
+    border-radius: 6px;
+    border-bottom: none;
+    transition: none;
+}
+
+.gh-onboarding-item:has(+ .gh-onboarding-item--next) {
+    border-bottom: none;
+}
+
+.gh-onboarding-item:not(.gh-onboarding-item--next) .gh-onboarding-item-description {
+    display: none;
+}
+
+.gh-onboarding-item--completed .gh-onboarding-item-content {
+    opacity: 0.2;
+}
+
+.gh-onboarding-item-content {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    min-width: 0;
+}
+
+.gh-onboarding-item-details {
+    display: flex;
+    flex-direction: column;
+    text-align: left;
+}
+
+.gh-onboarding-item-title {
+    font-weight: 700;
+    font-size: 1.6rem;
+    line-height: 1.3;
+    letter-spacing: 0;
+    color: var(--darkgrey);
+    padding: 0 32px 0 0;
+    text-decoration: none;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    margin-bottom: 0;
+}
+
+.gh-onboarding-item-description {
+    font-weight: 400;
+    color: var(--middarkgrey);
+    font-size: 1.5rem;
+    line-height: 1.4;
+    margin-top: 4px;
+    padding-right: 32px;
+}
+
+@media screen and (max-width: 480px) {
+    .gh-onboarding-item-title {
+        font-size: 1.5rem;
+    }
+
+    .gh-onboarding-item-description {
+        font-size: 1.4rem;
+        padding-right: 0;
+    }
+
+    .gh-onboarding-item-content {
+        padding-right: 16px;
+    }
+    
+    .gh-onboarding-item--next {
+        padding: 24px 20px;
+    }
+}
+
+.gh-onboarding-item-action {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    min-width: 0;
+    transition: transform .15s;
+}
+
+.gh-onboarding-item:hover .gh-onboarding-item-action {
+    transform: translateX(5px);
+}
+
+.gh-onboarding-item-content svg {
+    width: 20px;
+    min-width: 20px;
+    height: auto;
+    margin: 0 16px 0 0;
+    color: #ae5aef;
+    position: relative;
+}
+
+.gh-onboarding-item-content svg path {
+    stroke: var(--purple);
+    stroke-width: 1.5 !important;
+}
+
+.gh-onboarding-item--completed .gh-dashboard-onboarding-item-content svg {
+    color: var(--middarkgrey);
+}
+
+.gh-onboarding-item--completed .gh-onboarding-item-content svg path {
+    stroke: var(--middarkgrey);
+}
+
+.gh-onboarding-item-action svg {
+    width: 14px;
+    min-width: 14px;
+    height: 14px;
+}
+
+.gh-onboarding-item-action svg path {
+    fill: var(--purple);
+}
+
+.gh-onboarding-item-checkmark {
+    display: flex;
+}
+
+.gh-onboarding-item-checkmark svg {
+    width: 20px;
+    height: auto;
+}
+
+.gh-onboarding-item-checkmark svg path, .gh-onboarding-item-checkmark svg circle {
+    stroke: var(--green);
+}
+
+.gh-onboarding-help {
+    color: var(--midgrey);
+    margin: 32px 0 0;
+    font-size: 1.5rem;
+}
+
+@media screen and (max-width: 480px) {
+    .gh-onboarding-help {
+        font-size: 1.4rem;
+    }
+}
+
+.gh-onboarding-help a {
+    color: #30cf43
+}
+
+.gh-onboarding-help a:hover {
+    color: #2bba3c;
+}
+
+.gh-onboarding-skip {
+    display: flex;
+    align-items: center;
+    bottom: 32px;
+    margin-top: 24px;
+    padding: 1px 14px;
+    border: 1px solid var(--whitegrey);
+    color: var(--middarkgrey);
+    border-radius: 4px;
+    white-space: nowrap;
+    height: 38px;
+    overflow: hidden;
+    transition: opacity .1s linear;
+}
+
+@media (min-height: 900px) and (min-width: 480px) {
+    .gh-onboarding-skip {
+        position: absolute;
+    }
+  }
+
+.gh-onboarding-skip:hover {
+    color: var(--darkgrey);
+    border-color: var(--lightgrey);
+}
+
+.gh-onboarding-explore-dashboard {
+    display: flex;
+    padding: 12px 12px;
+    align-items: center;
+    justify-content: center;
+    background: var(--black);
+    color: var(--white);
+    border-radius: 4px;
+    font-size: 1.6rem;
+    font-weight: 600;
+    margin-top: 24px;
+    max-width: 540px;
+    width: 100%;
+    transition: opacity .3s ease-in-out;
+}
+
+@media screen and (max-width: 480px) {
+    .gh-onboarding-explore-dashboard {
+        font-size: 1.5rem;
+    }
+}
+
+.gh-onboarding-explore-dashboard:hover {
+    opacity: 0.9;
+}
+
+/* ---------------------------------
+Share publication modal */
+
+.gh-share-card-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-radius: 6px;
+    border: 1px solid var(--whitegrey);
+    background: var(--white);
+    transition: all .3s ease-in-out;
+}
+
+.gh-share-card-image {
+    max-height: 196px;
+}
+
+.gh-share-card-image img {
+    border-radius: 6px 6px 0 0;
+    object-fit: cover;
+    width: 484px;
+    height: 196px;
+}
+
+.gh-cover-placeholder {
+    width: 100%;
+    height: 196px;
+    border-radius: 6px 6px 0 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: var(--whitegrey);
+}
+
+.gh-cover-placeholder svg {
+    width: 40px;
+    height: 40px;
+    stroke: var(--lightgrey);
+}
+
+.gh-share-card-content {
+    padding: 24px;
+    width: 100%;
+}
+
+.gh-share-card-title {
+    font-size: 1.7rem;
+    font-weight: 600;
+}
+
+.gh-copy-publication-link {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 40px;
+    background: #fafafb;
+    border: 1px solid var(--whitegrey);
+    border-radius: 4px;
+    padding: 8px 16px;
+    min-height: 48px;
+    font-weight: 400;
+    color: var(--darkgrey);
+    transition: all .3s ease-in-out;
+}
+
+.gh-copy-publication-link span {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.gh-copy-publication-link:hover {
+    border: 1px solid var(--lightgrey);
+}
+
+.gh-copy-publication-link .gh-btn-icon {
+    font-weight: 600;
+}
+
+.gh-copy-publication-link .gh-share-link-success {
+    color: var(--green);
+    font-size: 1.5rem;
+    font-weight: 600;
+}
+
+.gh-share-links {
+    list-style: none;
+    padding: 0;
+    margin: 16px 0 0 0;
+    display: flex;
+    flex-direction: row;
+}
+
+.gh-share-links li { 
+    font-size: 1.5rem;
+    font-weight: 600;
+    color: var(--darkgrey);
+    line-height: 1.5;
+    width: 100%;
+    margin: 0 8px 0 0;
+    vertical-align: middle;
+}
+
+.gh-share-links li:last-child {
+    margin: 0;
+}
+
+.gh-share-links li a { 
+    display: block;
+    padding: 20px 0;
+    text-align: center;
+    border: 1px solid var(--whitegrey);
+    border-radius: 4px;
+    transition: all .3s ease-in-out;
+}
+
+.gh-share-links li a:hover {
+    box-shadow: 0 2px 4px rgb(0 0 0 / 7%);
+}
+
+.gh-share-links li span {
+    vertical-align: middle;
+    height: 20px;
+    display: block;
+}
+
+.gh-share-links li a span svg {
+    width: 20px;
+    height: 20px;
+    fill: var(--midgrey);
+}
+
+.gh-share-links svg path.social-facebook_svg__fb {
+    fill: var(--midgrey);
+}
+
+.gh-share-links svg path.social-linkedin_svg__linkedin {
+    fill: var(--midgrey);
+}
+
+.gh-share-links a:hover svg path.social-facebook_svg__fb {
+    fill: #1977f3;
+}
+
+
+.gh-share-links a:hover svg path.social-linkedin_svg__linkedin {
+    fill: #007ebb;
+}
+
+.gh-share-links a:hover svg path.social-x_svg__x {
+    fill: var(--black);
+}
+
+span.gh-tip {
+    font-size: 1.4rem;
+    font-weight: 400;
+    line-height: 1.5;
+    padding: 0;
+    margin-top: 8px;
+    color: var(--midgrey);
+    width: 100%;
+    display: block;
+}
+
+span.gh-tip a { 
+    text-decoration: underline;
+    color: var(--midgrey);
+}
+
+span.gh-tip a:hover {
+    color: var(--darkgrey);
 }
\ No newline at end of file
diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css
index bb3cd517ad1..2a9ad8304f9 100644
--- a/ghost/admin/app/styles/layouts/editor.css
+++ b/ghost/admin/app/styles/layouts/editor.css
@@ -160,8 +160,8 @@
 .gh-og-preview {
     background: #fff;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1) inset,
-    0 -1px 0 0 rgba(0, 0, 0, 0.06) inset,
-    0 1px 4px rgba(0, 0, 0, 0.1);
+        0 -1px 0 0 rgba(0, 0, 0, 0.06) inset,
+            0 1px 4px rgba(0, 0, 0, 0.1);
 }
 
 .gh-og-preview-image {
@@ -229,7 +229,7 @@
     border-style: solid;
     border-color: #e1e8ed;
     color: #292f33;
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 1.4rem;
     line-height: 1.3em;
     background: #fff;
@@ -283,7 +283,7 @@
 /* NEW editor
 /* ---------------------------------------------------------- */
 
-.gh-main > section.gh-editor-fullscreen {
+.gh-main>section.gh-editor-fullscreen {
     position: fixed;
     top: 0;
     left: 0;
@@ -320,7 +320,7 @@
 @media (max-width: 1024px) {
     .gh-editor-header {
         z-index: 100;
-        height: 64px;
+        height: 56px;
         margin: 0;
         padding: 0;
         padding-left: 15px;
@@ -329,12 +329,6 @@
     }
 }
 
-@media (max-width: 500px) {
-    .gh-editor-header .mobile {
-        margin-left: 5px;
-    }
-}
-
 .gh-btn-editor {
     background: var(--white) !important;
 }
@@ -379,6 +373,57 @@
     stroke: var(--midgrey-l2);
 }
 
+@media (max-width: 500px) {
+    .gh-editor-wordcount-container {
+        display: none;
+    }
+}
+
+.gh-editor-mobile-menu {
+    display: none;
+}
+
+@media (max-width: 500px) {
+    .gh-editor-mobile-menu {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 1.2rem;
+        height: 48px;
+        padding: 0 32px;
+        background: var(--white);
+    }
+
+    .gh-editor-mobile-menu .gh-editor-wordcount {
+        padding: 0;
+    }
+
+    .gh-editor-mobile-menu svg {
+        width: 16px;
+        height: 16px;
+    }
+
+    .gh-editor-mobile-menu .gh-editor-publish-buttons {
+        display: flex;
+        align-items: center;
+        gap: 1.6rem;
+    }
+
+    .gh-editor-mobile-menu .gh-btn-editor:hover {
+        background: none !important;
+    }
+
+    .gh-editor-mobile-menu .gh-btn-editor span {
+        height: 100%;
+        padding: 0;
+        font-size: 1.3rem;
+    }
+}
+
 .gh-editor-wordcount {
     padding: 0 4px 0 14px;
     color: var(--midgrey-l2);
@@ -404,7 +449,7 @@
 .gh-editor-feedback-dropdown {
     min-width: 400px;
     border-radius: 3px;
-    box-shadow: 0 0 0 1px rgba(0,0,0,.04), 0 8px 20px -3px rgba(0,0,0,.2);
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, .04), 0 8px 20px -3px rgba(0, 0, 0, .2);
     padding: 20px;
     background-color: #fff;
     background-clip: padding-box;
@@ -508,13 +553,20 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     height: 4px;
 }
 
+.gh-editor-feature-image {
+    position: relative;
+}
+
+.gh-editor-feature-image img {
+    display: block;
+}
 .gh-editor-feature-image-overlay {
     position: absolute;
     top: 0;
     left: 0;
     right: 0;
-    bottom: 100px;
-    background-image: linear-gradient(180deg,rgba(0,0,0,.2),transparent 40%,transparent);
+    bottom: 0;
+    background-image: linear-gradient(180deg, rgba(0, 0, 0, .2), transparent 40%, transparent);
     transition: all .1s ease-in;
     opacity: 0;
 }
@@ -536,7 +588,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     padding: 0;
     background: var(--white);
     color: var(--darkgrey);
-    border-radius: 4px;
+    border-radius: 6px;
     transition: all .1s ease-in;
     opacity: 0;
 }
@@ -559,7 +611,19 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
 }
 
 .gh-editor-feature-image .image-action svg path {
-    fill: var(--darkgrey);
+    stroke-width: 2;
+}
+
+.gh-editor-feature-image-add {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+@media (max-width: 768px) {
+    .gh-editor-feature-image-add {
+        padding-top: 1.6rem;
+    }
 }
 
 .gh-editor-feature-image-add-button {
@@ -593,6 +657,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;
 }
 
@@ -619,11 +684,19 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     stroke: var(--midgrey-l2);
 }
 
+.gh-editor-feature-image-caption-container {
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: .8rem 0;
+}
 .gh-editor-feature-image-alttext,
 .gh-editor-feature-image-caption {
     width: 100%;
-    height: 24px;
-    margin: 0 0 1.7em 0;
+    min-height: 24px;
+    margin: 0;
+    padding: 0 3.6rem 0 0;
     outline: none;
     border-width: 0;
     border-style: none;
@@ -633,6 +706,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     background-color: transparent !important;
     transition: border-color .15s linear;
     -webkit-appearance: none;
+    overflow: hidden; /* Hides any indicators such as TK */
 }
 
 .gh-editor-feature-image-alttext::placeholder,
@@ -657,12 +731,25 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     opacity: .5;
 }
 
+.gh-editor-title-container {
+    position: relative;
+    max-width: 740px;
+    width: 100%;
+    margin-right: auto;
+    margin-left: auto;
+    border: none;
+    background: transparent;
+}
+
 .gh-editor-title {
     display: block;
     width: 100%;
+    max-width: unset;
     min-height: auto;
-    margin-bottom: 1.2rem;
+    margin: 0 0 1.6rem;
+    padding: 0 0 4px;
     border: none;
+    background: transparent;
     color: var(--black);
     font-size: 4.8rem;
     letter-spacing: -0.017em;
@@ -672,6 +759,18 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     box-shadow: none;
 }
 
+@media (min-width: 500px) and (max-width: 768px) {
+    .gh-editor-title {
+        font-size: 3.6rem;
+    }
+}
+
+@media (max-width: 500px) {
+    .gh-editor-title {
+        font-size: 2.8rem;
+    }
+}
+
 .gh-editor-title:focus {
     box-shadow: none !important;
     border: none !important;
@@ -681,9 +780,94 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     opacity: .5;
 }
 
+.gh-editor-title::placeholder {
+    color: var(--lightgrey-d1);
+    font-weight: 700;
+    opacity: 1;
+}
+
+.gh-editor-hidden-indicator {
+    position: absolute;
+    top: -1px;
+    height: 2.4rem;
+    margin-left: -6rem;
+    color: var(--midgrey-l2);
+}
+
+.gh-editor-title-container .gh-editor-hidden-indicator {
+    top: 1.8rem;
+}
+
+.gh-editor-hidden-indicator svg {
+    height: 2.4rem;
+}
+
+.gh-editor-excerpt {
+    display: block;
+    width: 100%;
+    max-width: unset;
+    min-width: auto;
+    min-height: auto; /* Allows element to collapse for auto-expand calculation */
+    margin: 0;
+    padding: 0;
+    border: none;
+    background: transparent;
+    color: var(--darkgrey);
+    font-size: 2.0rem;
+    font-weight: 440;
+    line-height: 1.5em;
+    letter-spacing: -.018em;
+    overflow: hidden;
+    box-shadow: none;
+}
+
+.gh-editor-excerpt:focus {
+    box-shadow: none !important;
+    border: none !important;
+}
+
+.gh-editor-excerpt-error {
+    margin-top: .8rem;
+    margin-bottom: 4.8rem;
+    color: var(--red-d1);
+    font-size: 1.4rem;
+    font-weight: 400;
+}
+
+.gh-editor-title-divider {
+    margin: 1.6rem 0 4.8rem;
+}
+
+.gh-editor-title-divider-error {
+    margin: 1.6rem 0 0;
+    border-top: 1px solid var(--red);
+}
+
+.gh-editor .tk-indicator {
+    position: absolute;
+    top: 15px;
+    right: -5.6rem;
+    padding: .4rem;
+    color: #95A1AD;
+    font-size: 1.2rem;
+    font-weight: 500;
+    cursor: pointer;
+}
+
+.gh-editor .tk-indicator-excerpt {
+    top: -1px;
+}
+
+.gh-editor-feature-image-container .tk-indicator {
+    top: 0;
+    padding: 0 .4rem;
+}
+
 .gh-editor-back-button {
+    display: flex;
+    align-items: center;
     height: 34px;
-    margin-right: 8px;
+    gap: 8px;
     padding: 0 12px;
     outline: none;
     border: none;
@@ -705,23 +889,24 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     background: var(--whitegrey);
 }
 
-.gh-editor-back-button span {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
 .gh-editor-back-button svg {
-    width: .8em;
-    height: .8em;
+    width: 1.2rem;
+    height: 1.2rem;
     margin-right: .5em;
     padding-top: 2px;
     fill: var(--darkgrey);
 }
 
 @media (max-width: 500px) {
-    .gh-editor-back-button {
+    .gh-editor-back-button span {
+        display: none;
+    }
+
+    .gh-editor-back-button svg {
+        width: 1.3rem;
+        height: 1.3rem;
         margin-right: 0;
+        fill: var(--midgrey-l1);
     }
 }
 
@@ -739,6 +924,12 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     border-radius: 3px;
 }
 
+@media (max-width: 500px) {
+    .gh-editor-post-status {
+        padding: 0 8px;
+    }
+}
+
 .gh-editor-post-status-btn {
     position: relative;
 }
@@ -783,6 +974,19 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     font-weight: 500;
 }
 
+.gh-editor-publish-buttons {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    pointer-events: auto;
+}
+
+@media (max-width: 500px) {
+    .gh-editor-publish-buttons {
+        display: none;
+    }
+}
+
 .gh-lexical-indicator {
     margin: 1px 0 0 8px;
     padding: 1px 8px;
@@ -797,6 +1001,12 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     margin-right: 8px;
 }
 
+@media (max-width: 500px) {
+    .gh-editor-save-trigger {
+        margin-right: 0;
+    }
+}
+
 .gh-editor-preview-trigger {
     background: var(--white);
     font-size: 1.35rem;
@@ -823,21 +1033,6 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     }
 }
 
-@media (max-width: 500px) {
-    .gh-editor-title {
-        font-size: 3.4rem;
-    }
-}
-
-.gh-editor-title {
-    padding: 0 0 4px;
-}
-
-.gh-editor-title::placeholder {
-    color: var(--lightgrey-d1);
-    font-weight: 700;
-    opacity: 1;
-}
 .gh-editor .editor-preview {
     height: auto;
     margin-top: 4px;
@@ -856,7 +1051,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
 .gh-editor .editor-preview h3,
 .gh-editor .editor-preview h4,
 .gh-editor .editor-preview h5,
-.gh-editor .editor-preview h6, {
+.gh-editor .editor-preview h6 {
     font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, "Open Sans", "Helvetica Neue", sans-serif;
 }
 
@@ -877,7 +1072,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     width: 100%;
     height: 100%;
     border: 2px solid var(--blue);
-    background-color: rgba(255,255,255,0.6);
+    background-color: rgba(255, 255, 255, 0.6);
 }
 
 .gh-editor-drop-target .drop-target-message {
@@ -928,6 +1123,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     position: relative;
     vertical-align: bottom;
 }
+
 .editor-toolbar .fa-check:before {
     position: absolute;
     right: 3px;
@@ -1016,8 +1212,8 @@ figure {
     left: -20px;
     width: 20px;
     height: 100%;
-    background: rgb(255,255,255);
-    background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%);
+    background: rgb(255, 255, 255);
+    background: linear-gradient(90deg, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%);
     z-index: 999;
     opacity: 0;
     transition: all 250ms ease-out;
@@ -1030,22 +1226,22 @@ figure {
     right: 0;
     width: 20px;
     height: 100%;
-    background: rgb(255,255,255);
-    background: linear-gradient(90deg, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%);
+    background: rgb(255, 255, 255);
+    background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
     z-index: 999;
 }
 
 .ember-power-select-option[aria-current="true"] .kg-settings-link-url.scroller::before {
     opacity: 1;
     left: 0;
-    background: linear-gradient(90deg, rgba(244,245,245,1) 0%, rgba(244,245,245,0) 100%);
+    background: linear-gradient(90deg, rgba(244, 245, 245, 1) 0%, rgba(244, 245, 245, 0) 100%);
 }
 
 .ember-power-select-option[aria-current="true"] .kg-settings-link-url::after {
-    background: linear-gradient(90deg, rgba(244,245,245,0) 0%, rgba(244,245,245,1) 100%);
+    background: linear-gradient(90deg, rgba(244, 245, 245, 0) 0%, rgba(244, 245, 245, 1) 100%);
 }
 
-.kg-settings-link-url > span {
+.kg-settings-link-url>span {
     display: inline-block;
     font-weight: 400;
     font-size: 1.2rem;
@@ -1057,56 +1253,17 @@ figure {
     padding-right: 8px; /* extra padding used for dynamic positioning with js */
 }
 
-.gh-announcement-editor {
-    width: 100%;
-}
-
-.gh-announcement-editor div {
-    width: 100%;
+.gh-tk-reminder .modal-body p strong {
+    white-space: nowrap;
 }
 
 /* Labs
 /* ---------------------------------------------------------- */
 
-.gh-editor-title-container.page-improvements {
-    position: relative;
-    max-width: 740px;
-    width: 100%;
-    margin-right: auto;
-    margin-left: auto;
-    border: none;
-    background: transparent;
-}
-
-.gh-editor .page-improvements .gh-editor-title {
-    display: block;
-    width: 100%;
-    max-width: unset;
-    min-height: auto;
-    margin: 0 0 1.2rem;
-    border: none;
-    background: transparent;
-    color: var(--black);
-    font-size: 4.8rem;
-    letter-spacing: -0.017em;
-    line-height: 1.1em;
-    font-weight: 700;
-    overflow: hidden;
-    box-shadow: none;
-}
-
-.gh-editor-hidden-indicator {
-    position: absolute;
-    top: -1px;
-    height: 2.4rem;
-    margin-left: -6rem;
-    color: var(--midgrey-l2);
-}
-
-.gh-editor-title-container .gh-editor-hidden-indicator {
-    top: 1.8rem;
-}
-
-.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;
+}
\ No newline at end of file
diff --git a/ghost/admin/app/styles/layouts/flow.css b/ghost/admin/app/styles/layouts/flow.css
index d1c3aea8159..c669f6ea04d 100644
--- a/ghost/admin/app/styles/layouts/flow.css
+++ b/ghost/admin/app/styles/layouts/flow.css
@@ -269,10 +269,23 @@
 
 .gh-flow-content .main-error,
 .gh-setup .gh-flow-content .main-error {
-    margin-top: 8px;
-    color: var(--midgrey);
-    font-size: 1.35rem;
+    margin-top: 16px;
+    color: var(--red);
+    font-size: 1.4rem;
+    line-height: 1.5;
+    text-align: center;
+    text-wrap: balance;
+}
+
+.gh-flow-content .main-notification,
+.gh-setup .gh-flow-content .main-notification {
+    margin-top: 16px;
+    color: var(--black);
+    font-size: 1.4rem;
+    font-weight: 400;
+    line-height: 1.5;
     text-align: center;
+    text-wrap: balance;
 }
 
 .gh-setup .gh-flow-form .gh-btn-red,
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..c542e368ff6 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 */
@@ -113,7 +112,15 @@
     border-right: none;
     background: unset;
     width: 100%;
-    pointer-events: none;
+    overflow: unset;
+}
+
+.gh-nav-contributor .gh-nav-body {
+    overflow: unset;
+}
+
+.gh-nav-contributor .gh-sidebar-banner {
+    max-width: 300px;
 }
 
 .gh-nav-menu {
@@ -216,9 +223,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 +240,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;
@@ -471,6 +453,10 @@
     z-index: 999;
 }
 
+.gh-nav-list-home svg {
+    margin-top: -2px;
+}
+
 .gh-nav-list svg.force-fill path {
     fill: var(--midgrey);
 }
@@ -1470,14 +1456,13 @@
     display: flex;
     align-items: center;
     overflow: hidden;
-    margin: -3px 0 0 0;
-    padding: 0;
+    margin: -0.1em 0 0;
+    padding: 0 6px 0 0;
     text-overflow: ellipsis;
-    white-space: nowrap;
     font-size: 3.2rem;
-    line-height: 1.3em;
+    line-height: 1.25em;
     font-weight: 700;
-    letter-spacing: -0.021em;
+    letter-spacing: -0.025em;
     /* match button height to avoid jump on navigation between screens*/
     min-height: 35px;
     color: var(--black);
@@ -2044,14 +2029,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;
@@ -2172,12 +2149,12 @@ section.gh-ds h2 {
     background: var(--red);
 }
 
-/* Ghost Referrals invite toast */
-.gh-referral-toast {
+/* Sidebar banners like ghost Referrals invite toast */
+.gh-sidebar-banner {
     position: relative;
     display: block;
-    padding: 25px;
-    margin-bottom: 50px;
+    padding: 12px 16px 16px;
+    margin: 0 -7px 32px;
     color: var(--black);
     text-decoration: none;
     background: var(--white);
@@ -2187,38 +2164,38 @@ section.gh-ds h2 {
     cursor: pointer;
 }
 
-.gh-referral-toast a {
+.gh-sidebar-banner a {
     color: var(--black);
 }
 
-.gh-referral-toast:hover {
+.gh-sidebar-banner:hover {
     transform: translateY(-2px) scale(1.01);
     box-shadow: rgb(75 225 226 / 38%) -7px -4px 42px 10px, rgb(202 103 255 / 42%) 7px 8px 42px 10px;
     transition: all 0.3s ease;
   }
 
-.gh-referral-toast-close {
+.gh-sidebar-banner-close {
     position: absolute;
-    top: 7px;
-    right: 10px;
+    top: 4px;
+    right: 8px;
     padding: 5px;
     color: #ddd;
     font-size: 2.2rem;
     line-height: 1;
 }
 
-.gh-referral-toast-close:hover {
+.gh-sidebar-banner-close:hover {
     color: #15171A;
 }
 
-.gh-referral-toast a > strong {
+.gh-sidebar-banner a > strong {
     display: block;
     margin-bottom: 10px;
     font-size: 1.7rem;
     line-height: 1.2em;
 }
 
-.gh-referral-toast a > p {
+.gh-sidebar-banner a > p {
     margin: 0;
     font-size: 1.5rem;
     line-height: 1.35em;
@@ -2227,27 +2204,120 @@ section.gh-ds h2 {
     color: #666;
 }
 
-.gh-referral-toast a > p strong {
+.gh-sidebar-banner a > p strong {
     color: #ff247d;
 }
 
-.gh-referral-toast-button {
+.gh-sidebar-banner-button {
     margin-top: 20px;
     border-radius: 5px;
     width: 100%;
 }
 
-.gh-referral-toast-button span {
+.gh-sidebar-banner-button span {
     padding: 0 12px;
     font-size: 1.4rem;
     text-align-last: center;
-    height: 40px;
-    line-height: 40px;
+    height: 38px;
+    line-height: 38px;
+}
+
+.gh-sidebar-banner-container {
+    display: flex;
+    flex-direction: column;
+    text-align: left;
+}
+
+.gh-sidebar-banner-icon {
+    width: 16px;
+    height: 16px;
+}
+
+.gh-sidebar-banner-head {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 6px;
+    margin-top: 2px;
+}
+
+.gh-sidebar-banner-subhead {
+    font-size: 13px;
+    color: var(--midgrey);
+    font-weight: 400;
+}
+
+.gh-sidebar-banner a .gh-sidebar-banner-msg {
+    line-height: 1.4em;
+    font-weight: 600;
+    margin-top: -2px;
+    margin-bottom: 0;
+    font-size: 1.4rem;
+}
+
+.gh-sidebar-banner-details {
+    line-height: 1.4em;
+    font-size: 1.35rem;
+    margin: 5px 0 0;
+    color: var(--darkgrey);
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+}
+
+.gh-sidebar-banner-msg + .gh-sidebar-banner-button {
+    margin-top: 14px;
+}
+
+.gh-referral-toast {
+    padding: 25px;
+    margin: 0 0 50px;
+}
+
+.gh-referral-toast .gh-sidebar-banner-close {
+    top: 7px;
+    right: 10px;
 }
 
-.admin-x-settings-container-error {
+.gh-sidebar-banner.gh-error-banner {
+    box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.1), 0px 3px 8px 0px rgba(0, 0, 0, 0.06);
+    margin-bottom: 32px;
+    padding: 16px;
+}
+
+.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-container {
+    flex-direction: row;
+    gap: 10px;
+}
+
+.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-icon {
+    color: var(--red);
+}
+
+.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-subhead {
+    color: var(--red);
+    font-size: 1.4rem;
+    font-weight: 600;
+    display: block;
+    margin-top: -2px;
+}
+
+.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-msg {
+    font-weight: 400;
+    font-size: 1.3rem;
+    margin-top: 4px;
+    color: var(--darkgrey);
+}
+
+.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-button {
+    color: var(--white);
+    background-color: var(--red);
+}
+
+.admin-x-container-error {
     height: 100vh;
-    width: 100vw;
+    width: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -2255,12 +2325,12 @@ section.gh-ds h2 {
     background: var(--whitegrey-l2);
 }
 
-.admin-x-settings-error {
+.admin-x-error {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     gap: 20px;
-    background: white;
+    background: var(--white);
     box-shadow: var(--box-shadow-m);
     border-radius: 20px;
     padding: 5vmin;
@@ -2268,16 +2338,16 @@ section.gh-ds h2 {
     color: var(--darkgrey);
 }
 
-.admin-x-settings-container-error p,
-.admin-x-settings-container-error h1 {
+.admin-x-container-error p,
+.admin-x-container-error h1 {
     margin: 0;
     padding: 0;
 }
 
-.admin-x-settings-container-error a {
+.admin-x-container-error a {
     display: inline-block;
     padding: 6px 10px;
     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..bfbd1ce2e3d 100644
--- a/ghost/admin/app/styles/layouts/members.css
+++ b/ghost/admin/app/styles/layouts/members.css
@@ -68,6 +68,7 @@
 @media (max-width: 1450px) {
     .members-list-container-stretch {
         min-height: calc(100vh - 176px);
+        overflow: hidden;
     }
 }
 
@@ -315,6 +316,12 @@ p.gh-members-list-email {
     text-transform: uppercase;
 }
 
+.gh-members-list-row .gh-list-data:first-child {
+    width: 30%;
+    min-width: 360px;
+    padding-right: 20px !important;
+}
+
 @media (max-width: 1100px) {
     .gh-members-chart-summary-data {
         font-size: 2.8rem;
@@ -333,6 +340,18 @@ p.gh-members-list-email {
         margin-left: 0;
         margin-right: 0;
     }
+
+    .gh-members-list-row .gh-list-data:first-child {
+        min-width: 280px;
+        overflow-x: hidden;
+    }
+
+    .gh-members-list-email,
+    .gh-members-list-name {
+        max-width: 200px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 }
 
 @media (min-width: 440px) and (max-width: 1000px) {
@@ -357,31 +376,6 @@ p.gh-members-list-email {
         display: none;
     }
 
-    .gh-members-list-item {
-        display: flex;
-        position: relative;
-        flex-wrap: wrap;
-        border-bottom: 1px solid var(--list-color-divider);
-        margin: 0;
-    }
-
-    .gh-members-list-item:nth-of-type(2) {
-        border-top-left-radius: 5px;
-        border-top-right-radius: 5px;
-    }
-
-    .gh-members-list-item .gh-list-data {
-        border-top: none !important;
-    }
-
-    .gh-members-list-item:hover {
-        background: var(--whitegrey-l2);
-    }
-
-    .gh-members-list-item:hover .gh-list-data {
-        background: none !important;
-    }
-
     .gh-members-list-basic {
         display: block;
         flex: 1 1 100%;
@@ -1862,24 +1856,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..590550a85f3 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;
@@ -178,3 +199,7 @@
 .gh-post-history-hidden-lexical {
     display: none;
 }
+
+.gh-post-history .gh-editor-feature-image p {
+    margin: 0 0 1.2rem;
+}
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/stats.css b/ghost/admin/app/styles/layouts/stats.css
new file mode 100644
index 00000000000..b146744047f
--- /dev/null
+++ b/ghost/admin/app/styles/layouts/stats.css
@@ -0,0 +1,137 @@
+.gh-stats {
+    display: flex;
+    flex-direction: column;
+    gap: 32px;
+    padding-bottom: 32px !important;
+}
+
+.gh-stats-grid {
+    display: grid;
+    gap: 32px;
+}
+
+.gh-stats-grid.cols-2 {
+    grid-template-columns: 1fr 1fr;
+}
+
+.gh-stats-container {
+    padding: 20px;
+    border: 1px solid var(--whitegrey);
+    border-radius: 8px;
+    overflow: hidden;
+    transition: all ease-in-out 0.3s;
+}
+
+.gh-stats-container > .gh-stats-metric-label {
+    margin-bottom: 20px;
+}
+
+.gh-stats-container:hover {
+    box-shadow: 0 0 1px rgba(0,0,0,.12), 0 1px 6px rgba(0,0,0,.03), 0 8px 10px -8px rgba(0,0,0,.1);
+}
+
+.gh-stats-tabs {
+    position: relative;
+    display: flex;
+    margin: -20px -20px 20px;
+    padding: 0;
+    overflow: hidden;
+}
+
+.gh-stats-tabs:before {
+    display: block;
+    content: "";
+    position: absolute;
+    width: 100%;
+    height: 1px;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: var(--whitegrey);
+}
+
+.gh-stats-tab {
+    position: relative;
+    margin: 0 0 1px 0;
+    color: var(--midlightgrey);
+}
+
+.gh-stats-tab:not(.is-selected) .gh-stats-metric-label {
+    color: var(--midlightgrey);
+}
+
+.gh-stats-tab:hover {
+    background-color: var(--whitegrey-l2);
+}
+
+.gh-stats-tab.is-selected {
+    color: var(--black);
+}
+
+.gh-stats-tab.is-selected:before {
+    display: block;
+    content: "";
+    position: absolute;
+    width: 100%;
+    height: 2px;
+    bottom: -1px;
+    left: 0;
+    right: 0;
+    background: var(--black);
+}
+
+.gh-stats-metric {
+    width: 100%;
+    padding: 16px 20px;
+}
+
+.gh-stats-tab.min-width .gh-stats-metric {
+    min-width: 180px;
+}
+
+.gh-stats-metric-data {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    align-items: flex-start;
+}
+
+.gh-stats-metric-label {
+    font-weight: 600;
+    font-size: 16px;
+    margin-bottom: 0;
+}
+
+.gh-stats-metric-value {
+    font-size: 28px;
+    letter-spacing: -0.05em;
+    font-weight: 600;
+    line-height: 1;
+}
+
+.gh-stats-piechart-container {
+    display: flex;
+    gap: 16px;
+    align-items: flex-start;
+    width: 100%;
+}
+
+.gh-stats-piechart-container table {
+    margin-top: 5px;
+    width: 100%;
+    margin-bottom: 0;
+}
+
+.gh-stats-piechart-container .table td,
+.gh-stats-piechart-container.table th,
+.gh-stats-piechart-container table td,
+.gh-stats-piechart-container table th {
+    padding: 6px 6px 6px 0px;
+}
+
+.gh-stats-piechart {
+    width: 100%;
+    height: 100%;
+    flex-grow: 1;
+    margin-right: -20px;
+}
\ No newline at end of file
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-modal.css b/ghost/admin/app/styles/layouts/whatsnew-modal.css
new file mode 100644
index 00000000000..31a32a67337
--- /dev/null
+++ b/ghost/admin/app/styles/layouts/whatsnew-modal.css
@@ -0,0 +1,150 @@
+/* What's new modal */
+/* ---------------------------------------------------------- */
+.fullscreen-modal-whatsnew,
+.fullscreen-modal-whatsnew-featured {
+    max-height: calc(100vh - 12vw);
+    overflow-y: auto;
+    border-radius: 8px !important;
+}
+
+@media (max-height: 960px) {
+    .fullscreen-modal-whatsnew,
+    .fullscreen-modal-whatsnew-featured {
+        max-height: calc(100vh - 80px);
+    }
+}
+
+.fullscreen-modal-whatsnew {
+    max-width: 640px !important;
+}
+
+.fullscreen-modal-whatsnew a:focus {
+    outline: none;
+}
+
+.gh-whatsnew-modal-entries {
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+    margin-bottom: 32px;
+}
+
+.fullscreen-modal-whatsnew .modal-content,
+.fullscreen-modal-whatsnew-featured .modal-content {
+    padding: 0;
+}
+
+.gh-whatsnew-featured-container,
+.gh-whatsnew-modal-entries {
+    padding: 0 32px;
+}
+
+.gh-whatsnew-featured-subhead {
+    margin-bottom: 12px;
+    font-size: 1.3rem;
+    font-weight: 600;
+}
+
+.gh-whatsnew-featured-date {
+    font-weight: 500;
+    color: var(--midgrey);
+}
+
+.gh-whasnew-featured-title {
+    font-size: 2.8rem;
+}
+
+.gh-whatsnew-featured-excerpt {
+    margin: 0 0 24px;
+    font-size: 1.6rem;
+    line-height: 1.35em;
+}
+
+.gh-whatsnew-modal-footer {
+    z-index: 999;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: sticky;
+    bottom: 0px;
+    background: #fff;
+    padding: 32px;
+    margin-bottom: -32px;
+    box-shadow: 0px -7px 15px -10px rgba(0, 0, 0, 0.15);
+}
+
+@media (max-width: 900px) {
+    .gh-whatsnew-modal-footer {
+        bottom: -10px;
+    }
+}
+
+.gh-whatsnew-modal {
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+}
+
+.gh-whasnew-modal-title {
+    font-size: 2.5rem;
+    padding: 32px 32px 28px;
+    margin: 0;
+}
+
+.gh-whatsnew-modal-entry {
+    display: flex;
+    align-items: flex-start;
+    gap: 24px;
+    color: var(--black);
+    margin: -8px;
+    padding: 8px;
+}
+
+.gh-whatsnew-modal-entry:hover {
+    background: var(--whitegrey-l2);
+    border-radius: 6px;
+}
+
+.gh-whatsnew-modal-entry-featureimage {
+    max-width: 160px;
+    height: 110px;
+    object-fit: cover;
+    border-radius: 4px;
+}
+
+.gh-whatsnew-modal-entrycontent {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    font-size: 1.4rem;
+}
+
+.gh-whatsnew-modal-entrycontent h2 {
+    font-size: 1.7rem;
+    margin: 6px 0 0;
+}
+
+.gh-whatsnew-modal-entrycontent p {
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    line-height: 1.45em;
+    margin: 0;
+}
+
+.gh-whatsnew-modal-entrycontent span {
+    color: var(--midgrey);
+}
+
+.gh-whatsnew-modal-entrycontent img {
+    height: auto;
+}
+
+.gh-whatsnew-banner-icon {
+    color: var(--yellow);
+}
+
+.dropdown-item .gh-whatsnew-banner-icon {
+    margin-right: 0 !important;
+}
\ 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..015d6d6e581 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
 /* ---------------------------------------------------------- */
 
@@ -1905,4 +1925,4 @@
 .gh-whats-new .kg-header-card.kg-style-accent a.kg-header-card-button {
     background: #fff;
     color: #151515;
-}
+}
\ No newline at end of file
diff --git a/ghost/admin/app/styles/patterns/forms.css b/ghost/admin/app/styles/patterns/forms.css
index 82e216964bc..bf0a74b0859 100644
--- a/ghost/admin/app/styles/patterns/forms.css
+++ b/ghost/admin/app/styles/patterns/forms.css
@@ -225,20 +225,20 @@ select {
 .gh-select.error,
 .error .gh-input-append,
 select.error {
-    border-color: var(--red);
+    border-color: var(--red)!important;
 }
 
 .gh-input:focus,
 .gh-input.focus {
     outline: 0;
-    border-color: color-mod(var(--green)) !important;
+    border-color: var(--green);
     box-shadow: inset 0 0 0 1px var(--green);
     background: var(--white);
 }
 
 .error .gh-input:focus,
 .error .gh-input.focus {
-    border-color: color-mod(var(--red)) !important;
+    border-color: var(--red);
     box-shadow: inset 0 0 0 1px var(--red);
 }
 
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/styles/spirit/_custom-styles.css b/ghost/admin/app/styles/spirit/_custom-styles.css
index de443ae1a4d..870b2278a53 100644
--- a/ghost/admin/app/styles/spirit/_custom-styles.css
+++ b/ghost/admin/app/styles/spirit/_custom-styles.css
@@ -184,9 +184,9 @@ button, .btn-base {
     bottom: calc(100% + 4px);
     left: 50%;
     white-space: nowrap;
-    padding: 3px 7px;
-    border-radius: 3px;
-    background-color: var(--darkgrey);
+    padding: 4px 10px;
+    border-radius: 6px;
+    background-color: var(--black);
     color: var(--white);
     content: attr(data-tooltip);
     text-align: center;
diff --git a/ghost/admin/app/templates/activitypub-x.hbs b/ghost/admin/app/templates/activitypub-x.hbs
new file mode 100644
index 00000000000..ff79cd26b71
--- /dev/null
+++ b/ghost/admin/app/templates/activitypub-x.hbs
@@ -0,0 +1 @@
+<AdminX::Activitypub />
diff --git a/ghost/admin/app/templates/dashboard.hbs b/ghost/admin/app/templates/dashboard.hbs
index 3faa35e5925..ce1f815381d 100644
--- a/ghost/admin/app/templates/dashboard.hbs
+++ b/ghost/admin/app/templates/dashboard.hbs
@@ -1,6 +1,7 @@
 <section class="gh-canvas" {{scroll-top}}>
     <div class="gh-dashboard">
-        <GhCanvasHeader class="gh-canvas-header sticky">
+        {{#unless this.onboarding.isChecklistShown}}
+        <GhCanvasHeader class="gh-canvas-header sticky" data-test-dashboard="header">
             <h2 class="gh-canvas-title" data-test-screen-title>
                 Dashboard
             </h2>
@@ -78,16 +79,20 @@
                 </div>
             {{/unless}}
         </GhCanvasHeader>
+        {{/unless}}
+
         <section class="gh-dashboard-layout">
             {{#if this.isLoading }}
                 <GhLoadingSpinner />
             {{else}}
-                {{#if this.areMembersEnabled}}
+                {{#if this.onboarding.isChecklistShown}}
+                    <Dashboard::OnboardingChecklist />
+                {{/if}}
+                {{#if (and this.areMembersEnabled (not this.onboarding.isChecklistShown))}}
                     {{#if this.hasPaidTiers}}
                         <Dashboard::Charts::Overview />
                     {{/if}}
-
-                    <div class="gh-dashboard-group {{if this.isTotalMembersZero 'is-zero'}}">
+                    <div class="gh-dashboard-group {{if this.isTotalMembersZero 'is-zero'}}" data-test-dashboard="attribution">
                         <Dashboard::Charts::AnchorAttribution />
                         {{#if this.hasPaidTiers}}
                             <section class="gh-dashboard-section">
@@ -110,21 +115,23 @@
                     </div>
                 {{/if}}
 
-                <div class="gh-dashboard-recents-mentions">
-                    <Dashboard::Charts::Recents />
-                </div>
+                {{#unless this.onboarding.isChecklistShown}}
+                    <div class="gh-dashboard-recents-mentions">
+                        <Dashboard::Charts::Recents />
+                    </div>
 
-                <div class="gh-dashboard-split gh-dashboard-box is-secondary">
-                    <Dashboard::Resources::Resources />
-                    <Dashboard::Resources::Newsletter />
-                </div>
+                    <div class="gh-dashboard-split gh-dashboard-box is-secondary">
+                        <Dashboard::Resources::Resources />
+                        <Dashboard::Resources::Newsletter />
+                    </div>
 
-                <Dashboard::Resources::ExploreFeed />
+                    <Dashboard::Resources::ExploreFeed />
 
-                <div class="gh-dashboard-split gh-dashboard-box no-boarder">
-                    <Dashboard::Resources::Community />
-                    <Dashboard::Resources::WhatsNew />
-                </div>
+                    <div class="gh-dashboard-split gh-dashboard-box no-boarder">
+                        <Dashboard::Resources::Community />
+                        <Dashboard::Resources::WhatsNew />
+                    </div>
+                {{/unless}}
             {{/if}}
         </section>
 
diff --git a/ghost/admin/app/templates/demo-x.hbs b/ghost/admin/app/templates/demo-x.hbs
new file mode 100644
index 00000000000..3f704286c30
--- /dev/null
+++ b/ghost/admin/app/templates/demo-x.hbs
@@ -0,0 +1 @@
+<AdminX::Demo />
diff --git a/ghost/admin/app/templates/lexical-editor.hbs b/ghost/admin/app/templates/lexical-editor.hbs
index 2a4fde9cebd..252dc8129b4 100644
--- a/ghost/admin/app/templates/lexical-editor.hbs
+++ b/ghost/admin/app/templates/lexical-editor.hbs
@@ -9,6 +9,7 @@
                 <Editor::PublishManagement
                     @post={{this.post}}
                     @hasUnsavedChanges={{this.hasDirtyAttributes}}
+                    @tkCount={{this.tkCount}}
                     @beforePublish={{perform this.beforeSaveTask}}
                     @afterPublish={{this.afterSave}}
                     @saveTask={{this.saveTask}}
@@ -18,17 +19,13 @@
                         {{#if this.ui.isFullScreen}}
                             {{#if this.fromAnalytics }}
                                 <LinkTo @route="posts.analytics" @model={{this.post}} class="gh-btn-editor gh-editor-back-button" data-test-breadcrumb>
-                                    <span>
-                                        {{svg-jar "arrow-left"}}
-                                        Analytics
-                                    </span>
+                                    {{svg-jar "arrow-left"}}
+                                    <span>Analytics</span>
                                 </LinkTo>
                             {{else}}
                                 <LinkTo @route={{pluralize this.post.displayName }} class="gh-btn-editor gh-editor-back-button" data-test-link={{pluralize this.post.displayName}} data-test-breadcrumb>
-                                    <span>
-                                        {{svg-jar "arrow-left"}}
-                                        {{capitalize (pluralize this.post.displayName)}}
-                                    </span>
+                                    {{svg-jar "arrow-left"}}
+                                    <span>{{capitalize (pluralize this.post.displayName)}}</span>
                                 </LinkTo>
                             {{/if}}
                         {{/if}}
@@ -47,7 +44,7 @@
                         {{/if}}
                     </div>
 
-                    <section class="flex items-center pe-auto h-100">
+                    <section class="gh-editor-publish-buttons">
                         {{#unless this.post.isNew}}
                             <Editor::PublishButtons @publishManagement={{publishManagement}} />
                             {{#unless this.showSettingsMenu}}
@@ -64,24 +61,34 @@
             --}}
             <GhKoenigEditorLexical
                 @title={{readonly this.post.titleScratch}}
-                @titleAutofocus={{this.shouldFocusTitle}}
                 @titlePlaceholder={{concat (capitalize this.post.displayName) " title"}}
+                @titleAutofocus={{this.shouldFocusTitle}}
+                @titleHasTk={{this.titleHasTk}}
                 @onTitleChange={{this.updateTitleScratch}}
                 @onTitleBlur={{perform this.saveTitleTask}}
+                @excerpt={{readonly this.post.customExcerpt}}
+                @excerptHasTk={{this.excerptHasTk}}
+                @setExcerpt={{this.updateExcerpt}}
+                @onExcerptBlur={{perform this.saveExcerptTask}}
+                @excerptErrorMessage={{this.excerptErrorMessage}}
                 @body={{readonly this.post.lexicalScratch}}
                 @bodyPlaceholder={{concat "Begin writing your " this.post.displayName "..."}}
                 @onBodyChange={{this.updateScratch}}
+                @updateSecondaryInstanceModel={{this.updateSecondaryInstanceModel}}
                 @headerOffset={{editor.headerHeight}}
                 @scrollContainerSelector=".gh-koenig-editor"
                 @scrollOffsetBottomSelector=".gh-mobile-nav-bar"
                 @onEditorCreated={{this.setKoenigEditor}}
                 @updateWordCount={{this.updateWordCount}}
+                @updatePostTkCount={{this.updatePostTkCount}}
+                @updateFeatureImageTkCount={{this.updateFeatureImageTkCount}}
                 @featureImage={{this.post.featureImage}}
                 @featureImageAlt={{this.post.featureImageAlt}}
                 @featureImageCaption={{this.post.featureImageCaption}}
                 @setFeatureImage={{this.setFeatureImage}}
                 @setFeatureImageAlt={{this.setFeatureImageAlt}}
                 @setFeatureImageCaption={{this.setFeatureImageCaption}}
+                @handleFeatureImageCaptionBlur={{this.handleFeatureImageCaptionBlur}}
                 @clearFeatureImage={{this.clearFeatureImage}}
                 @cardOptions={{hash
                     post=this.post
@@ -92,6 +99,8 @@
                 }}
                 @postType={{this.post.displayName}}
                 @registerAPI={{this.registerEditorAPI}}
+                @registerSecondaryAPI={{this.registerSecondaryEditorAPI}}
+                @savePostTask={{this.savePostTask}}
             />
 
             <div class="gh-editor-wordcount-container">
@@ -101,6 +110,26 @@
                 <a href="https://ghost.org/help/using-the-editor/" class="flex" target="_blank" rel="noopener noreferrer">{{svg-jar "help"}}</a>
             </div>
 
+            <div class="gh-editor-mobile-menu">
+                <Editor::PublishManagement
+                    @post={{this.post}}
+                    @hasUnsavedChanges={{this.hasDirtyAttributes}}
+                    @beforePublish={{perform this.beforeSaveTask}}
+                    @afterPublish={{this.afterSave}}
+                    @saveTask={{this.saveTask}}
+                    as |publishManagement|
+                >
+                    <div class="gh-editor-wordcount">
+                        {{gh-pluralize this.wordCount "word"}}
+                    </div>
+                    <section class="gh-editor-publish-buttons">
+                        {{#unless this.post.isNew}}
+                            <Editor::PublishButtons @publishManagement={{publishManagement}} />
+                        {{/unless}}
+                    </section>
+                </Editor::PublishManagement>
+            </div>
+
         </GhEditor>
 
         {{#if this.showSettingsMenu}}
@@ -110,6 +139,7 @@
                 @updateSlugTask={{this.updateSlugTask}}
                 @savePostTask={{this.savePostTask}}
                 @editorAPI={{this.editorAPI}}
+                @secondaryEditorAPI={{this.secondaryEditorAPI}}
                 @toggleSettingsMenu={{this.toggleSettingsMenu}}
             />
         {{/if}}
diff --git a/ghost/admin/app/templates/member.hbs b/ghost/admin/app/templates/member.hbs
index a5b7186ee12..3a7cf1aada9 100644
--- a/ghost/admin/app/templates/member.hbs
+++ b/ghost/admin/app/templates/member.hbs
@@ -67,6 +67,16 @@
                                     <span>Impersonate</span>
                                 </button>
                             </li>
+                            <li>
+                                <button
+                                    type="button"
+                                    class="mr2"
+                                    {{on "click" this.confirmLogoutMember}}
+                                    data-test-button="logout-member"
+                                >
+                                    <span>Sign out of all devices</span>
+                                </button>
+                            </li>
                             <li>
                                 <button
                                     type="button"
diff --git a/ghost/admin/app/templates/members.hbs b/ghost/admin/app/templates/members.hbs
index 9bd9c98cdc7..c965f8389be 100644
--- a/ghost/admin/app/templates/members.hbs
+++ b/ghost/admin/app/templates/members.hbs
@@ -104,12 +104,14 @@
                                         </button>
                                     </li>
                                 {{/if}}
-                                <li class="divider"></li>
-                                <li>
-                                    <button class="mr2" data-test-button="delete-selected" type="button" {{on "click" this.bulkDelete}}>
-                                        <span class="red">Delete selected members ({{this.members.length}})</span>
-                                    </button>
-                                </li>
+                                {{#if this.isBulkDeletePermitted}}
+                                    <li class="divider"></li>
+                                    <li>
+                                        <button class="mr2" data-test-button="delete-selected" type="button" {{on "click" this.bulkDelete}}>
+                                            <span class="red">Delete selected members ({{this.members.length}})</span>
+                                        </button>
+                                    </li>
+                                {{/if}}
                             {{/if}}
                         </GhDropdown>
                     </span>
@@ -143,7 +145,7 @@
                                 {{/each}}
                             </tr>
                         </thead>
-                        <VerticalCollection @tagName="tbody" @items={{this.members}} @key="id" @containerSelector=".gh-list-scrolling" @estimateHeight={{69}} @staticHeight={{true}} @bufferSize={{20}} as |member|>
+                        <VerticalCollection @tagName="tbody" @items={{this.members}} @key="id" @containerSelector=".gh-list-scrolling" @estimateHeight={{75}} @staticHeight={{true}} @bufferSize={{5}} @renderAll={{false}} as |member|>
                             {{#if member.is_loading}}
                                 <Members::ListItemLoading
                                     @newsletterEnabled={{and (not-eq this.settings.editorDefaultEmailRecipients "disabled") this.settings.emailTrackOpens}}
diff --git a/ghost/admin/app/templates/offers.hbs b/ghost/admin/app/templates/offers.hbs
index 26f06bae5a3..8c3326f9f20 100644
--- a/ghost/admin/app/templates/offers.hbs
+++ b/ghost/admin/app/templates/offers.hbs
@@ -92,7 +92,7 @@
                                     <span class="midgrey strike ml2">{{currency-symbol offer.finalCurrency}}{{gh-price-amount offer.originalPrice}}</span>
                                 {{/if}}
                             </LinkTo>
-                            <LinkTo @route="members" @query={{hash filter=(concat "offer_redemptions:" offer.id)}} class="gh-list-data" data-test-list="redemption-count">
+                            <LinkTo @route="members" @query={{hash filter=(concat "offer_redemptions:[" offer.id "]")}} class="gh-list-data" data-test-list="redemption-count">
                                 <span class="midgrey">{{offer.redemptionCount}}</span>
                             </LinkTo>
                             <div class="gh-list-data gh-list-cellwidth-10 gh-list-chevron">
diff --git a/ghost/admin/app/templates/pages.hbs b/ghost/admin/app/templates/pages.hbs
index 723ebf8c171..7dba8759701 100644
--- a/ghost/admin/app/templates/pages.hbs
+++ b/ghost/admin/app/templates/pages.hbs
@@ -28,7 +28,7 @@
 
     <section class="view-container content-list">
         <PostsList::List
-            @model={{this.postsInfinityModel}}
+            @model={{@model}}
             @list={{this.selectionList}}
         >
             <li class="no-posts-box">
@@ -41,7 +41,7 @@
                         </LinkTo>
                     {{else}}
                         <h4>No pages match the current filter</h4>
-                        <LinkTo @route="pages" @query={{hash type=null author=null tag=null}} class="gh-btn">
+                        <LinkTo @route="pages" @query={{hash visibility=null type=null author=null tag=null}} class="gh-btn">
                             <span>Show all pages</span>
                         </LinkTo>
                     {{/if}}
@@ -49,11 +49,26 @@
             </li>
         </PostsList::List>
 
+    {{!-- only show one infinity loader wheel at a time - always order as scheduled, draft, remainder --}}
+    {{#if @model.scheduledInfinityModel}}
         <GhInfinityLoader
-            @infinityModel={{this.postsInfinityModel}}
+            @infinityModel={{@model.scheduledInfinityModel}}
             @scrollable=".gh-main"
             @triggerOffset={{1000}} />
-    </section>
+    {{/if}}
+    {{#if (and @model.draftInfinityModel (or (not @model.scheduledInfinityModel) (and @model.scheduledInfinityModel @model.scheduledInfinityModel.reachedInfinity)))}}
+        <GhInfinityLoader
+            @infinityModel={{@model.draftInfinityModel}}
+            @scrollable=".gh-main"
+            @triggerOffset={{1000}} />
+    {{/if}}
+    {{#if (and @model.publishedAndSentInfinityModel (and (or (not @model.scheduledInfinityModel) @model.scheduledInfinityModel.reachedInfinity) (or (not @model.draftInfinityModel) @model.draftInfinityModel.reachedInfinity)))}}
+        <GhInfinityLoader
+            @infinityModel={{@model.publishedAndSentInfinityModel}}
+            @scrollable=".gh-main"
+            @triggerOffset={{1000}} />
+    {{/if}}
 
+    </section>
     {{outlet}}
 </section>
diff --git a/ghost/admin/app/templates/posts.hbs b/ghost/admin/app/templates/posts.hbs
index f0d0b6bbe8a..dc3e26361dc 100644
--- a/ghost/admin/app/templates/posts.hbs
+++ b/ghost/admin/app/templates/posts.hbs
@@ -30,7 +30,7 @@
 
     <section class="view-container content-list">
         <PostsList::List
-            @model={{this.postsInfinityModel}}
+            @model={{@model}}
             @list={{this.selectionList}}
         >
             <li class="no-posts-box" data-test-no-posts-box>
@@ -43,7 +43,7 @@
                         </LinkTo>
                     {{else}}
                         <h4>No posts match the current filter</h4>
-                        <LinkTo @route="posts" @query={{hash type=null author=null tag=null}} class="gh-btn" data-test-link="show-all">
+                        <LinkTo @route="posts" @query={{hash type=null author=null tag=null visibility=null}} class="gh-btn" data-test-link="show-all">
                             <span>Show all posts</span>
                         </LinkTo>
                     {{/if}}
@@ -51,11 +51,26 @@
             </li>
         </PostsList::List>
 
+    {{!-- only show one infinity loader wheel at a time - always order as scheduled, draft, remainder --}}
+    {{#if @model.scheduledInfinityModel}}
         <GhInfinityLoader
-            @infinityModel={{this.postsInfinityModel}}
+            @infinityModel={{@model.scheduledInfinityModel}}
             @scrollable=".gh-main"
             @triggerOffset={{1000}} />
-    </section>
+    {{/if}}
+    {{#if (and @model.draftInfinityModel (or (not @model.scheduledInfinityModel) (and @model.scheduledInfinityModel @model.scheduledInfinityModel.reachedInfinity)))}}
+        <GhInfinityLoader
+            @infinityModel={{@model.draftInfinityModel}}
+            @scrollable=".gh-main"
+            @triggerOffset={{1000}} />
+    {{/if}}
+    {{#if (and @model.publishedAndSentInfinityModel (and (or (not @model.scheduledInfinityModel) @model.scheduledInfinityModel.reachedInfinity) (or (not @model.draftInfinityModel) @model.draftInfinityModel.reachedInfinity)))}}
+        <GhInfinityLoader
+            @infinityModel={{@model.publishedAndSentInfinityModel}}
+            @scrollable=".gh-main"
+            @triggerOffset={{1000}} />
+    {{/if}}
 
+    </section>
     {{outlet}}
-</section>
+</section>
\ No newline at end of file
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/templates/setup.hbs b/ghost/admin/app/templates/setup.hbs
index 5110340e814..db40583602a 100644
--- a/ghost/admin/app/templates/setup.hbs
+++ b/ghost/admin/app/templates/setup.hbs
@@ -6,7 +6,7 @@
             <p>All over the world, people have started 3,000,000+ incredible sites with Ghost. Today, we’re starting yours.</p>
         </header>
 
-        <form id="setup" class="gh-flow-form">
+        <form id="setup" method="post" action="javascript:void(0)" class="gh-flow-form">
             <GhFormGroup @errors={{this.errors}} @hasValidated={{this.hasValidated}} @property="blogTitle">
                 <label for="blog-title">Site title</label>
                 <span class="gh-input-icon gh-icon-content">
diff --git a/ghost/admin/app/templates/setup/done.hbs b/ghost/admin/app/templates/setup/done.hbs
deleted file mode 100644
index f197f071cce..00000000000
--- a/ghost/admin/app/templates/setup/done.hbs
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="gh-flow gh-done">
-    <main class="flex flex-row h-100">
-        <div class="gh-done-sidebar">
-            <div class="flex flex-column h-100">
-                <div class="gh-nav-body">
-                    <div class="gh-done-panel">
-                        <div class="gh-stack">
-                            <header>
-                                <h1>All done!</h1>
-                                <p>Your brand new publication is set up and ready to go.</p>
-                            </header>
-                            <h4>What do you want to do first?</h4>
-                            <section>
-                                <LinkTo class="gh-done-yellow" @route="lexical-editor.new" @model="post">
-                                    <span>{{svg-jar "posts"}}</span>
-                                    <h6>Write your first post</h6>
-                                    <p>Test out the editor and get a feel for creating content inside Ghost.</p>
-                                </LinkTo>
-                                <LinkTo class="gh-done-green" @route="settings-x">
-                                    <span>{{svg-jar "paint-palette"}}</span>
-                                    <h6>Customize your site</h6>
-                                    <p>Review your settings and tweak the design to make your site just right.</p>
-                                </LinkTo>
-                                <LinkTo class="gh-done-blue" @route="members.import">
-                                    <span>{{svg-jar "members"}}</span>
-                                    <h6>Import members</h6>
-                                    <p>Move your audience over to Ghost with our migration tools and guides.</p>
-                                </LinkTo>
-                                <LinkTo class="gh-done-pink" @route="dashboard">
-                                   <span>{{svg-jar "house"}}</span>
-                                    <h6>Explore Ghost admin</h6>
-                                    <p>View the dashboard, click around, and explore Ghost for yourself.</p>
-                                </LinkTo>
-                            </section>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="gh-done-preview">
-            <GhBrowserPreview>
-                <GhHtmlIframe class="site-frame" @html={{this.themeManagement.previewHtml}} />
-            </GhBrowserPreview>
-        </div>
-    </main>
-</div>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/signin.hbs b/ghost/admin/app/templates/signin.hbs
index 9c1991a9999..2a3d5e27410 100644
--- a/ghost/admin/app/templates/signin.hbs
+++ b/ghost/admin/app/templates/signin.hbs
@@ -12,7 +12,7 @@
                     </header>
                 </div>
             {{else}}
-                <form id="login" method="post" class="gh-signin" novalidate="novalidate" {{on "submit" (perform this.validateAndAuthenticateTask)}}>
+                <form id="login" method="post" action="javascript:void(0)" class="gh-signin" novalidate="novalidate" {{on "submit" (perform this.validateAndAuthenticateTask)}}>
                     <header>
                         <div class="gh-site-icon" style={{site-icon-style}}></div>
                         <h1>{{this.config.blogTitle}}</h1>
@@ -73,7 +73,7 @@
                         data-test-button="sign-in" />
                 </form>
 
-                <p class="main-error">{{if this.flowErrors this.flowErrors}}&nbsp;</p>
+                <p class="{{if this.flowErrors "main-error" "main-notification"}}" data-test-flow-notification>{{if this.flowErrors this.flowErrors this.flowNotification}}&nbsp;</p>
             {{/if}}
         </section>
     </div>
diff --git a/ghost/admin/app/templates/signup.hbs b/ghost/admin/app/templates/signup.hbs
index 025b422d550..c6996c89224 100644
--- a/ghost/admin/app/templates/signup.hbs
+++ b/ghost/admin/app/templates/signup.hbs
@@ -7,7 +7,7 @@
                 <h1>Create your account.</h1>
             </header>
 
-            <form id="signup" class="gh-signup" method="post" novalidate="novalidate" {{on "submit" this.submit}}>
+            <form id="signup" method="post" action="javascript:void(0)" class="gh-signup" novalidate="novalidate" {{on "submit" this.submit}}>
                 <GhFormGroup @errors={{this.signupDetails.errors}} @hasValidated={{this.signupDetails.hasValidated}} @property="name">
                     <label for="name">Full name</label>
                     <span class="gh-input-icon gh-icon-user">
diff --git a/ghost/admin/app/templates/stats.hbs b/ghost/admin/app/templates/stats.hbs
new file mode 100644
index 00000000000..f1816c277a8
--- /dev/null
+++ b/ghost/admin/app/templates/stats.hbs
@@ -0,0 +1,55 @@
+<section class="gh-canvas gh-canvas-sticky">
+    <GhCanvasHeader class="gh-canvas-header sticky break tablet post-header">
+        <GhCustomViewTitle @title="Stats" />
+            <div class="view-actions">
+                <Stats::Parts::AudienceFilter
+                    @excludedAudiences={{this.excludedAudiences}}
+                    @onChange={{this.onAudienceChange}}
+                />
+
+                <PowerSelect
+                    @selected={{this.selectedDaysOption}}
+                    @options={{this.daysOptions}}
+                    @searchEnabled={{false}}
+                    @onChange={{this.onDaysChange}}
+                    @triggerComponent={{component "gh-power-select/trigger"}}
+                    @triggerClass="gh-btn"
+                    @dropdownClass="gh-contentfilter-menu-dropdown is-narrow"
+                    @matchTriggerWidth={{false}}
+                    @horizontalPosition="right"
+                    as |option|
+                >
+                    {{#if option.name}}{{option.name}}{{else}}<span class="red">Unknown option</span>{{/if}}
+                </PowerSelect>
+            </div>
+    </GhCanvasHeader>
+
+    <section class="view-container gh-stats">
+        <section class="gh-stats-container">
+            <Stats::KpisOverview @chartDays={{this.chartDays}} @audience={{this.audience}} />
+        </section>
+
+        <section class="gh-stats-grid cols-2">
+            <div class="gh-stats-container">
+                <h5 class="gh-stats-metric-label">Top posts & pages</h5>
+                <Stats::Charts::TopPages @chartDays={{this.chartDays}} @audience={{this.audience}} />
+            </div>
+            <div class="gh-stats-container">
+                <h5 class="gh-stats-metric-label">Sources</h5>
+                <Stats::Charts::TopSources @chartDays={{this.chartDays}} @audience={{this.audience}} />
+            </div>
+        </section>
+
+        <section class="gh-stats-grid cols-2">
+            <div class="gh-stats-container">
+                <h5 class="gh-stats-metric-label">Top locations</h5>
+                <Stats::Charts::TopLocations @chartDays={{this.chartDays}} @audience={{this.audience}} />
+            </div>
+            <div class="gh-stats-container">
+                <Stats::TechnicalOverview @chartDays={{this.chartDays}} @audience={{this.audience}} />
+            </div>
+        </section>
+
+    </section>
+
+</section>
\ No newline at end of file
diff --git a/ghost/admin/app/templates/websockets.hbs b/ghost/admin/app/templates/websockets.hbs
deleted file mode 100644
index 28189cc5830..00000000000
--- a/ghost/admin/app/templates/websockets.hbs
+++ /dev/null
@@ -1,29 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <div class="flex flex-column">
-            <h2 class="gh-canvas-title" data-test-screen-title>
-                Testing Websockets
-            </h2>
-        </div>
-    </GhCanvasHeader>
-    {{#if (feature 'websockets')}}
-    <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">Secrets</h4>
-            <div class="gh-expandable">
-                <div class="gh-expandable-block">
-                    <Websockets />
-                </div>
-            </div>
-        </div>
-    </section>
-    {{else}}
-    <section class="view-container settings-debug">
-        <p class="gh-box gh-box-alert">{{svg-jar "warning-stroke"}}This is a testing ground for new or experimental features. You need developer experiments
-            enabled to see the content here.
-        </p>
-    </section>
-    {{/if}}
-</section>
\ No newline at end of file
diff --git a/ghost/admin/app/utils/analytics.js b/ghost/admin/app/utils/analytics.js
index ddce5e4ace5..4cf02cb9d4c 100644
--- a/ghost/admin/app/utils/analytics.js
+++ b/ghost/admin/app/utils/analytics.js
@@ -1,8 +1,93 @@
 // Wrapper function for Plausible event
 
-export default function trackEvent(eventName, props = {}) {
+function isPosthogLoaded() {
+    return window.posthog?.__loaded;
+}
+
+/**
+ * Hashes a user's email address so we can use it as a distinct_id in PostHog without storing the email address itself
+ * 
+ * 
+ * @param {string} email an email address
+ * @returns {(string|null)} a sha256 hash of the email address to use as distinct_id in PostHog — null if hashing fails
+ */
+async function hashEmail(email) {
+    try {
+        const digest = await window.crypto.subtle.digest('SHA-256', new TextEncoder().encode(email.trim().toLowerCase()));
+        const hashArray = Array.from(new Uint8Array(digest));
+        const hash = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+        // Double-check that the hash is a valid sha256 hex string before returning it, else return null
+        return hash.length === 64 ? hash : null;
+    } catch (e) {
+        // Modern browsers all support window.crypto, but we need to check for it to avoid errors on really old browsers
+        // If any errors occur when hashing email, return null
+        return null;
+    }
+}
+
+/**
+ * Sends a tracking event to Plausible and Posthog, if installed.
+ * 
+ * By default, Plausible and Posthog are not installed, in which case this function no-ops.
+ * 
+ * @param {string} eventName A string name for the event being tracked
+ * @param {Object} [props={}] An optional object of properties to include with the event
+ */
+export function trackEvent(eventName, props = {}) {
     window.plausible = window.plausible || function () {
         (window.plausible.q = window.plausible.q || []).push(arguments);
     };
     window.plausible(eventName, {props: props});
+
+    if (isPosthogLoaded()) {
+        window.posthog.capture(eventName, props);
+    }
+}
+
+/**
+ * Calls posthog.identify() with a hashed email address as the distinct_id
+ * 
+ * @param {Object} user A user to identify in PostHog
+ * @returns {void}
+ */
+export async function identifyUser(user) {
+    // Return early if window.posthog doesn't exist
+    if (!isPosthogLoaded()) {
+        return;
+    }
+    // User the user exists and has an email address, identify them in PostHog
+    if (user && user.get('email')) {
+        const email = user.get('email');
+        const hashedEmail = await hashEmail(email);
+        const distinctId = window.posthog.get_distinct_id();
+        // Only continue if hashing was successful, and the user hasn't already been identified
+        if (hashedEmail && hashedEmail !== distinctId) {
+            const props = {};
+            // Add the user's id
+            if (user.get('id')) {
+                props.id = user.get('id');
+            }
+            // Add the user's role
+            if (user.get('role').name) {
+                props.role = user.get('role').name.toLowerCase();
+            }
+            // Add the user's created_at date
+            if (user.get('createdAtUTC')) {
+                props.created_at = user.get('createdAtUTC').toISOString();
+            }
+            window.posthog.identify(hashedEmail, props);
+        }
+    }
 }
+
+/**
+ * Calls posthog.reset() to clear the current user's distinct_id and all associated properties
+ * To be called when a user logs out
+ * 
+ * @returns {void}
+ */
+export function resetUser() {
+    if (isPosthogLoaded()) {
+        window.posthog.reset();
+    }
+}
\ No newline at end of file
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/utils/member-event-types.js b/ghost/admin/app/utils/member-event-types.js
new file mode 100644
index 00000000000..6f1d415d089
--- /dev/null
+++ b/ghost/admin/app/utils/member-event-types.js
@@ -0,0 +1,57 @@
+export const ALL_EVENT_TYPES = [
+    {event: 'signup_event', icon: 'filter-dropdown-signups', name: 'Signups', group: 'auth'},
+    {event: 'login_event', icon: 'filter-dropdown-logins', name: 'Logins', group: 'auth'},
+    {event: 'subscription_event', icon: 'filter-dropdown-paid-subscriptions', name: 'Paid subscriptions', group: 'payments'},
+    {event: 'payment_event', icon: 'filter-dropdown-payments', name: 'Payments', group: 'payments'},
+    {event: 'newsletter_event', icon: 'filter-dropdown-email-subscriptions', name: 'Email subscriptions', group: 'emails'},
+    {event: 'email_opened_event', icon: 'filter-dropdown-email-opened', name: 'Email opened', group: 'emails'},
+    {event: 'email_delivered_event', icon: 'filter-dropdown-email-received', name: 'Email received', group: 'emails'},
+    {event: 'email_complaint_event', icon: 'filter-dropdown-email-flagged-as-spam', name: 'Email flagged as spam', group: 'emails'},
+    {event: 'email_failed_event', icon: 'filter-dropdown-email-bounced', name: 'Email bounced', group: 'emails'},
+    {event: 'email_change_event', icon: 'filter-dropdown-email-address-changed', name: 'Email address changed', group: 'emails'}
+];
+
+export function getAvailableEventTypes(settings, feature, hiddenEvents = []) {
+    const extended = [...ALL_EVENT_TYPES];
+
+    if (settings.commentsEnabled !== 'off') {
+        extended.push({event: 'comment_event', icon: 'filter-dropdown-comments', name: 'Comments', group: 'others'});
+    }
+    if (feature.audienceFeedback) {
+        extended.push({event: 'feedback_event', icon: 'filter-dropdown-feedback', name: 'Feedback', group: 'others'});
+    }
+    if (settings.emailTrackClicks) {
+        extended.push({event: 'click_event', icon: 'filter-dropdown-clicked-in-email', name: 'Clicked link in email', group: 'others'});
+    }
+
+    return extended.filter(t => !hiddenEvents.includes(t.event));
+}
+
+export function toggleEventType(eventType, eventTypes) {
+    const excludedEvents = new Set(eventTypes.filter(type => !type.isSelected).map(type => type.event));
+
+    if (eventType === 'payment_event') {
+        if (excludedEvents.has('payment_event')) {
+            excludedEvents.delete('payment_event');
+            excludedEvents.delete('donation_event');
+        } else {
+            excludedEvents.add('payment_event');
+            excludedEvents.add('donation_event');
+        }
+    } else {
+        if (excludedEvents.has(eventType)) {
+            excludedEvents.delete(eventType);
+        } else {
+            excludedEvents.add(eventType);
+        }
+    }
+
+    return Array.from(excludedEvents).join(',');
+}
+
+export function needDivider(event, prevEvent) {
+    if (!event?.group || !prevEvent?.group) {
+        return false;
+    }
+    return event.group !== prevEvent.group;
+}
diff --git a/ghost/admin/app/utils/merge-stats-by-date.js b/ghost/admin/app/utils/merge-stats-by-date.js
new file mode 100644
index 00000000000..bdd881f8976
--- /dev/null
+++ b/ghost/admin/app/utils/merge-stats-by-date.js
@@ -0,0 +1,26 @@
+export default function mergeStatsByDate(list) {
+    const reducedStatsByDate = list.reduce((acc, current) => {
+        const currentDate = current.date;
+
+        if (!acc[currentDate]) {
+            acc[currentDate] = {
+                date: currentDate,
+                count: 0,
+                positiveDelta: 0,
+                negativeDelta: 0,
+                signups: 0,
+                cancellations: 0
+            };
+        }
+
+        acc[currentDate].count += current.count;
+        acc[currentDate].positiveDelta += current.positive_delta;
+        acc[currentDate].negativeDelta += current.negative_delta;
+        acc[currentDate].signups += current.signups;
+        acc[currentDate].cancellations += current.cancellations;
+
+        return acc;
+    }, {});
+
+    return Object.values(reducedStatsByDate);
+}
diff --git a/ghost/admin/app/utils/publish-options.js b/ghost/admin/app/utils/publish-options.js
index 28d556cec7e..6d33eff6b19 100644
--- a/ghost/admin/app/utils/publish-options.js
+++ b/ghost/admin/app/utils/publish-options.js
@@ -10,6 +10,7 @@ export default class PublishOptions {
     limit = null;
     settings = null;
     store = null;
+    membersCountCache = null;
 
     // passed in models
     post = null;
@@ -234,13 +235,14 @@ export default class PublishOptions {
 
     // setup -------------------------------------------------------------------
 
-    constructor({config, limit, post, settings, store, user} = {}) {
+    constructor({config, limit, post, settings, store, user, membersCountCache} = {}) {
         this.config = config;
         this.limit = limit;
         this.post = post;
         this.settings = settings;
         this.store = store;
         this.user = user;
+        this.membersCountCache = membersCountCache;
 
         // this needs to be set here rather than a class-level property because
         // unlike Ember-based classes the services are not injected so can't be
@@ -285,8 +287,8 @@ export default class PublishOptions {
         // Only Admins/Owners have permission to browse members and get a count
         // for Editors/Authors set member count to 1 so email isn't disabled for not having any members
         if (this.user.isAdmin) {
-            promises.push(this.store.query('member', {limit: 1}).then((res) => {
-                this.totalMemberCount = res.meta.pagination.total;
+            promises.push(this.membersCountCache.count({}).then((res) => {
+                this.totalMemberCount = res;
             }));
         } else {
             this.totalMemberCount = 1;
diff --git a/ghost/admin/app/utils/selection-list.js b/ghost/admin/app/utils/selection-list.js
deleted file mode 100644
index b409d6da4bf..00000000000
--- a/ghost/admin/app/utils/selection-list.js
+++ /dev/null
@@ -1,241 +0,0 @@
-import {tracked} from '@glimmer/tracking';
-
-export default class SelectionList {
-    @tracked selectedIds = new Set();
-    @tracked inverted = false;
-    @tracked lastSelectedId = null;
-    @tracked lastShiftSelectionGroup = new Set();
-
-    enabled = true;
-
-    infinityModel;
-
-    #frozen = false;
-
-    /**
-     * When doing right click on an item, we temporarily select it, but want to clear it as soon as we close the context menu.
-     */
-    #clearOnNextUnfreeze = false;
-
-    constructor(infinityModel) {
-        this.infinityModel = infinityModel ?? {content: []};
-    }
-
-    freeze() {
-        this.#frozen = true;
-    }
-
-    unfreeze() {
-        this.#frozen = false;
-        if (this.#clearOnNextUnfreeze) {
-            this.clearSelection();
-            this.#clearOnNextUnfreeze = false;
-        }
-    }
-
-    clearOnNextUnfreeze() {
-        this.#clearOnNextUnfreeze = true;
-    }
-
-    /**
-     * Returns an NQL filter for all items, not the selection
-     */
-    get allFilter() {
-        return this.infinityModel.extraParams?.filter ?? '';
-    }
-
-    /**
-     * Returns an NQL filter for the current selection
-     */
-    get filter() {
-        if (this.inverted) {
-            if (this.allFilter) {
-                if (this.selectedIds.size === 0) {
-                    return this.allFilter;
-                }
-                return `(${this.allFilter})+id:-['${[...this.selectedIds].join('\',\'')}']`;
-            }
-            if (this.selectedIds.size === 0) {
-                // Select all
-                return '';
-            }
-            return `id:-['${[...this.selectedIds].join('\',\'')}']`;
-        }
-        if (this.selectedIds.size === 0) {
-            // Select nothing
-            return 'id:nothing';
-        }
-        // Only based on the ids
-        return `id:['${[...this.selectedIds].join('\',\'')}']`;
-    }
-
-    /**
-     * Create an empty copy
-     */
-    cloneEmpty() {
-        return new SelectionList(this.infinityModel);
-    }
-
-    /**
-     * Return a list of models that are already loaded in memory.
-     * Keep in mind that when using CMD + A, we don't have all items in memory!
-     */
-    get availableModels() {
-        const arr = [];
-        for (const item of this.infinityModel.content) {
-            if (this.isSelected(item.id)) {
-                arr.push(item);
-            }
-        }
-        return arr;
-    }
-
-    get first() {
-        return this.availableModels[0];
-    }
-
-    get isSingle() {
-        return this.selectedIds.size === 1 && !this.inverted;
-    }
-
-    get count() {
-        if (!this.inverted) {
-            return this.selectedIds.size;
-        }
-        return Math.max((this.infinityModel.meta?.pagination?.total ?? 0) - this.selectedIds.size, 1);
-    }
-
-    isSelected(id) {
-        if (this.inverted) {
-            return !this.selectedIds.has(id);
-        }
-        return this.selectedIds.has(id);
-    }
-
-    toggleItem(id) {
-        if (this.#frozen) {
-            return;
-        }
-        this.lastShiftSelectionGroup = new Set();
-
-        if (this.selectedIds.has(id)) {
-            this.selectedIds.delete(id);
-
-            if (!this.inverted) {
-                if (this.lastSelectedId === id) {
-                    this.lastSelectedId = null;
-                }
-            } else {
-                // Shift behaviour in inverted mode needs a review
-                this.lastSelectedId = id;
-            }
-        } else {
-            this.selectedIds.add(id);
-
-            if (!this.inverted) {
-                this.lastSelectedId = id;
-            } else {
-                // Shift behaviour in inverted mode needs a review
-                this.lastSelectedId = id;
-            }
-        }
-
-        // Force update
-        // eslint-disable-next-line no-self-assign
-        this.selectedIds = this.selectedIds;
-    }
-
-    clearUnavailableItems() {
-        const newSelection = new Set();
-        for (const item of this.infinityModel.content) {
-            if (this.selectedIds.has(item.id)) {
-                newSelection.add(item.id);
-            }
-        }
-        this.selectedIds = newSelection;
-    }
-
-    /**
-     * Select all items between the last selection or the first one if none
-     */
-    shiftItem(id) {
-        if (this.#frozen) {
-            return;
-        }
-        if (this.lastSelectedId === null) {
-            // Do a normal toggle
-            this.toggleItem(id);
-            return;
-        }
-
-        // Unselect last selected items
-        for (const item of this.lastShiftSelectionGroup) {
-            if (this.inverted) {
-                this.selectedIds.add(item);
-            } else {
-                this.selectedIds.delete(item);
-            }
-        }
-        this.lastShiftSelectionGroup = new Set();
-
-        // todo
-        let running = false;
-
-        for (const item of this.infinityModel.content) {
-            // Exlusing the last selected item
-            if (item.id === this.lastSelectedId || item.id === id) {
-                if (!running) {
-                    running = true;
-
-                    // Skip last selected on its own
-                    if (item.id === this.lastSelectedId) {
-                        continue;
-                    }
-                } else {
-                    // Still include id
-                    if (item.id === id) {
-                        this.lastShiftSelectionGroup.add(item.id);
-
-                        if (this.inverted) {
-                            this.selectedIds.delete(item.id);
-                        } else {
-                            this.selectedIds.add(item.id);
-                        }
-                    }
-                    break;
-                }
-            }
-
-            if (running) {
-                this.lastShiftSelectionGroup.add(item.id);
-                if (this.inverted) {
-                    this.selectedIds.delete(item.id);
-                } else {
-                    this.selectedIds.add(item.id);
-                }
-            }
-        }
-
-        // Force update
-        // eslint-disable-next-line no-self-assign
-        this.selectedIds = this.selectedIds;
-    }
-
-    selectAll() {
-        if (this.#frozen) {
-            return;
-        }
-        this.selectedIds = new Set();
-        this.inverted = !this.inverted;
-        this.lastSelectedId = null;
-    }
-
-    clearSelection(options = {}) {
-        if (this.#frozen && !options.force) {
-            return;
-        }
-        this.selectedIds = new Set();
-        this.inverted = false;
-        this.lastSelectedId = null;
-    }
-}
diff --git a/ghost/admin/app/utils/sentry.js b/ghost/admin/app/utils/sentry.js
new file mode 100644
index 00000000000..4677f68fa25
--- /dev/null
+++ b/ghost/admin/app/utils/sentry.js
@@ -0,0 +1,50 @@
+import {
+    isAjaxError
+} from 'ember-ajax/errors';
+
+export function beforeSend(event, hint) {
+    try {
+        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;
+        }
+
+        // if the error value includes a model id then overwrite it to improve grouping
+        if (event.exception && event.exception.values && event.exception.values.length > 0) {
+            const pattern = /<(post|page):[a-f0-9]+>/;
+            const replacement = '<$1:ID>';
+            event.exception.values[0].value = event.exception.values[0].value.replace(pattern, replacement);
+        }
+
+        // ajax errors — improve logging and add context for debugging
+        if (isAjaxError(exception) && exception.payload && exception.payload.errors && exception.payload.errors.length > 0) {
+            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;
+        } else {
+            delete event.contexts.ajax;
+            delete event.tags.ajax_status;
+            delete event.tags.ajax_method;
+            delete event.tags.ajax_url;
+        }
+
+        // Do not report posthog-js errors to Sentry
+        if (hint && hint.originalException && hint.originalException.stack) {
+            if (hint.originalException.stack.includes('/posthog-js/')) {
+                return null;
+            }
+        }
+
+        return event;
+    } catch (error) {
+        // If any errors occur in beforeSend, send the original event to Sentry
+        // Better to have some information than no information
+        return event;
+    }
+}
diff --git a/ghost/admin/app/utils/subscription-data.js b/ghost/admin/app/utils/subscription-data.js
new file mode 100644
index 00000000000..9a396963d96
--- /dev/null
+++ b/ghost/admin/app/utils/subscription-data.js
@@ -0,0 +1,116 @@
+import moment from 'moment-timezone';
+import {getNonDecimal, getSymbol} from 'ghost-admin/utils/currency';
+
+export function getSubscriptionData(sub) {
+    const data = {
+        ...sub,
+        attribution: {
+            ...sub.attribution,
+            referrerSource: sub.attribution?.referrer_source || 'Unknown',
+            referrerMedium: sub.attribution?.referrer_medium || '-'
+        },
+        startDate: sub.start_date ? moment(sub.start_date).format('D MMM YYYY') : '-',
+        validUntil: validUntil(sub),
+        hasEnded: isCanceled(sub),
+        willEndSoon: isSetToCancel(sub),
+        cancellationReason: sub.cancellation_reason,
+        price: {
+            ...sub.price,
+            currencySymbol: getSymbol(sub.price.currency),
+            nonDecimalAmount: getNonDecimal(sub.price.amount)
+        },
+        isComplimentary: isComplimentary(sub),
+        compExpiry: compExpiry(sub),
+        trialUntil: trialUntil(sub)
+    };
+
+    data.priceLabel = priceLabel(data);
+    data.validityDetails = validityDetails(data, !!data.priceLabel);
+
+    return data;
+}
+
+export function validUntil(sub) {
+    // If a subscription has been canceled immediately, don't render the end of validity date
+    // Reason: we don't store the exact cancelation date in the subscription object
+    if (sub.status === 'canceled' && !sub.cancel_at_period_end) {
+        return '';
+    }
+
+    // Otherwise, show the current period end date
+    if (sub.current_period_end) {
+        return moment(sub.current_period_end).format('D MMM YYYY');
+    }
+
+    return '';
+}
+
+export function isActive(sub) {
+    return ['active', 'trialing', 'past_due', 'unpaid'].includes(sub.status);
+}
+
+export function isComplimentary(sub) {
+    return !sub.id;
+}
+
+export function isCanceled(sub) {
+    return sub.status === 'canceled';
+}
+
+export function isSetToCancel(sub) {
+    return sub.cancel_at_period_end && isActive(sub);
+}
+
+export function compExpiry(sub) {
+    if (!sub.id && sub.tier && sub.tier.expiry_at) {
+        return moment(sub.tier.expiry_at).utc().format('D MMM YYYY');
+    }
+
+    return undefined;
+}
+
+export function trialUntil(sub) {
+    const inTrialMode = sub.trial_end_at && moment(sub.trial_end_at).isAfter(new Date(), 'day');
+    if (inTrialMode) {
+        return moment(sub.trial_end_at).format('D MMM YYYY');
+    }
+
+    return undefined;
+}
+
+export function validityDetails(data, separatorNeeded = false) {
+    const separator = separatorNeeded ? ' – ' : '';
+    const space = data.validUntil ? ' ' : '';
+
+    if (data.isComplimentary) {
+        if (data.compExpiry) {
+            return `${separator}Expires ${data.compExpiry}`;
+        } else {
+            return '';
+        }
+    }
+
+    if (data.hasEnded) {
+        return `${separator}Ended${space}${data.validUntil}`;
+    }
+
+    if (data.willEndSoon) {
+        return `${separator}Has access until${space}${data.validUntil}`;
+    }
+
+    if (data.trialUntil) {
+        return `${separator}Ends ${data.trialUntil}`;
+    }
+
+    return `${separator}Renews${space}${data.validUntil}`;
+}
+
+export function priceLabel(data) {
+    if (data.trialUntil) {
+        return 'Free trial';
+    }
+
+    if (data.price.nickname && data.price.nickname.length > 0 && data.price.nickname !== 'Monthly' && data.price.nickname !== 'Yearly') {
+        return data.price.nickname;
+    }
+}
diff --git a/ghost/admin/app/validators/post.js b/ghost/admin/app/validators/post.js
index 73aa67505b9..24da7163498 100644
--- a/ghost/admin/app/validators/post.js
+++ b/ghost/admin/app/validators/post.js
@@ -62,8 +62,11 @@ export default BaseValidator.create({
 
     customExcerpt(model) {
         if (!validator.isLength(model.customExcerpt || '', 0, 300)) {
-            model.errors.add('customExcerpt', 'Excerpt cannot be longer than 300 characters.');
+            const errorMessage = 'Excerpt cannot be longer than 300 characters.';
+            model.errors.add('customExcerpt', errorMessage);
             this.invalidate();
+        } else {
+            model.errors.remove('customExcerpt');
         }
     },
 
@@ -183,19 +186,19 @@ 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);
 
             // draft/published must be in past
             if ((status === 'draft' || status === 'published') && publishedAtBlogTZ.isSameOrAfter(now)) {
-                model.errors.add('publishedAtBlogDate', 'Must be in the past');
+                model.errors.add('publishedAtBlogDate', 'Please choose a past date and time.');
                 this.invalidate();
 
             // scheduled must be in the future when first scheduling
             } else if ((model.changedAttributes().status || model.changedAttributes().publishedAtUTC) && status === 'scheduled' && !isInFuture) {
-                model.errors.add('publishedAtBlogDate', 'Must be in the future');
+                model.errors.add('publishedAtBlogDate', 'Please choose a future date and time.');
                 this.invalidate();
             }
         }
diff --git a/ghost/admin/config/environment.js b/ghost/admin/config/environment.js
index b27c65eab48..d77a92194fd 100644
--- a/ghost/admin/config/environment.js
+++ b/ghost/admin/config/environment.js
@@ -35,10 +35,6 @@ module.exports = function (environment) {
 
         'ember-simple-auth': { },
 
-        'ember-websockets': {
-            socketIO: true
-        },
-
         '@sentry/ember': {
             disablePerformance: true,
             sentry: {}
@@ -70,10 +66,17 @@ module.exports = function (environment) {
         ENV.APP.rootElement = '#ember-testing';
         ENV.APP.autoboot = false;
 
-        // Withuot manually setting this, pretender won't track requests
+        // Without manually setting this, pretender won't track requests
         ENV['ember-cli-mirage'] = {
             trackRequests: true
         };
+
+        // We copy the dynamically loaded editor file into the ghost assets
+        // directory in the dev/test env so that tests can load it. We need to
+        // set the config appropriately here so that the fetchKoenigLexical
+        // utility creates the right URL
+        ENV.editorFilename = 'koenig-lexical.umd.js';
+        ENV.editorHash = 'test';
     }
 
     return ENV;
diff --git a/ghost/admin/ember-cli-build.js b/ghost/admin/ember-cli-build.js
index dcbab764464..684a6af97a5 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'),
@@ -212,6 +214,14 @@ module.exports = function (defaults) {
                         fs: false
                     }
                 },
+                ...(isDevelopment && {
+                    cache: {
+                        type: 'filesystem',
+                        buildDependencies: {
+                            config: [__filename]
+                        }
+                    }
+                }),
                 plugins: [
                     new webpack.ProvidePlugin({
                         process: 'process/browser'
@@ -244,5 +254,11 @@ module.exports = function (defaults) {
         app.import('vendor/codemirror/lib/codemirror.js', {type: 'test'});
     }
 
+    if (app.env === 'development' || app.env === 'test') {
+        // pull dynamic imports into the assets folder so that they can be lazy-loaded in tests
+        // also done in development env so http://localhost:4200/tests works
+        app.import('node_modules/@tryghost/koenig-lexical/dist/koenig-lexical.umd.js', {outputFile: 'ghost/assets/koenig-lexical/koenig-lexical.umd.js'});
+    }
+
     return app.toTree();
 };
diff --git a/ghost/admin/lib/asset-delivery/index.js b/ghost/admin/lib/asset-delivery/index.js
index 09f34229253..d48581a34f8 100644
--- a/ghost/admin/lib/asset-delivery/index.js
+++ b/ghost/admin/lib/asset-delivery/index.js
@@ -4,8 +4,9 @@
 const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
+const camelCase = require('lodash/camelCase');
 
-const adminXSettingsPath = '../../apps/admin-x-settings/dist';
+const adminXApps = ['admin-x-demo', 'admin-x-settings', 'admin-x-activitypub'];
 
 function generateHash(filePath) {
     const fileContents = fs.readFileSync(filePath, 'utf8');
@@ -31,13 +32,17 @@ module.exports = {
             this.packageConfig['editorHash'] = process.env.EDITOR_URL ? 'development' : generateHash(koenigLexicalPath);
 
             // TODO: ideally take this from the package, but that's broken thanks to .cjs file ext
-            const defaultAdminXSettingFilename = 'admin-x-settings.js';
-            this.packageConfig['adminXSettingsFilename'] = defaultAdminXSettingFilename;
-            this.packageConfig['adminXSettingsHash'] = (this.env === 'production') ? generateHash(path.join(adminXSettingsPath, defaultAdminXSettingFilename)) : 'development';
+            for (const app of adminXApps) {
+                const defaultFilename = `${app}.js`;
+                const configName = camelCase(app);
+                this.packageConfig[`${configName}Filename`] = defaultFilename;
+                this.packageConfig[`${configName}Hash`] = (this.env === 'production') ? generateHash(path.join(`../../apps/${app}/dist`, defaultFilename)) : 'development';
+            }
 
             if (this.env === 'production') {
-                console.log('Admin-X Settings:', this.packageConfig['adminXSettingsFilename'], this.packageConfig['adminXSettingsHash']);
-                console.log('Koenig-Lexical:', this.packageConfig['editorFilename'], this.packageConfig['editorHash']);
+                for (const [key, value] of Object.entries(this.packageConfig)) {
+                    console.log(`Asset-Delivery: ${key} = ${value}`);
+                }
             }
 
             return this.packageConfig;
@@ -63,28 +68,40 @@ 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; }
 
             fs.copySync(`${results.directory}/assets/${relativePath}`, `${assetsOut}/assets/${relativePath}`, {overwrite: true, dereference: true});
         });
 
-        // copy the @tryghost/admin-x-settings assets
-        const assetsAdminXPath = `${assetsOut}/assets/admin-x-settings`;
-
-        if (fs.existsSync(adminXSettingsPath)) {
-            if (this.env === 'production') {
-                fs.copySync(adminXSettingsPath, assetsAdminXPath, {overwrite: true, dereference: true});
-            } else {
-                fs.ensureSymlinkSync(adminXSettingsPath, assetsAdminXPath);
+        // copy assets for each admin-x app
+        for (const app of adminXApps) {
+            const adminXPath = `../../apps/${app}/dist`;
+            const assetsAdminXPath = `${assetsOut}/assets/${app}`;
+            if (fs.existsSync(adminXPath)) {
+                if (this.env === 'production') {
+                    fs.copySync(adminXPath, assetsAdminXPath, {overwrite: true, dereference: true});
+                } else {
+                    fs.ensureSymlinkSync(adminXPath, assetsAdminXPath);
+                }
+            } else  {
+                console.log(`${app} folder not found`);
             }
-        } else  {
-            console.log('Admin-X-Settings folder not found');
         }
 
         // if we are passed a URL for Koenig-Lexical dev server, we don't need to copy the assets
diff --git a/ghost/admin/lib/ember-power-calendar-utils/package.json b/ghost/admin/lib/ember-power-calendar-utils/package.json
index 5034506a936..87dbbba7760 100644
--- a/ghost/admin/lib/ember-power-calendar-utils/package.json
+++ b/ghost/admin/lib/ember-power-calendar-utils/package.json
@@ -9,6 +9,6 @@
   ],
   "dependencies": {
     "ember-cli-babel": "8.2.0",
-    "moment-timezone": "0.5.23"
+    "moment-timezone": "0.5.45"
   }
 }
diff --git a/ghost/admin/mirage/config/members.js b/ghost/admin/mirage/config/members.js
index ba07a3a846e..dc062fbc2ae 100644
--- a/ghost/admin/mirage/config/members.js
+++ b/ghost/admin/mirage/config/members.js
@@ -1,4 +1,3 @@
-import faker from 'faker';
 import moment from 'moment-timezone';
 import nql from '@tryghost/nql';
 import {Response} from 'miragejs';
@@ -7,6 +6,7 @@ import {
     paginateModelCollection,
     withPermissionsCheck
 } from '../utils';
+import {faker} from '@faker-js/faker';
 import {underscore} from '@ember/string';
 
 const ALLOWED_ROLES = [
diff --git a/ghost/admin/mirage/config/pages.js b/ghost/admin/mirage/config/pages.js
index 87127d430de..6faeb2b44af 100644
--- a/ghost/admin/mirage/config/pages.js
+++ b/ghost/admin/mirage/config/pages.js
@@ -1,40 +1,8 @@
 import moment from 'moment-timezone';
 import {Response} from 'miragejs';
 import {dasherize} from '@ember/string';
-import {isArray} from '@ember/array';
+import {extractFilterParam, paginateModelCollection} from '../utils';
 import {isBlank, isEmpty} from '@ember/utils';
-import {paginateModelCollection} from '../utils';
-
-function normalizeBooleanParams(arr) {
-    if (!isArray(arr)) {
-        return arr;
-    }
-
-    return arr.map((i) => {
-        if (i === 'true') {
-            return true;
-        } else if (i === 'false') {
-            return false;
-        } else {
-            return i;
-        }
-    });
-}
-
-// TODO: use GQL to parse filter string?
-function extractFilterParam(param, filter) {
-    let filterRegex = new RegExp(`${param}:(.*?)(?:\\+|$)`);
-    let match;
-
-    let [, result] = filter.match(filterRegex) || [];
-    if (result && result.startsWith('[')) {
-        match = result.replace(/^\[|\]$/g, '').split(',');
-    } else if (result) {
-        match = [result];
-    }
-
-    return normalizeBooleanParams(match);
-}
 
 // NOTE: mirage requires Model objects when saving relationships, however the
 // `attrs` on POST/PUT requests will contain POJOs for authors and tags so we
@@ -69,7 +37,6 @@ export default function mockPages(server) {
         return pages.create(attrs);
     });
 
-    // TODO: handle authors filter
     server.get('/pages/', function ({pages}, {queryParams}) {
         let {filter, page, limit} = queryParams;
 
diff --git a/ghost/admin/mirage/config/posts.js b/ghost/admin/mirage/config/posts.js
index 4d4643a12d5..916869416b7 100644
--- a/ghost/admin/mirage/config/posts.js
+++ b/ghost/admin/mirage/config/posts.js
@@ -23,6 +23,39 @@ function extractTags(postAttrs, tags) {
     });
 }
 
+export function getPosts({posts}, {queryParams}) {
+    let {filter, page, limit} = queryParams;
+
+    page = +page || 1;
+    limit = +limit || 15;
+
+    let statusFilter = extractFilterParam('status', filter);
+    let authorsFilter = extractFilterParam('authors', filter);
+    let visibilityFilter = extractFilterParam('visibility', filter);
+
+    let collection = posts.all().filter((post) => {
+        let matchesStatus = true;
+        let matchesAuthors = true;
+        let matchesVisibility = true;
+
+        if (!isEmpty(statusFilter)) {
+            matchesStatus = statusFilter.includes(post.status);
+        }
+
+        if (!isEmpty(authorsFilter)) {
+            matchesAuthors = authorsFilter.includes(post.authors.models[0].slug);
+        }
+
+        if (!isEmpty(visibilityFilter)) {
+            matchesVisibility = visibilityFilter.includes(post.visibility);
+        }
+
+        return matchesStatus && matchesAuthors && matchesVisibility;
+    });
+
+    return paginateModelCollection('posts', collection, page, limit);
+}
+
 export default function mockPosts(server) {
     server.post('/posts', function ({posts, users, tags}) {
         let attrs = this.normalizedRequestAttrs();
@@ -34,30 +67,14 @@ export default function mockPosts(server) {
             attrs.slug = dasherize(attrs.title);
         }
 
+        if (attrs.title) {
+            attrs.title = attrs.title.trim();
+        }
+
         return posts.create(attrs);
     });
 
-    // TODO: handle authors filter
-    server.get('/posts/', function ({posts}, {queryParams}) {
-        let {filter, page, limit} = queryParams;
-
-        page = +page || 1;
-        limit = +limit || 15;
-
-        let statusFilter = extractFilterParam('status', filter);
-
-        let collection = posts.all().filter((post) => {
-            let matchesStatus = true;
-
-            if (!isEmpty(statusFilter)) {
-                matchesStatus = statusFilter.includes(post.status);
-            }
-
-            return matchesStatus;
-        });
-
-        return paginateModelCollection('posts', collection, page, limit);
-    });
+    server.get('/posts/', getPosts);
 
     server.get('/posts/:id/', function ({posts}, {params}) {
         let {id} = params;
@@ -78,6 +95,10 @@ export default function mockPosts(server) {
         attrs.authors = extractAuthors(attrs, users);
         attrs.tags = extractTags(attrs, tags);
 
+        if (attrs.title) {
+            attrs.title = attrs.title.trim();
+        }
+
         attrs.updatedAt = moment.utc().toDate();
 
         if (queryParams.newsletter) {
@@ -90,4 +111,38 @@ export default function mockPosts(server) {
     });
 
     server.del('/posts/:id/');
+
+    server.del('/posts/', function ({posts}, {queryParams}) {
+        let ids = extractFilterParam('id', queryParams.filter);
+
+        posts.find(ids).destroy();
+    });
+
+    server.post('/posts/:id/copy/', function ({posts}, {params}) {
+        let post = posts.find(params.id);
+        let attrs = post.attrs;
+
+        return posts.create(attrs);
+    });
+
+    server.put('/posts/bulk/', function ({tags}, {requestBody}) {
+        const bulk = JSON.parse(requestBody).bulk;
+        const action = bulk.action;
+        // const ids = extractFilterParam('id', queryParams.filter);
+
+        if (action === 'addTag') {
+            // create tag so we have an id from the server
+            const newTags = bulk.meta.tags;
+
+            // check applied tags to see if any new ones should be created
+            newTags.forEach((tag) => {
+                if (!tag.id) {
+                    tags.create(tag);
+                }
+            });
+            // TODO: update the actual posts in the mock db if wanting to write tests where we navigate around (refresh model)
+            // const postsToUpdate = posts.find(ids);
+            // getting the posts is fine, but within this we CANNOT manipulate them (???) not even iterate with .forEach
+        }
+    });
 }
diff --git a/ghost/admin/mirage/config/stats.js b/ghost/admin/mirage/config/stats.js
index 8105665a722..f6ed5c2bf7a 100644
--- a/ghost/admin/mirage/config/stats.js
+++ b/ghost/admin/mirage/config/stats.js
@@ -63,4 +63,11 @@ export default function mockStats(server) {
             }
         };
     });
+
+    server.get('/stats/referrers/', function () {
+        return {
+            stats: [],
+            meta: {}
+        };
+    });
 }
diff --git a/ghost/admin/mirage/config/tags.js b/ghost/admin/mirage/config/tags.js
index 255c4a45f4b..c4702783f7a 100644
--- a/ghost/admin/mirage/config/tags.js
+++ b/ghost/admin/mirage/config/tags.js
@@ -14,14 +14,13 @@ export default function mockTags(server) {
         return tags.create(attrs);
     });
 
-    server.get('/tags/', paginatedResponse('tags'));
-
     server.get('/tags/slug/:slug/', function ({tags}, {params: {slug}}) {
         // TODO: remove post_count unless requested?
         return tags.findBy({slug});
     });
 
+    server.get('/tags/', paginatedResponse('tags'));
+    server.get('/tags/:id/');
     server.put('/tags/:id/');
-
     server.del('/tags/:id/');
 }
diff --git a/ghost/admin/mirage/config/themes.js b/ghost/admin/mirage/config/themes.js
index 0a2df043e59..7e44178bf00 100644
--- a/ghost/admin/mirage/config/themes.js
+++ b/ghost/admin/mirage/config/themes.js
@@ -5,6 +5,12 @@ let themeCount = 1;
 export default function mockThemes(server) {
     server.get('/themes');
 
+    server.get('/themes/active/', function ({themes}) {
+        const theme = themes.findBy({active: true});
+
+        return {themes: [theme]};
+    });
+
     server.post('/themes/upload/', function ({themes}) {
         // pretender/mirage doesn't currently process FormData so we can't use
         // any info passed in through the request
diff --git a/ghost/admin/mirage/factories/member-activity-event.js b/ghost/admin/mirage/factories/member-activity-event.js
index 23df12d38ef..2f292128388 100644
--- a/ghost/admin/mirage/factories/member-activity-event.js
+++ b/ghost/admin/mirage/factories/member-activity-event.js
@@ -1,12 +1,13 @@
-import faker from 'faker';
 import moment from 'moment-timezone';
 import {Factory} from 'miragejs';
+import {faker} from '@faker-js/faker';
 
 const EVENT_TYPES = [
     'newsletter_event',
     'login_event',
     'subscription_event',
     'payment_event',
+    'donation_event',
     'login_event',
     'signup_event',
     'email_delivered_event',
@@ -16,7 +17,7 @@ const EVENT_TYPES = [
 
 /* eslint-disable camelcase */
 export default Factory.extend({
-    type() { return faker.random.arrayElement([EVENT_TYPES]); },
+    type() { return faker.helpers.arrayElement([EVENT_TYPES]); },
     createdAt() { return moment.utc().format(); },
 
     afterCreate(event, server) {
diff --git a/ghost/admin/mirage/factories/member.js b/ghost/admin/mirage/factories/member.js
index 2e8a5a6caed..b3828eff3b2 100644
--- a/ghost/admin/mirage/factories/member.js
+++ b/ghost/admin/mirage/factories/member.js
@@ -1,6 +1,6 @@
-import faker from 'faker';
 import moment from 'moment-timezone';
 import {Factory, trait} from 'miragejs';
+import {faker} from '@faker-js/faker';
 
 let randomDate = function randomDate(start = moment().subtract(30, 'days').toDate(), end = new Date()) {
     return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
diff --git a/ghost/admin/mirage/factories/newsletter.js b/ghost/admin/mirage/factories/newsletter.js
new file mode 100644
index 00000000000..b6b0ac2ad40
--- /dev/null
+++ b/ghost/admin/mirage/factories/newsletter.js
@@ -0,0 +1,10 @@
+import moment from 'moment-timezone';
+import {Factory} from 'miragejs';
+
+export default Factory.extend({
+    name(i) { return `Newsletter ${i}`; },
+    slug(i) { return `newsletter-${i}`; },
+    status() { return 'active'; },
+    createdAt() { return moment.utc().toISOString(); },
+    updatedAt() { return moment.utc().toISOString(); }
+});
diff --git a/ghost/admin/mirage/factories/offer.js b/ghost/admin/mirage/factories/offer.js
index 0da2539c2b6..fd4f51a3b1d 100644
--- a/ghost/admin/mirage/factories/offer.js
+++ b/ghost/admin/mirage/factories/offer.js
@@ -1,6 +1,6 @@
-import faker from 'faker';
 import moment from 'moment-timezone';
 import {Factory} from 'miragejs';
+import {faker} from '@faker-js/faker';
 
 let randomDate = function randomDate(start = moment().subtract(30, 'days').toDate(), end = new Date()) {
     return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
diff --git a/ghost/admin/mirage/factories/page.js b/ghost/admin/mirage/factories/page.js
new file mode 100644
index 00000000000..6f00f427e90
--- /dev/null
+++ b/ghost/admin/mirage/factories/page.js
@@ -0,0 +1,54 @@
+import {Factory} from 'miragejs';
+import {isEmpty} from '@ember/utils';
+
+export default Factory.extend({
+    codeinjectionFoot: null,
+    codeinjectionHead: null,
+    createdAt: '2015-09-11T09:44:29.871Z',
+    createdBy: 1,
+    customExcerpt: null,
+    customTemplate: null,
+    description(i) { return `Title for page ${i}.`; },
+    featured: false,
+    featureImage(i) { return `/content/images/2015/10/page-${i}.jpg`; },
+    html(i) { return `<p>HTML for page ${i}.</p>`; },
+    visibility: 'public',
+    metaDescription(i) { return `Meta description for page ${i}.`; },
+    metaTitle(i) { return `Meta Title for page ${i}`; },
+    ogDescription: null,
+    ogImage: null,
+    ogTitle: null,
+    excerpt(i) { return `Excerpt for page ${i}.`; },
+    plaintext(i) { return `Plaintext for page ${i}.`; },
+    publishedAt: '2015-12-19T16:25:07.000Z',
+    publishedBy: 1,
+    status(i) {
+        let statuses = ['draft', 'published', 'scheduled'];
+        return statuses[i % statuses.length];
+    },
+    title(i) { return `Page ${i}`; },
+    twitterDescription: null,
+    twitterImage: null,
+    twitterTitle: null,
+    emailSubject: null,
+    updatedAt: '2015-10-19T16:25:07.756Z',
+    updatedBy: 1,
+    uuid(i) { return `page-${i}`; },
+
+    authors() { return []; },
+    tags() { return []; },
+
+    afterCreate(page, server) {
+        if (isEmpty(page.authors)) {
+            let user = server.schema.users.find(1);
+
+            if (!user) {
+                let role = server.schema.roles.find({name: 'Administrator'}) || server.create('role', {name: 'Administrator'});
+                user = server.create('user', {roles: [role]});
+            }
+
+            page.authors = [user];
+            page.save();
+        }
+    }
+});
diff --git a/ghost/admin/mirage/factories/post-revision.js b/ghost/admin/mirage/factories/post-revision.js
new file mode 100644
index 00000000000..b7b90f47cd6
--- /dev/null
+++ b/ghost/admin/mirage/factories/post-revision.js
@@ -0,0 +1,5 @@
+import {Factory} from 'miragejs';
+
+export default Factory.extend({
+
+});
diff --git a/ghost/admin/mirage/factories/post.js b/ghost/admin/mirage/factories/post.js
index d6286037fbe..41444883220 100644
--- a/ghost/admin/mirage/factories/post.js
+++ b/ghost/admin/mirage/factories/post.js
@@ -1,4 +1,5 @@
 import {Factory} from 'miragejs';
+import {dasherize} from '@ember/string';
 import {isEmpty} from '@ember/utils';
 
 export default Factory.extend({
@@ -27,6 +28,7 @@ export default Factory.extend({
         return statuses[i % statuses.length];
     },
     title(i) { return `Post ${i}`; },
+    slug: null,
     twitterDescription: null,
     twitterImage: null,
     twitterTitle: null,
@@ -50,5 +52,10 @@ export default Factory.extend({
             post.authors = [user];
             post.save();
         }
+
+        if (isEmpty(post.slug)) {
+            post.slug = dasherize(post.title);
+            post.save();
+        }
     }
 });
diff --git a/ghost/admin/mirage/fixtures/settings.js b/ghost/admin/mirage/fixtures/settings.js
index bfd841dd0a1..30d2c311ee2 100644
--- a/ghost/admin/mirage/fixtures/settings.js
+++ b/ghost/admin/mirage/fixtures/settings.js
@@ -49,7 +49,7 @@ export default [
     setting('site', 'twitter_description', null),
 
     // THEME
-    setting('theme', 'active_theme', 'Source'),
+    setting('theme', 'active_theme', 'source'),
 
     // PRIVATE
     setting('private', 'is_private', false),
@@ -77,6 +77,7 @@ export default [
     setting('portal', 'portal_name', true),
     setting('portal', 'portal_button', true),
     setting('portal', 'portal_plans', JSON.stringify(['free'])),
+    setting('portal', 'portal_default_plan', 'yearly'),
     setting('portal', 'portal_products', JSON.stringify([])),
     setting('portal', 'portal_button_style', 'icon-and-text'),
     setting('portal', 'portal_button_icon', null),
@@ -128,6 +129,6 @@ export default [
     setting('editor', 'editor_default_email_recipients_filter', 'all'),
 
     // DONATIONS
-    setting('donations_suggested_amount', 'donations', 0),
+    setting('donations_suggested_amount', 'donations', 500),
     setting('donations_currency', 'donations', 'USD')
 ];
diff --git a/ghost/admin/mirage/models/page.js b/ghost/admin/mirage/models/page.js
index d597bc4ca47..6956b658b16 100644
--- a/ghost/admin/mirage/models/page.js
+++ b/ghost/admin/mirage/models/page.js
@@ -1,5 +1,5 @@
 import PostModel from './post';
 
 export default PostModel.extend({
-
+    postRevisions: null
 });
diff --git a/ghost/admin/mirage/models/post-revision.js b/ghost/admin/mirage/models/post-revision.js
new file mode 100644
index 00000000000..22973739d2d
--- /dev/null
+++ b/ghost/admin/mirage/models/post-revision.js
@@ -0,0 +1,6 @@
+import {Model, belongsTo} from 'miragejs';
+
+export default Model.extend({
+    post: belongsTo(),
+    author: belongsTo('user')
+});
diff --git a/ghost/admin/mirage/models/post.js b/ghost/admin/mirage/models/post.js
index cc8b5150e46..46ea92d1faa 100644
--- a/ghost/admin/mirage/models/post.js
+++ b/ghost/admin/mirage/models/post.js
@@ -4,5 +4,6 @@ export default Model.extend({
     tags: hasMany(),
     authors: hasMany('user'),
     email: belongsTo(),
-    newsletter: belongsTo()
+    newsletter: belongsTo(),
+    postRevisions: hasMany()
 });
diff --git a/ghost/admin/mirage/models/user.js b/ghost/admin/mirage/models/user.js
index 2eec70daf64..0caf3fa2512 100644
--- a/ghost/admin/mirage/models/user.js
+++ b/ghost/admin/mirage/models/user.js
@@ -6,5 +6,6 @@ export default Model.extend({
     postCount: false,
 
     roles: hasMany(),
-    posts: hasMany()
+    posts: hasMany(),
+    postRevision: hasMany()
 });
diff --git a/ghost/admin/mirage/serializers/post-revision.js b/ghost/admin/mirage/serializers/post-revision.js
new file mode 100644
index 00000000000..a71ed69b114
--- /dev/null
+++ b/ghost/admin/mirage/serializers/post-revision.js
@@ -0,0 +1,9 @@
+import BaseSerializer from './application';
+
+export default BaseSerializer.extend({
+    embed: true,
+
+    include() {
+        return ['author'];
+    }
+});
diff --git a/ghost/admin/mirage/serializers/post.js b/ghost/admin/mirage/serializers/post.js
index 1c9d7f5a138..2985c0073f2 100644
--- a/ghost/admin/mirage/serializers/post.js
+++ b/ghost/admin/mirage/serializers/post.js
@@ -1,14 +1,42 @@
 import BaseSerializer from './application';
+import {camelize} from '@ember/string';
 
 export default BaseSerializer.extend({
     embed: true,
 
-    include(/*request*/) {
-        let includes = [];
+    include(request) {
+        const queryIncludes = (request.queryParams.include || '').split(',').compact().map(camelize);
+        const includes = new Set(queryIncludes);
 
-        includes.push('tags');
-        includes.push('authors');
+        // embedded records that are included by default in the API
+        includes.add('tags');
+        includes.add('authors');
 
-        return includes;
+        // clean up some things that mirage doesn't understand
+        includes.delete('authorsRoles');
+        includes.delete('countClicks');
+        includes.delete('postRevisionsAuthor');
+        includes.delete('tiers');
+
+        const result = Array.from(includes);
+        return result;
+    },
+
+    serialize(postModelOrCollection, request) {
+        const updatePost = (post) => {
+            if (post.status === 'published') {
+                post.update('url', `http://localhost:4200/${post.slug}/`);
+            } else {
+                post.update('url', `http://localhost:4200/p/${post.uuid}/`);
+            }
+        };
+
+        if (this.isModel(postModelOrCollection)) {
+            updatePost(postModelOrCollection);
+        } else {
+            postModelOrCollection.models.forEach(updatePost);
+        }
+
+        return BaseSerializer.prototype.serialize.call(this, postModelOrCollection, request);
     }
 });
diff --git a/ghost/admin/mirage/serializers/tag.js b/ghost/admin/mirage/serializers/tag.js
index 6906521de0b..76f90f85edc 100644
--- a/ghost/admin/mirage/serializers/tag.js
+++ b/ghost/admin/mirage/serializers/tag.js
@@ -1,16 +1,17 @@
 import BaseSerializer from './application';
 
 export default BaseSerializer.extend({
-    // make the tag.count.posts value dynamic
+    // make the tag.count.posts and url values dynamic
     serialize(tagModelOrCollection, request) {
-        let updatePostCount = (tag) => {
+        let updatePost = (tag) => {
             tag.update('count', {posts: tag.postIds.length});
+            tag.update('url', `http://localhost:4200/tag/${tag.slug}/`);
         };
 
         if (this.isModel(tagModelOrCollection)) {
-            updatePostCount(tagModelOrCollection);
+            updatePost(tagModelOrCollection);
         } else {
-            tagModelOrCollection.models.forEach(updatePostCount);
+            tagModelOrCollection.models.forEach(updatePost);
         }
 
         return BaseSerializer.prototype.serialize.call(this, tagModelOrCollection, request);
diff --git a/ghost/admin/mirage/serializers/user.js b/ghost/admin/mirage/serializers/user.js
index a9e929d935f..1627c2660af 100644
--- a/ghost/admin/mirage/serializers/user.js
+++ b/ghost/admin/mirage/serializers/user.js
@@ -1,5 +1,4 @@
 import BaseSerializer from './application';
-import {RestSerializer} from 'miragejs';
 
 export default BaseSerializer.extend({
     embed: true,
@@ -12,19 +11,21 @@ export default BaseSerializer.extend({
         return [];
     },
 
-    serialize(object, request) {
-        if (this.isCollection(object)) {
-            return BaseSerializer.prototype.serialize.call(this, object, request);
-        }
-
-        let {user} = RestSerializer.prototype.serialize.call(this, object, request);
+    serialize(userModelOrCollection, request) {
+        const updateUser = (user) => {
+            user.update('url', `http://localhost:4200/author/${user.slug}/`);
 
-        if (object.postCount) {
-            let posts = object.posts.models.length;
+            if (user.postCount) {
+                user.update('count', {posts: user.posts.models.length});
+            }
+        };
 
-            user.count = {posts};
+        if (this.isModel(userModelOrCollection)) {
+            updateUser(userModelOrCollection);
+        } else {
+            userModelOrCollection.models.forEach(updateUser);
         }
 
-        return {users: [user]};
+        return BaseSerializer.prototype.serialize.call(this, userModelOrCollection, request);
     }
 });
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 5ad9aeb2154..ca51b1a8e1d 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost-admin",
-  "version": "5.70.2",
+  "version": "5.93.0",
   "description": "Ember.js admin client for Ghost",
   "author": "Ghost Foundation",
   "homepage": "http://ghost.org",
@@ -26,32 +26,38 @@
     "lint": "yarn lint:js && yarn lint:hbs"
   },
   "engines": {
-    "node": "^18.12.1"
+    "node": "^18.12.1 || ^20.11.1"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.22.15",
+    "@babel/eslint-parser": "7.23.3",
     "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-decorators": "7.23.2",
+    "@babel/plugin-proposal-decorators": "7.23.7",
     "@ember/jquery": "2.0.0",
-    "@ember/optional-features": "2.0.0",
+    "@ember/optional-features": "2.1.0",
     "@ember/render-modifiers": "2.1.0",
     "@ember/test-helpers": "2.9.4",
-    "@embroider/macros": "1.13.2",
+    "@ember/test-waiters": "3.1.0",
+    "@embroider/macros": "1.13.4",
+    "@faker-js/faker": "7.6.0",
     "@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.119.0",
+    "@sentry/integrations": "7.114.0",
+    "@sentry/replay": "7.116.0",
+    "@tinybirdco/charts": "0.1.8",
+    "@tryghost/color-utils": "0.2.2",
     "@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.90",
+    "@tryghost/kg-clean-basic-html": "4.1.4",
+    "@tryghost/kg-converters": "1.0.7",
+    "@tryghost/koenig-lexical": "1.3.23",
+    "@tryghost/limit-service": "1.2.14",
     "@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/nql": "0.12.4",
+    "@tryghost/nql-lang": "0.6.1",
+    "@tryghost/string": "0.2.12",
+    "@tryghost/timezone-data": "0.4.3",
+    "animejs": "3.2.2",
     "autoprefixer": "9.8.6",
     "babel-eslint": "10.1.0",
     "babel-plugin-transform-class-properties": "6.24.1",
@@ -60,7 +66,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",
@@ -68,7 +74,7 @@
     "element-resize-detector": "1.2.4",
     "ember-ajax": "5.1.2",
     "ember-assign-helper": "0.4.0",
-    "ember-auto-import": "2.6.3",
+    "ember-auto-import": "2.7.4",
     "ember-classic-decorator": "3.0.1",
     "ember-cli": "3.24.0",
     "ember-cli-app-version": "5.0.0",
@@ -76,7 +82,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 +90,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",
@@ -112,23 +118,22 @@
     "ember-simple-auth": "5.0.0",
     "ember-sinon": "5.0.0",
     "ember-source": "3.24.0",
-    "ember-svg-jar": "2.4.7",
+    "ember-svg-jar": "2.4.9",
     "ember-template-lint": "5.11.0",
     "ember-test-selectors": "6.0.0",
     "ember-tooltips": "3.6.0",
     "ember-truth-helpers": "3.1.1",
-    "ember-websockets": "10.2.1",
     "eslint-plugin-babel": "5.3.1",
-    "faker": "5.5.3",
-    "fs-extra": "11.1.1",
+    "flexsearch": "0.7.43",
+    "fs-extra": "11.2.0",
     "glob": "8.1.0",
     "google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost",
     "keymaster": "https://github.com/madrobby/keymaster.git",
     "liquid-fire": "0.34.0",
     "liquid-wormhole": "3.0.1",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.47",
-    "moment-timezone": "0.5.23",
+    "miragejs": "0.1.48",
+    "moment-timezone": "0.5.45",
     "normalize.css": "3.0.3",
     "papaparse": "5.3.2",
     "postcss-color-mod-function": "3.0.3",
@@ -137,11 +142,11 @@
     "postcss-import": "12.0.1",
     "pretender": "3.4.7",
     "process": "0.11.10",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "reframe.js": "4.0.2",
-    "semver": "7.5.4",
-    "testem": "3.10.1",
+    "semver": "7.6.3",
+    "testem": "3.15.1",
     "tracked-built-ins": "3.3.0",
     "util": "0.12.5",
     "validator": "7.2.0",
@@ -150,15 +155,15 @@
   "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": {
     "ember-basic-dropdown": "6.0.2",
     "ember-in-viewport": "4.1.0",
     "moment": "2.24.0",
-    "moment-timezone": "0.5.23"
+    "moment-timezone": "0.5.45"
   },
   "ember": {
     "edition": "octane"
@@ -168,9 +173,9 @@
     "*.js": "eslint"
   },
   "dependencies": {
-    "jose": "4.15.4",
+    "jose": "4.15.9",
     "path-browserify": "1.0.1",
-    "webpack": "5.89.0"
+    "webpack": "5.93.0"
   },
   "nx": {
     "targets": {
@@ -179,7 +184,9 @@
           "build:dev",
           {
             "projects": [
-              "@tryghost/admin-x-settings"
+              "@tryghost/admin-x-demo",
+              "@tryghost/admin-x-settings",
+              "@tryghost/admin-x-activitypub"
             ],
             "target": "build"
           }
@@ -190,7 +197,9 @@
           "build",
           {
             "projects": [
-              "@tryghost/admin-x-settings"
+              "@tryghost/admin-x-demo",
+              "@tryghost/admin-x-settings",
+              "@tryghost/admin-x-activitypub"
             ],
             "target": "build"
           }
@@ -198,4 +207,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/public/assets/icons/brush.svg b/ghost/admin/public/assets/icons/brush.svg
new file mode 100644
index 00000000000..76ca2281820
--- /dev/null
+++ b/ghost/admin/public/assets/icons/brush.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" height="24" width="24" id="Color-Brush-3--Streamline-Ultimate.svg"><desc>Color Brush 3 Streamline Icon: https://streamlinehq.com</desc><path d="M1.382 22.522a0.552 0.552 0 0 1 0.03 -1.01c2.629 -1.065 1.781 -4.062 2.563 -5.664a3.931 3.931 0 0 1 5.22 -1.8c5.869 2.867 -1.117 11.661 -7.813 8.474Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m13.889 14.1 8.778 -11.116a1.353 1.353 0 0 0 -2.018 -1.8l-9.892 9.866" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/check-circle-filled.svg b/ghost/admin/public/assets/icons/check-circle-filled.svg
new file mode 100644
index 00000000000..353fcc7533a
--- /dev/null
+++ b/ghost/admin/public/assets/icons/check-circle-filled.svg
@@ -0,0 +1,10 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3_6)">
+<path d="M7 0.5C5.61553 0.5 4.26216 0.910543 3.11101 1.67971C1.95987 2.44888 1.06266 3.54213 0.532846 4.82122C0.00303299 6.1003 -0.13559 7.50776 0.134506 8.86563C0.404603 10.2235 1.07129 11.4708 2.05026 12.4497C3.02922 13.4287 4.2765 14.0954 5.63437 14.3655C6.99224 14.6356 8.39971 14.497 9.67879 13.9672C10.9579 13.4373 12.0511 12.5401 12.8203 11.389C13.5895 10.2378 14 8.88447 14 7.5C14 5.64348 13.2625 3.86301 11.9498 2.55025C10.637 1.2375 8.85652 0.5 7 0.5ZM11.0425 5.28333L7.04667 10.7025C7.00017 10.7659 6.94135 10.8192 6.87374 10.8592C6.80612 10.8993 6.73111 10.9253 6.6532 10.9356C6.57529 10.946 6.4961 10.9405 6.42037 10.9195C6.34464 10.8985 6.27393 10.8624 6.2125 10.8133L3.36 8.5325C3.30008 8.48436 3.25026 8.42486 3.21341 8.3574C3.17656 8.28995 3.1534 8.21587 3.14527 8.13944C3.13714 8.06301 3.14419 7.98572 3.16603 7.91202C3.18786 7.83832 3.22405 7.76967 3.2725 7.71C3.36943 7.59238 3.50855 7.51736 3.66009 7.50101C3.81163 7.48466 3.96354 7.52826 4.08334 7.6225L6.46334 9.52417L10.1033 4.58333C10.1952 4.46033 10.3318 4.3785 10.4836 4.35557C10.6354 4.33263 10.7901 4.37046 10.9142 4.46083C10.9772 4.50596 11.0306 4.56319 11.0712 4.62917C11.1119 4.69516 11.1389 4.76859 11.1509 4.84516C11.1628 4.92173 11.1594 4.99992 11.1408 5.07515C11.1222 5.15039 11.0888 5.22116 11.0425 5.28333Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_3_6">
+<rect width="14" height="14" fill="white" transform="translate(0 0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ghost/admin/public/assets/icons/check-circle-simple.svg b/ghost/admin/public/assets/icons/check-circle-simple.svg
new file mode 100644
index 00000000000..dc52a43f02a
--- /dev/null
+++ b/ghost/admin/public/assets/icons/check-circle-simple.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <defs>
+        <style>.a{fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px!important;}
+        </style>
+    </defs>
+    <title>check-circle-1</title>
+    <path class="a" d="M6,13.223,8.45,16.7a1.049,1.049,0,0,0,1.707.051L18,6.828"/>
+    <circle class="a" cx="12" cy="11.999" r="11.25"/>
+</svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/copy.svg b/ghost/admin/public/assets/icons/copy.svg
index b41c5dce385..b16a46d6a31 100644
--- a/ghost/admin/public/assets/icons/copy.svg
+++ b/ghost/admin/public/assets/icons/copy.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
   <title>copy</title>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.333 1.75A1.586 1.586 0 0 0 1.75 3.334v5.833a1.586 1.586 0 0 0 1.584 1.583h3.5a.75.75 0 0 1 0 1.5h-3.5A3.081 3.081 0 0 1 .25 9.167V3.333A3.085 3.085 0 0 1 3.333.25h3.5a3.083 3.083 0 0 1 3.084 3.083V4.5a.75.75 0 0 1-1.5 0V3.333A1.586 1.586 0 0 0 6.833 1.75h-3.5z" fill="#000"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M8.389 5.25a.806.806 0 0 0-.806.806v7.388c0 .445.361.806.806.806h5.055c.445 0 .806-.36.806-.806V6.056a.806.806 0 0 0-.806-.806H8.39zm-2.306.806A2.306 2.306 0 0 1 8.389 3.75h5.055a2.305 2.305 0 0 1 2.306 2.306v7.388a2.305 2.305 0 0 1-2.306 2.306H8.39a2.306 2.306 0 0 1-2.306-2.306V6.056z" fill="#000"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M3.333 1.75A1.586 1.586 0 0 0 1.75 3.334v5.833a1.586 1.586 0 0 0 1.584 1.583h3.5a.75.75 0 0 1 0 1.5h-3.5A3.081 3.081 0 0 1 .25 9.167V3.333A3.085 3.085 0 0 1 3.333.25h3.5a3.083 3.083 0 0 1 3.084 3.083V4.5a.75.75 0 0 1-1.5 0V3.333A1.586 1.586 0 0 0 6.833 1.75h-3.5z" fill="none"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M8.389 5.25a.806.806 0 0 0-.806.806v7.388c0 .445.361.806.806.806h5.055c.445 0 .806-.36.806-.806V6.056a.806.806 0 0 0-.806-.806H8.39zm-2.306.806A2.306 2.306 0 0 1 8.389 3.75h5.055a2.305 2.305 0 0 1 2.306 2.306v7.388a2.305 2.305 0 0 1-2.306 2.306H8.39a2.306 2.306 0 0 1-2.306-2.306V6.056z" fill="none"/>
 </svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/event-email-changed.svg b/ghost/admin/public/assets/icons/event-email-changed.svg
new file mode 100644
index 00000000000..2ed1e12e8f5
--- /dev/null
+++ b/ghost/admin/public/assets/icons/event-email-changed.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+  <path stroke="#6C747D" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M14.6 8.364v5.818c0 1.715 2.703 1.962 4.067-.356 1.157-1.963.873-4.955-.571-6.923-2.125-2.9-7.039-3.984-10.608-1.588-3.28 2.202-4.448 6.658-2.635 10.258 1.793 3.564 6.003 5.29 9.813 4.002"/>
+  <path stroke="#6C747D" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M11.52 15.23c1.701 0 3.08-1.495 3.08-3.34 0-1.846-1.379-3.341-3.08-3.341-1.702 0-3.081 1.495-3.081 3.34 0 1.846 1.38 3.342 3.08 3.342Z"/>
+</svg>
diff --git a/ghost/admin/public/assets/icons/filter-dropdown-email-address-changed.svg b/ghost/admin/public/assets/icons/filter-dropdown-email-address-changed.svg
new file mode 100644
index 00000000000..8b2fd02f2e8
--- /dev/null
+++ b/ghost/admin/public/assets/icons/filter-dropdown-email-address-changed.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16">
+    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M10.736 4.806v5.058c0 1.56 2.371 1.907 3.613-.203 1.052-1.785.794-4.509-.52-6.302C11.894.722 7.422-.265 4.173 1.916 1.19 3.92.127 7.975 1.776 11.252c1.632 3.243 5.463 4.814 8.931 3.641"/>
+    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M7.882 10.94c1.57 0 2.843-1.362 2.843-3.041 0-1.68-1.273-3.04-2.843-3.04S5.04 6.218 5.04 7.898c0 1.679 1.272 3.04 2.842 3.04Z"/>
+</svg>
diff --git a/ghost/admin/public/assets/icons/info-circle-filled.svg b/ghost/admin/public/assets/icons/info-circle-filled.svg
new file mode 100644
index 00000000000..f9d2d0c2106
--- /dev/null
+++ b/ghost/admin/public/assets/icons/info-circle-filled.svg
@@ -0,0 +1,10 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_12_50)">
+<path d="M7 0.5C5.61553 0.5 4.26216 0.910543 3.11101 1.67971C1.95987 2.44888 1.06266 3.54213 0.532846 4.82122C0.00303299 6.1003 -0.13559 7.50776 0.134506 8.86563C0.404603 10.2235 1.07129 11.4708 2.05026 12.4497C3.02922 13.4287 4.2765 14.0954 5.63437 14.3655C6.99224 14.6356 8.39971 14.497 9.67879 13.9672C10.9579 13.4373 12.0511 12.5401 12.8203 11.389C13.5895 10.2378 14 8.88447 14 7.5C14 5.64348 13.2625 3.86301 11.9498 2.55025C10.637 1.2375 8.85652 0.5 7 0.5ZM7.14584 3.41667C7.3189 3.41667 7.48807 3.46798 7.63196 3.56413C7.77585 3.66028 7.88801 3.79693 7.95423 3.95682C8.02046 4.1167 8.03779 4.29264 8.00402 4.46237C7.97026 4.6321 7.88693 4.78801 7.76456 4.91039C7.64218 5.03276 7.48627 5.11609 7.31654 5.14985C7.14681 5.18362 6.97087 5.16629 6.81099 5.10006C6.6511 5.03383 6.51445 4.92168 6.4183 4.77779C6.32215 4.6339 6.27084 4.46473 6.27084 4.29167C6.27084 4.0596 6.36302 3.83704 6.52712 3.67295C6.69121 3.50885 6.91377 3.41667 7.14584 3.41667ZM8.45834 11.2917H6.125C5.97029 11.2917 5.82192 11.2302 5.71252 11.1208C5.60313 11.0114 5.54167 10.863 5.54167 10.7083C5.54167 10.5536 5.60313 10.4053 5.71252 10.2959C5.82192 10.1865 5.97029 10.125 6.125 10.125H6.5625C6.60118 10.125 6.63827 10.1096 6.66562 10.0823C6.69297 10.0549 6.70834 10.0178 6.70834 9.97917V7.35417C6.70834 7.33502 6.70457 7.31605 6.69724 7.29836C6.68991 7.28066 6.67917 7.26459 6.66562 7.25105C6.65208 7.2375 6.636 7.22676 6.61831 7.21943C6.60062 7.21211 6.58166 7.20833 6.5625 7.20833H6.125C5.97029 7.20833 5.82192 7.14687 5.71252 7.03748C5.60313 6.92808 5.54167 6.77971 5.54167 6.625C5.54167 6.47029 5.60313 6.32192 5.71252 6.21252C5.82192 6.10313 5.97029 6.04167 6.125 6.04167H6.70834C7.01776 6.04167 7.3145 6.16458 7.5333 6.38338C7.75209 6.60217 7.875 6.89891 7.875 7.20833V9.97917C7.875 10.0178 7.89037 10.0549 7.91772 10.0823C7.94507 10.1096 7.98216 10.125 8.02084 10.125H8.45834C8.61305 10.125 8.76142 10.1865 8.87082 10.2959C8.98021 10.4053 9.04167 10.5536 9.04167 10.7083C9.04167 10.863 8.98021 11.0114 8.87082 11.1208C8.76142 11.2302 8.61305 11.2917 8.45834 11.2917Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_12_50">
+<rect width="14" height="14" fill="white" transform="translate(0 0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ghost/admin/public/assets/icons/koenig/kg-edit.svg b/ghost/admin/public/assets/icons/koenig/kg-edit.svg
deleted file mode 100644
index 8b4bd26cf48..00000000000
--- a/ghost/admin/public/assets/icons/koenig/kg-edit.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <g fill="currentColor">
-    <path d="m13.086 5.5-9.793 9.793a1.01 1.01 0 0 0-.241.391l-2 6a1 1 0 0 0 1.264 1.265l6-2c.147-.049.281-.132.391-.242l9.793-9.793L13.086 5.5Z"/>
-    <path d="m22.414 4.172-2.586-2.586a2.001 2.001 0 0 0-2.828 0l-2.5 2.5L19.914 9.5l2.5-2.5c.378-.378.586-.88.586-1.414s-.208-1.037-.586-1.414Z"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/koenig/kg-trash.svg b/ghost/admin/public/assets/icons/koenig/kg-trash.svg
index 2c16a4fb275..9e232fc94a8 100644
--- a/ghost/admin/public/assets/icons/koenig/kg-trash.svg
+++ b/ghost/admin/public/assets/icons/koenig/kg-trash.svg
@@ -1 +1,4 @@
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M1.3 4.6C.969 4.6.7 4.331.7 4c0-.331.269-.6.6-.6h13.5c.331 0 .6.269.6.6 0 .331-.269.6-.6.6H1.3z" fill="#FFF" fill-rule="nonzero"/><path d="M13.9 4v9.5c0 1.331-.769 2.1-2.1 2.1H4.3c-1.331 0-2.1-.769-2.1-2.1V4c0-.331.269-.6.6-.6h10.5c.331 0 .6.269.6.6zM5.95 6.75v5.5c0 .331.269.6.6.6.331 0 .6-.269.6-.6v-5.5c0-.331-.269-.6-.6-.6-.331 0-.6.269-.6.6zm3 0v5.5c0 .331.269.6.6.6.331 0 .6-.269.6-.6v-5.5c0-.331-.269-.6-.6-.6-.331 0-.6.269-.6.6z" fill="#FFF" fill-rule="nonzero"/><path d="M5.65 4c0 .331-.269.6-.6.6-.331 0-.6-.269-.6-.6V2.5c0-.573.21-1.08.615-1.485S5.977.4 6.55.4h3c1.331 0 2.1.769 2.1 2.1V4c0 .331-.269.6-.6.6-.331 0-.6-.269-.6-.6V2.5c0-.669-.231-.9-.9-.9h-3c-.255 0-.456.083-.636.264-.18.18-.264.38-.264.636V4z" fill="#FFF" fill-rule="nonzero"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M1.917 5.583h20.166m-8.02-3.666H9.936a1.375 1.375 0 0 0-1.374 1.375v2.291h6.874V3.292a1.375 1.375 0 0 0-1.374-1.375ZM9.938 17.27v-6.874m4.125 6.874v-6.874"/>
+    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M18.288 20.818a1.366 1.366 0 0 1-1.366 1.265H7.077a1.366 1.366 0 0 1-1.365-1.265L4.438 5.583h15.125l-1.275 15.235Z"/>
+</svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/koenig/kg-wand.svg b/ghost/admin/public/assets/icons/koenig/kg-wand.svg
new file mode 100644
index 00000000000..d604063224f
--- /dev/null
+++ b/ghost/admin/public/assets/icons/koenig/kg-wand.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 25">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M1 21.094 3.913 24 17 10.906 14.125 8 1 21.094ZM11 11l3 3M5.25 4.25a2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0-2.5-2.5Zm12 0a2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0-2.5-2.5Zm0 11.99a2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0-2.5-2.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/link.svg b/ghost/admin/public/assets/icons/link.svg
index 94847802802..272bbcc3d4c 100644
--- a/ghost/admin/public/assets/icons/link.svg
+++ b/ghost/admin/public/assets/icons/link.svg
@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <title>link</title>
-  <path d="m14.5 12.5.086.086a2 2 0 0 0 2.828 0l3.965-3.964a3.01 3.01 0 0 0 0-4.243l-1.758-1.757a3.008 3.008 0 0 0-4.242 0l-3.965 3.964a2 2 0 0 0 0 2.829l.086.085m-2 2-.086-.085a2 2 0 0 0-2.828 0l-3.965 3.964a3.01 3.01 0 0 0 0 4.243l1.758 1.757a3.008 3.008 0 0 0 4.242 0l3.965-3.964a2 2 0 0 0 0-2.829L12.5 14.5m-4.389 1.389 7.778-7.778" fill="none"/>
-</svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" id="Hyperlink-3--Streamline-Ultimate.svg" height="24" width="24"><desc>Hyperlink 3 Streamline Icon: https://streamlinehq.com</desc><path d="m9.364 18.5 -0.932 0.932a4.5 4.5 0 0 1 -6.364 -6.364l4.773 -4.774a4.5 4.5 0 0 1 6.825 5.825" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m14.818 5.567 0.75 -0.75a4.5 4.5 0 0 1 6.364 6.364l-4.773 4.773a4.5 4.5 0 0 1 -6.824 -5.826" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/lock-filled.svg b/ghost/admin/public/assets/icons/lock-filled.svg
index 720fa0ffce5..7a1f1db0a0f 100644
--- a/ghost/admin/public/assets/icons/lock-filled.svg
+++ b/ghost/admin/public/assets/icons/lock-filled.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="16" width="16">
-  <path d="M19.5,9.5h-.75V6.75a6.75,6.75,0,0,0-13.5,0V9.5H4.5a2,2,0,0,0-2,2V22a2,2,0,0,0,2,2h15a2,2,0,0,0,2-2V11.5A2,2,0,0,0,19.5,9.5Zm-7.5,9a2,2,0,1,1,2-2A2,2,0,0,1,12,18.5ZM16.25,9a.5.5,0,0,1-.5.5H8.25a.5.5,0,0,1-.5-.5V6.75a4.25,4.25,0,0,1,8.5,0Z" fill="#000000"></path>
+  <path d="M19.5,9.5h-.75V6.75a6.75,6.75,0,0,0-13.5,0V9.5H4.5a2,2,0,0,0-2,2V22a2,2,0,0,0,2,2h15a2,2,0,0,0,2-2V11.5A2,2,0,0,0,19.5,9.5Zm-7.5,9a2,2,0,1,1,2-2A2,2,0,0,1,12,18.5ZM16.25,9a.5.5,0,0,1-.5.5H8.25a.5.5,0,0,1-.5-.5V6.75a4.25,4.25,0,0,1,8.5,0Z" fill="currentColor"></path>
 </svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/megaphone.svg b/ghost/admin/public/assets/icons/megaphone.svg
new file mode 100644
index 00000000000..4225e5974a3
--- /dev/null
+++ b/ghost/admin/public/assets/icons/megaphone.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" height="24" width="24" id="Megaphone--Streamline-Ultimate.svg"><desc>Megaphone Streamline Icon: https://streamlinehq.com</desc><path d="M6.75 15.25H4.5a3.75 3.75 0 0 1 0 -7.5h2.25Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M6.75 15.25a22.3 22.3 0 0 1 12.366 3.744l1.134 0.756V3.25l-1.134 0.756A22.3 22.3 0 0 1 6.75 7.75Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m23.25 10 0 3" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M6.75 15.25A7.239 7.239 0 0 0 9 20.5" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/picture.svg b/ghost/admin/public/assets/icons/picture.svg
new file mode 100644
index 00000000000..be5edb3e93f
--- /dev/null
+++ b/ghost/admin/public/assets/icons/picture.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.625 -0.625 16 16" height="16" width="16" id="picture.svg" stroke="currentColor"><desc>Picture Landscape Streamline Icon: https://streamlinehq.com</desc><defs></defs><title>picture</title><path d="M1.3828124999999998 0.46093749999999994h11.984374999999998s0.9218749999999999 0 0.9218749999999999 0.9218749999999999v11.984374999999998s0 0.9218749999999999 -0.9218749999999999 0.9218749999999999H1.3828124999999998s-0.9218749999999999 0 -0.9218749999999999 -0.9218749999999999V1.3828124999999998s0 -0.9218749999999999 0.9218749999999999 -0.9218749999999999" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25"></path><path d="m3.2265624999999996 10.601562499999998 2.1276875 -2.8369166666666663a0.9218749999999999 0.9218749999999999 0 0 1 1.3895729166666666 -0.09894791666666666L7.374999999999999 8.296874999999998l2.0281249999999997 -2.7041666666666666a0.9218749999999999 0.9218749999999999 0 0 1 1.4749999999999999 0l1.6409374999999997 2.1879166666666663" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25"></path><path d="M2.7656249999999996 3.9179687499999996a1.1523437499999998 1.1523437499999998 0 1 0 2.3046874999999996 0 1.1523437499999998 1.1523437499999998 0 1 0 -2.3046874999999996 0" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25"></path><path d="m0.46093749999999994 10.601562499999998 13.828124999999998 0" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.25"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/reload.svg b/ghost/admin/public/assets/icons/reload.svg
index a094276a30c..5d17641a8a9 100644
--- a/ghost/admin/public/assets/icons/reload.svg
+++ b/ghost/admin/public/assets/icons/reload.svg
@@ -1,6 +1,6 @@
 <svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
   <title>reload</title>
-  <g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round" stroke="#000" stroke-width="1.5">
+  <g fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round" stroke="currentColor" stroke-width="1.5">
     <path d="M15.667 9.752h6.09V2.444"/>
     <path d="M21.705 9.579C20.622 5.226 16.688 2 12 2 6.477 2 2 6.477 2 12s4.477 10 10 10c3.3 0 6.228-1.6 8.05-4.065"/>
   </g>
diff --git a/ghost/admin/public/assets/icons/rocket.svg b/ghost/admin/public/assets/icons/rocket.svg
new file mode 100644
index 00000000000..eaaa9ede1a9
--- /dev/null
+++ b/ghost/admin/public/assets/icons/rocket.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" height="24" width="24" id="Space-Rocket-Flying--Streamline-Ultimate.svg"><desc>Space Rocket Flying Streamline Icon: https://streamlinehq.com</desc><path d="m22.5 1.567 -2.158 0.24a7.5 7.5 0 0 0 -4.475 2.151L6.06 13.765l4.24 4.242L20.109 8.2a7.494 7.494 0 0 0 2.151 -4.475Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m6.06 13.765 -3.622 -1.208a0.749 0.749 0 0 1 -0.293 -1.241l0.232 -0.232a6 6 0 0 1 6.14 -1.45l1.255 0.418Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m6.06 13.765 -3.622 -1.208a0.749 0.749 0 0 1 -0.293 -1.241l0.232 -0.232a6 6 0 0 1 6.14 -1.45l1.255 0.418Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m10.3 18.007 1.208 3.622a0.749 0.749 0 0 0 1.241 0.293l0.233 -0.232a6 6 0 0 0 1.449 -6.14l-0.416 -1.25Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m10.3 18.007 1.208 3.622a0.749 0.749 0 0 0 1.241 0.293l0.233 -0.232a6 6 0 0 0 1.449 -6.14l-0.416 -1.25Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M7.779 18.538a2.243 2.243 0 0 1 -0.659 1.591c-0.878 0.878 -5.3 2.121 -5.3 2.121s1.243 -4.425 2.121 -5.3a2.246 2.246 0 0 1 1.444 -0.655" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/share.svg b/ghost/admin/public/assets/icons/share.svg
new file mode 100644
index 00000000000..6feac81448c
--- /dev/null
+++ b/ghost/admin/public/assets/icons/share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Share-1--Streamline-Streamline--3.0.svg" height="24" width="24"><desc>Share 1 Streamline Icon: https://streamlinehq.com</desc><defs></defs><title>share-1</title><path d="M17.25 8.25h1.5a1.5 1.5 0 0 1 1.5 1.5v12a1.5 1.5 0 0 1 -1.5 1.5H5.25a1.5 1.5 0 0 1 -1.5 -1.5v-12a1.5 1.5 0 0 1 1.5 -1.5h1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m12 0.75 0 10.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M8.25 4.5 12 0.75l3.75 3.75" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/social-facebook.svg b/ghost/admin/public/assets/icons/social-facebook.svg
index ceebd7e7821..20a4f91b47c 100644
--- a/ghost/admin/public/assets/icons/social-facebook.svg
+++ b/ghost/admin/public/assets/icons/social-facebook.svg
@@ -1,5 +1,5 @@
 <svg width="40" height="40" fill="none" xmlns="http://www.w3.org/2000/svg">
   <title>social-facebook</title>
-  <path d="M20 40.004c11.046 0 20-8.955 20-20 0-11.046-8.954-20-20-20s-20 8.954-20 20c0 11.045 8.954 20 20 20z" fill="#1977F3"/>
+  <path d="M20 40.004c11.046 0 20-8.955 20-20 0-11.046-8.954-20-20-20s-20 8.954-20 20c0 11.045 8.954 20 20 20z" fill="#1977f3" class="fb" />
   <path d="m27.785 25.785.886-5.782h-5.546V16.25c0-1.58.773-3.125 3.26-3.125h2.522V8.204s-2.29-.39-4.477-.39c-4.568 0-7.555 2.767-7.555 7.781v4.408h-5.08v5.782h5.08v13.976a20.08 20.08 0 0 0 3.125.242c1.063 0 2.107-.085 3.125-.242V25.785h4.66z" fill="#fff"/>
 </svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/social-linkedin.svg b/ghost/admin/public/assets/icons/social-linkedin.svg
new file mode 100644
index 00000000000..286454af0bc
--- /dev/null
+++ b/ghost/admin/public/assets/icons/social-linkedin.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_537_833)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.77778 16H14.2222C15.2041 16 16 15.2041 16 14.2222V1.77778C16 0.795938 15.2041 0 14.2222 0H1.77778C0.795938 0 0 0.795938 0 1.77778V14.2222C0 15.2041 0.795938 16 1.77778 16Z" fill="#007ebb" class="linkedin"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7782 13.7777H11.4039V9.73375C11.4039 8.625 10.9826 8.0054 10.105 8.0054C9.15035 8.0054 8.65156 8.65019 8.65156 9.73375V13.7777H6.3634V6.07402H8.65156V7.11171C8.65156 7.11171 9.33955 5.83866 10.9743 5.83866C12.6084 5.83866 13.7782 6.83649 13.7782 8.90022V13.7777ZM3.63362 5.06528C2.85422 5.06528 2.22266 4.42876 2.22266 3.64373C2.22266 2.85869 2.85422 2.22217 3.63362 2.22217C4.41302 2.22217 5.04421 2.85869 5.04421 3.64373C5.04421 4.42876 4.41302 5.06528 3.63362 5.06528ZM2.45211 13.7777H4.83808V6.07402H2.45211V13.7777Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_537_833">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ghost/admin/public/assets/icons/social-threads.svg b/ghost/admin/public/assets/icons/social-threads.svg
new file mode 100644
index 00000000000..dc95af62710
--- /dev/null
+++ b/ghost/admin/public/assets/icons/social-threads.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_351_18008)">
+<path d="M13.0332 8.37917C12.96 8.34407 12.8856 8.3103 12.8103 8.27795C12.6791 5.86015 11.3579 4.47596 9.1396 4.4618C9.12955 4.46173 9.11955 4.46173 9.1095 4.46173C7.78265 4.46173 6.67913 5.0281 5.99992 6.05871L7.21993 6.89561C7.72733 6.12579 8.52364 5.96167 9.11008 5.96167C9.11686 5.96167 9.12366 5.96168 9.13036 5.96174C9.86078 5.96639 10.4119 6.17876 10.7687 6.59291C11.0283 6.89442 11.2019 7.31107 11.2879 7.8369C10.6403 7.72683 9.93993 7.69299 9.19122 7.73592C7.08214 7.8574 5.72624 9.08747 5.81731 10.7967C5.86352 11.6637 6.29544 12.4096 7.03346 12.8968C7.65745 13.3087 8.46111 13.5101 9.29635 13.4645C10.3994 13.4041 11.2647 12.9832 11.8684 12.2137C12.3268 11.6293 12.6168 10.872 12.7448 9.91782C13.2705 10.2351 13.6601 10.6525 13.8753 11.1544C14.2411 12.0075 14.2624 13.4094 13.1186 14.5523C12.1164 15.5535 10.9117 15.9866 9.09104 16C7.07147 15.9851 5.54409 15.3374 4.55103 14.0749C3.62111 12.8928 3.14053 11.1854 3.1226 9C3.14053 6.8146 3.62111 5.10714 4.55103 3.92503C5.54409 2.66262 7.07144 2.01495 9.09101 1.99994C11.1252 2.01506 12.6792 2.66585 13.7103 3.93435C14.2159 4.55641 14.597 5.3387 14.8483 6.25081L16.278 5.86936C15.9734 4.74665 15.4942 3.7792 14.842 2.97686C13.5201 1.35059 11.5869 0.517279 9.096 0.5H9.08603C6.60019 0.517219 4.68862 1.3537 3.40443 2.98619C2.26168 4.4389 1.67221 6.46024 1.65241 8.99402L1.65234 9L1.65241 9.00598C1.67221 11.5397 2.26168 13.5611 3.40443 15.0138C4.68862 16.6463 6.60019 17.4828 9.08603 17.5H9.096C11.306 17.4847 12.8638 16.9061 14.1472 15.6239C15.8262 13.9465 15.7756 11.8439 15.2222 10.5531C14.8252 9.62749 14.0683 8.8757 13.0332 8.37917ZM9.21739 11.9668C8.29301 12.0188 7.33268 11.6039 7.28533 10.7152C7.25023 10.0563 7.75426 9.32105 9.27412 9.23347C9.44817 9.22343 9.61897 9.21852 9.78676 9.21852C10.3388 9.21852 10.8553 9.27215 11.3248 9.3748C11.1497 11.562 10.1224 11.9171 9.21739 11.9668Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_351_18008">
+<rect width="17" height="17" fill="white" transform="translate(0.5 0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ghost/admin/public/assets/icons/social-x.svg b/ghost/admin/public/assets/icons/social-x.svg
index 6fffdb23215..619528e23ae 100644
--- a/ghost/admin/public/assets/icons/social-x.svg
+++ b/ghost/admin/public/assets/icons/social-x.svg
@@ -1,3 +1,3 @@
     <svg viewBox="0 0 24 24" aria-hidden="true">
-        <path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"></path>
+        <path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z" class="x"></path>
     </svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/sparkle-fill.svg b/ghost/admin/public/assets/icons/sparkle-fill.svg
new file mode 100644
index 00000000000..fea5bb260b0
--- /dev/null
+++ b/ghost/admin/public/assets/icons/sparkle-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" id="Reward-Stars-3--Streamline-Ultimate" height="24" width="24"><desc>Reward Stars 3 Streamline Icon: https://streamlinehq.com</desc><path fill="currentColor" fill-rule="evenodd" d="M17.66 1.143a0.75 0.75 0 0 1 1.451 0c0.33 1.262 0.693 2.037 1.235 2.61 0.546 0.577 1.344 1.027 2.705 1.484a0.75 0.75 0 0 1 0 1.422c-1.36 0.457 -2.16 0.907 -2.705 1.484 -0.542 0.574 -0.904 1.348 -1.235 2.61a0.75 0.75 0 0 1 -1.45 0c-0.331 -1.262 -0.694 -2.036 -1.236 -2.61 -0.545 -0.577 -1.344 -1.027 -2.705 -1.484a0.75 0.75 0 0 1 0 -1.422c1.361 -0.457 2.16 -0.907 2.705 -1.483 0.542 -0.574 0.905 -1.35 1.235 -2.61ZM8.052 5.322a0.75 0.75 0 0 1 1.451 0c0.595 2.283 1.27 3.774 2.33 4.9 1.062 1.129 2.584 1.967 5.031 2.792a0.75 0.75 0 0 1 0 1.422c-2.447 0.824 -3.969 1.663 -5.031 2.792 -1.06 1.126 -1.735 2.617 -2.33 4.9a0.75 0.75 0 0 1 -1.451 0c-0.596 -2.283 -1.27 -3.774 -2.33 -4.9C4.659 16.099 3.138 15.26 0.69 14.436a0.75 0.75 0 0 1 0 -1.422c2.448 -0.825 3.97 -1.663 5.032 -2.792 1.06 -1.126 1.734 -2.617 2.33 -4.9Zm11.85 10.147a0.75 0.75 0 0 0 -0.725 0.556c-0.24 0.9 -0.497 1.421 -0.863 1.8 -0.37 0.384 -0.926 0.698 -1.923 1.026a0.75 0.75 0 0 0 0 1.425c0.997 0.327 1.553 0.641 1.923 1.025 0.366 0.38 0.623 0.9 0.863 1.8a0.75 0.75 0 0 0 1.45 0c0.24 -0.9 0.496 -1.42 0.862 -1.8 0.37 -0.384 0.926 -0.698 1.923 -1.025a0.75 0.75 0 0 0 0 -1.425c-0.997 -0.328 -1.553 -0.642 -1.923 -1.026 -0.366 -0.379 -0.622 -0.9 -0.863 -1.8a0.75 0.75 0 0 0 -0.724 -0.556Z" clip-rule="evenodd" stroke-width="1"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/thumbs-down.svg b/ghost/admin/public/assets/icons/thumbs-down.svg
index 9edad7f3329..20450e318ea 100644
--- a/ghost/admin/public/assets/icons/thumbs-down.svg
+++ b/ghost/admin/public/assets/icons/thumbs-down.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2 14.429h3.444a1.906 1.906 0 0 1 1.543.794l4.617 7.095a1.622 1.622 0 0 0 1.992.537 1.597 1.597 0 0 0 .894-1.87l-.833-3.142a1.867 1.867 0 0 1 .993-2.164 1.91 1.91 0 0 1 .833-.193h4.63a1.882 1.882 0 0 0 1.806-2.426v-.011l-1.8-6.008v-.016c-.733-2.36-1.992-3.97-4.469-3.97-5.934 0-5.595-.684-12.524 2.818-.377.188-.752.379-1.126.572V16.5"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M22 14.429h-3.445a1.905 1.905 0 0 0-1.543.794l-4.617 7.095a1.622 1.622 0 0 1-2.783-.233 1.597 1.597 0 0 1-.103-1.1l.833-3.142a1.867 1.867 0 0 0-.993-2.164 1.911 1.911 0 0 0-.833-.193h-4.63A1.881 1.881 0 0 1 2.08 13.06v-.011l1.8-6.008v-.016c.733-2.36 1.992-3.97 4.47-3.97 5.933 0 5.594-.684 12.523 2.818.377.188.752.379 1.126.572V16.5"/>
 </svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/warning-circle-filled.svg b/ghost/admin/public/assets/icons/warning-circle-filled.svg
new file mode 100644
index 00000000000..2be3dfbbc91
--- /dev/null
+++ b/ghost/admin/public/assets/icons/warning-circle-filled.svg
@@ -0,0 +1,10 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_12_38)">
+<path d="M6.99988 0.499816C5.12613 0.529052 3.33898 1.29378 2.02405 2.62898C1.36955 3.28339 0.853135 4.06257 0.505429 4.92031C0.157723 5.77805 -0.0141905 6.69689 -0.000116184 7.62232C-0.000884783 8.52619 0.176676 9.42133 0.522395 10.2565C0.868115 11.0916 1.3752 11.8504 2.01461 12.4892C2.65401 13.1281 3.41318 13.6345 4.24861 13.9795C5.08405 14.3245 5.97934 14.5014 6.88322 14.4998H6.99988C8.87242 14.4829 10.6616 13.7231 11.9742 12.3875C13.2868 11.052 14.0154 9.24987 13.9999 7.37732C14.0016 6.4633 13.8208 5.55814 13.4681 4.71491C13.1154 3.87169 12.5979 3.10737 11.9459 2.4668C11.2939 1.82622 10.5206 1.32227 9.67126 0.984503C8.82194 0.646737 7.91373 0.481953 6.99988 0.499816ZM6.12488 10.1481C6.12011 10.0309 6.13931 9.91386 6.18129 9.80425C6.22327 9.69465 6.28716 9.59475 6.36906 9.51068C6.45095 9.4266 6.54913 9.3601 6.65759 9.31525C6.76606 9.2704 6.88253 9.24813 6.99988 9.24982C7.22964 9.25114 7.45003 9.34102 7.61519 9.50074C7.78035 9.66047 7.87754 9.87773 7.88655 10.1073C7.89127 10.2228 7.87258 10.3381 7.8316 10.4462C7.79063 10.5543 7.72821 10.653 7.64811 10.7364C7.56801 10.8198 7.47188 10.8861 7.36549 10.9314C7.25911 10.9766 7.14467 10.9999 7.02905 10.9998C6.79724 11.0031 6.57326 10.916 6.4045 10.7571C6.23575 10.5981 6.13547 10.3797 6.12488 10.1481ZM6.41655 7.81482V4.31482C6.41655 4.16011 6.47801 4.01173 6.58741 3.90234C6.6968 3.79294 6.84517 3.73148 6.99988 3.73148C7.15459 3.73148 7.30297 3.79294 7.41236 3.90234C7.52176 4.01173 7.58322 4.16011 7.58322 4.31482V7.81482C7.58322 7.96953 7.52176 8.1179 7.41236 8.22729C7.30297 8.33669 7.15459 8.39815 6.99988 8.39815C6.84517 8.39815 6.6968 8.33669 6.58741 8.22729C6.47801 8.1179 6.41655 7.96953 6.41655 7.81482Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_12_38">
+<rect width="14" height="14" fill="white" transform="translate(0 0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ghost/admin/public/assets/icons/warning-fill.svg b/ghost/admin/public/assets/icons/warning-fill.svg
new file mode 100644
index 00000000000..2561d9987c7
--- /dev/null
+++ b/ghost/admin/public/assets/icons/warning-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Road-Sign-Warning--Streamline-Ultimate" height="24" width="24"><desc>Road Sign Warning Streamline Icon: https://streamlinehq.com</desc><path d="M23.25 23.23a0.75 0.75 0 0 0 0.66 -1.1l-11.25 -21a0.78 0.78 0 0 0 -1.32 0l-11.25 21a0.73 0.73 0 0 0 0 0.74 0.73 0.73 0 0 0 0.64 0.36ZM12 20.48A1.5 1.5 0 1 1 13.5 19a1.5 1.5 0 0 1 -1.5 1.48Zm0 -12.25a1 1 0 0 1 1 1v5.47a1 1 0 0 1 -2 0V9.23a1 1 0 0 1 1 -1Z" fill="currentColor" stroke-width="1"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/icons/writing.svg b/ghost/admin/public/assets/icons/writing.svg
new file mode 100644
index 00000000000..4a8d328b879
--- /dev/null
+++ b/ghost/admin/public/assets/icons/writing.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" height="24" width="24" id="Pencil-Write--Streamline-Ultimate.svg"><desc>Pencil Write Streamline Icon: https://streamlinehq.com</desc><path d="m13.045 14.136 -3.712 0.531 0.53 -3.713 9.546 -9.546a2.25 2.25 0 0 1 3.182 3.182Z" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="m18.348 2.469 3.182 3.182" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path><path d="M18.75 14.25v7.5a1.5 1.5 0 0 1 -1.5 1.5h-15a1.5 1.5 0 0 1 -1.5 -1.5v-15a1.5 1.5 0 0 1 1.5 -1.5h7.5" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"></path></svg>
\ No newline at end of file
diff --git a/ghost/admin/public/assets/img/gradient-bg.png b/ghost/admin/public/assets/img/gradient-bg.png
new file mode 100644
index 00000000000..1c6c2fc3fec
Binary files /dev/null and b/ghost/admin/public/assets/img/gradient-bg.png differ
diff --git a/ghost/admin/public/assets/videos/logo-loader-dark.mp4 b/ghost/admin/public/assets/videos/logo-loader-dark.mp4
new file mode 100644
index 00000000000..7ebe99ef59d
Binary files /dev/null and b/ghost/admin/public/assets/videos/logo-loader-dark.mp4 differ
diff --git a/ghost/admin/tests/.eslintrc.js b/ghost/admin/tests/.eslintrc.js
deleted file mode 100644
index 6d3e6f4de3b..00000000000
--- a/ghost/admin/tests/.eslintrc.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-env node */
-module.exports = {
-    env: {
-        embertest: true,
-        mocha: true
-    },
-    rules: {
-        'ghost/ember/no-invalid-debug-function-arguments': 'off'
-    }
-};
diff --git a/ghost/admin/tests/acceptance/content-test.js b/ghost/admin/tests/acceptance/content-test.js
index da312358da6..44cf74b19db 100644
--- a/ghost/admin/tests/acceptance/content-test.js
+++ b/ghost/admin/tests/acceptance/content-test.js
@@ -1,12 +1,26 @@
+import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
+import sinon from 'sinon';
 import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
 import {beforeEach, describe, it} from 'mocha';
-import {blur, click, currentURL, fillIn, find, findAll, settled, visit} from '@ember/test-helpers';
+import {blur, click, currentURL, fillIn, find, findAll, triggerEvent, triggerKeyEvent, visit} from '@ember/test-helpers';
 import {clickTrigger, selectChoose} from 'ember-power-select/test-support/helpers';
 import {expect} from 'chai';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
 
-describe('Acceptance: Content', function () {
+/**
+ *
+ * @param {string} text
+ * @param {NodeList} buttons
+ * @returns Node
+ */
+const findButton = (text, buttons) => {
+    return Array.from(buttons).find(button => button.innerText.trim() === text);
+};
+
+// NOTE: With accommodations for faster loading of posts in the UI, the requests to fetch the posts have been split into separate requests based
+//  on the status of the post. This means that the tests for filtering by status will have multiple requests to check against.
+describe('Acceptance: Posts / Pages', function () {
     let hooks = setupApplicationTest();
     setupMirage(hooks);
 
@@ -14,270 +28,717 @@ describe('Acceptance: Content', function () {
         this.server.loadFixtures('configs');
     });
 
-    it('redirects to signin when not authenticated', async function () {
-        await invalidateSession();
-        await visit('/posts');
-
-        expect(currentURL()).to.equal('/signin');
+    this.afterEach(function () {
+        sinon.restore();
     });
 
-    describe('as admin', function () {
-        let admin, editor, publishedPost, scheduledPost, draftPost, authorPost;
+    describe('posts', function () {
+        it('redirects to signin when not authenticated', async function () {
+            await invalidateSession();
 
-        beforeEach(async function () {
-            let adminRole = this.server.create('role', {name: 'Administrator'});
-            admin = this.server.create('user', {roles: [adminRole]});
-            let editorRole = this.server.create('role', {name: 'Editor'});
-            editor = this.server.create('user', {roles: [editorRole]});
+            await visit('/posts');
+            expect(currentURL()).to.equal('/signin');
+        });
 
-            publishedPost = this.server.create('post', {authors: [admin], status: 'published', title: 'Published Post'});
-            scheduledPost = this.server.create('post', {authors: [admin], status: 'scheduled', title: 'Scheduled Post'});
-            draftPost = this.server.create('post', {authors: [admin], status: 'draft', title: 'Draft Post'});
-            authorPost = this.server.create('post', {authors: [editor], status: 'published', title: 'Editor Published Post'});
+        describe('as contributor', function () {
+            beforeEach(async function () {
+                let contributorRole = this.server.create('role', {name: 'Contributor'});
+                this.server.create('user', {roles: [contributorRole]});
 
-            // pages shouldn't appear in the list
-            this.server.create('page', {authors: [admin], status: 'published', title: 'Published Page'});
+                await authenticateSession();
+            });
 
-            return await authenticateSession();
-        });
+            // NOTE: This test seems to fail if run AFTER the 'can change access' test in the 'as admin' section; router seems to fail, did not look into it further
+            it('shows posts list and allows post creation', async function () {
+                await visit('/posts');
 
-        it.skip('displays and filters posts', async function () {
-            await visit('/posts');
-            // Not checking request here as it won't be the last request made
-            // Displays all posts + pages
-            expect(findAll('[data-test-post-id]').length, 'all posts count').to.equal(4);
-
-            // show draft posts
-            await selectChoose('[data-test-type-select]', 'Draft posts');
-
-            // API request is correct
-            let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.filter, '"drafts" request status filter').to.have.string('status:draft');
-            // Displays draft post
-            expect(findAll('[data-test-post-id]').length, 'drafts count').to.equal(1);
-            expect(find(`[data-test-post-id="${draftPost.id}"]`), 'draft post').to.exist;
-
-            // show published posts
-            await selectChoose('[data-test-type-select]', 'Published posts');
-
-            // API request is correct
-            [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.filter, '"published" request status filter').to.have.string('status:published');
-            // Displays three published posts + pages
-            expect(findAll('[data-test-post-id]').length, 'published count').to.equal(2);
-            expect(find(`[data-test-post-id="${publishedPost.id}"]`), 'admin published post').to.exist;
-            expect(find(`[data-test-post-id="${authorPost.id}"]`), 'author published post').to.exist;
-
-            // show scheduled posts
-            await selectChoose('[data-test-type-select]', 'Scheduled posts');
-
-            // API request is correct
-            [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.filter, '"scheduled" request status filter').to.have.string('status:scheduled');
-            // Displays scheduled post
-            expect(findAll('[data-test-post-id]').length, 'scheduled count').to.equal(1);
-            expect(find(`[data-test-post-id="${scheduledPost.id}"]`), 'scheduled post').to.exist;
-
-            // show all posts
-            await selectChoose('[data-test-type-select]', 'All posts');
-
-            // API request is correct
-            [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.filter, '"all" request status filter').to.have.string('status:[draft,scheduled,published]');
-
-            // show all posts by editor
-            await selectChoose('[data-test-author-select]', editor.name);
-
-            // API request is correct
-            [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.filter, '"editor" request status filter')
-                .to.have.string('status:[draft,scheduled,published]');
-            expect(lastRequest.queryParams.filter, '"editor" request filter param')
-                .to.have.string(`authors:${editor.slug}`);
-
-            // Post status is only visible when members is enabled
-            expect(find('[data-test-visibility-select]'), 'access dropdown before members enabled').to.not.exist;
-            let featureService = this.owner.lookup('service:feature');
-            featureService.set('members', true);
-            await settled();
-            expect(find('[data-test-visibility-select]'), 'access dropdown after members enabled').to.exist;
-
-            await selectChoose('[data-test-visibility-select]', 'Paid members-only');
-            [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.filter, '"visibility" request filter param')
-                .to.have.string('visibility:[paid,tiers]+status:[draft,scheduled,published]');
-
-            // Displays editor post
-            // TODO: implement "filter" param support and fix mirage post->author association
-            // expect(find('[data-test-post-id]').length, 'editor post count').to.equal(1);
-            // expect(find(`[data-test-post-id="${authorPost.id}"]`), 'author post').to.exist;
-
-            // TODO: test tags dropdown
-        });
+                // has an empty state
+                expect(findAll('[data-test-post-id]')).to.have.length(0);
+                expect(find('[data-test-no-posts-box]')).to.exist;
+                expect(find('[data-test-link="write-a-new-post"]')).to.exist;
 
-        // TODO: skipped due to consistently random failures on Travis
-        // options[0] is undefined
-        // https://github.com/TryGhost/Ghost/issues/10308
-        it.skip('sorts tags filter alphabetically', async function () {
-            this.server.create('tag', {name: 'B - Second', slug: 'second'});
-            this.server.create('tag', {name: 'Z - Last', slug: 'last'});
-            this.server.create('tag', {name: 'A - First', slug: 'first'});
+                await click('[data-test-link="write-a-new-post"]');
 
-            await visit('/posts');
-            await clickTrigger('[data-test-tag-select]');
+                expect(currentURL()).to.equal('/editor/post');
 
-            let options = findAll('.ember-power-select-option');
+                await fillIn('[data-test-editor-title-input]', 'First contributor post');
+                await blur('[data-test-editor-title-input]');
 
-            expect(options[0].textContent.trim()).to.equal('All tags');
-            expect(options[1].textContent.trim()).to.equal('A - First');
-            expect(options[2].textContent.trim()).to.equal('B - Second');
-            expect(options[3].textContent.trim()).to.equal('Z - Last');
-        });
+                expect(currentURL()).to.equal('/editor/post/1');
 
-        it('can add and edit custom views', async function () {
-            // actions are not visible when there's no filter
-            await visit('/posts');
-            expect(find('[data-test-button="edit-view"]'), 'edit-view button (no filter)').to.not.exist;
-            expect(find('[data-test-button="add-view"]'), 'add-view button (no filter)').to.not.exist;
-
-            // add action is visible after filtering to a non-default filter
-            await selectChoose('[data-test-author-select]', admin.name);
-            expect(find('[data-test-button="add-view"]'), 'add-view button (with filter)').to.exist;
-
-            // adding view shows it in the sidebar
-            await click('[data-test-button="add-view"]'), 'add-view button';
-            expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (on add)').to.exist;
-            expect(find('[data-test-modal="custom-view-form"] h1').textContent.trim()).to.equal('New view');
-            await fillIn('[data-test-input="custom-view-name"]', 'Test view');
-            await click('[data-test-button="save-custom-view"]');
-            // modal closes on save
-            expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (after add save)').to.not.exist;
-            // UI updates
-            expect(find('[data-test-nav-custom="posts-Test view"]'), 'new view nav').to.exist;
-            expect(find('[data-test-nav-custom="posts-Test view"]').textContent.trim()).to.equal('Test view');
-            expect(find('[data-test-button="add-view"]'), 'add-view button (on existing view)').to.not.exist;
-            expect(find('[data-test-button="edit-view"]'), 'edit-view button (on existing view)').to.exist;
-
-            // editing view
-            await click('[data-test-button="edit-view"]'), 'edit-view button';
-            expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (on edit)').to.exist;
-            expect(find('[data-test-modal="custom-view-form"] h1').textContent.trim()).to.equal('Edit view');
-            await fillIn('[data-test-input="custom-view-name"]', 'Updated view');
-            await click('[data-test-button="save-custom-view"]');
-            // modal closes on save
-            expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (after edit save)').to.not.exist;
-            // UI updates
-            expect(find('[data-test-nav-custom="posts-Updated view"]')).to.exist;
-            expect(find('[data-test-nav-custom="posts-Updated view"]').textContent.trim()).to.equal('Updated view');
-            expect(find('[data-test-button="add-view"]'), 'add-view button (after edit)').to.not.exist;
-            expect(find('[data-test-button="edit-view"]'), 'edit-view button (after edit)').to.exist;
+                await click('[data-test-link="posts"]');
+
+                expect(findAll('[data-test-post-id]')).to.have.length(1);
+                expect(find('[data-test-no-posts-box]')).to.not.exist;
+            });
         });
 
-        it('can navigate to custom views', async function () {
-            this.server.create('setting', {
-                group: 'site',
-                key: 'shared_views',
-                value: JSON.stringify([{
-                    route: 'posts',
-                    name: 'My posts',
-                    filter: {
-                        author: admin.slug
-                    }
-                }])
+        describe('as author', function () {
+            let author, authorPost;
+
+            beforeEach(async function () {
+                let authorRole = this.server.create('role', {name: 'Author'});
+                author = this.server.create('user', {roles: [authorRole]});
+                let adminRole = this.server.create('role', {name: 'Administrator'});
+                let admin = this.server.create('user', {roles: [adminRole]});
+
+                // create posts
+                authorPost = this.server.create('post', {authors: [author], status: 'published', title: 'Author Post'});
+                this.server.create('post', {authors: [admin], status: 'scheduled', title: 'Admin Post'});
+
+                await authenticateSession();
             });
 
-            await visit('/posts');
+            it('only fetches the author\'s posts', async function () {
+                await visit('/posts');
+                // trigger a filter request so we can grab the posts API request easily
+                await selectChoose('[data-test-type-select]', 'Published posts');
+
+                // API request includes author filter
+                let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                expect(lastRequest.queryParams.filter).to.have.string(`authors:${author.slug}`);
 
-            // nav bar contains default + custom views
-            expect(find('[data-test-nav-custom="posts-Drafts"]')).to.exist;
-            expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.exist;
-            expect(find('[data-test-nav-custom="posts-Published"]')).to.exist;
-            expect(find('[data-test-nav-custom="posts-My posts"]')).to.exist;
-
-            // screen has default title and sidebar is showing inactive custom view
-            expect(find('[data-test-screen-title]')).to.have.rendered.text('Posts');
-            expect(find('[data-test-nav="posts"]')).to.have.class('active');
-
-            // clicking sidebar custom view link works
-            await click('[data-test-nav-custom="posts-Scheduled"]');
-            expect(currentURL()).to.equal('/posts?type=scheduled');
-            expect(find('[data-test-screen-title]').innerText).to.match(/Scheduled/);
-            expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.have.class('active');
-
-            // clicking the main posts link resets
-            await click('[data-test-nav="posts"]');
-            expect(currentURL()).to.equal('/posts');
-            expect(find('[data-test-screen-title]')).to.have.rendered.text('Posts');
-            expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.not.have.class('active');
-
-            // changing a filter to match a custom view shows custom view
-            await selectChoose('[data-test-type-select]', 'Scheduled posts');
-            expect(currentURL()).to.equal('/posts?type=scheduled');
-            expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.have.class('active');
-            expect(find('[data-test-screen-title]').innerText).to.match(/Scheduled/);
+                // only author's post is shown
+                expect(findAll('[data-test-post-id]').length, 'post count').to.equal(1);
+                expect(find(`[data-test-post-id="${authorPost.id}"]`), 'author post').to.exist;
+            });
         });
-    });
 
-    describe('as author', function () {
-        let author, authorPost;
+        describe('as admin', function () {
+            let admin, editor, publishedPost, scheduledPost, draftPost, authorPost;
 
-        beforeEach(async function () {
-            let authorRole = this.server.create('role', {name: 'Author'});
-            author = this.server.create('user', {roles: [authorRole]});
-            let adminRole = this.server.create('role', {name: 'Administrator'});
-            let admin = this.server.create('user', {roles: [adminRole]});
+            beforeEach(async function () {
+                let adminRole = this.server.create('role', {name: 'Administrator'});
+                admin = this.server.create('user', {roles: [adminRole]});
+                let editorRole = this.server.create('role', {name: 'Editor'});
+                editor = this.server.create('user', {roles: [editorRole]});
 
-            // create posts
-            authorPost = this.server.create('post', {authors: [author], status: 'published', title: 'Author Post'});
-            this.server.create('post', {authors: [admin], status: 'scheduled', title: 'Admin Post'});
+                publishedPost = this.server.create('post', {authors: [admin], status: 'published', title: 'Published Post', visibility: 'paid'});
+                scheduledPost = this.server.create('post', {authors: [admin], status: 'scheduled', title: 'Scheduled Post'});
+                draftPost = this.server.create('post', {authors: [admin], status: 'draft', title: 'Draft Post'});
+                authorPost = this.server.create('post', {authors: [editor], status: 'published', title: 'Editor Published Post'});
 
-            return await authenticateSession();
-        });
+                // pages shouldn't appear in the list
+                this.server.create('page', {authors: [admin], status: 'published', title: 'Published Page'});
 
-        it('only fetches the author\'s posts', async function () {
-            await visit('/posts');
-            // trigger a filter request so we can grab the posts API request easily
-            await selectChoose('[data-test-type-select]', 'Published posts');
+                await authenticateSession();
+            });
 
-            // API request includes author filter
-            let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.filter).to.have.string(`authors:${author.slug}`);
+            describe('displays and filter posts', function () {
+                it('displays posts', async function () {
+                    await visit('/posts');
+
+                    const posts = findAll('[data-test-post-id]');
+                    // displays all posts by default (all statuses) [no pages]
+                    expect(posts.length, 'all posts count').to.equal(4);
+
+                    // make sure display is scheduled > draft > published/sent
+                    expect(posts[0].querySelector('.gh-content-entry-title').textContent, 'post 1 title').to.contain('Scheduled Post');
+                    expect(posts[1].querySelector('.gh-content-entry-title').textContent, 'post 2 title').to.contain('Draft Post');
+                    expect(posts[2].querySelector('.gh-content-entry-title').textContent, 'post 3 title').to.contain('Published Post');
+                    expect(posts[3].querySelector('.gh-content-entry-title').textContent, 'post 4 title').to.contain('Editor Published Post');
+
+                    // check API requests
+                    let lastRequests = this.server.pretender.handledRequests.filter(request => request.url.includes('/posts/'));
+                    expect(lastRequests[0].queryParams.filter, 'scheduled request filter').to.have.string('status:scheduled');
+                    expect(lastRequests[1].queryParams.filter, 'drafts request filter').to.have.string('status:draft');
+                    expect(lastRequests[2].queryParams.filter, 'published request filter').to.have.string('status:[published,sent]');
+                });
+
+                it('can filter by status', async function () {
+                    await visit('/posts');
+
+                    // show draft posts
+                    await selectChoose('[data-test-type-select]', 'Draft posts');
+
+                    // API request is correct
+                    let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                    expect(lastRequest.queryParams.filter, '"drafts" request status filter').to.have.string('status:draft');
+                    // Displays draft post
+                    expect(findAll('[data-test-post-id]').length, 'drafts count').to.equal(1);
+                    expect(find(`[data-test-post-id="${draftPost.id}"]`), 'draft post').to.exist;
+
+                    // show published posts
+                    await selectChoose('[data-test-type-select]', 'Published posts');
+
+                    // API request is correct
+                    [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                    expect(lastRequest.queryParams.filter, '"published" request status filter').to.have.string('status:published');
+                    // Displays three published posts + pages
+                    expect(findAll('[data-test-post-id]').length, 'published count').to.equal(2);
+                    expect(find(`[data-test-post-id="${publishedPost.id}"]`), 'admin published post').to.exist;
+                    expect(find(`[data-test-post-id="${authorPost.id}"]`), 'author published post').to.exist;
+
+                    // show scheduled posts
+                    await selectChoose('[data-test-type-select]', 'Scheduled posts');
+
+                    // API request is correct
+                    [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                    expect(lastRequest.queryParams.filter, '"scheduled" request status filter').to.have.string('status:scheduled');
+                    // Displays scheduled post
+                    expect(findAll('[data-test-post-id]').length, 'scheduled count').to.equal(1);
+                    expect(find(`[data-test-post-id="${scheduledPost.id}"]`), 'scheduled post').to.exist;
+                });
+
+                it('can filter by author', async function () {
+                    await visit('/posts');
+
+                    // show all posts by editor
+                    await selectChoose('[data-test-author-select]', editor.name);
+
+                    // API request is correct
+                    let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                    expect(lastRequest.queryParams.allFilter, '"editor" request status filter')
+                        .to.have.string('status:[draft,scheduled,published,sent]');
+                    expect(lastRequest.queryParams.allFilter, '"editor" request filter param')
+                        .to.have.string(`authors:${editor.slug}`);
+
+                    // Displays editor post
+                    expect(findAll('[data-test-post-id]').length, 'editor count').to.equal(1);
+                });
+
+                it('can filter by visibility', async function () {
+                    await visit('/posts');
+
+                    await selectChoose('[data-test-visibility-select]', 'Paid members-only');
+                    let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                    expect(lastRequest.queryParams.allFilter, '"visibility" request filter param')
+                        .to.have.string('visibility:[paid,tiers]');
+                    let posts = findAll('[data-test-post-id]');
+                    expect(posts.length, 'all posts count').to.equal(1);
+
+                    await selectChoose('[data-test-visibility-select]', 'Public');
+                    [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                    expect(lastRequest.queryParams.allFilter, '"visibility" request filter param')
+                        .to.have.string('visibility:public');
+                    posts = findAll('[data-test-post-id]');
+                    expect(posts.length, 'all posts count').to.equal(3);
+                });
+
+                it('can filter by tag', async function () {
+                    this.server.create('tag', {name: 'B - Second', slug: 'second'});
+                    this.server.create('tag', {name: 'Z - Last', slug: 'last'});
+                    this.server.create('tag', {name: 'A - First', slug: 'first'});
+
+                    await visit('/posts');
+                    await clickTrigger('[data-test-tag-select]');
+
+                    let options = findAll('.ember-power-select-option');
+
+                    // check that dropdown sorts alphabetically
+                    expect(options[0].textContent.trim()).to.equal('All tags');
+                    expect(options[1].textContent.trim()).to.equal('A - First');
+                    expect(options[2].textContent.trim()).to.equal('B - Second');
+                    expect(options[3].textContent.trim()).to.equal('Z - Last');
+
+                    // select one
+                    await selectChoose('[data-test-tag-select]', 'B - Second');
+                    // affirm request
+                    let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                    expect(lastRequest.queryParams.allFilter, '"tag" request filter param').to.have.string('tag:second');
+                });
+            });
 
-            // only author's post is shown
-            expect(findAll('[data-test-post-id]').length, 'post count').to.equal(1);
-            expect(find(`[data-test-post-id="${authorPost.id}"]`), 'author post').to.exist;
-        });
-    });
+            describe('context menu actions', function () {
+                describe('single post', function () {
+                    it('can duplicate a post', async function () {
+                        await visit('/posts');
 
-    describe('as contributor', function () {
-        beforeEach(async function () {
-            let contributorRole = this.server.create('role', {name: 'Contributor'});
-            this.server.create('user', {roles: [contributorRole]});
+                        // get the post
+                        const post = find(`[data-test-post-id="${publishedPost.id}"]`);
+                        expect(post, 'post').to.exist;
 
-            return await authenticateSession();
-        });
+                        await triggerEvent(post, 'contextmenu');
 
-        it('shows posts list and allows post creation', async function () {
-            await visit('/posts');
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+
+                        let buttons = contextMenu.querySelectorAll('button');
+
+                        expect(contextMenu, 'context menu').to.exist;
+                        expect(buttons.length, 'context menu buttons').to.equal(6);
+                        expect(buttons[0].innerText.trim(), 'context menu button 1').to.contain('Copy link to post');
+                        expect(buttons[1].innerText.trim(), 'context menu button 1').to.contain('Unpublish');
+                        expect(buttons[2].innerText.trim(), 'context menu button 2').to.contain('Feature'); // or Unfeature
+                        expect(buttons[3].innerText.trim(), 'context menu button 3').to.contain('Add a tag');
+                        expect(buttons[4].innerText.trim(), 'context menu button 4').to.contain('Duplicate');
+                        expect(buttons[5].innerText.trim(), 'context menu button 5').to.contain('Delete');
+
+                        // duplicate the post
+                        await click(buttons[4]);
+
+                        const posts = findAll('[data-test-post-id]');
+                        expect(posts.length, 'all posts count').to.equal(5);
+                        let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                        expect(lastRequest.url, 'request url').to.match(new RegExp(`/posts/${publishedPost.id}/copy/`));
+                    });
+
+                    it('can copy a post link', async function () {
+                        sinon.stub(navigator.clipboard, 'writeText').resolves();
+
+                        await visit('/posts');
+
+                        // get the post
+                        const post = find(`[data-test-post-id="${publishedPost.id}"]`);
+                        expect(post, 'post').to.exist;
+
+                        await triggerEvent(post, 'contextmenu');
+
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+
+                        let buttons = contextMenu.querySelectorAll('button');
+
+                        expect(contextMenu, 'context menu').to.exist;
+                        expect(buttons.length, 'context menu buttons').to.equal(6);
+                        expect(buttons[0].innerText.trim(), 'context menu button 1').to.contain('Copy link to post');
+                        expect(buttons[1].innerText.trim(), 'context menu button 1').to.contain('Unpublish');
+                        expect(buttons[2].innerText.trim(), 'context menu button 2').to.contain('Feature'); // or Unfeature
+                        expect(buttons[3].innerText.trim(), 'context menu button 3').to.contain('Add a tag');
+                        expect(buttons[4].innerText.trim(), 'context menu button 4').to.contain('Duplicate');
+                        expect(buttons[5].innerText.trim(), 'context menu button 5').to.contain('Delete');
+
+                        // Copy the post link
+                        await click(buttons[0]);
+
+                        // Check that the notification is displayed
+                        expect(find('[data-test-text="notification-content"]')).to.contain.text('Post link copied');
+
+                        // Check that the clipboard contains the right content
+                        expect(navigator.clipboard.writeText.calledOnce).to.be.true;
+                        expect(navigator.clipboard.writeText.firstCall.args[0]).to.equal(`http://localhost:4200/${publishedPost.slug}/`);
+                    });
+
+                    it('can copy a preview link', async function () {
+                        sinon.stub(navigator.clipboard, 'writeText').resolves();
+
+                        await visit('/posts');
+
+                        // get the post
+                        const post = find(`[data-test-post-id="${draftPost.id}"]`);
+                        expect(post, 'post').to.exist;
+
+                        await triggerEvent(post, 'contextmenu');
+
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+
+                        let buttons = contextMenu.querySelectorAll('button');
+
+                        expect(contextMenu, 'context menu').to.exist;
+                        expect(buttons.length, 'context menu buttons').to.equal(5);
+                        expect(buttons[0].innerText.trim(), 'context menu button 1').to.contain('Copy preview link');
+                        expect(buttons[1].innerText.trim(), 'context menu button 2').to.contain('Feature'); // or Unfeature
+                        expect(buttons[2].innerText.trim(), 'context menu button 3').to.contain('Add a tag');
+                        expect(buttons[3].innerText.trim(), 'context menu button 4').to.contain('Duplicate');
+                        expect(buttons[4].innerText.trim(), 'context menu button 5').to.contain('Delete');
+
+                        // Copy the preview link
+                        await click(buttons[0]);
+
+                        // Check that the notification is displayed
+                        expect(find('[data-test-text="notification-content"]')).to.contain.text('Preview link copied');
+
+                        // Check that the clipboard contains the right content
+                        expect(navigator.clipboard.writeText.calledOnce).to.be.true;
+                        expect(navigator.clipboard.writeText.firstCall.args[0]).to.equal(`http://localhost:4200/p/${draftPost.uuid}/`);
+                    });
+                });
+
+                describe('multiple posts', function () {
+                    it('can feature and unfeature', async function () {
+                        await visit('/posts');
 
-            // has an empty state
-            expect(findAll('[data-test-post-id]')).to.have.length(0);
-            expect(find('[data-test-no-posts-box]')).to.exist;
-            expect(find('[data-test-link="write-a-new-post"]')).to.exist;
+                        // get all posts
+                        const posts = findAll('[data-test-post-id]');
+                        expect(posts.length, 'all posts count').to.equal(4);
 
-            await click('[data-test-link="write-a-new-post"]');
+                        const postThreeContainer = posts[2].parentElement; // draft post
+                        const postFourContainer = posts[3].parentElement; // published post
 
-            expect(currentURL()).to.equal('/editor/post');
+                        await click(postThreeContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+                        await click(postFourContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
 
-            await fillIn('[data-test-editor-title-input]', 'First contributor post');
-            await blur('[data-test-editor-title-input]');
+                        expect(postFourContainer.getAttribute('data-selected'), 'postFour selected').to.exist;
+                        expect(postThreeContainer.getAttribute('data-selected'), 'postThree selected').to.exist;
 
-            expect(currentURL()).to.equal('/editor/post/1');
+                        // NOTE: right clicks don't seem to work in these tests
+                        //  contextmenu is the event triggered - https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
+                        await triggerEvent(postFourContainer, 'contextmenu');
 
-            await click('[data-test-link="posts"]');
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+                        expect(contextMenu, 'context menu').to.exist;
 
-            expect(findAll('[data-test-post-id]')).to.have.length(1);
-            expect(find('[data-test-no-posts-box]')).to.not.exist;
+                        // feature the post
+                        let buttons = contextMenu.querySelectorAll('button');
+                        let featureButton = findButton('Feature', buttons);
+                        expect(featureButton, 'feature button').to.exist;
+                        await click(featureButton);
+
+                        // API request is correct - note, we don't mock the actual model updates
+                        let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                        expect(lastRequest.queryParams.filter, 'feature request id').to.equal(`id:['${publishedPost.id}','${authorPost.id}']`);
+                        expect(JSON.parse(lastRequest.requestBody).bulk.action, 'feature request action').to.equal('feature');
+
+                        // ensure ui shows these are now featured
+                        expect(postThreeContainer.querySelector('.gh-featured-post'), 'postFour featured').to.exist;
+                        expect(postFourContainer.querySelector('.gh-featured-post'), 'postFour featured').to.exist;
+
+                        // unfeature the posts
+                        await triggerEvent(postFourContainer, 'contextmenu');
+
+                        contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+                        expect(contextMenu, 'context menu').to.exist;
+
+                        // unfeature the posts
+                        buttons = contextMenu.querySelectorAll('button');
+                        featureButton = findButton('Unfeature', buttons);
+                        expect(featureButton, 'unfeature button').to.exist;
+                        await click(featureButton);
+
+                        // API request is correct - note, we don't mock the actual model updates
+                        [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                        expect(lastRequest.queryParams.filter, 'unfeature request id').to.equal(`id:['${publishedPost.id}','${authorPost.id}']`);
+                        expect(JSON.parse(lastRequest.requestBody).bulk.action, 'unfeature request action').to.equal('unfeature');
+
+                        // ensure ui shows these are now unfeatured
+                        expect(postThreeContainer.querySelector('.gh-featured-post'), 'postFour featured').to.not.exist;
+                        expect(postFourContainer.querySelector('.gh-featured-post'), 'postFour featured').to.not.exist;
+                    });
+
+                    it('can add a tag', async function () {
+                        await visit('/posts');
+
+                        // get all posts
+                        const posts = findAll('[data-test-post-id]');
+                        expect(posts.length, 'all posts count').to.equal(4);
+
+                        const postThreeContainer = posts[2].parentElement; // draft post
+                        const postFourContainer = posts[3].parentElement; // published post
+
+                        await click(postThreeContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+                        await click(postFourContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+
+                        expect(postFourContainer.getAttribute('data-selected'), 'postFour selected').to.exist;
+                        expect(postThreeContainer.getAttribute('data-selected'), 'postThree selected').to.exist;
+
+                        // NOTE: right clicks don't seem to work in these tests
+                        //  contextmenu is the event triggered - https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
+                        await triggerEvent(postFourContainer, 'contextmenu');
+
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+                        expect(contextMenu, 'context menu').to.exist;
+
+                        // add a tag to the posts
+                        let buttons = contextMenu.querySelectorAll('button');
+                        let addTagButton = findButton('Add a tag', buttons);
+                        expect(addTagButton, 'add tag button').to.exist;
+                        await click(addTagButton);
+
+                        const addTagsModal = find('[data-test-modal="add-tags"]');
+                        expect(addTagsModal, 'tag settings modal').to.exist;
+
+                        const input = addTagsModal.querySelector('input');
+                        expect(input, 'tag input').to.exist;
+                        await fillIn(input, 'test-tag');
+                        await triggerKeyEvent(input, 'keydown', 13);
+                        await click('[data-test-button="confirm"]');
+
+                        // API request is correct - note, we don't mock the actual model updates
+                        let [lastRequest] = this.server.pretender.handledRequests.slice(-2);
+                        expect(lastRequest.queryParams.filter, 'add tag request id').to.equal(`id:['${publishedPost.id}','${authorPost.id}']`);
+                        expect(JSON.parse(lastRequest.requestBody).bulk.action, 'add tag request action').to.equal('addTag');
+                    });
+
+                    // TODO: Skip for now. This causes the member creation test to fail ('New member' text doesn't show... ???).
+                    it.skip('can change access', async function () {
+                        await visit('/posts');
+
+                        // get all posts
+                        const posts = findAll('[data-test-post-id]');
+                        expect(posts.length, 'all posts count').to.equal(4);
+
+                        const postThreeContainer = posts[2].parentElement; // draft post
+                        const postFourContainer = posts[3].parentElement; // published post
+
+                        await click(postThreeContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+                        await click(postFourContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+
+                        expect(postFourContainer.getAttribute('data-selected'), 'postFour selected').to.exist;
+                        expect(postThreeContainer.getAttribute('data-selected'), 'postThree selected').to.exist;
+
+                        await triggerEvent(postFourContainer, 'contextmenu');
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+                        expect(contextMenu, 'context menu').to.exist;
+                        let buttons = contextMenu.querySelectorAll('button');
+                        let changeAccessButton = findButton('Change access', buttons);
+
+                        expect(changeAccessButton, 'change access button').not.to.exist;
+
+                        const settingsService = this.owner.lookup('service:settings');
+                        await settingsService.set('membersEnabled', true);
+
+                        await triggerEvent(postFourContainer, 'contextmenu');
+                        contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+                        expect(contextMenu, 'context menu').to.exist;
+                        buttons = contextMenu.querySelectorAll('button');
+                        changeAccessButton = findButton('Change access', buttons);
+
+                        expect(changeAccessButton, 'change access button').to.exist;
+                        await click(changeAccessButton);
+
+                        const changeAccessModal = find('[data-test-modal="edit-posts-access"]');
+                        const selectElement = changeAccessModal.querySelector('select');
+                        await fillIn(selectElement, 'members');
+                        await click('[data-test-button="confirm"]');
+
+                        // check API request
+                        let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                        expect(lastRequest.queryParams.filter, 'change access request id').to.equal(`id:['${publishedPost.id}','${authorPost.id}']`);
+                        expect(JSON.parse(lastRequest.requestBody).bulk.action, 'change access request action').to.equal('access');
+                    });
+
+                    it('can unpublish', async function () {
+                        await visit('/posts');
+
+                        // get all posts
+                        const posts = findAll('[data-test-post-id]');
+                        expect(posts.length, 'all posts count').to.equal(4);
+
+                        const postThreeContainer = posts[2].parentElement; // draft post
+                        const postFourContainer = posts[3].parentElement; // published post
+
+                        await click(postThreeContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+                        await click(postFourContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+
+                        expect(postFourContainer.getAttribute('data-selected'), 'postFour selected').to.exist;
+                        expect(postThreeContainer.getAttribute('data-selected'), 'postThree selected').to.exist;
+
+                        // NOTE: right clicks don't seem to work in these tests
+                        //  contextmenu is the event triggered - https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
+                        await triggerEvent(postFourContainer, 'contextmenu');
+
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+                        expect(contextMenu, 'context menu').to.exist;
+
+                        // unpublish the posts
+                        let buttons = contextMenu.querySelectorAll('button');
+                        let unpublishButton = findButton('Unpublish', buttons);
+                        expect(unpublishButton, 'unpublish button').to.exist;
+                        await click(unpublishButton);
+
+                        // handle modal
+                        const modal = find('[data-test-modal="unpublish-posts"]');
+                        expect(modal, 'unpublish modal').to.exist;
+                        await click('[data-test-button="confirm"]');
+
+                        // API request is correct - note, we don't mock the actual model updates
+                        let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                        expect(lastRequest.queryParams.filter, 'unpublish request id').to.equal(`id:['${publishedPost.id}','${authorPost.id}']`);
+                        expect(JSON.parse(lastRequest.requestBody).bulk.action, 'unpublish request action').to.equal('unpublish');
+
+                        // ensure ui shows these are now unpublished
+                        expect(postThreeContainer.querySelector('.gh-content-entry-status').textContent, 'postThree status').to.contain('Draft');
+                        expect(postFourContainer.querySelector('.gh-content-entry-status').textContent, 'postThree status').to.contain('Draft');
+                    });
+
+                    it('can delete', async function () {
+                        await visit('/posts');
+
+                        // get all posts
+                        const posts = findAll('[data-test-post-id]');
+                        expect(posts.length, 'all posts count').to.equal(4);
+
+                        const postThreeContainer = posts[2].parentElement; // draft post
+                        const postFourContainer = posts[3].parentElement; // published post
+
+                        await click(postThreeContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+                        await click(postFourContainer, {metaKey: ctrlOrCmd === 'command', ctrlKey: ctrlOrCmd === 'ctrl'});
+
+                        expect(postFourContainer.getAttribute('data-selected'), 'postFour selected').to.exist;
+                        expect(postThreeContainer.getAttribute('data-selected'), 'postThree selected').to.exist;
+
+                        // NOTE: right clicks don't seem to work in these tests
+                        //  contextmenu is the event triggered - https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
+                        await triggerEvent(postFourContainer, 'contextmenu');
+
+                        let contextMenu = find('.gh-posts-context-menu'); // this is a <ul> element
+                        expect(contextMenu, 'context menu').to.exist;
+
+                        // delete the posts
+                        let buttons = contextMenu.querySelectorAll('button');
+                        let deleteButton = findButton('Delete', buttons);
+                        expect(deleteButton, 'delete button').to.exist;
+                        await click(deleteButton);
+
+                        // handle modal
+                        const modal = find('[data-test-modal="delete-posts"]');
+                        expect(modal, 'delete modal').to.exist;
+                        await click('[data-test-button="confirm"]');
+
+                        // API request is correct - note, we don't mock the actual model updates
+                        let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                        expect(lastRequest.queryParams.filter, 'delete request id').to.equal(`id:['${publishedPost.id}','${authorPost.id}']`);
+                        expect(lastRequest.method, 'delete request method').to.equal('DELETE');
+
+                        // ensure ui shows these are now deleted
+                        expect(findAll('[data-test-post-id]').length, 'all posts count').to.equal(2);
+                    });
+                });
+            });
+
+            it('can add and edit custom views', async function () {
+                // actions are not visible when there's no filter
+                await visit('/posts');
+                expect(find('[data-test-button="edit-view"]'), 'edit-view button (no filter)').to.not.exist;
+                expect(find('[data-test-button="add-view"]'), 'add-view button (no filter)').to.not.exist;
+
+                // add action is visible after filtering to a non-default filter
+                await selectChoose('[data-test-author-select]', admin.name);
+                expect(find('[data-test-button="add-view"]'), 'add-view button (with filter)').to.exist;
+
+                // adding view shows it in the sidebar
+                await click('[data-test-button="add-view"]'), 'add-view button';
+                expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (on add)').to.exist;
+                expect(find('[data-test-modal="custom-view-form"] h1').textContent.trim()).to.equal('New view');
+                await fillIn('[data-test-input="custom-view-name"]', 'Test view');
+                await click('[data-test-button="save-custom-view"]');
+                // modal closes on save
+                expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (after add save)').to.not.exist;
+                // UI updates
+                expect(find('[data-test-nav-custom="posts-Test view"]'), 'new view nav').to.exist;
+                expect(find('[data-test-nav-custom="posts-Test view"]').textContent.trim()).to.equal('Test view');
+                expect(find('[data-test-button="add-view"]'), 'add-view button (on existing view)').to.not.exist;
+                expect(find('[data-test-button="edit-view"]'), 'edit-view button (on existing view)').to.exist;
+
+                // editing view
+                await click('[data-test-button="edit-view"]'), 'edit-view button';
+                expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (on edit)').to.exist;
+                expect(find('[data-test-modal="custom-view-form"] h1').textContent.trim()).to.equal('Edit view');
+                await fillIn('[data-test-input="custom-view-name"]', 'Updated view');
+                await click('[data-test-button="save-custom-view"]');
+                // modal closes on save
+                expect(find('[data-test-modal="custom-view-form"]'), 'custom view modal (after edit save)').to.not.exist;
+                // UI updates
+                expect(find('[data-test-nav-custom="posts-Updated view"]')).to.exist;
+                expect(find('[data-test-nav-custom="posts-Updated view"]').textContent.trim()).to.equal('Updated view');
+                expect(find('[data-test-button="add-view"]'), 'add-view button (after edit)').to.not.exist;
+                expect(find('[data-test-button="edit-view"]'), 'edit-view button (after edit)').to.exist;
+            });
+
+            it('can navigate to custom views', async function () {
+                this.server.create('setting', {
+                    group: 'site',
+                    key: 'shared_views',
+                    value: JSON.stringify([{
+                        route: 'posts',
+                        name: 'My posts',
+                        filter: {
+                            author: admin.slug
+                        }
+                    }])
+                });
+
+                await visit('/posts');
+
+                // nav bar contains default + custom views
+                expect(find('[data-test-nav-custom="posts-Drafts"]')).to.exist;
+                expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.exist;
+                expect(find('[data-test-nav-custom="posts-Published"]')).to.exist;
+                expect(find('[data-test-nav-custom="posts-My posts"]')).to.exist;
+
+                // screen has default title and sidebar is showing inactive custom view
+                expect(find('[data-test-screen-title]')).to.have.rendered.trimmed.text('Posts');
+                expect(find('[data-test-nav="posts"]')).to.have.class('active');
+
+                // clicking sidebar custom view link works
+                await click('[data-test-nav-custom="posts-Scheduled"]');
+                expect(currentURL()).to.equal('/posts?type=scheduled');
+                expect(find('[data-test-screen-title]').innerText).to.match(/Scheduled/);
+                expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.have.class('active');
+
+                // clicking the main posts link resets
+                await click('[data-test-nav="posts"]');
+                expect(currentURL()).to.equal('/posts');
+                expect(find('[data-test-screen-title]')).to.have.rendered.trimmed.text('Posts');
+                expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.not.have.class('active');
+
+                // changing a filter to match a custom view shows custom view
+                await selectChoose('[data-test-type-select]', 'Scheduled posts');
+                expect(currentURL()).to.equal('/posts?type=scheduled');
+                expect(find('[data-test-nav-custom="posts-Scheduled"]')).to.have.class('active');
+                expect(find('[data-test-screen-title]').innerText).to.match(/Scheduled/);
+            });
+        });
+    });
+
+    // NOTE: Because the pages list is (at this point in time) a thin extension of the posts list, we should not need to duplicate all of the tests.
+    //  The main difference is that we fetch pages, not posts.
+    //  IF we implement any kind of functionality that *is* specific to a post or page and differentiate these models further, we will need to add tests then.
+    describe('pages', function () {
+        describe('as admin', function () {
+            let admin, editor;
+
+            beforeEach(async function () {
+                let adminRole = this.server.create('role', {name: 'Administrator'});
+                admin = this.server.create('user', {roles: [adminRole]});
+                let editorRole = this.server.create('role', {name: 'Editor'});
+                editor = this.server.create('user', {roles: [editorRole]});
+
+                // posts shouldn't show in the pages list
+                // TODO: figure out why we need post counts to be >= page count for mirage to work right
+                this.server.create('post', {authors: [admin], status: 'published', title: 'Published Post', visibility: 'paid'});
+                this.server.create('post', {authors: [admin], status: 'published', title: 'Published Post', visibility: 'paid'});
+                this.server.create('post', {authors: [admin], status: 'published', title: 'Published Post', visibility: 'paid'});
+                this.server.create('post', {authors: [admin], status: 'published', title: 'Published Post', visibility: 'paid'});
+
+                this.server.create('page', {authors: [admin], status: 'published', title: 'Published Page'});
+                this.server.create('page', {authors: [editor], status: 'published', title: 'Editor Published Page'});
+                this.server.create('page', {authors: [admin], status: 'draft', title: 'Draft Page'});
+                this.server.create('page', {authors: [admin], status: 'scheduled', title: 'Scheduled Page'});
+
+                await authenticateSession();
+            });
+
+            it('can view pages', async function () {
+                await visit('/pages');
+
+                const pages = findAll('[data-test-post-id]');
+                // displays all pages by default (all statuses)
+                expect(pages.length, 'all pages count').to.equal(4);
+            });
+
+            it('can filter pages', async function () {
+                await visit('/pages');
+
+                // show draft pages
+                await selectChoose('[data-test-type-select]', 'Draft pages');
+
+                // API request is correct
+                let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                expect(lastRequest.queryParams.filter, '"drafts" request status filter').to.have.string('status:draft');
+                // Displays draft page
+                expect(findAll('[data-test-post-id]').length, 'drafts count').to.equal(1);
+                expect(find('[data-test-post-id="3"]'), 'draft page').to.exist;
+
+                // show published pages
+                await selectChoose('[data-test-type-select]', 'Published pages');
+
+                // API request is correct
+                [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                expect(lastRequest.queryParams.filter, '"published" request status filter').to.have.string('status:published');
+                // Displays two published pages
+                expect(findAll('[data-test-post-id]').length, 'published count').to.equal(2);
+                expect(find('[data-test-post-id="1"]'), 'admin published page').to.exist;
+                expect(find('[data-test-post-id="2"]'), 'editor published page').to.exist;
+
+                // show scheduled pages
+                await selectChoose('[data-test-type-select]', 'Scheduled pages');
+
+                // API request is correct
+                [lastRequest] = this.server.pretender.handledRequests.slice(-1);
+                expect(lastRequest.queryParams.filter, '"scheduled" request status filter').to.have.string('status:scheduled');
+                // Displays scheduled page
+                expect(findAll('[data-test-post-id]').length, 'scheduled count').to.equal(1);
+                expect(find('[data-test-post-id="4"]'), 'scheduled page').to.exist;
+            });
         });
     });
 });
diff --git a/ghost/admin/tests/acceptance/custom-post-templates-test.js b/ghost/admin/tests/acceptance/custom-post-templates-test.js
index d3ad9abec12..a448a578447 100644
--- a/ghost/admin/tests/acceptance/custom-post-templates-test.js
+++ b/ghost/admin/tests/acceptance/custom-post-templates-test.js
@@ -19,7 +19,7 @@ describe('Acceptance: Custom Post Templates', function () {
         let role = this.server.create('role', {name: 'Administrator'});
         this.server.create('user', {roles: [role]});
 
-        return await authenticateSession();
+        await authenticateSession();
     });
 
     describe('with custom templates', function () {
diff --git a/ghost/admin/tests/acceptance/dashboard-test.js b/ghost/admin/tests/acceptance/dashboard-test.js
index 3406b3f7636..70d10516e5e 100644
--- a/ghost/admin/tests/acceptance/dashboard-test.js
+++ b/ghost/admin/tests/acceptance/dashboard-test.js
@@ -16,7 +16,7 @@ describe('Acceptance: Dashboard', function () {
         let role = this.server.create('role', {name: 'Administrator'});
         this.server.create('user', {roles: [role]});
 
-        return await authenticateSession();
+        await authenticateSession();
     });
 
     it('can visit /dashboard', async function () {
diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js
index 9d596fd2181..b1d828862fd 100644
--- a/ghost/admin/tests/acceptance/editor-test.js
+++ b/ghost/admin/tests/acceptance/editor-test.js
@@ -5,6 +5,7 @@ import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-sup
 import {beforeEach, describe, it} from 'mocha';
 import {blur, click, currentRouteName, currentURL, fillIn, find, findAll, triggerEvent, typeIn} from '@ember/test-helpers';
 import {datepickerSelect} from 'ember-power-datepicker/test-support';
+import {enableLabsFlag} from '../helpers/labs-flag';
 import {expect} from 'chai';
 import {selectChoose} from 'ember-power-select/test-support';
 import {setupApplicationTest} from 'ember-mocha';
@@ -117,7 +118,7 @@ describe('Acceptance: Editor', function () {
             author = this.server.create('user', {roles: [role]});
             this.server.loadFixtures('settings');
 
-            return await authenticateSession();
+            await authenticateSession();
         });
 
         describe('post settings menu', function () {
@@ -153,7 +154,7 @@ describe('Acceptance: Editor', function () {
                 await blur('[data-test-date-time-picker-time-input]');
 
                 expect(find('[data-test-date-time-picker-error]').textContent.trim(), 'inline error response for future time')
-                    .to.equal('Must be in the past');
+                    .to.equal('Please choose a past date and time.');
 
                 // closing the PSM will reset the invalid date/time
                 await click('[data-test-psm-trigger]');
@@ -235,7 +236,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]});
@@ -490,6 +491,38 @@ describe('Acceptance: Editor', function () {
             ).to.equal(0);
         });
 
+        it('handles in-editor excerpt update and validation', async function () {
+            enableLabsFlag(this.server, 'editorExcerpt');
+
+            let post = this.server.create('post', {authors: [author], customExcerpt: 'Existing excerpt'});
+
+            await visit(`/editor/post/${post.id}`);
+
+            expect(find('[data-test-textarea="excerpt"]'), 'initial textarea').to.be.visible;
+            expect(find('[data-test-textarea="excerpt"]'), 'initial textarea').to.have.value('Existing excerpt');
+
+            await fillIn('[data-test-textarea="excerpt"]', 'New excerpt');
+            expect(find('[data-test-textarea="excerpt"]'), 'updated textarea').to.have.value('New excerpt');
+
+            await triggerEvent('[data-test-textarea="excerpt"]', 'keydown', {
+                key: 's',
+                keyCode: 83, // s
+                metaKey: ctrlOrCmd === 'command',
+                ctrlKey: ctrlOrCmd === 'ctrl'
+            });
+
+            expect(post.customExcerpt, 'saved excerpt').to.equal('New excerpt');
+
+            await fillIn('[data-test-textarea="excerpt"]', Array(302).join('a'));
+
+            expect(find('[data-test-error="excerpt"]'), 'excerpt error').to.exist;
+            expect(find('[data-test-error="excerpt"]')).to.have.trimmed.text('Excerpt cannot be longer than 300 characters.');
+
+            await fillIn('[data-test-textarea="excerpt"]', Array(300).join('a'));
+
+            expect(find('[data-test-error="excerpt"]'), 'excerpt error').to.not.exist;
+        });
+
         // https://github.com/TryGhost/Ghost/issues/11786
         // NOTE: Flaky test with moving to Lexical editor, skipping for now
         it.skip('save shortcut works when tags/authors field is focused', async function () {
@@ -570,5 +603,71 @@ describe('Acceptance: Editor', function () {
                 'breadcrumb link'
             ).to.equal(`/ghost/posts/analytics/${post.id}`);
         });
+
+        it('handles TKs in title', async function () {
+            let post = this.server.create('post', {authors: [author]});
+
+            await visit(`/editor/post/${post.id}`);
+
+            expect(
+                find('[data-test-editor-title-input]').value,
+                'initial title'
+            ).to.equal('Post 0');
+
+            await fillIn('[data-test-editor-title-input]', 'Test TK Title');
+
+            expect(
+                find('[data-test-editor-title-input]').value,
+                'title after typing'
+            ).to.equal('Test TK Title');
+
+            // check for TK indicator
+            expect(
+                find('[data-testid="tk-indicator"]'),
+                'TK indicator text'
+            ).to.exist;
+
+            // click publish to see if confirmation comes up
+            await click('[data-test-button="publish-flow"]');
+
+            expect(
+                find('[data-test-modal="tk-reminder"]'),
+                'TK reminder modal'
+            ).to.exist;
+        });
+
+        it('handles TKs in excerpt', async function () {
+            enableLabsFlag(this.server, 'editorExcerpt');
+
+            const post = this.server.create('post', {authors: [author]});
+
+            await visit(`/editor/post/${post.id}`);
+
+            expect(
+                find('[data-test-textarea="excerpt"]').value,
+                'initial excerpt'
+            ).to.equal('');
+
+            await fillIn('[data-test-textarea="excerpt"]', 'Test TK excerpt');
+
+            expect(
+                find('[data-test-textarea="excerpt"]').value,
+                'excerpt after typing'
+            ).to.equal('Test TK excerpt');
+
+            // check for TK indicator
+            expect(
+                find('[data-testid="tk-indicator-excerpt"]'),
+                'TK indicator text'
+            ).to.exist;
+
+            // click publish to see if confirmation comes up
+            await click('[data-test-button="publish-flow"]');
+
+            expect(
+                find('[data-test-modal="tk-reminder"]'),
+                'TK reminder modal'
+            ).to.exist;
+        });
     });
 });
diff --git a/ghost/admin/tests/acceptance/editor/lexical-test.js b/ghost/admin/tests/acceptance/editor/lexical-test.js
index 1f0909ecb42..27b98bfaf87 100644
--- a/ghost/admin/tests/acceptance/editor/lexical-test.js
+++ b/ghost/admin/tests/acceptance/editor/lexical-test.js
@@ -1,6 +1,8 @@
 import loginAsRole from '../../helpers/login-as-role';
-import {currentURL} from '@ember/test-helpers';
+import {blur, click, currentURL, fillIn, find, waitFor, waitUntil} from '@ember/test-helpers';
+import {enableLabsFlag} from '../../helpers/labs-flag';
 import {expect} from 'chai';
+import {invalidateSession} from 'ember-simple-auth/test-support';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
 import {visit} from '../../helpers/visit';
@@ -11,16 +13,120 @@ describe('Acceptance: Lexical editor', function () {
 
     beforeEach(async function () {
         this.server.loadFixtures();
+        await loginAsRole('Administrator', this.server);
     });
 
     it('redirects to signin when not authenticated', async function () {
+        await invalidateSession();
+
         await visit('/editor/post/');
         expect(currentURL(), 'currentURL').to.equal('/signin');
     });
 
-    it('loads editor', async function () {
-        await loginAsRole('Administrator', this.server);
-        await visit('/editor/post/');
-        expect(currentURL(), 'currentURL').to.equal('/editor/post/');
+    describe('with new post', function () {
+        it('loads editor', async function () {
+            await visit('/editor/post/');
+            expect(currentURL(), 'currentURL').to.equal('/editor/post/');
+
+            await waitFor('[data-secondary-instance="false"] [data-lexical-editor]');
+            // find the placeholder div
+            const xpath = '//div[text()="Begin writing your post..."]';
+            const match = document.evaluate(xpath, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+            expect(match.singleNodeValue).to.exist;
+        });
+
+        it('can leave editor without unsaved changes modal', async function () {
+            await visit('/editor/post/');
+            await click('[data-test-link="posts"]');
+            expect(find('[data-test-modal="unsaved-post-changes"]')).to.not.exist;
+            expect(currentURL(), 'currentURL').to.equal('/posts');
+        });
+
+        it('saves on title change', async function () {
+            await visit('/editor/post/');
+            await fillIn('[data-test-editor-title-input]', 'Test Post');
+            await blur('[data-test-editor-title-input]');
+
+            // NOTE: during testing we switch status so quickly this doesn't catch the intermediate state
+            // await waitUntil(function () {
+            //     return find('[data-test-editor-post-status]').textContent.includes('Saving...');
+            // });
+
+            await waitUntil(function () {
+                return find('[data-test-editor-post-status]').textContent.includes('Saved');
+            }, {timeoutMessage: 'Timed out waiting for "Saved" status'});
+
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/1`);
+        });
+
+        it('saves on excerpt change', async function () {
+            // excerpt is not shown by default
+            enableLabsFlag(this.server, 'editorExcerpt');
+
+            await visit('/editor/post/');
+            await fillIn('[data-test-textarea="excerpt"]', 'Test Post');
+            await blur('[data-test-textarea="excerpt"]');
+
+            await waitUntil(function () {
+                return find('[data-test-editor-post-status]').textContent.includes('Saved');
+            }, {timeoutMessage: 'Timed out waiting for "Saved" status'});
+
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/1`);
+        });
+
+        // TODO: requires editor to be loading
+        it('saves on content change');
+    });
+
+    describe('with existing post', function () {
+        it('loads editor', async function () {
+            const post = this.server.create('post', {lexical: '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"This is a test","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}'});
+            await visit(`/editor/post/${post.id}`);
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/${post.id}`);
+            await waitFor('[data-secondary-instance="false"] [data-lexical-editor]');
+            // find the post content
+            expect(find('[data-secondary-instance="false"] [data-lexical-editor]')).to.contain.text('This is a test');
+        });
+
+        it('does not save post on title blur', async function () {
+            const post = this.server.create('post', {status: 'published'});
+            const originalTitle = post.title;
+
+            await visit('/editor/post/1');
+            await fillIn('[data-test-editor-title-input]', 'Change test');
+            await blur('[data-test-editor-title-input]');
+
+            expect(find('[data-test-editor-post-status]')).not.to.contain.text('Saved');
+            expect(post.status, 'post status').to.equal('published');
+            expect(post.title, 'saved title').to.equal(originalTitle);
+
+            await click('[data-test-link="posts"]');
+
+            expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.exist;
+
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/1`);
+        });
+
+        it('does not save post on excerpt blur', async function () {
+            // excerpt is not shown by default
+            enableLabsFlag(this.server, 'editorExcerpt');
+
+            const post = this.server.create('post', {status: 'published'});
+            const originalExcerpt = post.excerpt;
+
+            await visit('/editor/post/1');
+            await fillIn('[data-test-textarea="excerpt"]', 'Change test');
+            await blur('[data-test-textarea="excerpt"]');
+
+            expect(find('[data-test-editor-post-status]')).not.to.contain.text('Saved');
+            expect(post.status, 'post status').to.equal('published');
+            expect(post.excerpt, 'saved excerpt').to.equal(originalExcerpt);
+
+            await click('[data-test-link="posts"]');
+
+            expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.exist;
+
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/1`);
+        });
     });
 });
diff --git a/ghost/admin/tests/acceptance/editor/post-revisions-test.js b/ghost/admin/tests/acceptance/editor/post-revisions-test.js
new file mode 100644
index 00000000000..2c9df145eb3
--- /dev/null
+++ b/ghost/admin/tests/acceptance/editor/post-revisions-test.js
@@ -0,0 +1,195 @@
+import loginAsRole from '../../helpers/login-as-role';
+import moment from 'moment-timezone';
+import {click, find, findAll} from '@ember/test-helpers';
+import {enableLabsFlag} from '../../helpers/labs-flag';
+import {expect} from 'chai';
+import {setupApplicationTest} from 'ember-mocha';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+import {visit} from '../../helpers/visit';
+
+describe('Acceptance: Post revisions', function () {
+    let hooks = setupApplicationTest();
+    setupMirage(hooks);
+
+    beforeEach(async function () {
+        this.server.loadFixtures();
+
+        await loginAsRole('Administrator', this.server);
+    });
+
+    it('can restore a draft post revision', async function () {
+        const post = this.server.create('post', {
+            title: 'Current Title',
+            customExcerpt: 'Current excerpt',
+            status: 'draft'
+        });
+        this.server.create('post-revision', {
+            post,
+            title: post.title,
+            customExcerpt: 'New excerpt',
+            featureImage: 'https://example.com/new-image.jpg',
+            featureImageAlt: 'New feature alt text',
+            featureImageCaption: 'New feature caption',
+            postStatus: 'draft',
+            author: post.authors.models[0],
+            createdAt: moment(post.updatedAt).subtract(1, 'hour'),
+            reason: 'explicit_save',
+            lexical: '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"New body","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}'
+        });
+        this.server.create('post-revision', {
+            post,
+            title: 'Old Title',
+            customExcerpt: 'Old excerpt',
+            featureImage: 'https://example.com/old-image.jpg',
+            featureImageAlt: 'Old feature alt text',
+            featureImageCaption: 'Old feature caption',
+            postStatus: 'draft',
+            author: post.authors.models[0],
+            createdAt: moment(post.updatedAt).subtract(1, 'day'),
+            reason: 'initial_revision',
+            lexical: '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Old body","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}'
+        });
+
+        await visit(`/editor/post/${post.id}`);
+
+        // open post history menu
+        await click('[data-test-psm-trigger]');
+        await click('[data-test-toggle="post-history"]');
+
+        // latest and previous post listed
+        expect(findAll('[data-test-revision-item]').length).to.equal(2);
+        expect(find('[data-test-revision-item="0"]')).to.contain.trimmed.text('19 Oct 2015, 15:25');
+        expect(find('[data-test-revision-item="0"] [data-test-revision-latest]')).to.exist;
+
+        expect(find('[data-test-revision-item="1"]')).to.contain.trimmed.text('18 Oct 2015, 16:25');
+        expect(find('[data-test-revision-item="1"] [data-test-revision-latest]')).to.not.exist;
+
+        // latest post is previewed by default
+        expect(find('[data-test-post-history-preview-title]')).to.have.trimmed.text('Current Title');
+        expect(find('[data-test-post-history-preview-feature-image]')).to.have.attribute('src', 'https://example.com/new-image.jpg');
+        expect(find('[data-test-post-history-preview-feature-image]')).to.have.attribute('alt', 'New feature alt text');
+        expect(find('[data-test-post-history-preview-feature-image-caption]')).to.have.trimmed.text('New feature caption');
+
+        // excerpt is not visible (needs feature flag)
+        expect(find('[data-test-post-history-preview-excerpt]')).to.not.exist;
+
+        // previous post can be previewed
+        await click('[data-test-revision-item="1"] [data-test-button="preview-revision"]');
+        expect(find('[data-test-post-history-preview-title]')).to.have.trimmed.text('Old Title');
+
+        // previous post can be restored
+        expect(find('[data-test-revision-item="1"] [data-test-button="restore-revision"]')).to.exist;
+        await click('[data-test-revision-item="1"] [data-test-button="restore-revision"]');
+        expect(find('[data-test-modal="restore-revision"]')).to.exist;
+        await click('[data-test-modal="restore-revision"] [data-test-button="restore"]');
+        expect(find('[data-test-modal="restore-revision"]')).to.not.exist;
+        expect(find('[data-test-editor-title-input]')).to.have.value('Old Title');
+        // post has been saved with correct data
+        expect(post.attrs.title).to.equal('Old Title');
+        expect(post.attrs.featureImage).to.equal('https://example.com/old-image.jpg');
+        expect(post.attrs.featureImageAlt).to.equal('Old feature alt text');
+        expect(post.attrs.featureImageCaption).to.equal('Old feature caption');
+
+        // excerpt (customExcerpt) is not restored (needs feature flag)
+        expect(post.attrs.customExcerpt).to.equal('Current excerpt');
+    });
+
+    it('can preview and restore excerpt (with editorExcerpt feature flag)', async function () {
+        enableLabsFlag(this.server, 'editorExcerpt');
+
+        const post = this.server.create('post', {
+            title: 'Current Title',
+            customExcerpt: 'Current excerpt',
+            status: 'draft'
+        });
+        this.server.create('post-revision', {
+            post,
+            title: post.title,
+            customExcerpt: 'New excerpt',
+            postStatus: 'draft',
+            author: post.authors.models[0],
+            createdAt: moment(post.updatedAt).subtract(1, 'hour'),
+            reason: 'explicit_save',
+            lexical: '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"New body","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}'
+        });
+        this.server.create('post-revision', {
+            post,
+            title: 'Old Title',
+            customExcerpt: 'Old excerpt',
+            postStatus: 'draft',
+            author: post.authors.models[0],
+            createdAt: moment(post.updatedAt).subtract(1, 'day'),
+            reason: 'initial_revision',
+            lexical: '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Old body","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}'
+        });
+
+        await visit(`/editor/post/${post.id}`);
+
+        // open post history menu
+        await click('[data-test-psm-trigger]');
+        await click('[data-test-toggle="post-history"]');
+
+        // excerpt is visible
+        expect(find('[data-test-post-history-preview-excerpt]')).to.exist;
+        expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('New excerpt');
+
+        // previous post can be previewed
+        await click('[data-test-revision-item="1"] [data-test-button="preview-revision"]');
+        expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('Old excerpt');
+
+        // previous post can be restored
+        await click('[data-test-revision-item="1"] [data-test-button="restore-revision"]');
+        await click('[data-test-modal="restore-revision"] [data-test-button="restore"]');
+
+        // post has been saved with correct data
+        expect(post.attrs.customExcerpt).to.equal('Old excerpt');
+    });
+
+    it('reverts to current post excerpt if revision excerpt is missing (with editorExcerpt feature flag)', async function () {
+        enableLabsFlag(this.server, 'editorExcerpt');
+
+        const post = this.server.create('post', {
+            title: 'Current Title',
+            customExcerpt: 'Current excerpt',
+            status: 'draft'
+        });
+        this.server.create('post-revision', {
+            post,
+            title: post.title,
+            postStatus: 'draft',
+            author: post.authors.models[0],
+            createdAt: moment(post.updatedAt).subtract(1, 'hour'),
+            reason: 'explicit_save'
+        });
+        this.server.create('post-revision', {
+            post,
+            title: 'Old Title',
+            customExcerpt: null,
+            postStatus: 'draft',
+            author: post.authors.models[0],
+            createdAt: moment(post.updatedAt).subtract(1, 'day'),
+            reason: 'initial_revision'
+        });
+
+        await visit(`/editor/post/${post.id}`);
+
+        // open post history menu
+        await click('[data-test-psm-trigger]');
+        await click('[data-test-toggle="post-history"]');
+
+        // latest excerpt is set to current
+        expect(find('[data-test-post-history-preview-excerpt]')).to.exist;
+        expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('Current excerpt');
+
+        // previous post can be previewed and excerpt is set to current
+        await click('[data-test-revision-item="1"] [data-test-button="preview-revision"]');
+        expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('Current excerpt');
+
+        // restore saves current excerpt
+        await click('[data-test-revision-item="1"] [data-test-button="restore-revision"]');
+        await click('[data-test-modal="restore-revision"] [data-test-button="restore"]');
+
+        // post has been saved with correct data
+        expect(post.attrs.customExcerpt).to.equal('Current excerpt');
+    });
+});
diff --git a/ghost/admin/tests/acceptance/editor/publish-flow-test.js b/ghost/admin/tests/acceptance/editor/publish-flow-test.js
index 41b262805b4..306fbee0e43 100644
--- a/ghost/admin/tests/acceptance/editor/publish-flow-test.js
+++ b/ghost/admin/tests/acceptance/editor/publish-flow-test.js
@@ -1,6 +1,6 @@
 import loginAsRole from '../../helpers/login-as-role';
 import moment from 'moment-timezone';
-import {blur, click, fillIn, find, findAll} from '@ember/test-helpers';
+import {blur, click, fillIn, find, findAll, waitFor} from '@ember/test-helpers';
 import {clickTrigger, removeMultipleOption, selectChoose} from 'ember-power-select/test-support/helpers';
 import {disableMailgun, enableMailgun} from '../../helpers/mailgun';
 import {disableMembers, enableMembers} from '../../helpers/members';
@@ -51,6 +51,18 @@ describe('Acceptance: Publish flow', function () {
         expect(find('[data-test-modal="publish-flow"]'), 'publish flow modal').to.not.exist;
     });
 
+    it('populates search index when opening', async function () {
+        await loginAsRole('Administrator', this.server);
+
+        const search = this.owner.lookup('service:search');
+        expect(search.isContentStale).to.be.true;
+
+        const post = this.server.create('post', {status: 'draft'});
+        await visit(`/editor/post/${post.id}`);
+
+        expect(search.isContentStale).to.be.false;
+    });
+
     it('handles timezones correctly when scheduling');
 
     // email unavailable state occurs when
@@ -93,19 +105,21 @@ describe('Acceptance: Publish flow', function () {
         expect(find('[data-test-publish-flow="confirm"]'), 'confirm step').to.exist;
 
         expect(find('[data-test-text="confirm-details"]'), 'confirmation text')
-            .to.have.rendered.text('Your post will be published on your site.');
+            .to.have.rendered.trimmed.text('Your post will be published on your site.');
 
         expect(find('[data-test-button="confirm-publish"]'), 'publish button text')
-            .to.have.rendered.text('Publish post, right now');
+            .to.have.rendered.trimmed.text('Publish post, right now');
 
         await click('[data-test-button="confirm-publish"]');
 
         expect(post.status, 'post status after publish').to.equal('published');
 
         expect(find('[data-test-publish-flow="complete"]'), 'complete step').to.exist;
-        expect(find('[data-test-complete-title]'), 'complete title').to.have.rendered.text('Boom. It’s out there. That’s 1 post published, keep going!');
+        expect(find('[data-test-complete-title]'), 'complete title').to.have.rendered.trimmed.text('Boom! It\'s out there.\nThat\'s 1 post published.');
         expect(find('[data-test-complete-bookmark]'), 'bookmark card').to.exist;
 
+        await visit(`/editor/post/${post.id}`);
+
         // "revert to draft" only shown for scheduled posts
         expect(find('[data-test-button="revert-to-draft"]'), 'revert-to-draft button').to.not.exist;
 
@@ -113,7 +127,7 @@ describe('Acceptance: Publish flow', function () {
         expect(find('[data-test-button="publish-flow-preview"]'), 'preview button on complete step').to.not.exist;
         expect(find('[data-test-button="publish-flow-publish"]'), 'publish button on complete step').to.not.exist;
 
-        await click('[data-test-button="back-to-editor"]');
+        await click('[data-test-button="close-publish-flow"]');
 
         expect(find('[data-test-button="publish-flow"]'), 'publish button after publishing').to.not.exist;
         expect(find('[data-test-button="update-flow"]'), 'update button after publishing').to.exist;
@@ -121,7 +135,7 @@ describe('Acceptance: Publish flow', function () {
         await click('[data-test-button="update-flow"]');
 
         expect(find('[data-test-modal="update-flow"]'), 'update flow modal').to.exist;
-        expect(find('[data-test-update-flow-title]')).to.have.rendered.text('This post has been published');
+        expect(find('[data-test-update-flow-title]')).to.have.rendered.trimmed.text('This post has been published');
         expect(find('[data-test-update-flow-confirmation]')).to.contain.rendered.text('Your post was published on your site');
         const savedPublishAt = moment(post.publishedAt).utc();
         expect(find('[data-test-update-flow-confirmation]')).to.contain.rendered.text(`on ${savedPublishAt.format('D MMM YYYY')} at ${savedPublishAt.format('HH:mm')}`);
@@ -245,14 +259,14 @@ describe('Acceptance: Publish flow', function () {
             expect(find('[data-test-text="confirm-details"]')).to.contain.rendered
                 .text('will be published on your site, and delivered to all 7 subscribers.');
 
-            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered
+            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered.trimmed
                 .text('Publish & send, right now');
 
             await click('[data-test-button="confirm-publish"]');
 
             // complete text has right count
             expect(find('[data-test-complete-title]')).to.contain.rendered
-                .text('That’s 1 post published');
+                .text('Boom! It\'s out there.\nThat\'s 1 post published.');
         });
 
         it('can publish+send with multiple newsletters', async function () {
@@ -301,7 +315,7 @@ describe('Acceptance: Publish flow', function () {
             expect(find('[data-test-text="confirm-details"]')).to.contain.rendered
                 .text('will be published on your site, and delivered to all 1 subscriber of Second newsletter.');
 
-            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered
+            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered.trimmed
                 .text('Publish & send, right now');
 
             await click('[data-test-button="confirm-publish"]');
@@ -316,42 +330,44 @@ describe('Acceptance: Publish flow', function () {
             await visit(`/editor/post/${post.id}`);
             await click('[data-test-button="publish-flow"]');
 
-            expect(find('[data-test-setting="publish-at"] [data-test-setting-title]')).to.have.rendered
+            expect(find('[data-test-setting="publish-at"] [data-test-setting-title]')).to.have.rendered.trimmed
                 .text('Right now');
 
             const siteTz = this.server.db.settings.findBy({key: 'timezone'}).value;
-            const plus10 = moment().tz(siteTz).add(10, 'minutes').set({});
+            const plus10 = moment().tz(siteTz).add(10, 'minutes').startOf('minute');
 
             await click('[data-test-setting="publish-at"] [data-test-setting-title]');
             await click('[data-test-radio="schedule"]');
 
             // date + time inputs are shown, defaults to now+5 mins
+            await waitFor('[data-test-setting="publish-at"] [data-test-date-time-picker-datepicker]');
             expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-datepicker]'), 'datepicker').to.exist;
             expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-date-input]'), 'initial datepicker value')
                 .to.have.value(plus10.format('YYYY-MM-DD'));
 
+            await waitFor('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]');
             expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]'), 'time input').to.exist;
             expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]'), 'initial time input value')
                 .to.have.value(plus10.format('HH:mm'));
 
             // can set a new date and time
-            const newDate = moment().tz(siteTz).add(4, 'days').add(5, 'hours').set('second', 0);
+            const newDate = moment().tz(siteTz).add(4, 'days').add(5, 'hours').startOf('minute');
             await fillIn('[data-test-setting="publish-at"] [data-test-date-time-picker-date-input]', newDate.format('YYYY-MM-DD'));
             await blur('[data-test-setting="publish-at"] [data-test-date-time-picker-date-input]');
             await fillIn('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]', newDate.format('HH:mm'));
             await blur('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]');
             expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]')).to.have.value(newDate.format('HH:mm'));
 
-            expect(find('[data-test-setting="publish-at"] [data-test-setting-title]'), 'publish-at title after change').to.have.rendered
+            expect(find('[data-test-setting="publish-at"] [data-test-setting-title]'), 'publish-at title after change').to.have.rendered.trimmed
                 .text('In 4 days');
 
             await click('[data-test-button="continue"]');
 
             // has correct confirm text
-            expect(find('[data-test-text="confirm-details"]')).to.have.rendered
+            expect(find('[data-test-text="confirm-details"]')).to.have.rendered.trimmed
                 .text(`On ${newDate.format('D MMM YYYY')} at ${newDate.format('HH:mm')} your post will be published on your site, and delivered to all 7 subscribers.`);
 
-            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered
+            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered.trimmed
                 .text(`Publish & send, on ${newDate.format('MMMM Do')}`);
 
             await click('[data-test-button="confirm-publish"]');
@@ -371,16 +387,16 @@ describe('Acceptance: Publish flow', function () {
             await click('[data-test-setting="publish-type"] [data-test-setting-title]');
             await click('[data-test-publish-type="send"]');
 
-            expect(find('[data-test-setting="publish-type"] [data-test-setting-title]')).to.have.rendered
+            expect(find('[data-test-setting="publish-type"] [data-test-setting-title]')).to.have.rendered.trimmed
                 .text('Email');
 
             await click('[data-test-button="continue"]');
 
             // has correct confirm text
-            expect(find('[data-test-text="confirm-details"]')).to.have.rendered
+            expect(find('[data-test-text="confirm-details"]')).to.have.rendered.trimmed
                 .text(`Your post will be delivered to all 7 subscribers, and will not be published on your site.`);
 
-            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered
+            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered.trimmed
                 .text(`Send email, right now`);
 
             await click('[data-test-button="confirm-publish"]');
@@ -397,7 +413,7 @@ describe('Acceptance: Publish flow', function () {
             await click('[data-test-setting="publish-type"] [data-test-setting-title]');
             await click('[data-test-publish-type="send"]');
 
-            expect(find('[data-test-setting="publish-type"] [data-test-setting-title]')).to.have.rendered
+            expect(find('[data-test-setting="publish-type"] [data-test-setting-title]')).to.have.rendered.trimmed
                 .text('Email');
 
             await click('[data-test-setting="publish-at"] [data-test-setting-title]');
@@ -411,16 +427,16 @@ describe('Acceptance: Publish flow', function () {
             await blur('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]');
             expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]')).to.have.value(newDate.format('HH:mm'));
 
-            expect(find('[data-test-setting="publish-at"] [data-test-setting-title]'), 'publish-at title after change').to.have.rendered
+            expect(find('[data-test-setting="publish-at"] [data-test-setting-title]'), 'publish-at title after change').to.have.rendered.trimmed
                 .text('In 4 days');
 
             await click('[data-test-button="continue"]');
 
             // has correct confirm text
-            expect(find('[data-test-text="confirm-details"]')).to.have.rendered
+            expect(find('[data-test-text="confirm-details"]')).to.have.rendered.trimmed
                 .text(`On ${newDate.format('D MMM YYYY')} at ${newDate.format('HH:mm')} your post will be delivered to all 7 subscribers, and will not be published on your site.`);
 
-            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered
+            expect(find('[data-test-button="confirm-publish"]')).to.have.rendered.trimmed
                 .text(`Send email, on ${newDate.format('MMMM Do')}`);
 
             await click('[data-test-button="confirm-publish"]');
diff --git a/ghost/admin/tests/acceptance/editor/unsaved-changes-test.js b/ghost/admin/tests/acceptance/editor/unsaved-changes-test.js
new file mode 100644
index 00000000000..c52cb4eb7ad
--- /dev/null
+++ b/ghost/admin/tests/acceptance/editor/unsaved-changes-test.js
@@ -0,0 +1,167 @@
+import loginAsRole from '../../helpers/login-as-role';
+import {click, currentURL, fillIn, find, waitFor, waitUntil} 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';
+
+const titleSelector = '[data-test-editor-title-input]';
+const editorSelector = '[data-secondary-instance="false"] [data-lexical-editor]';
+const unsavedModalSelector = '[data-test-modal="unsaved-post-changes"]';
+const backToPostsSelector = '[data-test-link="posts"]';
+
+const pasteInEditor = async (text) => {
+    await waitFor(editorSelector);
+    await click(editorSelector);
+    const dataTransfer = new DataTransfer();
+    dataTransfer.setData('text/plain', text);
+    document.activeElement.dispatchEvent(new ClipboardEvent('paste', {clipboardData: dataTransfer, bubbles: true, cancelable: true}));
+    dataTransfer.clearData();
+    const editor = find(editorSelector);
+    await waitUntil(() => editor.textContent.includes(text));
+};
+
+describe('Acceptance: Editor: Unsaved changes', function () {
+    let hooks = setupApplicationTest();
+    setupMirage(hooks);
+
+    beforeEach(async function () {
+        this.server.loadFixtures();
+        await loginAsRole('Administrator', this.server);
+    });
+
+    describe('triggers modal', function () {
+        // published content should never autosave and should warn on leaving when there's changes
+        it('when published title has changed', async function () {
+            const post = this.server.create('post', {
+                title: 'Test Post',
+                status: 'published'
+            });
+            await visit('/editor/post/' + post.id);
+            await fillIn(titleSelector, 'New Title');
+            // modal is shown and navigation is blocked
+            await click(backToPostsSelector);
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.exist;
+            // post was not saved
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/${post.id}`);
+        });
+
+        it('when published content has changed', async function () {
+            const post = this.server.create('post', {
+                title: 'Test Post',
+                status: 'published'
+            });
+            await visit('/editor/post/' + post.id);
+            await pasteInEditor('New content');
+            await click(backToPostsSelector);
+            // modal is shown and navigation is blocked
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.exist;
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/${post.id}`);
+            // post was not saved
+            expect(this.server.db.posts.find(post.id).lexical).to.equal(undefined);
+        });
+
+        it('when scheduled title has changed', async function () {
+            const post = this.server.create('post', {
+                title: 'Test Post',
+                status: 'scheduled'
+            });
+            await visit('/editor/post/' + post.id);
+            await fillIn(titleSelector, 'New Title');
+            await click(backToPostsSelector);
+            // modal is shown and navigation is blocked
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.exist;
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/${post.id}`);
+            // post was not saved
+            expect(this.server.db.posts.find(post.id).title).to.equal('Test Post');
+        });
+
+        it('when scheduled content has changed', async function () {
+            const post = this.server.create('post', {
+                title: 'Test Post',
+                status: 'scheduled'
+            });
+            await visit('/editor/post/' + post.id);
+            await pasteInEditor('New content');
+            await click(backToPostsSelector);
+            // modal is shown and navigation is blocked
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.exist;
+            expect(currentURL(), 'currentURL').to.equal(`/editor/post/${post.id}`);
+            // post was not saved
+            expect(this.server.db.posts.find(post.id).lexical).to.equal(undefined);
+        });
+    });
+
+    describe('does not trigger modal', function () {
+        // draft content should autosave and leave without warning
+        it('when leaving after making changes to draft', async function () {
+            const post = this.server.create('post', {
+                title: 'Test Post',
+                status: 'draft'
+            });
+            await visit('/editor/post/' + post.id);
+            await fillIn(titleSelector, 'New Title');
+            await click(backToPostsSelector);
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.not.exist;
+
+            // new title should be saved
+            expect(post.title, 'saved post title').to.equal('New Title');
+            expect(currentURL(), 'currentURL').to.equal('/posts');
+        });
+
+        it('when loading and leaving published post', async function () {
+            const post = this.server.create('post', {status: 'published', lexical: '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"This is a test","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}'});
+            await visit(`/editor/post/${post.id}`);
+            await click(backToPostsSelector);
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.not.exist;
+        });
+
+        it('when publishing post', async function () {
+            const post = this.server.create('post', {status: 'draft'});
+            await visit(`/editor/post/${post.id}`);
+            await fillIn(titleSelector, 'Test');
+            await fillIn(editorSelector, 'This is a test');
+            await click('[data-test-button="publish-flow"]');
+            await click('[data-test-button="continue"]');
+            await click('[data-test-button="confirm-publish"]');
+            await click('[data-test-button="close-publish-flow"]');
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.not.exist;
+            expect(currentURL(), 'currentURL').to.equal('/posts');
+        });
+
+        // published and edited content should not warn when changes are reverted (either via undo or manually)
+        it('when changing title and changing it back', async function () {
+            const post = this.server.create('post', {
+                title: 'Test Post',
+                status: 'published',
+                lexical: `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`
+            });
+            await visit('/editor/post/' + post.id);
+            await fillIn('[data-test-editor-title-input]', 'New Title');
+            await click('[data-test-link="posts"]');
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.exist;
+            await click('[data-test-stay-button]');
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.not.exist;
+            // revert title
+            await fillIn('[data-test-editor-title-input]', 'Test Post');
+            await click('[data-test-link="posts"]');
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.not.exist;
+        });
+
+        it('when publishing post with trailing whitespace in title', async function () {
+            const post = this.server.create('post', {
+                title: 'Test Post',
+                status: 'draft'
+            });
+            await visit(`/editor/post/${post.id}`);
+            await fillIn(titleSelector, 'Test Post ');
+            await click('[data-test-button="publish-flow"]');
+            await click('[data-test-button="continue"]');
+            await click('[data-test-button="confirm-publish"]');
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.not.exist;
+            await click('[data-test-button="close-publish-flow"]');
+            expect(find(unsavedModalSelector), 'unsaved changes modal').to.not.exist;
+            expect(currentURL(), 'currentURL').to.equal('/posts');
+        });
+    });
+});
diff --git a/ghost/admin/tests/acceptance/error-handling-test.js b/ghost/admin/tests/acceptance/error-handling-test.js
index 2e331d15e2d..106b176d47b 100644
--- a/ghost/admin/tests/acceptance/error-handling-test.js
+++ b/ghost/admin/tests/acceptance/error-handling-test.js
@@ -25,7 +25,7 @@ describe('Acceptance: Error Handling', function () {
                 let role = this.server.create('role', {name: 'Administrator'});
                 this.server.create('user', {roles: [role]});
 
-                return await authenticateSession();
+                await authenticateSession();
             });
 
             // TODO: can't replicate this with the Lexical editor... skip for now
@@ -90,7 +90,7 @@ describe('Acceptance: Error Handling', function () {
             let roles = this.server.schema.roles.where({name: 'Administrator'});
             this.server.create('user', {roles});
 
-            return await authenticateSession();
+            await authenticateSession();
         });
 
         it('handles Ember Data HTML response', async function () {
diff --git a/ghost/admin/tests/acceptance/members-activity-test.js b/ghost/admin/tests/acceptance/members-activity-test.js
index a62b6f9ffa0..bc015376c71 100644
--- a/ghost/admin/tests/acceptance/members-activity-test.js
+++ b/ghost/admin/tests/acceptance/members-activity-test.js
@@ -1,5 +1,6 @@
+import moment from 'moment-timezone';
 import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-import {currentURL} from '@ember/test-helpers';
+import {click, currentURL, find, findAll} from '@ember/test-helpers';
 import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupApplicationTest} from 'ember-mocha';
@@ -40,4 +41,111 @@ describe('Acceptance: Members activity', function () {
             expect(currentURL()).to.equal('/members-activity');
         });
     });
+
+    describe('as owner', function () {
+        beforeEach(async function () {
+            const role = this.server.create('role', {name: 'Owner'});
+            this.server.create('user', {roles: [role]});
+
+            await authenticateSession();
+        });
+
+        it('renders', async function () {
+            await visit('/members-activity');
+            expect(currentURL()).to.equal('/members-activity');
+        });
+    });
+
+    describe('members activity filter', function () {
+        beforeEach(async function () {
+            const role = this.server.create('role', {name: 'Administrator'});
+            await this.server.create('user', {roles: [role]});
+
+            await authenticateSession();
+
+            // create 1 member with id 1
+            this.server.create('member', {id: 1, name: 'Member 1', email: '', status: 'free'});
+
+            // create an event for member 1
+            this.server.create('member-activity-event', {memberId: 1, createdAt: moment('2024-08-18 08:18:08').format('YYYY-MM-DD HH:mm:ss'), type: 'payment_event'});
+            this.server.create('member-activity-event', {memberId: 1, createdAt: moment('2024-08-18 08:18:08').format('YYYY-MM-DD HH:mm:ss'), type: 'subscription_event'});
+            this.server.create('member-activity-event', {memberId: 1, createdAt: moment('2024-08-18 08:18:08').format('YYYY-MM-DD HH:mm:ss'), type: 'donation_event'});
+        });
+
+        it('renders', async function () {
+            await visit('/members-activity');
+            expect(currentURL()).to.equal('/members-activity');
+        });
+
+        it('lists all events', async function () {
+            await visit('/members-activity');
+            expect(findAll('.gh-members-activity-event').length).to.equal(3);
+        });
+
+        it('filters events payment and donation events', async function () {
+            await visit('/members-activity?excludedEvents=payment_event%2Cdonation_event');
+            expect(findAll('.gh-members-activity-event').length).to.equal(1);
+        });
+
+        it('includes one time (donation) payments under payments filtering', async function () {
+            await visit('/members-activity');
+            await click('[data-test-id="filter-events-button"]');
+            await click('[data-test-id="event-type-filter-checkbox-payment_event"]');
+            expect(findAll('.gh-members-activity-event').length).to.equal(1);
+        });
+
+        it('has a donation event with attribution from homepage and has a dash', async function () {
+            this.server.create('member-activity-event', {
+                memberId: 1,
+                createdAt: moment('2024-08-18 08:18:08').format('YYYY-MM-DD HH:mm:ss'),
+                type: 'donation_event',
+                data: {
+                    amount: 500000, // or whatever amount you want to test with
+                    currency: 'krw',
+                    attribution: {
+                        title: 'homepage',
+                        url: 'https://example.com'
+                    }
+                }
+            });
+
+            await visit('/members-activity');
+
+            const events = findAll('.gh-members-activity-event');
+
+            let donationEvent = null;
+            for (let event of events) {
+                if (event.textContent.includes('homepage')) {
+                    donationEvent = event;
+                    break;
+                }
+            }
+
+            donationEvent = find('.gh-members-activity-event-join');
+
+            expect(donationEvent.textContent).to.include('–');
+        });
+
+        it('has a donation event without attribution and does not contain a dash', async function () {
+            this.server.create('member-activity-event', {
+                memberId: 1,
+                createdAt: moment('2024-08-18 08:18:08').format('YYYY-MM-DD HH:mm:ss'),
+                type: 'donation_event',
+                data: {
+                    amount: 500000, // or whatever amount you want to test with
+                    currency: 'krw'
+                }
+            });
+
+            await visit('/members-activity');
+
+            const events = findAll('.gh-members-activity-event');
+
+            const donationEventWithoutAttribution = events[0];
+
+            expect(donationEventWithoutAttribution).to.exist;
+
+            expect(donationEventWithoutAttribution.textContent).to.not.include('–');
+        });
+    });
 });
diff --git a/ghost/admin/tests/acceptance/members-test.js b/ghost/admin/tests/acceptance/members-test.js
index 6fd5f5fd628..50ab1eeee27 100644
--- a/ghost/admin/tests/acceptance/members-test.js
+++ b/ghost/admin/tests/acceptance/members-test.js
@@ -37,7 +37,7 @@ describe('Acceptance: Members', function () {
             let role = this.server.create('role', {name: 'Owner'});
             this.server.create('user', {roles: [role]});
 
-            return await authenticateSession();
+            await authenticateSession();
         });
 
         it('it renders, can be navigated, can edit member', async function () {
@@ -49,9 +49,6 @@ describe('Acceptance: Members', function () {
             // lands on correct page
             expect(currentURL(), 'currentURL').to.equal('/members');
 
-            // it has correct page title
-            expect(document.title, 'page title').to.equal('Members - Test Blog');
-
             // it lists all members
             expect(findAll('[data-test-list="members-list-item"]').length, 'members list count')
                 .to.equal(2);
@@ -105,9 +102,6 @@ describe('Acceptance: Members', function () {
             // lands on correct page
             expect(currentURL(), 'currentURL').to.equal('/members');
 
-            // it has correct page title
-            expect(document.title, 'page title').to.equal('Members - Test Blog');
-
             // it lists all members
             expect(findAll('[data-test-list="members-list-item"]').length, 'members list count')
                 .to.equal(1);
@@ -149,6 +143,135 @@ describe('Acceptance: Members', function () {
                 .to.equal('example@domain.com');
         });
 
+        /* Due to a limitation with NQL when multiple member filters are used in combination, we currently have a safeguard around member bulk deletion.
+        *  Member bulk deletion is not permitted when:
+        *   1) Multiple newsletters exist, and 2 or more newsletter filters are in use
+        *   2) If any of the following Stripe filters are used, even once:
+        *     - Billing period
+        *     - Stripe subscription status
+        *     - Paid start date
+        *     - Next billing date
+        *     - Subscription started on post/page
+        *     - Offers
+        *
+        * See code: ghost/admin/app/controllers/members.js:isBulkDeletePermitted
+        * See issue https://linear.app/tryghost/issue/ENG-1484 for more context
+        *
+        * TODO: delete this block of tests once the guardrail has been removed
+        */
+        describe('[Temp] Guardrail against bulk deletion', function () {
+            it('cannot bulk delete members if more than 1 newsletter filter is used', async function () {
+                // Create two newsletters and members subscribed to 1 or 2 newsletters
+                const newsletterOne = this.server.create('newsletter');
+                const newsletterTwo = this.server.create('newsletter');
+                this.server.createList('member', 2).forEach(member => member.update({newsletters: [newsletterOne], email_disabled: 0}));
+                this.server.createList('member', 2).forEach(member => member.update({newsletters: [newsletterOne, newsletterTwo], email_disabled: 0}));
+
+                await visit('/members');
+                expect(findAll('[data-test-member]').length).to.equal(4);
+
+                // The delete button should not be visible by default
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+
+                // Apply a first filter
+                await click('[data-test-button="members-filter-actions"]');
+                await fillIn('[data-test-members-filter="0"] [data-test-select="members-filter"]', `newsletters.slug:${newsletterOne.slug}`);
+                await click(`[data-test-button="members-apply-filter"]`);
+
+                expect(findAll('[data-test-member]').length).to.equal(4);
+                expect(currentURL()).to.equal(`/members?filter=(newsletters.slug%3A${newsletterOne.slug}%2Bemail_disabled%3A0)`);
+
+                // Bulk deletion is permitted
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.exist;
+
+                // Apply a second filter
+                await click('[data-test-button="members-filter-actions"]');
+                await click('[data-test-button="add-members-filter"]');
+                await fillIn('[data-test-members-filter="1"] [data-test-select="members-filter"]', `newsletters.slug:${newsletterTwo.slug}`);
+                await click(`[data-test-button="members-apply-filter"]`);
+
+                expect(findAll('[data-test-member]').length).to.equal(2);
+                expect(currentURL()).to.equal(`/members?filter=(newsletters.slug%3A${newsletterOne.slug}%2Bemail_disabled%3A0)%2B(newsletters.slug%3A${newsletterTwo.slug}%2Bemail_disabled%3A0)`);
+
+                // Bulk deletion is not permitted anymore
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+            });
+
+            it('can bulk delete members if a non-Stripe subscription filter is in use (member tier, status)', async function () {
+                const tier = this.server.create('tier', {id: 'qwerty123456789'});
+                this.server.createList('member', 2, {status: 'free'});
+                this.server.createList('member', 2, {status: 'paid', tiers: [tier]});
+
+                await visit('/members');
+                expect(findAll('[data-test-member]').length).to.equal(4);
+
+                // The delete button should not be visible by default
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+
+                // 1) Membership tier filter: permitted
+                await visit(`/members?filter=tier_id:[${tier.id}]`);
+                expect(findAll('[data-test-member]').length).to.equal(2);
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.exist;
+
+                // 2) Member status filter: permitted
+                await visit('/members?filter=status%3Afree');
+                expect(findAll('[data-test-member]').length).to.equal(2);
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.exist;
+            });
+
+            it('cannot bulk delete members if a Stripe subscription filter is in use', async function () {
+                // Create free and paid members
+                const tier = this.server.create('tier');
+                const offer = this.server.create('offer', {tier: {id: tier.id}, createdAt: moment.utc().subtract(1, 'day').valueOf()});
+                this.server.createList('member', 2, {status: 'free'});
+                this.server.createList('member', 2, {status: 'paid'}).forEach(member => this.server.create('subscription', {member, planInterval: 'month', status: 'active', start_date: '2000-01-01T00:00:00.000Z', current_period_end: '2000-02-01T00:00:00.000Z', offer: offer, tier: tier}));
+                this.server.createList('member', 2, {status: 'paid'}).forEach(member => this.server.create('subscription', {member, planInterval: 'year', status: 'active'}));
+
+                await visit('/members');
+                expect(findAll('[data-test-member]').length).to.equal(6);
+
+                // The delete button should not be visible by default
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+
+                // 1) Stripe billing period filter: not permitted
+                await visit('/members?filter=subscriptions.plan_interval%3Amonth');
+                expect(findAll('[data-test-member]').length).to.equal(2);
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+
+                // 2) Stripe subscription status filter: not permitted
+                await visit('/members?filter=subscriptions.status%3Aactive');
+                expect(findAll('[data-test-member]').length).to.equal(4);
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+
+                // 3) Stripe paid start date filter: not permitted
+                await visit(`/members?filter=subscriptions.start_date%3A>'1999-01-01%2005%3A59%3A59'`);
+                expect(findAll('[data-test-member]').length).to.equal(2);
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+
+                // 4) Next billing date filter: not permitted
+                await visit(`/members?filter=subscriptions.current_period_end%3A>'2000-01-01%2005%3A59%3A59'`);
+                expect(findAll('[data-test-member]').length).to.equal(2);
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+
+                // 5) Offers redeemed filter: not permitted
+                await visit('/members?filter=' + encodeURIComponent(`offer_redemptions:'${offer.id}'`));
+                expect(findAll('[data-test-member]').length).to.equal(2);
+                await click('[data-test-button="members-actions"]');
+                expect(find('[data-test-button="delete-selected"]')).to.not.exist;
+            });
+        });
+
         it('can bulk delete members', async function () {
             // members to be kept
             this.server.createList('member', 6);
@@ -173,7 +296,7 @@ describe('Acceptance: Members', function () {
             await click(`[data-test-button="members-apply-filter"]`);
 
             expect(findAll('[data-test-member]').length).to.equal(5);
-            expect(currentURL()).to.equal('/members?filter=label%3A%5Blabel-0%5D');
+            expect(currentURL()).to.equal(`/members?filter=label%3A%5B${label.slug}%5D`);
 
             await click('[data-test-button="members-actions"]');
 
diff --git a/ghost/admin/tests/acceptance/members/details-test.js b/ghost/admin/tests/acceptance/members/details-test.js
index b004fbf7d3e..4a4f6891a3f 100644
--- a/ghost/admin/tests/acceptance/members/details-test.js
+++ b/ghost/admin/tests/acceptance/members/details-test.js
@@ -42,7 +42,7 @@ describe('Acceptance: Member details', function () {
         let role = this.server.create('role', {name: 'Owner'});
         this.server.create('user', {roles: [role]});
 
-        return await authenticateSession();
+        await authenticateSession();
     });
 
     afterEach(function () {
diff --git a/ghost/admin/tests/acceptance/members/filter-test.js b/ghost/admin/tests/acceptance/members/filter-test.js
index 5bf2585b7eb..205c7f947f8 100644
--- a/ghost/admin/tests/acceptance/members/filter-test.js
+++ b/ghost/admin/tests/acceptance/members/filter-test.js
@@ -29,7 +29,7 @@ describe('Acceptance: Members filtering', function () {
         let role = this.server.create('role', {name: 'Owner'});
         this.server.create('user', {roles: [role]});
 
-        return await authenticateSession();
+        await authenticateSession();
     });
 
     afterEach(function () {
@@ -197,99 +197,153 @@ describe('Acceptance: Members filtering', function () {
             expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows').to.equal(1);
         });
 
-        it('can filter by specific newsletter subscription', async function () {
-            // add some members to filters
-            const newsletter = this.server.create('newsletter', {status: 'active', slug: 'test-newsletter'});
-            this.server.createList('newsletter', 4);
-            this.server.createList('tier', 4);
-            this.server.createList('member', 4, {subscribed: false});
+        it('can filter by newsletter subscription when there is only one newsletter', async function () {
+            // Create a single newsletter
+            this.server.createList('newsletter', 1);
+            // Add some members to filter
+            this.server.createList('member', 3, {subscribed: true, email_disabled: 0});
+            this.server.createList('member', 4, {subscribed: false, email_disabled: 0});
+            this.server.createList('member', 1, {subscribed: true, email_disabled: 1});
 
             await visit('/members');
 
             expect(findAll('[data-test-list="members-list-item"]').length, '# of initial member rows')
+                .to.equal(8);
+
+            await click('[data-test-button="members-filter-actions"]');
+
+            const filterSelector = `[data-test-members-filter="0"]`;
+
+            await fillIn(`${filterSelector} [data-test-select="members-filter"]`, 'subscribed');
+
+            // has the right operators
+            const operatorOptions = findAll(`${filterSelector} [data-test-select="members-filter-operator"] option`);
+            expect(operatorOptions).to.have.length(2);
+            expect(operatorOptions[0]).to.have.value('is');
+            expect(operatorOptions[1]).to.have.value('is-not');
+
+            // has the right values
+            const valueOptions = findAll(`${filterSelector} [data-test-select="members-filter-value"] option`);
+            expect(valueOptions).to.have.length(3);
+            expect(valueOptions[0]).to.have.value('subscribed');
+            expect(valueOptions[1]).to.have.value('unsubscribed');
+            expect(valueOptions[2]).to.have.value('email-disabled');
+
+            // applies default filter subscribed immediately
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - subscribed')
+                .to.equal(3);
+
+            // can change filter to unsubscribed
+            await fillIn(`${filterSelector} [data-test-select="members-filter-value"]`, 'unsubscribed');
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - unsubscribed')
                 .to.equal(4);
+            expect(find('[data-test-table-column="subscribed"]')).to.exist;
+
+            // can change filter to email-disabled
+            await fillIn(`${filterSelector} [data-test-select="members-filter-value"]`, 'email-disabled');
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - email-disabled')
+                .to.equal(1);
+            expect(find('[data-test-table-column="subscribed"]')).to.exist;
+
+            // can delete filter
+            await click('[data-test-delete-members-filter="0"]');
+
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows after delete')
+                .to.equal(8);
 
+            // Can set filter to 'subscribed' by path
+            await visit('/');
+            await visit('/members?filter=' + encodeURIComponent('(subscribed:true+email_disabled:0)'));
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - subscribed - from URL')
+                .to.equal(3);
             await click('[data-test-button="members-filter-actions"]');
-            // make sure newsletters are in the filter dropdown
-            const newslettersCount = this.server.schema.newsletters.all().models.length;
-            let options = this.element.querySelectorAll('option');
-            let matchingOptions = [...options].filter(option => option.value.includes('newsletters.slug'));
-            expect(matchingOptions).to.have.length(newslettersCount);
+            expect(find(`${filterSelector} [data-test-select="members-filter-value"]`)).to.have.value('subscribed');
 
+            // Can set filter to 'unsubscribed' by path
             await visit('/');
-            await visit('/members');
-            // add some members with tiers
-            const tier = this.server.create('tier');
-            const member = this.server.create('member', {tiers: [tier], subscribed: true});
-            member.update({newsletters: [newsletter]});
-            this.server.createList('member', 4, {subscribed: false});
+            await visit('/members?filter=' + encodeURIComponent('(subscribed:false+email_disabled:0)'));
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - unsubscribed - from URL')
+                .to.equal(4);
+            await click('[data-test-button="members-filter-actions"]');
+            expect(find(`${filterSelector} [data-test-select="members-filter-value"]`)).to.have.value('unsubscribed');
 
-            await visit('/members?filter=' + encodeURIComponent(`newsletters.slug:${newsletter.slug}`));
-            // only 1 member is subscribed so we should only see 1 row
-            expect(findAll('[data-test-list="members-list-item"]').length, '# of initial member rows')
+            // Can set filter to 'email-disabled' by path
+            await visit('/');
+            await visit('/members?filter=' + encodeURIComponent('(email_disabled:1)'));
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - email-disabled - from URL')
                 .to.equal(1);
+            await click('[data-test-button="members-filter-actions"]');
+            expect(find(`${filterSelector} [data-test-select="members-filter-value"]`)).to.have.value('email-disabled');
         });
 
-        it('can filter by newsletter subscription', async function () {
-            // add some members to filter
-            this.server.createList('member', 3, {subscribed: true, email_disabled: 0});
+        it('can filter by specific newsletter subscription when there are multiple newsletters', async function () {
+            // Create:
+            // - 1 subscribed member to newsletter
+            // - 1 subscribed member to newsletter with email disabled
+            // - 4 unsubscribed members
+            const newsletter = this.server.create('newsletter', {status: 'active', slug: 'test-newsletter'});
+            const tier = this.server.create('tier');
+
+            const subscribedMember = this.server.create('member', {tiers: [tier], subscribed: true, email_disabled: 0});
+            subscribedMember.update({newsletters: [newsletter]});
+
+            const emailDisabledMember = this.server.create('member', {tiers: [tier], subscribed: true, email_disabled: 1});
+            emailDisabledMember.update({newsletters: [newsletter]});
+
             this.server.createList('member', 4, {subscribed: false, email_disabled: 0});
-            this.server.createList('member', 1, {subscribed: true, email_disabled: 1});
 
+            // Test initial member count
             await visit('/members');
-
             expect(findAll('[data-test-list="members-list-item"]').length, '# of initial member rows')
-                .to.equal(8);
+                .to.equal(6);
 
+            // Test newsletters options are in the filter dropdown
             await click('[data-test-button="members-filter-actions"]');
+            const newslettersCount = this.server.schema.newsletters.all().models.length;
+            let options = this.element.querySelectorAll('option');
+            let matchingOptions = [...options].filter(option => option.value.includes('newsletters.slug'));
+            expect(matchingOptions).to.have.length(newslettersCount);
 
             const filterSelector = `[data-test-members-filter="0"]`;
 
-            await fillIn(`${filterSelector} [data-test-select="members-filter"]`, 'subscribed');
+            // Select first newsletter
+            await fillIn(`${filterSelector} [data-test-select="members-filter"]`, `newsletters.slug:${newsletter.slug}`);
 
-            // has the right operators
+            // Test that the filter has the right operators
             const operatorOptions = findAll(`${filterSelector} [data-test-select="members-filter-operator"] option`);
-            expect(operatorOptions).to.have.length(2);
             expect(operatorOptions[0]).to.have.value('is');
             expect(operatorOptions[1]).to.have.value('is-not');
 
-            // has the right values
+            // Test that the filter has the right operators
             const valueOptions = findAll(`${filterSelector} [data-test-select="members-filter-value"] option`);
-            expect(valueOptions).to.have.length(2);
             expect(valueOptions[0]).to.have.value('true');
             expect(valueOptions[1]).to.have.value('false');
 
-            // applies default filter immediately
-            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - true')
-                .to.equal(3);
+            // applies default filter subscribed immediately, and only count subscribed members without email disabled
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - subscribed')
+                .to.equal(1);
 
-            // can change filter
+            // can change filter to unsubscribed
             await fillIn(`${filterSelector} [data-test-select="members-filter-value"]`, 'false');
-            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - false')
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - unsubscribed')
                 .to.equal(5);
-            expect(find('[data-test-table-column="subscribed"]')).to.exist;
 
             // can delete filter
             await click('[data-test-delete-members-filter="0"]');
-
             expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows after delete')
-                .to.equal(8);
+                .to.equal(6);
 
-            // Can set filter by path
+            // Can filter members subscribed to that newsletter by path
             await visit('/');
-            await visit('/members?filter=' + encodeURIComponent('(subscribed:true+email_disabled:0)'));
-            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - true - from URL')
-                .to.equal(3);
-            await click('[data-test-button="members-filter-actions"]');
-            expect(find(`${filterSelector} [data-test-select="members-filter-value"]`)).to.have.value('true');
+            await visit('/members?filter=' + encodeURIComponent(`newsletters.slug:${newsletter.slug}+email_disabled:0`));
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of initial member rows')
+                .to.equal(1);
 
-            // Can set filter by path
+            // Can filter members unsubscribed to that newsletter by path
             await visit('/');
-            await visit('/members?filter=' + encodeURIComponent('(subscribed:false,email_disabled:1)'));
-            expect(findAll('[data-test-list="members-list-item"]').length, '# of filtered member rows - false - from URL')
+            await visit('/members?filter=' + encodeURIComponent(`newsletters.slug:-${newsletter.slug},email_disabled:1`));
+            expect(findAll('[data-test-list="members-list-item"]').length, '# of initial member rows')
                 .to.equal(5);
-            await click('[data-test-button="members-filter-actions"]');
-            expect(find(`${filterSelector} [data-test-select="members-filter-value"]`)).to.have.value('false');
         });
 
         it('can filter by member status', async function () {
@@ -1274,7 +1328,12 @@ describe('Acceptance: Members filtering', function () {
             expect(find('[data-test-button="add-label-selected"]'), 'add label to selected button').to.exist;
             expect(find('[data-test-button="remove-label-selected"]'), 'remove label from selected button').to.exist;
             expect(find('[data-test-button="unsubscribe-selected"]'), 'unsubscribe selected button').to.exist;
-            expect(find('[data-test-button="delete-selected"]'), 'delete selected button').to.exist;
+
+            /* NOTE: Bulk deletion is disabled temporarily when multiple filters are applied, due to a NQL limitation.
+            * Re-enable following line once we have fixed the root NQL limitation.
+            * See https://linear.app/tryghost/issue/ONC-203
+            */
+            // expect(find('[data-test-button="delete-selected"]'), 'delete selected button').to.exist;
 
             // filter is active and has # of filters
             expect(find('[data-test-button="members-filter-actions"] span'), 'filter button').to.have.class('gh-btn-label-green');
diff --git a/ghost/admin/tests/acceptance/members/import-test.js b/ghost/admin/tests/acceptance/members/import-test.js
index 9817bcd5520..01201e96f5e 100644
--- a/ghost/admin/tests/acceptance/members/import-test.js
+++ b/ghost/admin/tests/acceptance/members/import-test.js
@@ -17,7 +17,7 @@ describe('Acceptance: Members import', function () {
         let role = this.server.create('role', {name: 'Owner'});
         this.server.create('user', {roles: [role]});
 
-        return await authenticateSession();
+        await authenticateSession();
     });
 
     it('can open and close import modal', async function () {
diff --git a/ghost/admin/tests/acceptance/mentions-test.js b/ghost/admin/tests/acceptance/mentions-test.js
index dd8b335aff9..6fe618f7962 100644
--- a/ghost/admin/tests/acceptance/mentions-test.js
+++ b/ghost/admin/tests/acceptance/mentions-test.js
@@ -20,11 +20,11 @@ describe('Acceptance: Mentions', function () {
         beforeEach(async function () {
             this.server.loadFixtures('configs');
             this.server.loadFixtures('settings');
-    
+
             let role = this.server.create('role', {name: 'Administrator'});
             this.server.create('user', {roles: [role]});
             enableLabsFlag(this.server, 'webmentions');
-            return await authenticateSession();
+            await authenticateSession();
         });
         it('can render mentions page', async function () {
             await visit('/mentions');
diff --git a/ghost/admin/tests/acceptance/offers-test.js b/ghost/admin/tests/acceptance/offers-test.js
index 404c1f2cddf..f3af9b81e92 100644
--- a/ghost/admin/tests/acceptance/offers-test.js
+++ b/ghost/admin/tests/acceptance/offers-test.js
@@ -1,114 +1,111 @@
-import moment from 'moment-timezone';
-import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-import {beforeEach, describe, it} from 'mocha';
-import {blur, click, currentURL, fillIn, find, findAll, settled} from '@ember/test-helpers';
-import {enablePaidMembers} from '../helpers/members';
-import {expect} from 'chai';
-import {setupApplicationTest} from 'ember-mocha';
-import {setupMirage} from 'ember-cli-mirage/test-support';
-import {timeout} from 'ember-concurrency';
-import {visit} from '../helpers/visit';
+// import moment from 'moment-timezone';
+// import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
+// import {beforeEach, describe, it} from 'mocha';
+// import {blur, click, currentURL, fillIn, find, findAll, settled} from '@ember/test-helpers';
+// import {enablePaidMembers} from '../helpers/members';
+// import {expect} from 'chai';
+// import {setupApplicationTest} from 'ember-mocha';
+// import {setupMirage} from 'ember-cli-mirage/test-support';
+// import {timeout} from 'ember-concurrency';
+// import {visit} from '../helpers/visit';
 
-describe('Acceptance: Offers', function () {
-    let hooks = setupApplicationTest();
-    setupMirage(hooks);
+// describe('Acceptance: Offers', function () {
+//     let hooks = setupApplicationTest();
+//     setupMirage(hooks);
 
-    it('redirects to signin when not authenticated', async function () {
-        await invalidateSession();
-        await visit('/offers');
+//     it('redirects to signin when not authenticated', async function () {
+//         await invalidateSession();
+//         await visit('/offers');
 
-        expect(currentURL()).to.equal('/signin');
-    });
+//         expect(currentURL()).to.equal('/signin');
+//     });
 
-    it('redirects non-admins to site', async function () {
-        let role = this.server.create('role', {name: 'Editor'});
-        this.server.create('user', {roles: [role]});
+//     it('redirects non-admins to site', async function () {
+//         let role = this.server.create('role', {name: 'Editor'});
+//         this.server.create('user', {roles: [role]});
 
-        await authenticateSession();
-        await visit('/offers');
+//         await authenticateSession();
+//         await visit('/offers');
 
-        expect(currentURL()).to.equal('/site');
-        expect(find('[data-test-nav="offers"]'), 'sidebar link')
-            .to.not.exist;
-    });
+//         expect(currentURL()).to.equal('/site');
+//         expect(find('[data-test-nav="offers"]'), 'sidebar link')
+//             .to.not.exist;
+//     });
 
-    describe('as owner', function () {
-        beforeEach(async function () {
-            this.server.loadFixtures('tiers');
+//     describe('as owner', function () {
+//         beforeEach(async function () {
+//             this.server.loadFixtures('tiers');
 
-            let role = this.server.create('role', {name: 'Owner'});
-            this.server.create('user', {roles: [role]});
+//             let role = this.server.create('role', {name: 'Owner'});
+//             this.server.create('user', {roles: [role]});
 
-            enablePaidMembers(this.server);
+//             enablePaidMembers(this.server);
 
-            return await authenticateSession();
-        });
+//             await authenticateSession();
+//         });
 
-        it('it renders, can be navigated, can edit offer', async function () {
-            const tier = this.server.create('tier');
-            let offer1 = this.server.create('offer', {tier: {id: tier.id}, createdAt: moment.utc().subtract(1, 'day').valueOf()});
-            this.server.create('offer', {tier: {id: tier.id}, createdAt: moment.utc().subtract(2, 'day').valueOf()});
+//         it('it renders, can be navigated, can edit offer', async function () {
+//             const tier = this.server.create('tier');
+//             let offer1 = this.server.create('offer', {tier: {id: tier.id}, createdAt: moment.utc().subtract(1, 'day').valueOf()});
+//             this.server.create('offer', {tier: {id: tier.id}, createdAt: moment.utc().subtract(2, 'day').valueOf()});
 
-            await visit('/offers');
+//             await visit('/offers');
 
-            await settled();
+//             await settled();
 
-            // lands on correct page
-            expect(currentURL(), 'currentURL').to.equal('/offers');
+//             // lands on correct page
+//             expect(currentURL(), 'currentURL').to.equal('/offers');
 
-            // it has correct page title
-            expect(document.title, 'page title').to.equal('Offers - Test Blog');
+//             // it highlights active state in nav menu
+//             expect(
+//                 find('[data-test-nav="offers"]'),
+//                 'highlights nav menu item'
+//             ).to.have.class('active');
 
-            // it highlights active state in nav menu
-            expect(
-                find('[data-test-nav="offers"]'),
-                'highlights nav menu item'
-            ).to.have.class('active');
+//             // it lists all offers
+//             expect(findAll('[data-test-list="offers-list-item"]').length, 'offers list count')
+//                 .to.equal(2);
 
-            // it lists all offers
-            expect(findAll('[data-test-list="offers-list-item"]').length, 'offers list count')
-                .to.equal(2);
+//             let offer = find('[data-test-list="offers-list-item"]');
+//             expect(offer.querySelector('[data-test-list="offer-name"] h3').textContent, 'offer list item name')
+//                 .to.equal(offer1.name);
 
-            let offer = find('[data-test-list="offers-list-item"]');
-            expect(offer.querySelector('[data-test-list="offer-name"] h3').textContent, 'offer list item name')
-                .to.equal(offer1.name);
+//             await visit(`/offers/${offer1.id}`);
 
-            await visit(`/offers/${offer1.id}`);
+//             // second wait is needed for the offer details to settle
+//             await settled();
 
-            // second wait is needed for the offer details to settle
-            await settled();
+//             // it shows selected offer form
+//             expect(find('[data-test-input="offer-name"]').value, 'loads correct offer into form')
+//                 .to.equal(offer1.name);
 
-            // it shows selected offer form
-            expect(find('[data-test-input="offer-name"]').value, 'loads correct offer into form')
-                .to.equal(offer1.name);
+//             // it maintains active state in nav menu
+//             expect(
+//                 find('[data-test-nav="offers"]'),
+//                 'highlights nav menu item'
+//             ).to.have.class('active');
 
-            // it maintains active state in nav menu
-            expect(
-                find('[data-test-nav="offers"]'),
-                'highlights nav menu item'
-            ).to.have.class('active');
+//             // trigger save
+//             await fillIn('[data-test-input="offer-name"]', 'New Name');
+//             await blur('[data-test-input="offer-name"]');
 
-            // trigger save
-            await fillIn('[data-test-input="offer-name"]', 'New Name');
-            await blur('[data-test-input="offer-name"]');
+//             await click('[data-test-button="save"]');
 
-            await click('[data-test-button="save"]');
+//             // extra timeout needed for Travis - sometimes it doesn't update
+//             // quick enough and an extra wait() call doesn't help
+//             await timeout(100);
 
-            // extra timeout needed for Travis - sometimes it doesn't update
-            // quick enough and an extra wait() call doesn't help
-            await timeout(100);
+//             await click('[data-test-link="offers-back"]');
 
-            await click('[data-test-link="offers-back"]');
+//             // lands on correct page
+//             expect(currentURL(), 'currentURL').to.equal('/offers');
+//         });
 
-            // lands on correct page
-            expect(currentURL(), 'currentURL').to.equal('/offers');
-        });
-
-        it('maintains active state in nav menu when creating a new tag', async function () {
-            await visit('offers/new');
-            expect(currentURL()).to.equal('offers/new');
-            expect(find('[data-test-nav="offers"]'), 'highlights nav menu item')
-                .to.have.class('active');
-        });
-    });
-});
+//         it('maintains active state in nav menu when creating a new tag', async function () {
+//             await visit('offers/new');
+//             expect(currentURL()).to.equal('offers/new');
+//             expect(find('[data-test-nav="offers"]'), 'highlights nav menu item')
+//                 .to.have.class('active');
+//         });
+//     });
+// });
diff --git a/ghost/admin/tests/acceptance/onboarding-test.js b/ghost/admin/tests/acceptance/onboarding-test.js
new file mode 100644
index 00000000000..b92eeb645b8
--- /dev/null
+++ b/ghost/admin/tests/acceptance/onboarding-test.js
@@ -0,0 +1,97 @@
+import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
+import {currentURL, find, visit} from '@ember/test-helpers';
+import {describe, it} from 'mocha';
+import {enableMembers} from '../helpers/members';
+import {expect} from 'chai';
+import {setupApplicationTest} from 'ember-mocha';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+
+describe('Acceptance: Onboarding', function () {
+    const hooks = setupApplicationTest();
+    setupMirage(hooks);
+
+    beforeEach(async function () {
+        this.server.loadFixtures('configs');
+        this.server.loadFixtures('settings');
+        this.server.loadFixtures('themes');
+
+        enableMembers(this.server);
+    });
+
+    describe('checklist (owner)', function () {
+        beforeEach(async function () {
+            let role = this.server.create('role', {name: 'Owner'});
+            this.server.create('user', {roles: [role], slug: 'owner'});
+            await authenticateSession();
+        });
+
+        it('dashboard does not show checklist by default', async function () {
+            await visit('/dashboard');
+            expect(currentURL()).to.equal('/dashboard');
+
+            // onboarding isn't shown
+            expect(find('[data-test-dashboard="onboarding-checklist"]'), 'checklist').to.not.exist;
+
+            // other default dashboard elements are visible
+            expect(find('[data-test-dashboard="header"]'), 'header').to.exist;
+            expect(find('[data-test-dashboard="attribution"]'), 'attribution section').to.exist;
+        });
+
+        it('dashboard shows the checklist after accessing setup/done', async function () {
+            await visit('/setup/done');
+            expect(currentURL()).to.equal('/dashboard');
+
+            // main onboarding list is visible
+            expect(find('[data-test-dashboard="onboarding-checklist"]'), 'checklist').to.exist;
+
+            // other default dashboard elements get hidden
+            expect(find('[data-test-dashboard="header"]'), 'header').to.not.exist;
+            expect(find('[data-test-dashboard="attribution"]'), 'attribution section').to.not.exist;
+        });
+
+        it('checklist is shown when members disabled', async function () {
+            this.server.db.settings.update({membersSignupAccess: 'none'});
+            await visit('/setup/done');
+            await visit('/dashboard');
+
+            // onboarding is't shown
+            expect(find('[data-test-dashboard="onboarding-checklist"]'), 'checklist').to.exist;
+
+            // other default dashboard elements are not visible
+            expect(find('[data-test-dashboard="header"]'), 'header').to.not.exist;
+            expect(find('[data-test-dashboard="attribution"]'), 'attribution section').to.not.exist;
+        });
+    });
+
+    describe('checklist (non-owner)', function () {
+        beforeEach(async function () {
+            let role = this.server.create('role', {name: 'Administrator'});
+            this.server.create('user', {roles: [role], slug: 'admin'});
+            await authenticateSession();
+        });
+
+        it('dashboard doesn\'t show the checklist', async function () {
+            await visit('/dashboard');
+            expect(currentURL()).to.equal('/dashboard');
+
+            // onboarding isn't shown
+            expect(find('[data-test-dashboard="onboarding-checklist"]'), 'checklist').to.not.exist;
+
+            // other default dashboard elements are visible
+            expect(find('[data-test-dashboard="header"]'), 'header').to.exist;
+            expect(find('[data-test-dashboard="attribution"]'), 'attribution section').to.exist;
+        });
+    });
+
+    describe('unauthenticated', function () {
+        beforeEach(async function () {
+            this.server.db.users.remove();
+            await invalidateSession();
+        });
+
+        it('setup is redirected to signin', async function () {
+            await visit('/setup/done');
+            expect(currentURL()).to.equal('/signin');
+        });
+    });
+});
diff --git a/ghost/admin/tests/acceptance/password-reset-test.js b/ghost/admin/tests/acceptance/password-reset-test.js
index 6dc0a8bc350..2c86c75611f 100644
--- a/ghost/admin/tests/acceptance/password-reset-test.js
+++ b/ghost/admin/tests/acceptance/password-reset-test.js
@@ -17,7 +17,7 @@ describe('Acceptance: Password Reset', function () {
             await click('.forgotten-link');
 
             // an alert with instructions is displayed
-            expect(findAll('.gh-alert-blue').length, 'alert count')
+            expect(findAll('[data-test-flow-notification]').length, 'alert count')
                 .to.equal(1);
         });
 
@@ -41,7 +41,7 @@ describe('Acceptance: Password Reset', function () {
 
             // error message shown
             expect(find('p.main-error').textContent.trim(), 'error message')
-                .to.equal('We need your email address to reset your password!');
+                .to.equal('We need your email address to reset your password.');
 
             // invalid email provided
             await fillIn('input[name="identification"]', 'test');
@@ -61,7 +61,7 @@ describe('Acceptance: Password Reset', function () {
 
             // error message
             expect(find('p.main-error').textContent.trim(), 'error message')
-                .to.equal('We need your email address to reset your password!');
+                .to.equal('We need your email address to reset your password.');
 
             // unknown email provided
             await fillIn('input[name="identification"]', 'unknown@example.com');
diff --git a/ghost/admin/tests/acceptance/search-test.js b/ghost/admin/tests/acceptance/search-test.js
new file mode 100644
index 00000000000..ba785588051
--- /dev/null
+++ b/ghost/admin/tests/acceptance/search-test.js
@@ -0,0 +1,202 @@
+import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
+import {authenticateSession} from 'ember-simple-auth/test-support';
+import {click, currentURL, find, findAll, triggerKeyEvent, visit} from '@ember/test-helpers';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import {getPosts} from '../../mirage/config/posts';
+import {setupApplicationTest} from 'ember-mocha';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+import {typeInSearch} from 'ember-power-select/test-support/helpers';
+
+// we have two search providers
+// - "flex" which uses the flexsearch engine but is limited to english only
+// - "basic" which uses exact string matches in a less performant way but is language agnostic
+const suites = [{
+    name: 'Acceptance: Search (flex)',
+    beforeEach() {
+        // noop - default locale is 'en'
+    },
+    confirmProvider() {
+        const searchService = this.owner.lookup('service:search');
+        expect(searchService.provider.constructor.name, 'provider name').to.equal('SearchProviderFlexService');
+    }
+}, {
+    name: 'Acceptance: Search (basic)',
+    beforeEach() {
+        this.server.db.settings.update({key: 'locale'}, {value: 'de'});
+    },
+    confirmProvider() {
+        const settingsService = this.owner.lookup('service:settings');
+        expect(settingsService.locale, 'settings.locale').to.equal('de');
+        const searchService = this.owner.lookup('service:search');
+        expect(searchService.provider.constructor.name, 'provider name').to.equal('SearchProviderBasicService');
+    }
+}];
+
+suites.forEach((suite) => {
+    describe(suite.name, function () {
+        const trigger = '[data-test-modal="search"] .ember-power-select-trigger';
+        // eslint-disable-next-line no-unused-vars
+        let firstUser, firstPost, secondPost, firstPage, firstTag;
+
+        const hooks = setupApplicationTest();
+        setupMirage(hooks);
+
+        this.beforeEach(async function () {
+            this.server.loadFixtures();
+
+            // create user to authenticate as
+            let role = this.server.create('role', {name: 'Owner'});
+            firstUser = this.server.create('user', {roles: [role], slug: 'owner', name: 'First user'});
+
+            // populate store with data we'll be searching
+            firstPost = this.server.create('post', {title: 'First post', slug: 'first-post'});
+            secondPost = this.server.create('post', {title: 'Second post', slug: 'second-post'});
+            firstPage = this.server.create('page', {title: 'First page', slug: 'first-page'});
+            firstTag = this.server.create('tag', {name: 'First tag', slug: 'first-tag'});
+
+            suite.beforeEach.bind(this)();
+
+            await authenticateSession();
+        });
+
+        it('is using correct provider', async function () {
+            await visit('/dashboard');
+            suite.confirmProvider.bind(this)();
+        });
+
+        it('opens search modal when clicking icon', async function () {
+            await visit('/dashboard');
+            expect(currentURL(), 'currentURL').to.equal('/dashboard');
+            expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist;
+            await click('[data-test-button="search"]');
+            expect(find('[data-test-modal="search"]'), 'search modal').to.exist;
+        });
+
+        it('opens search icon when pressing Ctrl/Cmd+K', async function () {
+            await visit('/dashboard');
+            expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist;
+            await triggerKeyEvent(document, 'keydown', 'K', {
+                metaKey: ctrlOrCmd === 'command',
+                ctrlKey: ctrlOrCmd === 'ctrl'
+            });
+            expect(find('[data-test-modal="search"]'), 'search modal').to.exist;
+        });
+
+        it('closes search modal on escape key', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            expect(find('[data-test-modal="search"]'), 'search modal').to.exist;
+            await triggerKeyEvent(document, 'keydown', 'Escape');
+            expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist;
+        });
+
+        it('closes search modal on click outside', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            expect(find('[data-test-modal="search"]'), 'search modal').to.exist;
+            await click('.epm-backdrop');
+            expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist;
+        });
+
+        it('finds posts, pages, staff, and tags when typing', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('first'); // search is not case sensitive
+
+            // all groups are present
+            const groupNames = findAll('.ember-power-select-group-name');
+            expect(groupNames, 'group names').to.have.length(4);
+            expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']);
+
+            // correct results are found
+            const options = findAll('.ember-power-select-option');
+            expect(options, 'number of search results').to.have.length(4);
+            expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']);
+
+            // first item is selected
+            expect(options[0]).to.have.attribute('aria-current', 'true');
+        });
+
+        it('up/down arrows move selected item', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('first post');
+            expect(findAll('.ember-power-select-option')[0], 'first option (initial)').to.have.attribute('aria-current', 'true');
+            await triggerKeyEvent(trigger, 'keyup', 'ArrowDown');
+            expect(findAll('.ember-power-select-option')[0], 'second option (after down)').to.have.attribute('aria-current', 'true');
+            await triggerKeyEvent(trigger, 'keyup', 'ArrowUp');
+            expect(findAll('.ember-power-select-option')[0], 'first option (after up)').to.have.attribute('aria-current', 'true');
+        });
+
+        it('navigates to editor when post selected (Enter)', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('first post');
+            await triggerKeyEvent(trigger, 'keydown', 'Enter');
+            expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`);
+        });
+
+        it('navigates to editor when post selected (Clicked)', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('first post');
+            await click('.ember-power-select-option[aria-current="true"]');
+            expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`);
+        });
+
+        it('navigates to editor when page selected', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('page');
+            await triggerKeyEvent(trigger, 'keydown', 'Enter');
+            expect(currentURL(), 'url after selecting page').to.equal(`/editor/page/${firstPage.id}`);
+        });
+
+        it('navigates to tag edit screen when tag selected', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('tag');
+            await triggerKeyEvent(trigger, 'keydown', 'Enter');
+            expect(currentURL(), 'url after selecting tag').to.equal(`/tags/${firstTag.slug}`);
+        });
+
+        // TODO: Staff settings are now part of AdminX so this isn't working, can we test AdminX from Ember tests?
+        it.skip('navigates to user edit screen when user selected', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('user');
+            await triggerKeyEvent(trigger, 'keydown', 'Enter');
+            expect(currentURL(), 'url after selecting user').to.equal(`/settings/staff/${firstUser.slug}`);
+        });
+
+        it('shows no results message when no results', async function () {
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('x');
+            expect(find('.ember-power-select-option--no-matches-message'), 'no results message').to.contain.text('No results found');
+        });
+
+        // https://linear.app/tryghost/issue/MOM-103/search-stalls-on-query-when-refresh-occurs
+        it('handles refresh on first search being slow', async function () {
+            this.server.get('/posts/', getPosts, {timing: 200});
+
+            await visit('/dashboard');
+            await click('[data-test-button="search"]');
+            await typeInSearch('first'); // search is not case sensitive
+
+            // all groups are present
+            const groupNames = findAll('.ember-power-select-group-name');
+            expect(groupNames, 'group names').to.have.length(4);
+            expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']);
+
+            // correct results are found
+            const options = findAll('.ember-power-select-option');
+            expect(options, 'number of search results').to.have.length(4);
+            expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']);
+
+            // first item is selected
+            expect(options[0]).to.have.attribute('aria-current', 'true');
+        });
+    });
+});
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/setup-test.js b/ghost/admin/tests/acceptance/setup-test.js
index 4857598448e..1b2dabef445 100644
--- a/ghost/admin/tests/acceptance/setup-test.js
+++ b/ghost/admin/tests/acceptance/setup-test.js
@@ -84,7 +84,7 @@ describe('Acceptance: Setup', function () {
 
             // it redirects to the dashboard
             expect(currentURL(), 'url after submitting account details')
-                .to.equal('/setup/done');
+                .to.equal('/dashboard');
         });
 
         it('handles validation errors in setup', async function () {
@@ -182,9 +182,9 @@ describe('Acceptance: Setup', function () {
             await authenticateSession();
         });
 
-        it('transitions to done screen', async function () {
+        it('transitions to dashboard', async function () {
             await visit('/?firstStart=true');
-            expect(currentURL()).to.equal('/setup/done');
+            expect(currentURL()).to.equal('/dashboard');
         });
     });
 });
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/staff-test.js b/ghost/admin/tests/acceptance/staff-test.js
index f310729ef49..e3a534153c1 100644
--- a/ghost/admin/tests/acceptance/staff-test.js
+++ b/ghost/admin/tests/acceptance/staff-test.js
@@ -90,7 +90,7 @@
 //             // add a suspended user
 //             suspendedUser = this.server.create('user', {email: 'suspended@example.com', roles: [adminRole], status: 'inactive'});
 
-//             return await authenticateSession();
+//             await authenticateSession();
 //         });
 
 //         it('it renders and navigates correctly', async function () {
@@ -102,9 +102,6 @@
 //             // doesn't do any redirecting
 //             expect(currentURL(), 'currentURL').to.equal('/settings/staff');
 
-//             // it has correct page title
-//             expect(document.title, 'page title').to.equal('Staff - Test Blog');
-
 //             // it shows active users in active section
 //             expect(
 //                 findAll('[data-test-active-users] [data-test-user-id]').length,
@@ -134,9 +131,6 @@
 //             // url is correct
 //             expect(currentURL(), 'url after clicking user').to.equal(`/settings/staff/${user2.slug}`);
 
-//             // title is correct
-//             expect(document.title, 'title after clicking user').to.equal('Staff - User - Test Blog');
-
 //             // view title should exist and be linkable and active
 //             expect(
 //                 find('[data-test-breadcrumb] a[href="/ghost/settings/staff"]').classList.contains('active'),
@@ -919,7 +913,7 @@
 //             // add an expired invite
 //             this.server.create('invite', {expires: moment.utc().subtract(1, 'day').valueOf(), role: adminRole});
 
-//             return await authenticateSession();
+//             await authenticateSession();
 //         });
 
 //         describe('existing user', function () {
@@ -978,7 +972,7 @@
 //                 });
 //             });
 
-//             return await authenticateSession();
+//             await authenticateSession();
 //         });
 
 //         it('is redirected to user profile page', async function () {
diff --git a/ghost/admin/tests/acceptance/stats-test.js b/ghost/admin/tests/acceptance/stats-test.js
new file mode 100644
index 00000000000..26cc32ac542
--- /dev/null
+++ b/ghost/admin/tests/acceptance/stats-test.js
@@ -0,0 +1,94 @@
+import loginAsRole from '../helpers/login-as-role';
+import {currentURL, find, visit} from '@ember/test-helpers';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import {invalidateSession} from 'ember-simple-auth/test-support';
+import {setupApplicationTest} from 'ember-mocha';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+
+describe('Acceptance: Stats', function () {
+    const hooks = setupApplicationTest();
+    setupMirage(hooks);
+
+    beforeEach(function () {
+        this.server.loadFixtures();
+    });
+
+    describe('permissions', function () {
+        it('redirects to signin when not authenticated', async function () {
+            await invalidateSession();
+            await visit('/stats');
+            expect(currentURL()).to.equal('/signin');
+        });
+
+        it('redirects to posts page when authenticated as contributor', async function () {
+            await loginAsRole('Contributor', this.server);
+            await visit('/stats');
+            expect(currentURL(), 'currentURL').to.equal('/posts');
+        });
+
+        it('redirects to site page when authenticated as author', async function () {
+            await loginAsRole('Author', this.server);
+            await visit('/stats');
+            expect(currentURL(), 'currentURL').to.equal('/site');
+        });
+
+        it('redirects to dashboard when logged in as admin with no stats config set', async function () {
+            await loginAsRole('Administrator', this.server);
+
+            await visit('/stats');
+            expect(currentURL()).to.equal('/dashboard');
+            expect(find('[data-test-screen-title]')).to.have.rendered.trimmed.text('Dashboard');
+        });
+
+        it('can visit /stats when logged in as admin AND stats config is set', async function () {
+            await loginAsRole('Administrator', this.server);
+
+            const config = this.server.db.configs.find(1);
+            config.stats = {
+                endpoint: 'http://testing.com'
+            };
+            this.server.db.configs.update(1, config);
+
+            await visit('/stats');
+            expect(currentURL()).to.equal('/stats');
+            expect(find('[data-test-screen-title]')).to.have.rendered.trimmed.text('Stats');
+        });
+
+        // Tests to be written
+        it('can filter by audience type', async function () {});
+        it('can filter by date range', async function () {});
+        it('can filter by number of days', async function () {});
+
+        it('shows sum of unique visitors', async function () {});
+        it('shows sum of visits', async function () {});
+        it('shows sum of pageviews', async function () {});
+        it('shows average bounce rate', async function () {});
+        it('shows average visit duration', async function () {});
+
+        it('can switch between kpi tabs', async function () {});
+
+        it('shows unique visitors chart', async function () {});
+        it('shows visits chart', async function () {});
+        it('shows pageviews chart', async function () {});
+        it('shows bounce rate chart', async function () {});
+        it('shows visit duration chart', async function () {});
+
+        it('shows "content" bar list chart', async function () {});
+        it('can filter for posts', async function () {});
+        it('can filter for pages', async function () {});
+        it('can view all "content" stat', async function () {});
+
+        it('shows "sources" bar list chart', async function () {});
+        it('can filter for campaigns', async function () {});
+        it('can view all "sources" stat', async function () {});
+
+        it('shows "countries" bar list chart', async function () {});
+        it('can view all "countries" stat', async function () {});
+
+        it('can switch between technical tabs', async function () {});
+        it('shows "devices" chart', async function () {});
+        it('shows "browsers" chart', async function () {});
+        it('shows "OS" chart', async function () {});
+    });
+});
diff --git a/ghost/admin/tests/acceptance/settings/tags-test.js b/ghost/admin/tests/acceptance/tags-test.js
similarity index 97%
rename from ghost/admin/tests/acceptance/settings/tags-test.js
rename to ghost/admin/tests/acceptance/tags-test.js
index bc4798ef810..51ad2e58c1f 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();
@@ -43,7 +43,7 @@ describe('Acceptance: Tags', function () {
             let role = this.server.create('role', {name: 'Administrator'});
             this.server.create('user', {roles: [role]});
 
-            return await authenticateSession();
+            await authenticateSession();
         });
 
         it('lists public and internal tags separately', async function () {
@@ -59,9 +59,6 @@ describe('Acceptance: Tags', function () {
             // it loads tags list
             expect(currentURL(), 'currentURL').to.equal('tags');
 
-            // it has correct page title
-            expect(document.title, 'page title').to.equal('Tags - Test Blog');
-
             // it highlights nav menu
             expect(find('[data-test-nav="tags"]'), 'highlights nav menu item')
                 .to.have.class('active');
diff --git a/ghost/admin/tests/integration/components/gh-alert-test.js b/ghost/admin/tests/integration/components/gh-alert-test.js
index 92c96120780..64863ea3e13 100644
--- a/ghost/admin/tests/integration/components/gh-alert-test.js
+++ b/ghost/admin/tests/integration/components/gh-alert-test.js
@@ -45,11 +45,11 @@ describe('Integration: Component: gh-alert', function () {
 
         this.message.type = 'warn';
         await settled();
-        expect(alert, 'warn class is yellow').to.have.class('gh-alert-blue');
+        expect(alert, 'warn class is black').to.have.class('gh-alert-black');
 
         this.message.type = 'info';
         await settled();
-        expect(alert, 'info class is blue').to.have.class('gh-alert-blue');
+        expect(alert, 'info class is black').to.have.class('gh-alert-black');
     });
 
     it('closes notification through notifications service', async function () {
diff --git a/ghost/admin/tests/integration/components/gh-date-picker-test.js b/ghost/admin/tests/integration/components/gh-date-picker-test.js
index 2b5e3208fe0..93e658c5d0f 100644
--- a/ghost/admin/tests/integration/components/gh-date-picker-test.js
+++ b/ghost/admin/tests/integration/components/gh-date-picker-test.js
@@ -333,12 +333,12 @@ describe('Integration: Component: gh-date-picker', function () {
             this.set('date', moment('2022-02-22 22:22:22.000')).toDate();
             this.set('maxDate', moment('2022-02-25 12:00:00.000').toDate());
 
-            await render(hbs`<GhDatePicker @value={{this.date}} @maxDate={{this.maxDate}} @maxDateError="Must be in the past" @onChange={{this.onChange}} />`);
+            await render(hbs`<GhDatePicker @value={{this.date}} @maxDate={{this.maxDate}} @maxDateError="Please choose a past date." @onChange={{this.onChange}} />`);
 
             await fillIn('[data-test-date-picker-input]', '2022-02-28');
             await blur('[data-test-date-picker-input]');
 
-            expect(find('[data-test-date-picker-error]')).to.have.text('Must be in the past');
+            expect(find('[data-test-date-picker-error]')).to.have.text('Please choose a past date.');
         });
     });
 
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-members-import-table-test.js b/ghost/admin/tests/integration/components/gh-members-import-table-test.js
index 302de9d5fcf..5e5442ac200 100644
--- a/ghost/admin/tests/integration/components/gh-members-import-table-test.js
+++ b/ghost/admin/tests/integration/components/gh-members-import-table-test.js
@@ -71,31 +71,40 @@ describe('Integration: Component: gh-members-import-table', function () {
     });
 
     it('cannot navigate through data when only one data item is present', async function () {
-        it('renders members data with all the properties', async function () {
-            this.set('importData', [{
-                name: 'Egg',
-                email: 'egg@example.com'
-            }]);
-
-            await render(hbs`
-                <GhMembersImportTable @importData={{this.importData}} />
-            `);
-
-            await click('[data-test-import-prev]');
-
-            expect(findAll('table tbody tr').length).to.equal(2);
-            expect(findAll('table tbody tr td')[0].textContent).to.equal('name');
-            expect(findAll('table tbody tr td')[1].textContent).to.equal('Egg');
-            expect(findAll('table tbody tr td')[2].textContent).to.equal('email');
-            expect(findAll('table tbody tr td')[3].textContent).to.equal('egg@example.com');
-
-            await click('[data-test-import-next]');
-
-            expect(findAll('table tbody tr').length).to.equal(2);
-            expect(findAll('table tbody tr td')[0].textContent).to.equal('name');
-            expect(findAll('table tbody tr td')[1].textContent).to.equal('Egg');
-            expect(findAll('table tbody tr td')[2].textContent).to.equal('email');
-            expect(findAll('table tbody tr td')[3].textContent).to.equal('egg@example.com');
-        });
+        this.set('importData', [{
+            name: 'Egg',
+            email: 'egg@example.com'
+        }]);
+        this.set('setMapping', () => {});
+
+        await render(hbs`
+            <GhMembersImportTable @data={{this.importData}} @setMapping={{this.setMapping}} />
+        `);
+
+        expect(findAll('table tbody tr').length).to.equal(2);
+        expect(findAll('table tbody tr td')[0].textContent).to.equal('name');
+        expect(findAll('table tbody tr td')[1].textContent).to.equal('Egg');
+        expect(findAll('table tbody tr td')[2].textContent).to.match(/Not imported/);
+        expect(findAll('table tbody tr td')[3].textContent).to.equal('email');
+        expect(findAll('table tbody tr td')[4].textContent).to.equal('egg@example.com');
+        expect(findAll('table tbody tr td')[5].textContent).to.match(/Not imported/);
+
+        await click('[data-test-import-next]');
+
+        expect(findAll('table tbody tr td')[0].textContent).to.equal('name');
+        expect(findAll('table tbody tr td')[1].textContent).to.equal('Egg');
+        expect(findAll('table tbody tr td')[2].textContent).to.match(/Not imported/);
+        expect(findAll('table tbody tr td')[3].textContent).to.equal('email');
+        expect(findAll('table tbody tr td')[4].textContent).to.equal('egg@example.com');
+        expect(findAll('table tbody tr td')[5].textContent).to.match(/Not imported/);
+
+        await click('[data-test-import-prev]');
+
+        expect(findAll('table tbody tr td')[0].textContent).to.equal('name');
+        expect(findAll('table tbody tr td')[1].textContent).to.equal('Egg');
+        expect(findAll('table tbody tr td')[2].textContent).to.match(/Not imported/);
+        expect(findAll('table tbody tr td')[3].textContent).to.equal('email');
+        expect(findAll('table tbody tr td')[4].textContent).to.equal('egg@example.com');
+        expect(findAll('table tbody tr td')[5].textContent).to.match(/Not imported/);
     });
 });
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/integration/helpers/gh-format-post-time-test.js b/ghost/admin/tests/integration/helpers/gh-format-post-time-test.js
index 26ac760a129..772a53f02f1 100644
--- a/ghost/admin/tests/integration/helpers/gh-format-post-time-test.js
+++ b/ghost/admin/tests/integration/helpers/gh-format-post-time-test.js
@@ -42,7 +42,7 @@ describe('Integration: Helper: gh-format-post-time', function () {
         let mockDate = moment.utc().subtract(1, 'hour');
         this.set('mockDate', mockDate);
 
-        await render(hbs`{{gh-format-post-time mockDate draft=true}}`);
+        await render(hbs`{{gh-format-post-time mockDate relative=true}}`);
         expect(this.element).to.have.trimmed.text('an hour ago');
     });
 
@@ -50,7 +50,7 @@ describe('Integration: Helper: gh-format-post-time', function () {
         let mockDate = moment.utc().subtract(13, 'minutes');
         this.set('mockDate', mockDate);
 
-        await render(hbs`{{gh-format-post-time mockDate published=true}}`);
+        await render(hbs`{{gh-format-post-time mockDate absolute=true}}`);
         expect(this.element).to.have.trimmed.text('13 minutes ago');
     });
 
@@ -70,7 +70,7 @@ describe('Integration: Helper: gh-format-post-time', function () {
         });
         this.set('mockDate', mockDate);
 
-        await render(hbs`{{gh-format-post-time mockDate published=true}}`);
+        await render(hbs`{{gh-format-post-time mockDate absolute=true}}`);
         expect(this.element).to.have.trimmed.text(`${expectedTime} (UTC) Today`);
     });
 
@@ -93,8 +93,19 @@ describe('Integration: Helper: gh-format-post-time', function () {
         });
         this.set('mockDate', mockDate);
 
-        await render(hbs`{{gh-format-post-time mockDate published=true}}`);
-        expect(this.element).to.have.trimmed.text(`${expectedTime} (UTC) Yesterday`);
+        await render(hbs`{{gh-format-post-time mockDate absolute=true}}`);
+        expect(this.element).to.have.trimmed.text(`${expectedTime} (UTC) yesterday`);
+    });
+
+    it('returns correct short format if post was published yesterday', async function () {
+        let {mockDate} = setupMockDate({
+            date: '2017-09-05T16:00:00Z',
+            utcDate: '2017-09-06T18:00:00Z'
+        });
+        this.set('mockDate', mockDate);
+
+        await render(hbs`{{gh-format-post-time mockDate absolute=true short=true}}`);
+        expect(this.element).to.have.trimmed.text(`Yesterday`);
     });
 
     it('returns correct format if post is scheduled for tomorrow', async function () {
@@ -115,7 +126,18 @@ describe('Integration: Helper: gh-format-post-time', function () {
         });
         this.set('mockDate', mockDate);
 
-        await render(hbs`{{gh-format-post-time mockDate published=true}}`);
+        await render(hbs`{{gh-format-post-time mockDate absolute=true}}`);
+        expect(this.element).to.have.trimmed.text('16:00 (UTC) 02 Sep 2017');
+    });
+
+    it('returns correct short format if post was published prior to yesterday', async function () {
+        let {mockDate} = setupMockDate({
+            date: '2017-09-02T16:00:00Z',
+            utcDate: '2017-09-06T18:00:00Z'
+        });
+        this.set('mockDate', mockDate);
+
+        await render(hbs`{{gh-format-post-time mockDate absolute=true short=true}}`);
         expect(this.element).to.have.trimmed.text('02 Sep 2017');
     });
 
diff --git a/ghost/admin/tests/integration/models/post-test.js b/ghost/admin/tests/integration/models/post-test.js
new file mode 100644
index 00000000000..506521b0d65
--- /dev/null
+++ b/ghost/admin/tests/integration/models/post-test.js
@@ -0,0 +1,80 @@
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+import {setupTest} from 'ember-mocha';
+
+describe('Integration: Model: post', function () {
+    const hooks = setupTest();
+    setupMirage(hooks);
+
+    let store;
+
+    beforeEach(function () {
+        store = this.owner.lookup('service:store');
+    });
+
+    describe('search expiry', function () {
+        let search;
+
+        beforeEach(function () {
+            search = this.owner.lookup('service:search');
+            search.isContentStale = false;
+        });
+
+        it('expires on published save', async function () {
+            const serverPost = this.server.create('post', {status: 'published'});
+
+            const postModel = await store.find('post', serverPost.id);
+            await postModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.true;
+        });
+
+        it('expires on published delete', async function () {
+            const serverPost = this.server.create('post', {status: 'published'});
+
+            const postModel = await store.find('post', serverPost.id);
+            await postModel.destroyRecord();
+
+            expect(search.isContentStale, 'stale flag after delete').to.be.true;
+        });
+
+        it('expires when publishing', async function () {
+            const serverPost = this.server.create('post', {status: 'draft'});
+
+            const postModel = await store.find('post', serverPost.id);
+            postModel.status = 'published';
+            await postModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.true;
+        });
+
+        it('expires when unpublishing', async function () {
+            const serverPost = this.server.create('post', {status: 'published'});
+
+            const postModel = await store.find('post', serverPost.id);
+            postModel.status = 'draft';
+            await postModel.save();
+
+            expect(search.isContentStale, 'stale flag after unpublish').to.be.true;
+        });
+
+        it('does not expire on draft save', async function () {
+            const serverPost = this.server.create('post', {status: 'draft'});
+
+            const postModel = await store.find('post', serverPost.id);
+            await postModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.false;
+        });
+
+        it('does not expire on draft delete', async function () {
+            const serverPost = this.server.create('post', {status: 'draft'});
+
+            const postModel = await store.find('post', serverPost.id);
+            await postModel.destroyRecord();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.false;
+        });
+    });
+});
diff --git a/ghost/admin/tests/integration/models/tag-test.js b/ghost/admin/tests/integration/models/tag-test.js
new file mode 100644
index 00000000000..47cabe7de8b
--- /dev/null
+++ b/ghost/admin/tests/integration/models/tag-test.js
@@ -0,0 +1,71 @@
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+import {setupTest} from 'ember-mocha';
+
+describe('Integration: Model: tag', function () {
+    const hooks = setupTest();
+    setupMirage(hooks);
+
+    let store;
+
+    beforeEach(function () {
+        store = this.owner.lookup('service:store');
+    });
+
+    describe('search expiry', function () {
+        let search;
+
+        beforeEach(function () {
+            search = this.owner.lookup('service:search');
+            search.isContentStale = false;
+        });
+
+        it('expires on create', async function () {
+            const tagModel = await store.createRecord('tag');
+            tagModel.name = 'Test tag';
+            await tagModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.true;
+        });
+
+        it('expires on delete', async function () {
+            const serverTag = this.server.create('tag');
+
+            const tagModel = await store.find('tag', serverTag.id);
+            await tagModel.destroyRecord();
+
+            expect(search.isContentStale, 'stale flag after delete').to.be.true;
+        });
+
+        it('expires when name changed', async function () {
+            const serverTag = this.server.create('tag');
+
+            const tagModel = await store.find('tag', serverTag.id);
+            tagModel.name = 'New name';
+            await tagModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.true;
+        });
+
+        it('expires when url changed', async function () {
+            const serverTag = this.server.create('tag');
+
+            const tagModel = await store.find('tag', serverTag.id);
+            tagModel.slug = 'new-slug';
+            await tagModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.true;
+        });
+
+        it('does not expire on non-name change', async function () {
+            const serverTag = this.server.create('tag');
+
+            const tagModel = await store.find('tag', serverTag.id);
+            tagModel.description = 'New description';
+            await tagModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.false;
+        });
+    });
+});
diff --git a/ghost/admin/tests/integration/models/user-test.js b/ghost/admin/tests/integration/models/user-test.js
new file mode 100644
index 00000000000..982808b309c
--- /dev/null
+++ b/ghost/admin/tests/integration/models/user-test.js
@@ -0,0 +1,63 @@
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+import {setupTest} from 'ember-mocha';
+
+describe('Integration: Model: user', function () {
+    const hooks = setupTest();
+    setupMirage(hooks);
+
+    let store;
+
+    beforeEach(function () {
+        store = this.owner.lookup('service:store');
+    });
+
+    describe('search expiry', function () {
+        let search;
+
+        beforeEach(function () {
+            search = this.owner.lookup('service:search');
+            search.isContentStale = false;
+        });
+
+        it('expires on delete', async function () {
+            const serverUser = this.server.create('user');
+
+            const userModel = await store.find('user', serverUser.id);
+            await userModel.destroyRecord();
+
+            expect(search.isContentStale, 'stale flag after delete').to.be.true;
+        });
+
+        it('expires when name changed', async function () {
+            const serverUser = this.server.create('user');
+
+            const userModel = await store.find('user', serverUser.id);
+            userModel.name = 'New name';
+            await userModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.true;
+        });
+
+        it('expires when url changed', async function () {
+            const serverUser = this.server.create('user');
+
+            const userModel = await store.find('user', serverUser.id);
+            userModel.slug = 'new-slug';
+            await userModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.true;
+        });
+
+        it('does not expire on non-name change', async function () {
+            const serverUser = this.server.create('user');
+
+            const userModel = await store.find('user', serverUser.id);
+            userModel.description = 'New description';
+            await userModel.save();
+
+            expect(search.isContentStale, 'stale flag after save').to.be.false;
+        });
+    });
+});
diff --git a/ghost/admin/tests/integration/services/feature-test.js b/ghost/admin/tests/integration/services/feature-test.js
index 8d657f7cf99..e99bf6b96da 100644
--- a/ghost/admin/tests/integration/services/feature-test.js
+++ b/ghost/admin/tests/integration/services/feature-test.js
@@ -101,10 +101,9 @@ describe('Integration: Service: feature', function () {
 
         let service = this.owner.lookup('service:feature');
 
-        return service.fetch().then(() => {
-            expect(service.get('testFlag')).to.be.true;
-            expect(service.get('testUserFlag')).to.be.true;
-        });
+        await service.fetch();
+        expect(service.get('testFlag')).to.be.true;
+        expect(service.get('testUserFlag')).to.be.true;
     });
 
     it('returns false for set flag with config false and labs false', async function () {
@@ -119,10 +118,9 @@ describe('Integration: Service: feature', function () {
         let service = this.owner.lookup('service:feature');
         service.config.testFlag = false;
 
-        return service.fetch().then(() => {
-            expect(service.get('labs.testFlag')).to.be.false;
-            expect(service.get('testFlag')).to.be.false;
-        });
+        await service.fetch();
+        expect(service.get('labs.testFlag')).to.be.false;
+        expect(service.get('testFlag')).to.be.false;
     });
 
     it('returns true for set flag with config true and labs false', async function () {
@@ -137,10 +135,9 @@ describe('Integration: Service: feature', function () {
         let service = this.owner.lookup('service:feature');
         service.config.testFlag = true;
 
-        return service.fetch().then(() => {
-            expect(service.get('labs.testFlag')).to.be.false;
-            expect(service.get('testFlag')).to.be.true;
-        });
+        await service.fetch();
+        expect(service.get('labs.testFlag')).to.be.false;
+        expect(service.get('testFlag')).to.be.true;
     });
 
     it('returns true for set flag with config is an object and labs true', async function () {
@@ -155,10 +152,9 @@ describe('Integration: Service: feature', function () {
         let service = this.owner.lookup('service:feature');
         service.config.testFlag = {key: 'value'};
 
-        return service.fetch().then(() => {
-            expect(service.get('labs.testFlag')).to.be.true;
-            expect(service.get('testFlag')).to.be.true;
-        });
+        await service.fetch();
+        expect(service.get('labs.testFlag')).to.be.true;
+        expect(service.get('testFlag')).to.be.true;
     });
 
     it('returns true for set flag with config true and labs true', async function () {
@@ -173,10 +169,9 @@ describe('Integration: Service: feature', function () {
         let service = this.owner.lookup('service:feature');
         service.config.testFlag = true;
 
-        return service.fetch().then(() => {
-            expect(service.get('labs.testFlag')).to.be.true;
-            expect(service.get('testFlag')).to.be.true;
-        });
+        await service.fetch();
+        expect(service.get('labs.testFlag')).to.be.true;
+        expect(service.get('testFlag')).to.be.true;
     });
 
     it('returns false for set flag with accessibility false', async function () {
@@ -190,10 +185,9 @@ describe('Integration: Service: feature', function () {
 
         let service = this.owner.lookup('service:feature');
 
-        return service.fetch().then(() => {
-            expect(service.get('accessibility.testUserFlag')).to.be.false;
-            expect(service.get('testUserFlag')).to.be.false;
-        });
+        await service.fetch();
+        expect(service.get('accessibility.testUserFlag')).to.be.false;
+        expect(service.get('testUserFlag')).to.be.false;
     });
 
     it('returns true for set flag with accessibility true', async function () {
@@ -207,10 +201,9 @@ describe('Integration: Service: feature', function () {
 
         let service = this.owner.lookup('service:feature');
 
-        return service.fetch().then(() => {
-            expect(service.get('accessibility.testUserFlag')).to.be.true;
-            expect(service.get('testUserFlag')).to.be.true;
-        });
+        await service.fetch();
+        expect(service.get('accessibility.testUserFlag')).to.be.true;
+        expect(service.get('testUserFlag')).to.be.true;
     });
 
     it('saves labs setting correctly', async function () {
@@ -225,18 +218,17 @@ describe('Integration: Service: feature', function () {
         let service = this.owner.lookup('service:feature');
         service.config.testFlag = {key: 'value'};
 
-        return service.fetch().then(() => {
-            expect(service.get('testFlag')).to.be.false;
+        await service.fetch();
+        expect(service.get('testFlag')).to.be.false;
 
-            run(() => {
-                service.set('testFlag', true);
-            });
-
-            return settled().then(() => {
-                expect(server.handlers[2].numberOfCalls).to.equal(1);
-                expect(service.get('testFlag')).to.be.true;
-            });
+        run(() => {
+            service.set('testFlag', true);
         });
+
+        await settled();
+
+        expect(server.handlers[2].numberOfCalls).to.equal(1);
+        expect(service.get('testFlag')).to.be.true;
     });
 
     it('saves accessibility setting correctly', async function () {
@@ -250,18 +242,16 @@ describe('Integration: Service: feature', function () {
 
         let service = this.owner.lookup('service:feature');
 
-        return service.fetch().then(() => {
-            expect(service.get('testUserFlag')).to.be.false;
-
-            run(() => {
-                service.set('testUserFlag', true);
-            });
+        await service.fetch();
+        expect(service.get('testUserFlag')).to.be.false;
 
-            return settled().then(() => {
-                expect(server.handlers[4].numberOfCalls).to.equal(1);
-                expect(service.get('testUserFlag')).to.be.true;
-            });
+        run(() => {
+            service.set('testUserFlag', true);
         });
+
+        await settled();
+        expect(server.handlers[4].numberOfCalls).to.equal(1);
+        expect(service.get('testUserFlag')).to.be.true;
     });
 
     it('notifies for server errors on labs save', async function () {
@@ -276,27 +266,25 @@ describe('Integration: Service: feature', function () {
         let service = this.owner.lookup('service:feature');
         service.config.testFlag = false;
 
-        return service.fetch().then(() => {
-            expect(service.get('testFlag')).to.be.false;
+        await service.fetch();
+        expect(service.get('testFlag')).to.be.false;
 
-            run(() => {
-                service.set('testFlag', true);
-            });
+        run(() => {
+            service.set('testFlag', true);
+        });
 
-            return settled().then(() => {
-                expect(
-                    server.handlers[2].numberOfCalls,
-                    'PUT call is made'
-                ).to.equal(1);
+        await settled();
+        expect(
+            server.handlers[2].numberOfCalls,
+            'PUT call is made'
+        ).to.equal(1);
 
-                expect(
-                    service.get('notifications.alerts').length,
-                    'number of alerts shown'
-                ).to.equal(1);
+        expect(
+            service.get('notifications.alerts').length,
+            'number of alerts shown'
+        ).to.equal(1);
 
-                expect(service.get('testFlag')).to.be.false;
-            });
-        });
+        expect(service.get('testFlag')).to.be.false;
     });
 
     it('notifies for server errors on accessibility save', async function () {
@@ -310,27 +298,25 @@ describe('Integration: Service: feature', function () {
 
         let service = this.owner.lookup('service:feature');
 
-        return service.fetch().then(() => {
-            expect(service.get('testUserFlag')).to.be.false;
+        await service.fetch();
+        expect(service.get('testUserFlag')).to.be.false;
 
-            run(() => {
-                service.set('testUserFlag', true);
-            });
+        run(() => {
+            service.set('testUserFlag', true);
+        });
 
-            return settled().then(() => {
-                expect(
-                    server.handlers[3].numberOfCalls,
-                    'PUT call is made'
-                ).to.equal(1);
+        await settled();
+        expect(
+            server.handlers[3].numberOfCalls,
+            'PUT call is made'
+        ).to.equal(1);
 
-                expect(
-                    service.get('notifications.alerts').length,
-                    'number of alerts shown'
-                ).to.equal(1);
+        expect(
+            service.get('notifications.alerts').length,
+            'number of alerts shown'
+        ).to.equal(1);
 
-                expect(service.get('testUserFlag')).to.be.false;
-            });
-        });
+        expect(service.get('testUserFlag')).to.be.false;
     });
 
     it('notifies for validation errors', async function () {
@@ -345,21 +331,19 @@ describe('Integration: Service: feature', function () {
         let featureService = this.owner.lookup('service:feature');
         featureService.config.testFlag = false;
 
-        return featureService.fetch().then(() => {
-            expect(featureService.get('testFlag'), 'testFlag before set').to.be.false;
+        await featureService.fetch();
+        expect(featureService.get('testFlag'), 'testFlag before set').to.be.false;
 
-            run(() => {
-                expect(() => {
-                    featureService.set('testFlag', true);
-                }, EmberError, 'threw validation error');
-            });
-
-            return settled().then(() => {
-                // ensure validation is happening before the API is hit
-                expect(server.handlers[2].numberOfCalls).to.equal(0);
-                expect(featureService.get('testFlag')).to.be.false;
-            });
+        run(() => {
+            expect(() => {
+                featureService.set('testFlag', true);
+            }, EmberError, 'threw validation error');
         });
+
+        await settled();
+        // ensure validation is happening before the API is hit
+        expect(server.handlers[2].numberOfCalls).to.equal(0);
+        expect(featureService.get('testFlag')).to.be.false;
     });
 
     it('has correct labs flags when accessed before and after settings load', async function () {
diff --git a/ghost/admin/tests/integration/services/member-import-validator-test.js b/ghost/admin/tests/integration/services/member-import-validator-test.js
index 2d055fa55c1..99641d5d1b0 100644
--- a/ghost/admin/tests/integration/services/member-import-validator-test.js
+++ b/ghost/admin/tests/integration/services/member-import-validator-test.js
@@ -128,7 +128,7 @@ describe('Integration: Service: member-import-validator', function () {
             expect(result.stripe_customer_id).to.equal(undefined);
         });
 
-        it('correctly detects only email mapping', async function () {
+        it('correctly detects email mapping', async function () {
             this.owner.register('service:membersUtils', Service.extend({
                 isStripeEnabled: false
             }));
diff --git a/ghost/admin/tests/integration/services/search-test.js b/ghost/admin/tests/integration/services/search-test.js
new file mode 100644
index 00000000000..cebc03a52e2
--- /dev/null
+++ b/ghost/admin/tests/integration/services/search-test.js
@@ -0,0 +1,78 @@
+import {authenticateSession} from 'ember-simple-auth/test-support';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import {setupMirage} from 'ember-cli-mirage/test-support';
+import {setupTest} from 'ember-mocha';
+
+// we have two search providers
+// - "flex" which uses the flexsearch engine but is limited to english only
+// - "basic" which uses exact string matches in a less performant way but is language agnostic
+const suites = [{
+    name: 'Integration: Service: Search (flex)',
+    beforeEach() {
+        // noop - default locale is 'en'
+    },
+    confirmProvider() {
+        const searchService = this.owner.lookup('service:search');
+        expect(searchService.provider.constructor.name, 'provider name').to.equal('SearchProviderFlexService');
+    }
+}, {
+    name: 'Integration: Service: Search (basic)',
+    beforeEach() {
+        this.server.db.settings.update({key: 'locale'}, {value: 'de'});
+    },
+    confirmProvider() {
+        const settingsService = this.owner.lookup('service:settings');
+        expect(settingsService.locale, 'settings.locale').to.equal('de');
+        const searchService = this.owner.lookup('service:search');
+        expect(searchService.provider.constructor.name, 'provider name').to.equal('SearchProviderBasicService');
+    }
+}];
+
+suites.forEach((suite) => {
+    describe(suite.name, function () {
+        const hooks = setupTest();
+        setupMirage(hooks);
+
+        let search;
+        // eslint-disable-next-line no-unused-vars
+        let firstUser, firstPost, secondPost, firstPage, firstTag;
+
+        beforeEach(async function () {
+            this.server.loadFixtures();
+            await authenticateSession();
+
+            suite.beforeEach.bind(this)();
+
+            const settings = this.owner.lookup('service:settings');
+            await settings.fetch();
+
+            search = this.owner.lookup('service:search');
+
+            // populate store with data we'll be searching
+            firstPost = this.server.create('post', {title: 'First post', slug: 'first-post', visibility: 'members', publishedAt: '2024-05-08T16:21:07.000Z'});
+            secondPost = this.server.create('post', {title: 'Second post', slug: 'second-post'});
+            firstPage = this.server.create('page', {title: 'First page', slug: 'first-page'});
+            firstTag = this.server.create('tag', {name: 'First tag', slug: 'first-tag'});
+        });
+
+        it('is using correct provider', async function () {
+            suite.confirmProvider.bind(this)();
+        });
+
+        it('returns urls for search results', async function () {
+            const results = await search.searchTask.perform('first');
+
+            expect(results[0].options[0].url).to.equal('http://localhost:4200/tag/first-tag/');
+            expect(results[1].options[0].url).to.equal('http://localhost:4200/p/post-0/');
+            expect(results[2].options[0].url).to.equal('http://localhost:4200/p/page-0/');
+        });
+
+        it('returns additional post-related fields', async function () {
+            const results = await search.searchTask.perform('post');
+
+            expect(results[0].options[0].visibility).to.equal('members');
+            expect(results[0].options[0].publishedAt).to.equal('2024-05-08T16:21:07.000Z');
+        });
+    });
+});
diff --git a/ghost/admin/tests/test-helper.js b/ghost/admin/tests/test-helper.js
index 447f279d766..756802bcd08 100644
--- a/ghost/admin/tests/test-helper.js
+++ b/ghost/admin/tests/test-helper.js
@@ -8,12 +8,6 @@ import chai from 'chai';
 import chaiDom from 'chai-dom';
 chai.use(chaiDom);
 
-// stub loaded external module to avoid loading of external dep
-window['@tryghost/koenig-lexical'] = {
-    KoenigComposer: () => null,
-    KoenigEditor: () => null
-};
-
 setApplication(Application.create(config.APP));
 
 registerWaiter();
diff --git a/ghost/admin/tests/unit/components/koenig-lexical-editor-test.js b/ghost/admin/tests/unit/components/koenig-lexical-editor-test.js
new file mode 100644
index 00000000000..74e9525fff6
--- /dev/null
+++ b/ghost/admin/tests/unit/components/koenig-lexical-editor-test.js
@@ -0,0 +1,126 @@
+import sinon from 'sinon';
+import {decoratePostSearchResult, offerUrls} from 'ghost-admin/components/koenig-lexical-editor';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+
+describe('Unit: Component: koenig-lexical-editor', function () {
+    describe('decoratePostSearchResult()', function () {
+        let result;
+
+        beforeEach(function () {
+            result = {
+                title: 'Test Post',
+                url: '/test-post',
+                visibility: 'public',
+                publishedAt: '2024-05-08T16:21:07.000Z'
+            };
+        });
+
+        it('handles members disabled', function () {
+            decoratePostSearchResult(result, {membersEnabled: false, timezone: 'Etc/UTC'});
+
+            expect(result.metaText).to.equal('8 May 2024');
+            expect(result.MetaIcon).to.be.undefined;
+            expect(result.metaIconTitle).to.be.undefined;
+        });
+
+        it('handles public content', function () {
+            decoratePostSearchResult(result, {membersEnabled: true, timezone: 'Etc/UTC'});
+
+            expect(result.metaText).to.equal('8 May 2024');
+            expect(result.MetaIcon).to.be.undefined;
+            expect(result.metaIconTitle).to.be.undefined;
+        });
+
+        it('handles members content', function () {
+            result.visibility = 'members';
+            decoratePostSearchResult(result, {membersEnabled: true, timezone: 'Etc/UTC'});
+
+            expect(result.metaText).to.equal('8 May 2024');
+            expect(result.MetaIcon).to.exist;
+            expect(result.metaIconTitle).to.equal('Members only');
+        });
+
+        it('handles paid members content', function () {
+            result.visibility = 'paid';
+            decoratePostSearchResult(result, {membersEnabled: true, timezone: 'Etc/UTC'});
+
+            expect(result.metaText).to.equal('8 May 2024');
+            expect(result.MetaIcon).to.exist;
+            expect(result.metaIconTitle).to.equal('Paid-members only');
+        });
+
+        it('handles specific tiers content', function () {
+            result.visibility = 'tiers';
+            decoratePostSearchResult(result, {membersEnabled: true, timezone: 'Etc/UTC'});
+
+            expect(result.metaText).to.equal('8 May 2024');
+            expect(result.MetaIcon).to.exist;
+            expect(result.metaIconTitle).to.equal('Specific tiers only');
+        });
+
+        it('handles unknown visibility', function () {
+            result.visibility = 'unknown';
+            decoratePostSearchResult(result, {membersEnabled: true, timezone: 'Etc/UTC'});
+
+            expect(result.metaText).to.equal('8 May 2024');
+            expect(result.MetaIcon).to.be.undefined;
+            expect(result.metaIconTitle).to.be.undefined;
+        });
+    });
+
+    describe('offersUrls', function () {
+        let context;
+        let performStub;
+
+        beforeEach(function () {
+            context = {
+                fetchOffersTask: {
+                    perform: () => {}
+                },
+                config: {
+                    getSiteUrl: code => `https://example.com?offer=${code}`
+                }
+            };
+
+            performStub = sinon.stub(context.fetchOffersTask, 'perform');
+        });
+
+        afterEach(function () {
+            sinon.restore();
+        });
+
+        it('returns an empty array if fetching offers gives no result', async function () {
+            performStub.resolves([]);
+
+            const results = await offerUrls.call(context);
+
+            expect(performStub.callCount).to.equal(1);
+            expect(results).to.deep.equal([]);
+        });
+
+        it('returns an empty array if fetching offers fails', async function () {
+            performStub.rejects(new Error('Failed to fetch offers'));
+
+            const results = await offerUrls.call(context);
+
+            expect(performStub.callCount).to.equal(1);
+            expect(results).to.deep.equal([]);
+        });
+
+        it(('returns an array of offers urls if fetching offers is successful'), async function () {
+            performStub.resolves([
+                {name: 'Yellow Thursday', code: 'yellow-thursday'},
+                {name: 'Green Friday', code: 'green-friday'}
+            ]);
+
+            const results = await offerUrls.call(context);
+
+            expect(performStub.callCount).to.equal(1);
+            expect(results).to.deep.equal([
+                {label: 'Offer — Yellow Thursday', value: 'https://example.com?offer=yellow-thursday'},
+                {label: 'Offer — Green Friday', value: 'https://example.com?offer=green-friday'}
+            ]);
+        });
+    });
+});
diff --git a/ghost/admin/tests/unit/controllers/editor-test.js b/ghost/admin/tests/unit/controllers/editor-test.js
index 60c71348514..003de0507c1 100644
--- a/ghost/admin/tests/unit/controllers/editor-test.js
+++ b/ghost/admin/tests/unit/controllers/editor-test.js
@@ -10,16 +10,26 @@ import {task} from 'ember-concurrency';
 describe('Unit: Controller: lexical-editor', function () {
     setupTest();
 
+    let createPost;
+
+    const _createPost = function (attrs) {
+        const store = this.owner.lookup('service:store');
+        return store.createRecord('post', attrs);
+    };
+
+    beforeEach(function () {
+        createPost = _createPost.bind(this);
+    });
+
     describe('generateSlug', function () {
         it('should generate a slug and set it on the post', async function () {
             let controller = this.owner.lookup('controller:lexical-editor');
-
             controller.set('slugGenerator', EmberObject.create({
                 generateSlug(slugType, str) {
                     return RSVP.resolve(`${str}-slug`);
                 }
             }));
-            controller.set('post', EmberObject.create({slug: ''}));
+            controller.set('post', createPost({slug: ''}));
 
             controller.set('post.titleScratch', 'title');
             await settled();
@@ -33,13 +43,12 @@ describe('Unit: Controller: lexical-editor', function () {
 
         it('should not set the destination if the title is "(Untitled)" and the post already has a slug', async function () {
             let controller = this.owner.lookup('controller:lexical-editor');
-
             controller.set('slugGenerator', EmberObject.create({
                 generateSlug(slugType, str) {
                     return RSVP.resolve(`${str}-slug`);
                 }
             }));
-            controller.set('post', EmberObject.create({slug: 'whatever'}));
+            controller.set('post', createPost({slug: 'whatever'}));
 
             expect(controller.get('post.slug')).to.equal('whatever');
 
@@ -48,15 +57,95 @@ describe('Unit: Controller: lexical-editor', function () {
 
             expect(controller.get('post.slug')).to.equal('whatever');
         });
+
+        it('should generate a new slug if the previous title was (Untitled)', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            controller.set('slugGenerator', EmberObject.create({
+                generateSlug(slugType, str) {
+                    return RSVP.resolve(`${str}-slug`);
+                }
+            }));
+            controller.set('post', createPost({
+                slug: '',
+                title: '(Untitled)',
+                titleScratch: 'title'
+            }));
+
+            await controller.generateSlugTask.perform();
+
+            expect(controller.get('post.slug')).to.equal('title-slug');
+        });
+
+        it('should generate a new slug if the previous title ended with (Copy)', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            controller.set('slugGenerator', EmberObject.create({
+                generateSlug(slugType, str) {
+                    return RSVP.resolve(`${str}-slug`);
+                }
+            }));
+
+            controller.set('post', createPost({
+                slug: '',
+                title: 'title (Copy)',
+                titleScratch: 'newTitle'
+            }));
+
+            await controller.generateSlugTask.perform();
+
+            expect(controller.get('post.slug')).to.equal('newTitle-slug');
+        });
+
+        it('should not generate a new slug if it appears a custom slug was set', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            controller.set('slugGenerator', EmberObject.create({
+                generateSlug(slugType, str) {
+                    return RSVP.resolve(`${str}-slug`);
+                }
+            }));
+
+            controller.set('post', createPost({
+                slug: 'custom-slug',
+                title: 'original title',
+                titleScratch: 'newTitle'
+            }));
+
+            expect(controller.get('post.slug')).to.equal('custom-slug');
+            expect(controller.get('post.titleScratch')).to.equal('newTitle');
+
+            await controller.generateSlugTask.perform();
+
+            expect(controller.get('post.slug')).to.equal('custom-slug');
+        });
+
+        it('should generate new slugs if the title changes', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            controller.set('slugGenerator', EmberObject.create({
+                generateSlug(slugType, str) {
+                    return RSVP.resolve(`${str}-slug`);
+                }
+            }));
+            controller.set('post', createPost({
+                slug: 'somepost',
+                title: 'somepost',
+                titleScratch: 'newtitle'
+            }));
+
+            await controller.generateSlugTask.perform();
+
+            expect(controller.get('post.slug')).to.equal('newtitle-slug');
+        });
     });
 
     describe('saveTitleTask', function () {
         beforeEach(function () {
             this.controller = this.owner.lookup('controller:lexical-editor');
             this.controller.set('target', {send() {}});
+            defineProperty(this.controller, 'autosaveTask', task(function * () {
+                yield RSVP.resolve();
+            }));
         });
 
-        it('should invoke generateSlug if the post is new and a title has not been set', async function () {
+        it('should invoke generateSlug if the post is not published', async function () {
             let {controller} = this;
 
             controller.set('target', {send() {}});
@@ -64,9 +153,10 @@ describe('Unit: Controller: lexical-editor', function () {
                 this.set('post.slug', 'test-slug');
                 yield RSVP.resolve();
             }));
-            controller.set('post', EmberObject.create({isNew: true}));
 
-            expect(controller.get('post.isNew')).to.be.true;
+            controller.set('post', createPost({isDraft: true}));
+
+            expect(controller.get('post.isDraft')).to.be.true;
             expect(controller.get('post.titleScratch')).to.not.be.ok;
 
             controller.set('post.titleScratch', 'test');
@@ -76,90 +166,262 @@ describe('Unit: Controller: lexical-editor', function () {
             expect(controller.get('post.slug')).to.equal('test-slug');
         });
 
-        it('should invoke generateSlug if the post is not new and it\'s title is "(Untitled)"', async function () {
+        it('should not invoke generateSlug if the post is published', async function () {
             let {controller} = this;
 
             controller.set('target', {send() {}});
-            defineProperty(controller, 'generateSlugTask', task(function * () {
-                this.set('post.slug', 'test-slug');
-                yield RSVP.resolve();
+            controller.set('post', createPost({
+                title: 'a title',
+                isPublished: true
             }));
-            controller.set('post', EmberObject.create({isNew: false, title: '(Untitled)'}));
 
-            expect(controller.get('post.isNew')).to.be.false;
+            expect(controller.get('post.isPublished')).to.be.true;
+            expect(controller.get('post.title')).to.equal('a title');
             expect(controller.get('post.titleScratch')).to.not.be.ok;
 
-            controller.set('post.titleScratch', 'New Title');
-
+            controller.set('post.titleScratch', 'test');
             await controller.saveTitleTask.perform();
 
-            expect(controller.get('post.titleScratch')).to.equal('New Title');
-            expect(controller.get('post.slug')).to.equal('test-slug');
+            expect(controller.get('post.titleScratch')).to.equal('test');
+            expect(controller.get('post.slug')).to.not.be.ok;
         });
+    });
 
-        it('should invoke generateSlug if the post is a duplicated post', async function () {
-            let {controller} = this;
+    describe('TK count in title', function () {
+        it('should have count 0 for no TK', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
 
-            controller.set('target', {send() {}});
-            defineProperty(controller, 'generateSlugTask', task(function * () {
-                this.set('post.slug', 'test-slug');
-                yield RSVP.resolve();
-            }));
-            controller.set('post', EmberObject.create({isNew: false, title: 'Some Title (Copy)'}));
+            controller.set('post', createPost({titleScratch: 'this is a title'}));
 
-            expect(controller.get('post.isNew')).to.be.false;
-            expect(controller.get('post.titleScratch')).to.not.be.ok;
+            expect(controller.get('tkCount')).to.equal(0);
+        });
 
-            controller.set('post.titleScratch', 'Some Title');
+        it('should count TK reminders in the title', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
 
-            await controller.saveTitleTask.perform();
+            controller.set('post', createPost({titleScratch: 'this is a TK'}));
 
-            expect(controller.get('post.titleScratch')).to.equal('Some Title');
-            expect(controller.get('post.slug')).to.equal('test-slug');
+            expect(controller.get('tkCount')).to.equal(1);
         });
+    });
 
-        it('should not invoke generateSlug if the post is new but has a title', async function () {
-            let {controller} = this;
-
-            controller.set('target', {send() {}});
-            defineProperty(controller, 'generateSlugTask', task(function * () {
-                expect(false, 'generateSlug should not be called').to.equal(true);
-                yield RSVP.resolve();
+    describe('hasDirtyAttributes', function () {
+        it('detects new post with changed attributes as dirty (autosave)', async function () {
+            const initialLexicalString = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const lexicalScratch = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content updated","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            let controller = this.owner.lookup('controller:lexical-editor');
+            controller.set('post', createPost({
+                title: '',
+                titleScratch: '',
+                status: 'draft',
+                lexical: initialLexicalString,
+                lexicalScratch: lexicalScratch,
+                secondaryLexicalState: initialLexicalString
             }));
-            controller.set('post', EmberObject.create({
-                isNew: true,
-                title: 'a title'
+
+            let isDirty = controller.hasDirtyAttributes;
+            expect(isDirty).to.be.true;
+        });
+
+        it('does not detect new post as dirty when there are no changes', async function () {
+            const controller = this.owner.lookup('controller:lexical-editor');
+            const post = createPost({});
+            post.titleScratch = post.title;
+            post.lexicalScratch = post.lexical;
+            controller.set('post', post);
+
+            let isDirty = controller.hasDirtyAttributes;
+            expect(isDirty).to.be.false;
+        });
+
+        it('marks isNew post as dirty when lexicalScratch differs from lexical and secondaryLexical', async function () {
+            const initialLexicalString = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const lexicalScratch = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content scratch","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            let controller = this.owner.lookup('controller:lexical-editor');
+            controller.set('post', createPost({
+                title: '',
+                titleScratch: '',
+                status: 'draft',
+                lexical: initialLexicalString,
+                lexicalScratch: lexicalScratch,
+                secondaryLexicalState: initialLexicalString,
+                changedAttributes: () => ({title: ['', 'New Title']})
             }));
 
-            expect(controller.get('post.isNew')).to.be.true;
-            expect(controller.get('post.title')).to.equal('a title');
-            expect(controller.get('post.titleScratch')).to.not.be.ok;
+            let isDirty = controller.hasDirtyAttributes;
+            expect(isDirty).to.be.true;
+        });
 
-            controller.set('post.titleScratch', 'test');
-            await controller.saveTitleTask.perform();
+        it('Changes in the direction field in the lexical string are not considered dirty', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
 
-            expect(controller.get('post.titleScratch')).to.equal('test');
-            expect(controller.get('post.slug')).to.not.be.ok;
+            const initialLexicalString = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const lexicalStringNoNullDirection = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const lexicalStringUpdatedContent = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Here's some new text","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+
+            const post = createPost({
+                title: 'this is a title',
+                status: 'published',
+                lexical: initialLexicalString,
+                tags: [],
+                authors: [],
+                postRevisions: []
+            });
+            const postJson = {...post.serialize(), id: 1};
+            this.owner.lookup('service:store').unloadRecord(post);
+            this.owner.lookup('service:store').pushPayload({posts: [postJson]});
+            // scratch attrs are not serialized/deserialized so need to be set manually
+            const savedPost = this.owner.lookup('service:store').peekRecord('post', 1);
+            savedPost.titleScratch = postJson.title;
+            savedPost.lexicalScratch = initialLexicalString;
+            savedPost.secondaryLexicalState = initialLexicalString;
+            controller.set('post', savedPost);
+
+            // synthetically update the lexicalScratch as if the editor itself made the modifications on loading the initial editorState
+            controller.send('updateScratch',JSON.parse(lexicalStringNoNullDirection));
+
+            // this should NOT result in the post being dirty - while lexical !== lexicalScratch, we ignore the direction field
+            let isDirty = controller.hasDirtyAttributes;
+            expect(isDirty).to.be.false;
+
+            // now we try a synthetic change in the actual text content that should result in a dirty post
+            controller.send('updateScratch',JSON.parse(lexicalStringUpdatedContent));
+
+            // this should NOT result in the post being dirty - while lexical !== lexicalScratch, we ignore the direction field
+            isDirty = controller.hasDirtyAttributes;
+            expect(isDirty).to.be.true;
         });
 
-        it('should not invoke generateSlug if the post is not new and the title is not "(Untitled)"', async function () {
-            let {controller} = this;
+        it('dirty is false if secondaryLexical and scratch matches, but lexical is outdated', async function () {
+            const initialLexicalString = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const lexicalScratch = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const secondLexicalInstance = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Here's some new text","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
 
-            controller.set('target', {send() {}});
-            defineProperty(controller, 'generateSlugTask', task(function * () {
-                expect(false, 'generateSlug should not be called').to.equal(true);
-                yield RSVP.resolve();
-            }));
-            controller.set('post', EmberObject.create({isNew: false}));
+            let controller = this.owner.lookup('controller:lexical-editor');
 
-            expect(controller.get('post.isNew')).to.be.false;
-            expect(controller.get('post.title')).to.not.be.ok;
+            const post = createPost({
+                title: 'this is a title',
+                status: 'published',
+                lexical: initialLexicalString,
+                tags: [],
+                authors: [],
+                postRevisions: []
+            });
+            const postJson = {...post.serialize(), id: 1};
+            this.owner.lookup('service:store').unloadRecord(post);
+            this.owner.lookup('service:store').pushPayload({posts: [postJson]});
+            // scratch attrs are not serialized/deserialized so need to be set manually
+            const savedPost = this.owner.lookup('service:store').peekRecord('post', 1);
+            savedPost.titleScratch = postJson.title;
+            savedPost.lexicalScratch = lexicalScratch;
+            savedPost.secondaryLexicalState = secondLexicalInstance;
+            controller.set('post', savedPost);
+
+            let isDirty = controller.hasDirtyAttributes;
+
+            expect(isDirty).to.be.false;
+        });
 
-            controller.set('post.titleScratch', 'title');
-            await controller.saveTitleTask.perform();
+        it('dirty is true if secondaryLexical and lexical does not match scratch', async function () {
+            const initialLexicalString = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const lexicalScratch = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content1234","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
+            const secondLexicalInstance = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Here's some new text","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`;
 
-            expect(controller.get('post.titleScratch')).to.equal('title');
-            expect(controller.get('post.slug')).to.not.be.ok;
+            let controller = this.owner.lookup('controller:lexical-editor');
+
+            const post = createPost({
+                title: 'this is a title',
+                status: 'published',
+                lexical: initialLexicalString,
+                tags: [],
+                authors: [],
+                postRevisions: []
+            });
+            const postJson = {...post.serialize(), id: 1};
+            this.owner.lookup('service:store').unloadRecord(post);
+            this.owner.lookup('service:store').pushPayload({posts: [postJson]});
+            // scratch attrs are not serialized/deserialized so need to be set manually
+            const savedPost = this.owner.lookup('service:store').peekRecord('post', 1);
+            savedPost.titleScratch = postJson.title;
+            savedPost.lexicalScratch = lexicalScratch;
+            savedPost.secondaryLexicalState = secondLexicalInstance;
+            controller.set('post', savedPost);
+
+            controller.send('updateScratch',JSON.parse(lexicalScratch));
+
+            let isDirty = controller.hasDirtyAttributes;
+
+            expect(isDirty).to.be.true;
+        });
+
+        it('dirty is false if no Post', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            controller.set('post', null);
+
+            let isDirty = controller.hasDirtyAttributes;
+
+            expect(isDirty).to.be.false;
+        });
+
+        it('returns true if current tags differ from previous tags', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            const tag1 = this.owner.lookup('service:store').createRecord('tag', {id: 1, name: 'test'});
+            const tag2 = this.owner.lookup('service:store').createRecord('tag', {id: 2, name: 'changed'});
+            const post = createPost({
+                tags: [tag1],
+                authors: [],
+                postRevisions: []
+            });
+            const postJson = {...post.serialize(), id: 1};
+            this.owner.lookup('service:store').unloadRecord(post);
+            this.owner.lookup('service:store').pushPayload({posts: [postJson]});
+
+            const savedPost = this.owner.lookup('service:store').peekRecord('post', 1);
+            controller.set('post', savedPost);
+
+            savedPost.tags = [tag1, tag2];
+
+            let isDirty = controller.hasDirtyAttributes;
+
+            expect(isDirty).to.be.true;
+        });
+
+        it('returns false when the post is new but has no changed attributes', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            // no attrs = defaults = empty changedAttributes
+            const post = createPost({});
+            controller.set('post', post);
+            // update scratch attrs to match controller.setPost behavior
+            post.titleScratch = post.title;
+            post.lexicalScratch = post.lexical;
+
+            let isDirty = controller.hasDirtyAttributes;
+            expect(isDirty).to.be.false;
+        });
+
+        it('skips new post check if post is not new', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+            const post = createPost({
+                title: 'Sample Title',
+                status: 'draft',
+                lexical: '',
+                tags: [],
+                authors: [],
+                postRevisions: []
+            });
+            const postJson = {...post.serialize(), id: 1};
+            this.owner.lookup('service:store').unloadRecord(post);
+            this.owner.lookup('service:store').pushPayload({posts: [postJson]});
+            // scratch attrs are not serialized/deserialized so need to be set manually
+            const savedPost = this.owner.lookup('service:store').peekRecord('post', 1);
+            savedPost.titleScratch = 'Sample Title';
+            savedPost.lexicalScratch = '';
+            savedPost.secondaryLexicalState = '';
+            controller.set('post', savedPost);
+
+            let isDirty = controller.hasDirtyAttributes;
+            // The test passes if no errors occur and it doesn't return true for new post condition
+            expect(isDirty).to.be.false;
         });
     });
 });
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/admin/tests/unit/helpers/most-relevant-subscription-test.js b/ghost/admin/tests/unit/helpers/most-relevant-subscription-test.js
new file mode 100644
index 00000000000..e38f11155c7
--- /dev/null
+++ b/ghost/admin/tests/unit/helpers/most-relevant-subscription-test.js
@@ -0,0 +1,72 @@
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import {mostRelevantSubscription} from 'ghost-admin/helpers/most-relevant-subscription';
+
+describe('Unit: Helper: most-relevant-subscription', function () {
+    it('returns active subscriptions first', function () {
+        const active = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
+        const canceled = {id: 'b', status: 'canceled', current_period_end: '2022-03-04 16:10'};
+
+        const subs = [active, canceled];
+
+        expect(mostRelevantSubscription(subs)).to.equal(active);
+    });
+
+    it('returns the subscription with the latest current_period_end', function () {
+        const older = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
+        const latest = {id: 'b', status: 'active', current_period_end: '2022-03-04 16:20'};
+
+        const subs = [older, latest];
+
+        expect(mostRelevantSubscription(subs)).to.equal(latest);
+    });
+
+    it('ignores comped subscriptions', function () {
+        const normal = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
+        const comped = {id: null, status: 'active', current_period_end: '2022-03-04 16:20'};
+
+        const subs = [normal, comped];
+
+        expect(mostRelevantSubscription(subs)).to.equal(normal);
+    });
+
+    it('handles null or invalid dates', function () {
+        const a = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
+        const b = {id: 'b', status: 'active', current_period_end: '2022-03-04 16:20'};
+        const c = {id: 'c', status: 'active', current_period_end: ''};
+        const d = {id: 'd', status: 'active', current_period_end: null};
+        const e = {id: 'e', status: 'active', current_period_end: 'string'};
+
+        const subs = [a, b, c, d, e];
+
+        expect(mostRelevantSubscription(subs)).to.equal(b);
+    });
+
+    it('handles a single-element array', function () {
+        const a = {id: 'a', current_period_end: '2022-02-22'};
+
+        expect(mostRelevantSubscription([a])).to.equal(a);
+    });
+
+    it('handles null', function () {
+        expect(mostRelevantSubscription(null)).to.equal(null);
+    });
+
+    it('handles empty array', function () {
+        expect(mostRelevantSubscription([])).to.equal(null);
+    });
+
+    it('does not modify original array', function () {
+        const a = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
+        const b = {id: 'b', status: 'canceled', current_period_end: '2022-03-04 16:10'};
+        const c = {id: null, status: 'active', current_period_end: '2022-03-04 16:10'};
+
+        const subs = [a, b, c];
+
+        mostRelevantSubscription(subs);
+
+        expect(subs[0]).to.equal(a);
+        expect(subs[1]).to.equal(b);
+        expect(subs[2]).to.equal(c);
+    });
+});
diff --git a/ghost/admin/tests/unit/services/dashboard-stats-test.js b/ghost/admin/tests/unit/services/dashboard-stats-test.js
new file mode 100644
index 00000000000..20ea4e2a510
--- /dev/null
+++ b/ghost/admin/tests/unit/services/dashboard-stats-test.js
@@ -0,0 +1,102 @@
+import moment from 'moment-timezone';
+import {beforeEach, describe, it} from 'mocha';
+import {expect} from 'chai';
+import {setupTest} from 'ember-mocha';
+
+describe('Unit: Service: dashboardStats', function () {
+    setupTest();
+
+    let dashboardStatsService;
+
+    beforeEach(function () {
+        dashboardStatsService = this.owner.lookup('service:dashboardStats');
+    });
+
+    it('Test dashboard stats', function () {
+        expect(0).to.equal(0);
+    });
+
+    it('exists', function () {
+        expect(dashboardStatsService).to.be.ok;
+    });
+
+    it('memberSourceAttributionCounts returns an empty array when memberAttributionStats is null', function () {
+        dashboardStatsService.memberAttributionStats = null;
+
+        let result = dashboardStatsService.memberSourceAttributionCounts;
+        expect(result).to.deep.equal([]);
+    });
+
+    it('memberSourceAttributionCounts returns aggregated and sorted data', function () {
+        dashboardStatsService.chartDays = 30;
+        let today = moment().format('YYYY-MM-DD');
+        let fiveDaysAgo = moment().subtract(5, 'days').format('YYYY-MM-DD');
+        let tenDaysAgo = moment().subtract(10, 'days').format('YYYY-MM-DD');
+
+        dashboardStatsService.memberAttributionStats = [
+            {date: today, source: 'google', signups: 10, paidConversions: 2},
+            {date: today, source: 'facebook', signups: 5, paidConversions: 1},
+            {date: fiveDaysAgo, source: 'google', signups: 3, paidConversions: 1},
+            {date: tenDaysAgo, source: 'twitter', signups: 2, paidConversions: 0},
+            {date: tenDaysAgo, source: 'google', signups: 1, paidConversions: 1}
+        ];
+
+        let result = dashboardStatsService.memberSourceAttributionCounts;
+
+        let expected = [
+            {source: 'google', signups: 14, paidConversions: 4},
+            {source: 'facebook', signups: 5, paidConversions: 1},
+            {source: 'twitter', signups: 2, paidConversions: 0}
+        ];
+
+        expect(result).to.deep.equal(expected);
+    });
+
+    it('memberSourceAttributionCounts filters data based on chartDays', function () {
+        dashboardStatsService.chartDays = 7;
+        let today = moment().format('YYYY-MM-DD');
+        let fiveDaysAgo = moment().subtract(5, 'days').format('YYYY-MM-DD');
+        let tenDaysAgo = moment().subtract(10, 'days').format('YYYY-MM-DD');
+
+        dashboardStatsService.memberAttributionStats = [
+            {date: today, source: 'google', signups: 10, paidConversions: 2},
+            {date: fiveDaysAgo, source: 'facebook', signups: 5, paidConversions: 1},
+            {date: tenDaysAgo, source: 'twitter', signups: 2, paidConversions: 0}
+        ];
+
+        let result = dashboardStatsService.memberSourceAttributionCounts;
+
+        let expected = [
+            {source: 'google', signups: 10, paidConversions: 2},
+            {source: 'facebook', signups: 5, paidConversions: 1}
+        ];
+
+        expect(result).to.deep.equal(expected);
+    });
+
+    it('memberSourceAttributionCounts is not case sensitive', function () {
+        dashboardStatsService.chartDays = 30;
+        let today = moment().format('YYYY-MM-DD');
+        let fiveDaysAgo = moment().subtract(5, 'days').format('YYYY-MM-DD');
+        let tenDaysAgo = moment().subtract(10, 'days').format('YYYY-MM-DD');
+
+        dashboardStatsService.memberAttributionStats = [
+            {date: today, source: 'google', signups: 10, paidConversions: 2},
+            {date: today, source: 'facebook', signups: 5, paidConversions: 1},
+            {date: fiveDaysAgo, source: 'google', signups: 3, paidConversions: 1},
+            {date: tenDaysAgo, source: 'twitter', signups: 2, paidConversions: 0},
+            {date: tenDaysAgo, source: 'Google', signups: 1, paidConversions: 1}
+        ];
+
+        let result = dashboardStatsService.memberSourceAttributionCounts;
+
+        let expected = [
+            {source: 'google', signups: 14, paidConversions: 4},
+            {source: 'facebook', signups: 5, paidConversions: 1},
+            {source: 'twitter', signups: 2, paidConversions: 0}
+        ];
+
+        expect(result).to.deep.equal(expected);
+    });
+});
+
diff --git a/ghost/admin/tests/unit/utils/member-event-types-test.js b/ghost/admin/tests/unit/utils/member-event-types-test.js
new file mode 100644
index 00000000000..71d5793a9b4
--- /dev/null
+++ b/ghost/admin/tests/unit/utils/member-event-types-test.js
@@ -0,0 +1,66 @@
+import {ALL_EVENT_TYPES, getAvailableEventTypes, needDivider, toggleEventType} from 'ghost-admin/utils/member-event-types';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+
+describe('Unit | Utility | event-type-utils', function () {
+    it('should return available event types with settings and features applied', function () {
+        const settings = {
+            commentsEnabled: 'on',
+            emailTrackClicks: true
+        };
+        const feature = {
+            audienceFeedback: true
+        };
+        const hiddenEvents = [];
+
+        const eventTypes = getAvailableEventTypes(settings, feature, hiddenEvents);
+
+        expect(eventTypes).to.deep.include({event: 'comment_event', icon: 'filter-dropdown-comments', name: 'Comments', group: 'others'});
+        expect(eventTypes).to.deep.include({event: 'feedback_event', icon: 'filter-dropdown-feedback', name: 'Feedback', group: 'others'});
+        expect(eventTypes).to.deep.include({event: 'click_event', icon: 'filter-dropdown-clicked-in-email', name: 'Clicked link in email', group: 'others'});
+    });
+
+    it('should toggle both payment_event and donation_event when toggling payment_event', function () {
+        const eventTypes = [
+            {event: 'payment_event', isSelected: true}
+        ];
+
+        const newExcludedEvents = toggleEventType('payment_event', eventTypes);
+
+        expect(newExcludedEvents).to.equal('payment_event,donation_event');
+    });
+
+    it('should toggle both payment_event and donation_event off when toggling payment_event off', function () {
+        const eventTypes = [
+            {event: 'payment_event', isSelected: false}
+        ];
+
+        const newExcludedEvents = toggleEventType('payment_event', eventTypes);
+
+        expect(newExcludedEvents).to.equal('');
+    });
+
+    it('should return correct divider need based on event groups', function () {
+        const event = {group: 'auth'};
+        const prevEvent = {group: 'payments'};
+
+        const result = needDivider(event, prevEvent);
+
+        expect(result).to.be.true;
+    });
+
+    it('should return only base event types when no settings or features are enabled', function () {
+        const settings = {
+            commentsEnabled: 'off',
+            emailTrackClicks: false
+        };
+        const feature = {
+            audienceFeedback: false
+        };
+        const hiddenEvents = [];
+
+        const eventTypes = getAvailableEventTypes(settings, feature, hiddenEvents);
+
+        expect(eventTypes).to.deep.equal(ALL_EVENT_TYPES);
+    });
+});
diff --git a/ghost/admin/tests/unit/utils/merge-stats-by-date-test.js b/ghost/admin/tests/unit/utils/merge-stats-by-date-test.js
new file mode 100644
index 00000000000..62480d478a7
--- /dev/null
+++ b/ghost/admin/tests/unit/utils/merge-stats-by-date-test.js
@@ -0,0 +1,184 @@
+import mergeStatsByDate from 'ghost-admin/utils/merge-stats-by-date';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+
+const STATS_DATA = [
+    {
+        date: '2024-06-22',
+        tier: '111111111111111111111111',
+        cadence: 'month',
+        positive_delta: 0,
+        negative_delta: 0,
+        signups: 0,
+        cancellations: 0,
+        count: 456
+    },
+    {
+        date: '2024-06-22',
+        tier: '111111111111111111111111',
+        cadence: 'year',
+        positive_delta: 1,
+        negative_delta: 1,
+        signups: 0,
+        cancellations: 0,
+        count: 1354
+    },
+    {
+        date: '2024-06-23',
+        tier: '111111111111111111111111',
+        cadence: 'month',
+        positive_delta: 0,
+        negative_delta: 0,
+        signups: 0,
+        cancellations: 0,
+        count: 456
+    },
+    {
+        date: '2024-06-23',
+        tier: '111111111111111111111111',
+        cadence: 'year',
+        positive_delta: 1,
+        negative_delta: 1,
+        signups: 0,
+        cancellations: 0,
+        count: 1354
+    },
+    {
+        date: '2024-06-23',
+        tier: '111111111111111111111113',
+        cadence: 'year',
+        positive_delta: 0,
+        negative_delta: 0,
+        signups: 0,
+        cancellations: 0,
+        count: 400
+    },
+    {
+        date: '2024-06-24',
+        tier: '111111111111111111111111',
+        cadence: 'year',
+        positive_delta: 3,
+        negative_delta: 2,
+        signups: 1,
+        cancellations: 0,
+        count: 1355
+    },
+    {
+        date: '2024-06-24',
+        tier: '111111111111111111111113',
+        cadence: 'year',
+        positive_delta: 2,
+        negative_delta: 1,
+        signups: 2,
+        cancellations: 1,
+        count: 401
+    },
+    {
+        date: '2024-06-24',
+        tier: '111111111111111111111112',
+        cadence: 'year',
+        positive_delta: 1,
+        negative_delta: 0,
+        signups: 1,
+        cancellations: 0,
+        count: 55
+    },
+    {
+        date: '2024-06-25',
+        tier: '111111111111111111111111',
+        cadence: 'month',
+        positive_delta: 0,
+        negative_delta: 1,
+        signups: 0,
+        cancellations: 1,
+        count: 455
+    },
+    {
+        date: '2024-06-25',
+        tier: '111111111111111111111111',
+        cadence: 'year',
+        positive_delta: 2,
+        negative_delta: 5,
+        signups: 1,
+        cancellations: 4,
+        count: 1352
+    },
+    {
+        date: '2024-06-25',
+        tier: '111111111111111111111113',
+        cadence: 'year',
+        positive_delta: 1,
+        negative_delta: 2,
+        signups: 1,
+        cancellations: 2,
+        count: 400
+    },
+    {
+        date: '2024-06-26',
+        tier: '111111111111111111111111',
+        cadence: 'year',
+        positive_delta: 2,
+        negative_delta: 2,
+        signups: 0,
+        cancellations: 0,
+        count: 1352
+    },
+    {
+        date: '2024-06-26',
+        tier: '111111111111111111111113',
+        cadence: 'year',
+        positive_delta: 0,
+        negative_delta: 0,
+        signups: 0,
+        cancellations: 0,
+        count: 400
+    }
+];
+
+describe('mergeStatsByDate', function () {
+    it('merges stats as expected', function () {
+        const result = mergeStatsByDate(STATS_DATA);
+        expect(result).to.deep.equal([
+            {
+                date: '2024-06-22',
+                count: 1810,
+                positiveDelta: 1,
+                negativeDelta: 1,
+                signups: 0,
+                cancellations: 0
+            },
+            {
+                date: '2024-06-23',
+                count: 2210,
+                positiveDelta: 1,
+                negativeDelta: 1,
+                signups: 0,
+                cancellations: 0
+            },
+            {
+                date: '2024-06-24',
+                count: 1811,
+                positiveDelta: 6,
+                negativeDelta: 3,
+                signups: 4,
+                cancellations: 1
+            },
+            {
+                date: '2024-06-25',
+                count: 2207,
+                positiveDelta: 3,
+                negativeDelta: 8,
+                signups: 2,
+                cancellations: 7
+            },
+            {
+                date: '2024-06-26',
+                count: 1752,
+                positiveDelta: 2,
+                negativeDelta: 2,
+                signups: 0,
+                cancellations: 0
+            }
+        ]);
+    });
+});
diff --git a/ghost/admin/tests/unit/utils/sentry-test.js b/ghost/admin/tests/unit/utils/sentry-test.js
new file mode 100644
index 00000000000..709d4be8726
--- /dev/null
+++ b/ghost/admin/tests/unit/utils/sentry-test.js
@@ -0,0 +1,117 @@
+import {beforeSend} from 'ghost-admin/utils/sentry';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+
+import * as emberErrors from 'ember-ajax/errors';
+import sinon from 'sinon';
+
+describe('Unit: Util: sentry', function () {
+    let isAjaxErrorStub;
+    describe('beforeSend', function () {
+        before(function () {
+            isAjaxErrorStub = sinon.stub(emberErrors, 'isAjaxError');
+        });
+
+        it('should return an event', () => {
+            isAjaxErrorStub.returns(false);
+            const event = {
+                test: 'test'
+            };
+            const hint = {};
+
+            const result = beforeSend(event, hint);
+            expect(result).to.deep.equal(event);
+        });
+
+        it('does not send the event if it was shown to the user', () => {
+            isAjaxErrorStub.returns(false);
+            const event = {
+                tags: {
+                    shown_to_user: true
+                }
+            };
+            const hint = {};
+
+            const result = beforeSend(event, hint);
+            expect(result).to.equal(null);
+        });
+
+        it('removes post and page ids from the error message', () => {
+            isAjaxErrorStub.returns(false);
+            const event = {
+                exception: {
+                    values: [
+                        {
+                            value: 'Something went wrong <post:123>'
+                        }
+                    ]
+                }
+            };
+            const hint = {};
+
+            const result = beforeSend(event, hint);
+            expect(result.exception.values[0].value).to.equal('Something went wrong <post:ID>');
+        });
+
+        it('returns the original event if there is an error', () => {
+            isAjaxErrorStub.throws(new Error('test'));
+
+            const event = {
+                test: 'test'
+            };
+            const hint = {};
+
+            const result = beforeSend(event, hint);
+            expect(result).to.deep.equal(event);
+        });
+
+        it('returns the event even if the ajax error is missing values', () => {
+            isAjaxErrorStub.returns(true);
+
+            const event = {
+                exception: {
+                    values: []
+                }
+            };
+            const exception = {
+                payload: {
+                    errors: []
+                }
+            };
+            const hint = {
+                originalException: exception
+            };
+
+            const result = beforeSend(event, hint);
+            expect(result).to.deep.equal(event);
+        });
+
+        it('removes ajax tags and context if it is not an ajax error', () => {
+            isAjaxErrorStub.returns(false);
+
+            const event = {
+                tags: {
+                    ajax_status: 'test status',
+                    ajax_method: 'test method',
+                    ajax_url: 'test url'
+                },
+                contexts: {
+                    ajax: 'test context'
+                }
+            };
+            const hint = {
+                originalException: {
+                    payload: {
+                        errors: []
+                    }
+                }
+            };
+
+            const result = beforeSend(event, hint);
+            expect(result.tags.ajax_status).to.equal(undefined);
+            expect(result.tags.ajax_method).to.equal(undefined);
+            expect(result.tags.ajax_url).to.equal(undefined);
+            expect(result.contexts.ajax).to.equal(undefined);
+        });
+    });
+});
diff --git a/ghost/admin/tests/unit/utils/subscription-data-test.js b/ghost/admin/tests/unit/utils/subscription-data-test.js
new file mode 100644
index 00000000000..660b4d72c46
--- /dev/null
+++ b/ghost/admin/tests/unit/utils/subscription-data-test.js
@@ -0,0 +1,405 @@
+import moment from 'moment-timezone';
+import {compExpiry, getSubscriptionData, isActive, isCanceled, isComplimentary, isSetToCancel, priceLabel, trialUntil, validUntil, validityDetails} from 'ghost-admin/utils/subscription-data';
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+
+describe('Unit: Util: subscription-data', function () {
+    describe('validUntil', function () {
+        it('returns the end of the current billing period when the subscription is canceled at the end of the period', function () {
+            let sub = {
+                status: 'canceled',
+                cancel_at_period_end: true,
+                current_period_end: '2021-05-31'
+            };
+            expect(validUntil(sub)).to.equal('31 May 2021');
+        });
+
+        it('returns an empty string when the subscription is canceled immediately', function () {
+            let sub = {
+                status: 'canceled',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31'
+            };
+            expect(validUntil(sub)).to.equal('');
+        });
+
+        it('returns the end of the current billing period when the subscription is active', function () {
+            let sub = {
+                status: 'active',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31'
+            };
+            expect(validUntil(sub)).to.equal('31 May 2021');
+        });
+
+        it('returns the end of the current billing period when the subscription is in trial', function () {
+            let sub = {
+                status: 'trialing',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31'
+            };
+            expect(validUntil(sub)).to.equal('31 May 2021');
+        });
+
+        it('returns the end of the current billing period when the subscription is past_due', function () {
+            let sub = {
+                status: 'past_due',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31'
+            };
+            expect(validUntil(sub)).to.equal('31 May 2021');
+        });
+
+        it('returns the end of the current billing period when the subscription is unpaid', function () {
+            let sub = {
+                status: 'unpaid',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31'
+            };
+            expect(validUntil(sub)).to.equal('31 May 2021');
+        });
+
+        // Extra data safety check, mainly for imported subscriptions
+        it('returns an empty string if the subcription is canceled immediately and has no current_period_start', function () {
+            let sub = {
+                status: 'canceled',
+                cancel_at_period_end: false
+            };
+            expect(validUntil(sub)).to.equal('');
+        });
+
+        // Extra data safety check, mainly for imported subscriptions
+        it('returns an empty string if the subscription has no current_period_end', function () {
+            let sub = {
+                status: 'active',
+                cancel_at_period_end: false
+            };
+            expect(validUntil(sub)).to.equal('');
+        });
+    });
+
+    describe('isActive', function () {
+        it('returns true for active subscriptions', function () {
+            let sub = {status: 'active'};
+            expect(isActive(sub)).to.be.true;
+        });
+
+        it('returns true for trialing subscriptions', function () {
+            let sub = {status: 'trialing'};
+            expect(isActive(sub)).to.be.true;
+        });
+
+        it('returns true for past_due subscriptions', function () {
+            let sub = {status: 'past_due'};
+            expect(isActive(sub)).to.be.true;
+        });
+
+        it('returns true for unpaid subscriptions', function () {
+            let sub = {status: 'unpaid'};
+            expect(isActive(sub)).to.be.true;
+        });
+
+        it('returns false for canceled subscriptions', function () {
+            let sub = {status: 'canceled'};
+            expect(isActive(sub)).to.be.false;
+        });
+    });
+
+    describe('isComplimentary', function () {
+        it('returns true for complimentary subscriptions', function () {
+            let sub = {id: null};
+            expect(isComplimentary(sub)).to.be.true;
+        });
+
+        it('returns false for paid subscriptions', function () {
+            let sub = {id: 'sub_123'};
+            expect(isComplimentary(sub)).to.be.false;
+        });
+    });
+
+    describe('isCanceled', function () {
+        it('returns true for canceled subscriptions', function () {
+            let sub = {status: 'canceled'};
+            expect(isCanceled(sub)).to.be.true;
+        });
+
+        it('returns false for active subscriptions', function () {
+            let sub = {status: 'active'};
+            expect(isCanceled(sub)).to.be.false;
+        });
+    });
+
+    describe('isSetToCancel', function () {
+        it('returns true for subscriptions set to cancel at the end of the period', function () {
+            let sub = {status: 'active', cancel_at_period_end: true};
+            expect(isSetToCancel(sub)).to.be.true;
+        });
+
+        it('returns false for canceled subscriptions', function () {
+            let sub = {status: 'canceled', cancel_at_period_end: true};
+            expect(isSetToCancel(sub)).to.be.false;
+        });
+    });
+
+    describe('trialUntil', function () {
+        it('returns the trial end date for subscriptions in trial', function () {
+            let sub = {status: 'trialing', trial_end_at: '2222-05-31'};
+            expect(trialUntil(sub)).to.equal('31 May 2222');
+        });
+
+        it('returns undefined for subscriptions not in trial', function () {
+            let sub = {status: 'active'};
+            expect(trialUntil(sub)).to.be.undefined;
+        });
+    });
+
+    describe('compExpiry', function () {
+        it('returns the complimentary expiry date for complimentary subscriptions', function () {
+            let sub = {id: null, tier: {expiry_at: moment.utc('2021-05-31').toISOString()}};
+            expect(compExpiry(sub)).to.equal('31 May 2021');
+        });
+
+        it('returns undefined for paid subscriptions', function () {
+            let sub = {id: 'sub_123'};
+            expect(compExpiry(sub)).to.be.undefined;
+        });
+    });
+
+    describe('priceLabel', function () {
+        it('returns "Free trial" for trial subscriptions', function () {
+            let data = {trialUntil: '31 May 2021'};
+            expect(priceLabel(data)).to.equal('Free trial');
+        });
+
+        it('returns nothing if the price nickname is the default "monthly" or "yearly"', function () {
+            let data = {price: {nickname: 'Monthly'}};
+            expect(priceLabel(data)).to.be.undefined;
+
+            data = {price: {nickname: 'Yearly'}};
+            expect(priceLabel(data)).to.be.undefined;
+        });
+
+        it('returns the price nickname for non-default prices', function () {
+            let data = {price: {nickname: 'Custom'}};
+            expect(priceLabel(data)).to.equal('Custom');
+        });
+    });
+
+    describe('validityDetails', function () {
+        it('returns "Expires {compExpiry}" for expired complimentary subscriptions', function () {
+            let data = {
+                isComplimentary: true,
+                compExpiry: '31 May 2021'
+            };
+            expect(validityDetails(data)).to.equal('Expires 31 May 2021');
+        });
+
+        it('returns "" for forever complimentary subscriptions', function () {
+            let data = {
+                isComplimentary: true,
+                compExpiry: undefined
+            };
+            expect(validityDetails(data)).to.equal('');
+        });
+
+        it('returns "Ended {validUntil}" for canceled subscriptions', function () {
+            let data = {
+                hasEnded: true,
+                validUntil: '31 May 2021'
+            };
+            expect(validityDetails(data)).to.equal('Ended 31 May 2021');
+        });
+
+        it('returns "Has access until {validUntil}" for set to cancel subscriptions', function () {
+            let data = {
+                willEndSoon: true,
+                validUntil: '31 May 2021'
+            };
+            expect(validityDetails(data)).to.equal('Has access until 31 May 2021');
+        });
+
+        it('returns "Ends {validUntil}" for trial subscriptions', function () {
+            let data = {
+                trialUntil: '31 May 2021'
+            };
+            expect(validityDetails(data)).to.equal('Ends 31 May 2021');
+        });
+
+        it('returns "Renews {validUntil}" for active subscriptions', function () {
+            let data = {
+                validUntil: '31 May 2021'
+            };
+            expect(validityDetails(data)).to.equal('Renews 31 May 2021');
+        });
+    });
+
+    describe('getSubscriptionData', function () {
+        it('returns the correct data for an active subscription', function () {
+            let sub = {
+                id: 'defined',
+                status: 'active',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31',
+                trial_end_at: null,
+                tier: null,
+                price: {
+                    currency: 'usd',
+                    amount: 5000
+                }
+            };
+            let data = getSubscriptionData(sub);
+
+            expect(data).to.include({
+                isComplimentary: false,
+                compExpiry: undefined,
+                hasEnded: false,
+                validUntil: '31 May 2021',
+                willEndSoon: false,
+                trialUntil: undefined,
+                priceLabel: undefined,
+                validityDetails: 'Renews 31 May 2021'
+            });
+        });
+
+        it('returns the correct data for a trial subscription', function () {
+            let sub = {
+                id: 'defined',
+                status: 'trialing',
+                cancel_at_period_end: false,
+                current_period_end: '2222-05-31',
+                trial_end_at: '2222-05-31',
+                tier: null,
+                price: {
+                    currency: 'usd',
+                    amount: 5000
+                }
+            };
+            let data = getSubscriptionData(sub);
+
+            expect(data).to.include({
+                isComplimentary: false,
+                compExpiry: undefined,
+                hasEnded: false,
+                validUntil: '31 May 2222',
+                willEndSoon: false,
+                trialUntil: '31 May 2222',
+                priceLabel: 'Free trial',
+                validityDetails: ' – Ends 31 May 2222'
+            });
+        });
+
+        it('returns the correct data for an immediately canceled subscription', function () {
+            let sub = {
+                id: 'defined',
+                status: 'canceled',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31',
+                trial_end_at: null,
+                tier: null,
+                price: {
+                    currency: 'usd',
+                    amount: 5000
+                }
+            };
+            let data = getSubscriptionData(sub);
+
+            expect(data).to.include({
+                isComplimentary: false,
+                compExpiry: undefined,
+                hasEnded: true,
+                validUntil: '',
+                willEndSoon: false,
+                trialUntil: undefined,
+                priceLabel: undefined,
+                validityDetails: 'Ended'
+            });
+        });
+
+        it('returns the correct data for a subscription set to cancel at the end of the period', function () {
+            let sub = {
+                id: 'defined',
+                status: 'active',
+                cancel_at_period_end: true,
+                current_period_end: '2021-05-31',
+                trial_end_at: null,
+                tier: null,
+                price: {
+                    currency: 'usd',
+                    amount: 5000
+                }
+            };
+            let data = getSubscriptionData(sub);
+
+            expect(data).to.include({
+                isComplimentary: false,
+                compExpiry: undefined,
+                hasEnded: false,
+                validUntil: '31 May 2021',
+                willEndSoon: true,
+                trialUntil: undefined,
+                priceLabel: undefined,
+                validityDetails: 'Has access until 31 May 2021'
+            });
+        });
+
+        it('returns the correct data for a complimentary subscription active forever', function () {
+            let sub = {
+                id: null,
+                status: 'active',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31',
+                trial_end_at: null,
+                tier: {
+                    expiry_at: null
+                },
+                price: {
+                    currency: 'usd',
+                    amount: 0,
+                    nickname: 'Complimentary'
+                }
+            };
+            let data = getSubscriptionData(sub);
+
+            expect(data).to.include({
+                isComplimentary: true,
+                compExpiry: undefined,
+                hasEnded: false,
+                validUntil: '31 May 2021',
+                willEndSoon: false,
+                trialUntil: undefined,
+                priceLabel: 'Complimentary',
+                validityDetails: ''
+            });
+        });
+
+        it('returns the correct data for a complimentary subscription with an expiration date', function () {
+            let sub = {
+                id: null,
+                status: 'active',
+                cancel_at_period_end: false,
+                current_period_end: '2021-05-31',
+                trial_end_at: null,
+                tier: {
+                    expiry_at: moment.utc('2021-05-31').toISOString()
+                },
+                price: {
+                    currency: 'usd',
+                    amount: 0,
+                    nickname: 'Complimentary'
+                }
+            };
+            let data = getSubscriptionData(sub);
+
+            expect(data).to.include({
+                isComplimentary: true,
+                compExpiry: '31 May 2021',
+                hasEnded: false,
+                validUntil: '31 May 2021',
+                willEndSoon: false,
+                trialUntil: undefined,
+                priceLabel: 'Complimentary',
+                validityDetails: ' – Expires 31 May 2021'
+            });
+        });
+    });
+});
diff --git a/ghost/api-framework/index.js b/ghost/api-framework/index.js
index 373c844ba24..2fd7fa32f49 100644
--- a/ghost/api-framework/index.js
+++ b/ghost/api-framework/index.js
@@ -1 +1,27 @@
+/** @typedef {object} PermissionsObject */
+/** @typedef {boolean} PermissionsBoolean */
+
+/** @typedef {number} StatusCodeNumber */
+/** @typedef {(result: any) => number} StatusCodeFunction */
+
+/** @typedef {object} ValidationObject */
+
+/**
+ * @typedef {object} ControllerMethod
+ * @property {object} headers
+ * @property {PermissionsBoolean | PermissionsObject} permissions
+ * @property {string[]} [options]
+ * @property {ValidationObject} [validation]
+ * @property {string[]} [data]
+ * @property {StatusCodeFunction | StatusCodeNumber} [statusCode]
+ * @property {object} [response]
+ * @property {function} [cache]
+ * @property {(frame: import('./lib/Frame')) => object} [generateCacheKeyData]
+ * @property {(frame: import('./lib/Frame')) => any} query
+ */
+
+/**
+ * @typedef {Record<string, ControllerMethod | string> & Record<'docName', string>} Controller
+ */
+
 module.exports = require('./lib/api-framework');
diff --git a/ghost/api-framework/lib/Frame.js b/ghost/api-framework/lib/Frame.js
index 2be8cb3b747..70d265bb8a1 100644
--- a/ghost/api-framework/lib/Frame.js
+++ b/ghost/api-framework/lib/Frame.js
@@ -9,6 +9,7 @@ const _ = require('lodash');
  * easiest to use. We always have access to the original input, we never loose track of it.
  */
 class Frame {
+    #headers = {};
     constructor(obj = {}) {
         this.original = obj;
 
@@ -27,6 +28,7 @@ class Frame {
         this.user = {};
         this.file = {};
         this.files = [];
+        this.#headers = {};
         this.apiType = null;
         this.docName = null;
         this.method = null;
@@ -95,6 +97,14 @@ class Frame {
         debug('options', this.options);
         debug('data', this.data);
     }
+
+    setHeader(header, value) {
+        this.#headers[header] = value;
+    }
+
+    getHeaders() {
+        return Object.assign({}, this.#headers);
+    }
 }
 
 module.exports = Frame;
diff --git a/ghost/api-framework/lib/headers.js b/ghost/api-framework/lib/headers.js
index 4349777c12b..165baeb377a 100644
--- a/ghost/api-framework/lib/headers.js
+++ b/ghost/api-framework/lib/headers.js
@@ -99,8 +99,8 @@ module.exports = {
      *
      * @param {Object} result - API response
      * @param {Object} apiConfigHeaders
-     * @param {Object} frame
-     * @return {Promise}
+     * @param {import('@tryghost/api-framework').Frame} frame
+     * @return {Promise<object>}
      */
     async get(result, apiConfigHeaders = {}, frame) {
         let headers = {};
@@ -147,6 +147,10 @@ module.exports = {
             Object.assign(headers, locationHeader);
         }
 
+        const headersFromFrame = frame.getHeaders();
+
+        Object.assign(headers, headersFromFrame);
+
         debug(headers);
         return headers;
     }
diff --git a/ghost/api-framework/lib/http.js b/ghost/api-framework/lib/http.js
index 369ce13aa4f..cf35d705591 100644
--- a/ghost/api-framework/lib/http.js
+++ b/ghost/api-framework/lib/http.js
@@ -10,10 +10,16 @@ const headers = require('./headers');
  * This wrapper is used in the routes definition (see web/).
  * The wrapper receives the express request, prepares the frame and forwards the request to the pipeline.
  *
- * @param {Function} apiImpl - Pipeline wrapper, which executes the target ctrl function.
- * @return {Function}
+ * @param {import('@tryghost/api-framework').Controller} apiImpl - Pipeline wrapper, which executes the target ctrl function.
+ * @return {import('express').RequestHandler}
  */
 const http = (apiImpl) => {
+    /**
+     * @param {import('express').Request} req - Express request object.
+     * @param {import('express').Response} res - Express response object.
+     * @param {import('express').NextFunction} next - Express next function.
+     * @returns {Promise<import('express').RequestHandler>}
+     */
     return async function Http(req, res, next) {
         debug(`External API request to ${req.url}`);
         let apiKey = null;
diff --git a/ghost/api-framework/lib/pipeline.js b/ghost/api-framework/lib/pipeline.js
index 7ea64343066..436de80465e 100644
--- a/ghost/api-framework/lib/pipeline.js
+++ b/ghost/api-framework/lib/pipeline.js
@@ -20,8 +20,8 @@ const STAGES = {
          *
          * @param {Object} apiUtils - Local utils of target API version.
          * @param {Object} apiConfig - Docname & Method of ctrl.
-         * @param {Object} apiImpl -  Controller configuration.
-         * @param {Object} frame
+         * @param {import('@tryghost/api-framework').ControllerMethod} apiImpl -  Controller configuration.
+         * @param {import('@tryghost/api-framework').Frame} frame
          * @return {Promise}
          */
         input(apiUtils, apiConfig, apiImpl, frame) {
@@ -57,8 +57,8 @@ const STAGES = {
          *
          * @param {Object} apiUtils - Local utils of target API version.
          * @param {Object} apiConfig - Docname & Method of ctrl.
-         * @param {Object} apiImpl -  Controller configuration.
-         * @param {Object} frame
+         * @param {import('@tryghost/api-framework').ControllerMethod} apiImpl -  Controller configuration.
+         * @param {import('@tryghost/api-framework').Frame} frame
          * @return {Promise}
          */
         input(apiUtils, apiConfig, apiImpl, frame) {
@@ -80,8 +80,8 @@ const STAGES = {
          *
          * @param {Object} apiUtils - Local utils of target API version.
          * @param {Object} apiConfig - Docname & Method of ctrl.
-         * @param {Object} apiImpl -  Controller configuration.
-         * @param {Object} frame
+         * @param {import('@tryghost/api-framework').ControllerMethod} apiImpl -  Controller configuration.
+         * @param {import('@tryghost/api-framework').Frame} frame
          * @return {Promise}
          */
         output(response, apiUtils, apiConfig, apiImpl, frame) {
@@ -99,8 +99,8 @@ const STAGES = {
      *
      * @param {Object} apiUtils - Local utils of target API version.
      * @param {Object} apiConfig - Docname & Method of ctrl.
-     * @param {Object} apiImpl -  Controller configuration.
-     * @param {Object} frame
+     * @param {import('@tryghost/api-framework').ControllerMethod} apiImpl -  Controller configuration.
+     * @param {import('@tryghost/api-framework').Frame} frame
      * @return {Promise}
      */
     permissions(apiUtils, apiConfig, apiImpl, frame) {
@@ -145,8 +145,8 @@ const STAGES = {
      *
      * @param {Object} apiUtils - Local utils of target API version.
      * @param {Object} apiConfig - Docname & Method of ctrl.
-     * @param {Object} apiImpl -  Controller configuration.
-     * @param {Object} frame
+     * @param {import('@tryghost/api-framework').ControllerMethod} apiImpl -  Controller configuration.
+     * @param {import('@tryghost/api-framework').Frame} frame
      * @return {Promise}
      */
     query(apiUtils, apiConfig, apiImpl, frame) {
@@ -160,6 +160,8 @@ const STAGES = {
     }
 };
 
+const controllerMap = new Map();
+
 /**
  * @description The pipeline runs the request through all stages (validation, serialisation, permissions).
  *
@@ -174,21 +176,27 @@ const STAGES = {
  * 4. Controller - Execute the controller implementation & receive model response.
  * 5. Output Serialisation - Output formatting, Deprecations, Extra attributes etc...
  *
- * @param {Object} apiController
+ * @param {import('@tryghost/api-framework').Controller} apiController
  * @param {Object} apiUtils - Local utils (validation & serialisation) from target API version
  * @param {String} [apiType] - Content or Admin API access
  * @return {Object}
  */
 const pipeline = (apiController, apiUtils, apiType) => {
-    const keys = Object.keys(apiController);
+    if (controllerMap.has(apiController)) {
+        return controllerMap.get(apiController);
+    }
+
+    const keys = Object.keys(apiController).filter(key => key !== 'docName');
     const docName = apiController.docName;
 
     // CASE: api controllers are objects with configuration.
     //       We have to ensure that we expose a functional interface e.g. `api.posts.add` has to be available.
-    return keys.reduce((obj, method) => {
+    const result = keys.reduce((obj, method) => {
         const apiImpl = _.cloneDeep(apiController)[method];
 
-        obj[method] = async function wrapper() {
+        Object.freeze(apiImpl.headers);
+
+        obj[method] = async function ImplWrapper() {
             const apiConfig = {docName, method};
             let options;
             let data;
@@ -238,40 +246,37 @@ const pipeline = (apiController, apiUtils, apiType) => {
             const cacheKey = stringify(cacheKeyData);
 
             if (apiImpl.cache) {
-                const response = await apiImpl.cache.get(cacheKey);
-
+                const response = await apiImpl.cache.get(cacheKey, getResponse);
                 if (response) {
                     return Promise.resolve(response);
                 }
             }
 
-            return Promise.resolve()
-                .then(() => {
-                    return STAGES.validation.input(apiUtils, apiConfig, apiImpl, frame);
-                })
-                .then(() => {
-                    return STAGES.serialisation.input(apiUtils, apiConfig, apiImpl, frame);
-                })
-                .then(() => {
-                    return STAGES.permissions(apiUtils, apiConfig, apiImpl, frame);
-                })
-                .then(() => {
-                    return STAGES.query(apiUtils, apiConfig, apiImpl, frame);
-                })
-                .then((response) => {
-                    return STAGES.serialisation.output(response, apiUtils, apiConfig, apiImpl, frame);
-                })
-                .then(async () => {
-                    if (apiImpl.cache) {
-                        await apiImpl.cache.set(cacheKey, frame.response);
-                    }
-                    return frame.response;
-                });
+            async function getResponse() {
+                await STAGES.validation.input(apiUtils, apiConfig, apiImpl, frame);
+                await STAGES.serialisation.input(apiUtils, apiConfig, apiImpl, frame);
+                await STAGES.permissions(apiUtils, apiConfig, apiImpl, frame);
+                const response = await STAGES.query(apiUtils, apiConfig, apiImpl, frame);
+                await STAGES.serialisation.output(response, apiUtils, apiConfig, apiImpl, frame);
+                return frame.response;
+            }
+
+            const response = await getResponse();
+
+            if (apiImpl.cache) {
+                await apiImpl.cache.set(cacheKey, response);
+            }
+
+            return response;
         };
 
         Object.assign(obj[method], apiImpl);
         return obj;
     }, {});
+
+    controllerMap.set(apiController, result);
+
+    return result;
 };
 
 module.exports = pipeline;
diff --git a/ghost/api-framework/lib/serializers/handle.js b/ghost/api-framework/lib/serializers/handle.js
index c86fe1bdfaa..6356ebdbf35 100644
--- a/ghost/api-framework/lib/serializers/handle.js
+++ b/ghost/api-framework/lib/serializers/handle.js
@@ -12,7 +12,7 @@ const errors = require('@tryghost/errors');
  *
  * @param {Object} apiConfig - Docname + method of the ctrl
  * @param {Object} apiSerializers - Target API serializers
- * @param {Object} frame
+ * @param {import('@tryghost/api-framework').Frame} frame
  */
 module.exports.input = (apiConfig, apiSerializers, frame) => {
     debug('input');
@@ -90,7 +90,7 @@ const getBestMatchSerializer = function (apiSerializers, docName, method) {
  * @param {Object} response - API response
  * @param {Object} apiConfig - Docname + method of the ctrl
  * @param {Object} apiSerializers - Target API serializers
- * @param {Object} frame
+ * @param {import('@tryghost/api-framework').Frame} frame
  */
 module.exports.output = (response = {}, apiConfig, apiSerializers, frame) => {
     debug('output');
diff --git a/ghost/api-framework/lib/utils/options.js b/ghost/api-framework/lib/utils/options.js
index 22dd5759258..90b5d6eaa45 100644
--- a/ghost/api-framework/lib/utils/options.js
+++ b/ghost/api-framework/lib/utils/options.js
@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const {IncorrectUsageError} = require('@tryghost/errors');
 
 /**
  * @description Helper function to prepare params for internal usages.
@@ -15,6 +16,14 @@ const trimAndLowerCase = (params) => {
         params = params.split(',');
     }
 
+    // If we don't have an array at this point, something is wrong, so we should throw an
+    // error to avoid trying to .map over something else
+    if (!_.isArray(params)) {
+        throw new IncorrectUsageError({
+            message: 'Params must be a string or array'
+        });
+    }
+
     return params.map((item) => {
         return item.trim().toLowerCase();
     });
diff --git a/ghost/api-framework/lib/validators/handle.js b/ghost/api-framework/lib/validators/handle.js
index ab9901ea9f0..43f62f77ddc 100644
--- a/ghost/api-framework/lib/validators/handle.js
+++ b/ghost/api-framework/lib/validators/handle.js
@@ -12,7 +12,7 @@ const {sequence} = require('@tryghost/promise');
  *
  * @param {Object} apiConfig - Docname + method of the ctrl
  * @param {Object} apiValidators - Target API validators
- * @param {Object} frame
+ * @param {import('@tryghost/api-framework').Frame} frame
  */
 module.exports.input = (apiConfig, apiValidators, frame) => {
     debug('input begin');
diff --git a/ghost/api-framework/lib/validators/input/all.js b/ghost/api-framework/lib/validators/input/all.js
index f6e4efc664b..fadb17bb2c8 100644
--- a/ghost/api-framework/lib/validators/input/all.js
+++ b/ghost/api-framework/lib/validators/input/all.js
@@ -90,6 +90,10 @@ const validate = (config, attrs) => {
 };
 
 module.exports = {
+    /**
+     * @param {object} apiConfig
+     * @param {import('@tryghost/api-framework').Frame} frame
+     */
     all(apiConfig, frame) {
         debug('validate all');
 
@@ -102,6 +106,10 @@ module.exports = {
         return Promise.resolve();
     },
 
+    /**
+     * @param {object} apiConfig
+     * @param {import('@tryghost/api-framework').Frame} frame
+     */
     browse(apiConfig, frame) {
         debug('validate browse');
 
@@ -121,6 +129,10 @@ module.exports = {
         return this.browse(...arguments);
     },
 
+    /**
+     * @param {object} apiConfig
+     * @param {import('@tryghost/api-framework').Frame} frame
+     */
     add(apiConfig, frame) {
         debug('validate add');
 
@@ -168,6 +180,10 @@ module.exports = {
         }
     },
 
+    /**
+     * @param {object} apiConfig
+     * @param {import('@tryghost/api-framework').Frame} frame
+     */
     edit(apiConfig, frame) {
         debug('validate edit');
         const result = this.add(...arguments);
diff --git a/ghost/api-framework/package.json b/ghost/api-framework/package.json
index 6c0e5ce0963..cd4310d1a67 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/errors": "1.2.26",
-    "@tryghost/promise": "0.3.4",
-    "@tryghost/tpl": "0.1.24",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/debug": "0.1.32",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/promise": "0.3.12",
+    "@tryghost/tpl": "0.1.32",
+    "@tryghost/validator": "0.2.14",
     "jsonpath": "1.1.1",
     "lodash": "4.17.21"
   }
diff --git a/ghost/api-framework/test/headers.test.js b/ghost/api-framework/test/headers.test.js
index c7ce6dfedd8..941ba9160b3 100644
--- a/ghost/api-framework/test/headers.test.js
+++ b/ghost/api-framework/test/headers.test.js
@@ -1,15 +1,16 @@
 const shared = require('../');
+const Frame = require('../lib/Frame');
 
 describe('Headers', function () {
     it('empty headers config', function () {
-        return shared.headers.get().then((result) => {
+        return shared.headers.get({}, {}, new Frame()).then((result) => {
             result.should.eql({});
         });
     });
 
     describe('config.disposition', function () {
         it('json', function () {
-            return shared.headers.get({}, {disposition: {type: 'json', value: 'value'}})
+            return shared.headers.get({}, {disposition: {type: 'json', value: 'value'}}, new Frame())
                 .then((result) => {
                     result.should.eql({
                         'Content-Disposition': 'Attachment; filename="value"',
@@ -20,7 +21,7 @@ describe('Headers', function () {
         });
 
         it('csv', function () {
-            return shared.headers.get({}, {disposition: {type: 'csv', value: 'my.csv'}})
+            return shared.headers.get({}, {disposition: {type: 'csv', value: 'my.csv'}}, new Frame())
                 .then((result) => {
                     result.should.eql({
                         'Content-Disposition': 'Attachment; filename="my.csv"',
@@ -39,7 +40,7 @@ describe('Headers', function () {
                         return filename;
                     }
                 }
-            });
+            }, new Frame());
             result.should.eql({
                 'Content-Disposition': 'Attachment; filename="awesome-data-2022-08-01.csv"',
                 'Content-Type': 'text/csv'
@@ -47,7 +48,7 @@ describe('Headers', function () {
         });
 
         it('file', async function () {
-            const result = await shared.headers.get({}, {disposition: {type: 'file', value: 'my.txt'}});
+            const result = await shared.headers.get({}, {disposition: {type: 'file', value: 'my.txt'}}, new Frame());
             result.should.eql({
                 'Content-Disposition': 'Attachment; filename="my.txt"'
             });
@@ -63,14 +64,14 @@ describe('Headers', function () {
                         return filename;
                     }
                 }
-            });
+            }, new Frame());
             result.should.eql({
                 'Content-Disposition': 'Attachment; filename="awesome-data-2022-08-01.txt"'
             });
         });
 
         it('yaml', function () {
-            return shared.headers.get('yaml file', {disposition: {type: 'yaml', value: 'my.yaml'}})
+            return shared.headers.get('yaml file', {disposition: {type: 'yaml', value: 'my.yaml'}}, new Frame())
                 .then((result) => {
                     result.should.eql({
                         'Content-Disposition': 'Attachment; filename="my.yaml"',
@@ -83,7 +84,7 @@ describe('Headers', function () {
 
     describe('config.cacheInvalidate', function () {
         it('default', function () {
-            return shared.headers.get({}, {cacheInvalidate: true})
+            return shared.headers.get({}, {cacheInvalidate: true}, new Frame())
                 .then((result) => {
                     result.should.eql({
                         'X-Cache-Invalidate': '/*'
@@ -92,7 +93,7 @@ describe('Headers', function () {
         });
 
         it('custom value', function () {
-            return shared.headers.get({}, {cacheInvalidate: {value: 'value'}})
+            return shared.headers.get({}, {cacheInvalidate: {value: 'value'}}, new Frame())
                 .then((result) => {
                     result.should.eql({
                         'X-Cache-Invalidate': 'value'
@@ -110,14 +111,13 @@ describe('Headers', function () {
             };
 
             const apiConfigHeaders = {};
-            const frame = {
-                docName: 'posts',
-                method: 'add',
-                original: {
-                    url: {
-                        host: 'example.com',
-                        pathname: `/api/content/posts/`
-                    }
+            const frame = new Frame();
+            frame.docName = 'posts',
+            frame.method = 'add',
+            frame.original = {
+                url: {
+                    host: 'example.com',
+                    pathname: `/api/content/posts/`
                 }
             };
 
@@ -146,14 +146,13 @@ describe('Headers', function () {
                     }
                 }
             };
-            const frame = {
-                docName: 'posts',
-                method: 'copy',
-                original: {
-                    url: {
-                        host: 'example.com',
-                        pathname: `/api/content/posts/existing_post_id_value/copy`
-                    }
+            const frame = new Frame();
+            frame.docName = 'posts';
+            frame.method = 'copy';
+            frame.original = {
+                url: {
+                    host: 'example.com',
+                    pathname: `/api/content/posts/existing_post_id_value/copy`
                 }
             };
 
@@ -173,15 +172,15 @@ describe('Headers', function () {
             };
 
             const apiConfigHeaders = {};
-            const frame = {
-                docName: 'posts',
-                method: 'add',
-                original: {
-                    url: {
-                        host: 'example.com',
-                        pathname: `/api/content/posts/`,
-                        secure: false
-                    }
+            const frame = new Frame();
+
+            frame.docName = 'posts';
+            frame.method = 'add';
+            frame.original = {
+                url: {
+                    host: 'example.com',
+                    pathname: `/api/content/posts/`,
+                    secure: false
                 }
             };
 
@@ -200,14 +199,13 @@ describe('Headers', function () {
             };
 
             const apiConfigHeaders = {};
-            const frame = {
-                docName: 'posts',
-                method: 'add',
-                original: {
-                    url: {
-                        host: 'example.com',
-                        pathname: `/api/content/posts`
-                    }
+            const frame = new Frame();
+            frame.docName = 'posts';
+            frame.method = 'add';
+            frame.original = {
+                url: {
+                    host: 'example.com',
+                    pathname: `/api/content/posts`
                 }
             };
 
@@ -224,14 +222,13 @@ describe('Headers', function () {
             const apiResult = {};
 
             const apiConfigHeaders = {};
-            const frame = {
-                docName: 'posts',
-                method: 'add',
-                original: {
-                    url: {
-                        host: 'example.com',
-                        pathname: `/api/content/posts/`
-                    }
+            const frame = new Frame();
+            frame.docName = 'posts';
+            frame.method = 'add';
+            frame.original = {
+                url: {
+                    host: 'example.com',
+                    pathname: `/api/content/posts/`
                 }
             };
 
diff --git a/ghost/api-framework/test/util/options.test.js b/ghost/api-framework/test/util/options.test.js
index d9812a41cee..ad926f8991c 100644
--- a/ghost/api-framework/test/util/options.test.js
+++ b/ghost/api-framework/test/util/options.test.js
@@ -20,4 +20,12 @@ describe('util/options', function () {
     it('accepts parameters in form of an array', function () {
         optionsUtil.trimAndLowerCase(['  PeanUt', ' buTTer ']).should.eql(['peanut', 'butter']);
     });
+
+    it('throws error for invalid object input', function () {
+        try {
+            optionsUtil.trimAndLowerCase({name: 'peanut'});
+        } catch (err) {
+            err.message.should.eql('Params must be a string or array');
+        }
+    });
 });
diff --git a/ghost/api-version-compatibility-service/lib/APIVersionCompatibilityService.js b/ghost/api-version-compatibility-service/lib/APIVersionCompatibilityService.js
index 14c4cfc5761..5ba6a99a422 100644
--- a/ghost/api-version-compatibility-service/lib/APIVersionCompatibilityService.js
+++ b/ghost/api-version-compatibility-service/lib/APIVersionCompatibilityService.js
@@ -41,10 +41,17 @@ class APIVersionCompatibilityService {
      */
     async handleMismatch({acceptVersion, contentVersion, apiKeyValue, apiKeyType, requestURL, userAgent = ''}) {
         if (!await this.versionNotificationsDataService.fetchNotification(acceptVersion)) {
+            const integration = await this.versionNotificationsDataService.getIntegration(apiKeyValue, apiKeyType);
+
+            // We couldn't find the integration
+            if (!integration) {
+                return;
+            }
+
             const {
                 name: integrationName,
                 type: integrationType
-            } = await this.versionNotificationsDataService.getIntegration(apiKeyValue, apiKeyType);
+            } = integration;
 
             // @NOTE: "internal" or "core" integrations (https://ghost.notion.site/Data-Types-e5dc54dd0078443f9afd6b2abda443c4)
             //        are maintained by Ghost team, so there is no sense notifying the instance owner about it's incompatibility.
diff --git a/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js b/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js
index c9087601cc8..1009e6660f0 100644
--- a/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js
+++ b/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js
@@ -184,6 +184,43 @@ describe('APIVersionCompatibilityService', function () {
         assert.equal(sendEmail.calledTwice, false);
     });
 
+    it('Does not send email when unknown integration is detected', async function () {
+        const sendEmail = sinon.spy();
+        const findOneStub = sinon.stub();
+
+        findOneStub
+            .withArgs({
+                id: 'unknown_key'
+            }, {
+                withRelated: ['integration']
+            })
+            .resolves(null);
+
+        ApiKeyModel = {
+            findOne: findOneStub
+        };
+
+        const compatibilityService = new APIVersionCompatibilityService({
+            sendEmail,
+            ApiKeyModel,
+            UserModel,
+            settingsService,
+            getSiteUrl,
+            getSiteTitle
+        });
+
+        await compatibilityService.handleMismatch({
+            acceptVersion: 'v4.5',
+            contentVersion: 'v5.1',
+            userAgent: 'GhostAdminSDK/2.4.0',
+            requestURL: 'https://amazeballsghostsite.com/ghost/api/admin/posts/dew023d9203se4',
+            apiKeyValue: 'unknown_key',
+            apiKeyType: 'content'
+        });
+
+        assert.equal(sendEmail.called, false);
+    });
+
     it('Does NOT send an email to the instance owner when "internal" or "core" integration triggered version mismatch', async function () {
         const sendEmail = sinon.spy();
         const findOneStub = sinon.stub();
diff --git a/ghost/audience-feedback/lib/AudienceFeedbackService.js b/ghost/audience-feedback/lib/AudienceFeedbackService.js
index cb262ee23aa..f72cc0aa785 100644
--- a/ghost/audience-feedback/lib/AudienceFeedbackService.js
+++ b/ghost/audience-feedback/lib/AudienceFeedbackService.js
@@ -17,15 +17,16 @@ class AudienceFeedbackService {
      * @param {string} uuid
      * @param {string} postId
      * @param {0 | 1} score
+     * @param {string} key - hashed uuid value
      */
-    buildLink(uuid, postId, score) {
+    buildLink(uuid, postId, score, key) {
         let postUrl = this.#urlService.getUrlByResourceId(postId, {absolute: true});
 
         if (postUrl.match(/\/404\//)) {
             postUrl = this.#baseURL;
         }
         const url = new URL(postUrl);
-        url.hash = `#/feedback/${postId}/${score}/?uuid=${encodeURIComponent(uuid)}`;
+        url.hash = `#/feedback/${postId}/${score}/?uuid=${encodeURIComponent(uuid)}&key=${encodeURIComponent(key)}`;
         return url;
     }
 }
diff --git a/ghost/audience-feedback/package.json b/ghost/audience-feedback/package.json
index 1b4569ba923..d3e8b8ebe03 100644
--- a/ghost/audience-feedback/package.json
+++ b/ghost/audience-feedback/package.json
@@ -24,8 +24,8 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/tpl": "0.1.32",
     "bson-objectid": "2.0.4"
   }
 }
diff --git a/ghost/audience-feedback/test/AudienceFeedbackService.test.js b/ghost/audience-feedback/test/AudienceFeedbackService.test.js
index 8a85d54262b..c744f510d6e 100644
--- a/ghost/audience-feedback/test/AudienceFeedbackService.test.js
+++ b/ghost/audience-feedback/test/AudienceFeedbackService.test.js
@@ -10,7 +10,8 @@ describe('audienceFeedbackService', function () {
         uuid: '7b11de3c-dff9-4563-82ae-a281122d201d',
         postId: '634fc3901e0a291855d8b135',
         postTitle: 'somepost',
-        score: 1
+        score: 1,
+        key: 'somekey'
     };
 
     describe('build link', function () {
@@ -23,8 +24,8 @@ describe('audienceFeedbackService', function () {
                     baseURL: new URL('https://localhost:2368')
                 }
             });
-            const link = instance.buildLink(mockData.uuid, mockData.postId, mockData.score);
-            const expectedLink = `https://localhost:2368/${mockData.postTitle}/#/feedback/${mockData.postId}/${mockData.score}/?uuid=${mockData.uuid}`;
+            const link = instance.buildLink(mockData.uuid, mockData.postId, mockData.score, mockData.key);
+            const expectedLink = `https://localhost:2368/${mockData.postTitle}/#/feedback/${mockData.postId}/${mockData.score}/?uuid=${mockData.uuid}&key=somekey`;
             assert.equal(link.href, expectedLink);
         });
 
@@ -37,8 +38,8 @@ describe('audienceFeedbackService', function () {
                     baseURL: new URL('https://localhost:2368')
                 }
             });
-            const link = instance.buildLink(mockData.uuid, mockData.postId, mockData.score);
-            const expectedLink = `https://localhost:2368/#/feedback/${mockData.postId}/${mockData.score}/?uuid=${mockData.uuid}`;
+            const link = instance.buildLink(mockData.uuid, mockData.postId, mockData.score, mockData.key);
+            const expectedLink = `https://localhost:2368/#/feedback/${mockData.postId}/${mockData.score}/?uuid=${mockData.uuid}&key=somekey`;
             assert.equal(link.href, expectedLink);
         });
     });
diff --git a/ghost/bookshelf-repository/package.json b/ghost/bookshelf-repository/package.json
index f9f952f543f..33db7ccf47b 100644
--- a/ghost/bookshelf-repository/package.json
+++ b/ghost/bookshelf-repository/package.json
@@ -7,8 +7,8 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "build:ts": "yarn build",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",
@@ -23,10 +23,10 @@
     "c8": "7.14.0",
     "mocha": "10.2.0",
     "sinon": "15.2.0",
-    "@tryghost/nql": "0.11.0"
+    "@tryghost/nql": "0.12.4"
   },
   "dependencies": {
-    "@tryghost/mongo-utils": "0.5.0",
+    "@tryghost/mongo-utils": "0.6.2",
     "knex": "2.4.2"
   }
 }
diff --git a/ghost/bookshelf-repository/test/BookshelfRepository.test.ts b/ghost/bookshelf-repository/test/BookshelfRepository.test.ts
index c46c3757e0f..d56b86b3968 100644
--- a/ghost/bookshelf-repository/test/BookshelfRepository.test.ts
+++ b/ghost/bookshelf-repository/test/BookshelfRepository.test.ts
@@ -1,7 +1,7 @@
-import assert from 'assert';
-import {BookshelfRepository, ModelClass, ModelInstance} from '../src/index';
-import {Knex} from 'knex';
 import nql from '@tryghost/nql';
+import assert from 'assert/strict';
+import {Knex} from 'knex';
+import {BookshelfRepository, ModelClass, ModelInstance} from '../src/index';
 
 type SimpleEntity = {
     id: string;
diff --git a/ghost/bootstrap-socket/package.json b/ghost/bootstrap-socket/package.json
index 8626dc0da59..d59ce01e6ae 100644
--- a/ghost/bootstrap-socket/package.json
+++ b/ghost/bootstrap-socket/package.json
@@ -24,6 +24,6 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/logging": "2.4.8"
+    "@tryghost/logging": "2.4.18"
   }
 }
diff --git a/ghost/collections/package.json b/ghost/collections/package.json
index fd2d825e72f..f26123e4ea6 100644
--- a/ghost/collections/package.json
+++ b/ghost/collections/package.json
@@ -7,8 +7,8 @@
     "main": "build/index.js",
     "types": "build/index.d.ts",
     "scripts": {
-        "build": "tsc",
-        "build:ts": "yarn build",
+        "build": "yarn build:ts",
+        "build:ts": "tsc",
         "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
         "test": "yarn test:types && yarn test:unit",
         "test:types": "tsc --noEmit",
@@ -26,14 +26,14 @@
         "sinon": "15.2.0"
     },
     "dependencies": {
-        "@tryghost/debug": "0.1.26",
-        "@tryghost/errors": "1.2.26",
+        "@tryghost/debug": "0.1.32",
+        "@tryghost/errors": "1.3.5",
         "@tryghost/in-memory-repository": "0.0.0",
-        "@tryghost/logging": "2.4.8",
-        "@tryghost/nql": "0.11.0",
+        "@tryghost/logging": "2.4.18",
+        "@tryghost/nql": "0.12.4",
         "@tryghost/nql-filter-expansions": "0.0.0",
         "@tryghost/post-events": "0.0.0",
-        "@tryghost/tpl": "0.1.25",
+        "@tryghost/tpl": "0.1.32",
         "bson-objectid": "2.0.4",
         "lodash": "4.17.21"
     },
diff --git a/ghost/collections/src/CollectionsService.ts b/ghost/collections/src/CollectionsService.ts
index 2db7334a4c4..597ad6f6654 100644
--- a/ghost/collections/src/CollectionsService.ts
+++ b/ghost/collections/src/CollectionsService.ts
@@ -609,7 +609,7 @@ export class CollectionsService {
     }
     async getCollectionsForPost(postId: string): Promise<CollectionDTO[]> {
         const collections = await this.collectionsRepository.getAll({
-            filter: `posts:${postId},slug:latest`
+            filter: `posts:'${postId}',slug:latest`
         });
 
         return Promise.all(collections.sort((a, b) => {
diff --git a/ghost/collections/test/Collection.test.ts b/ghost/collections/test/Collection.test.ts
index 27c19bd9401..7c8206afb34 100644
--- a/ghost/collections/test/Collection.test.ts
+++ b/ghost/collections/test/Collection.test.ts
@@ -1,4 +1,4 @@
-import assert from 'assert';
+import assert from 'assert/strict';
 import ObjectID from 'bson-objectid';
 import {Collection} from '../src/index';
 
diff --git a/ghost/core/.c8rc.json b/ghost/core/.c8rc.json
index f76eb885f74..c1eddd0a0b3 100644
--- a/ghost/core/.c8rc.json
+++ b/ghost/core/.c8rc.json
@@ -6,10 +6,10 @@
     "text-summary",
     "cobertura"
   ],
-  "statements": 58.8,
+  "statements": 58.7,
   "branches": 84,
   "functions": 50,
-  "lines": 58.8,
+  "lines": 58.7,
   "include": [
     "core/{*.js,frontend,server,shared}"
   ],
diff --git a/ghost/core/.npmignore b/ghost/core/.npmignore
index 43bdf932901..c8bfd336526 100644
--- a/ghost/core/.npmignore
+++ b/ghost/core/.npmignore
@@ -62,7 +62,7 @@ renovate.json
 !core/server/services/mail/templates/**
 bower_components/**
 .editorconfig
-gulpfile.js
+monobundle.js
 !content/themes/casper/gulpfile.js
 !content/themes/source/gulpfile.js
 package-lock.json
diff --git a/ghost/core/content/themes/casper b/ghost/core/content/themes/casper
index 4d3319d05ce..bf3617a726b 160000
--- a/ghost/core/content/themes/casper
+++ b/ghost/core/content/themes/casper
@@ -1 +1 @@
-Subproject commit 4d3319d05ce92e7b0244e5608d3fc6cc9c86e735
+Subproject commit bf3617a726b1b72f45663397d1ca11fb126c2546
diff --git a/ghost/core/content/themes/source b/ghost/core/content/themes/source
index ea08ce4e9dd..61a511b229f 160000
--- a/ghost/core/content/themes/source
+++ b/ghost/core/content/themes/source
@@ -1 +1 @@
-Subproject commit ea08ce4e9dd6f67cdaae216bcc5b55a6490efc1d
+Subproject commit 61a511b229f3005856dadf625a24d697d5b07986
diff --git a/ghost/core/core/app.js b/ghost/core/core/app.js
index 3039aaf6f93..5a996f6d346 100644
--- a/ghost/core/core/app.js
+++ b/ghost/core/core/app.js
@@ -15,7 +15,7 @@ const isMaintenanceModeEnabled = (req) => {
 };
 
 // We never want middleware functions to be anonymous
-const maintenanceMiddleware = (req, res, next) => {
+const maintenanceMiddleware = function maintenanceMiddleware(req, res, next) {
     if (!isMaintenanceModeEnabled(req)) {
         return next();
     }
@@ -30,7 +30,9 @@ const maintenanceMiddleware = (req, res, next) => {
 const rootApp = () => {
     const app = express('root');
     app.use(sentry.requestHandler);
-
+    if (config.get('sentry')?.tracing?.enabled === true) {
+        app.use(sentry.tracingHandler);
+    }
     app.enable('maintenance');
     app.use(maintenanceMiddleware);
 
diff --git a/ghost/core/core/boot.js b/ghost/core/core/boot.js
index 3b7bfe6118a..bee8ed9b5a7 100644
--- a/ghost/core/core/boot.js
+++ b/ghost/core/core/boot.js
@@ -292,11 +292,8 @@ async function initAppService() {
  * Services are components that make up part of Ghost and need initializing on boot
  * These services should all be part of core, frontend services should be loaded with the frontend
  * We are working towards this being a service loader, with the ability to make certain services optional
- *
- * @param {object} options
- * @param {object} options.config
  */
-async function initServices({config}) {
+async function initServices() {
     debug('Begin: initServices');
 
     debug('Begin: Services');
@@ -330,6 +327,8 @@ async function initServices({config}) {
     const mailEvents = require('./server/services/mail-events');
     const donationService = require('./server/services/donations');
     const recommendationsService = require('./server/services/recommendations');
+    const emailAddressService = require('./server/services/email-address');
+    const statsService = require('./server/services/stats');
 
     const urlUtils = require('./shared/url-utils');
 
@@ -341,6 +340,9 @@ async function initServices({config}) {
     //       so they are initialized before it.
     await stripe.init();
 
+    // NOTE: newsletter service and email service depend on email address service
+    await emailAddressService.init(),
+
     await Promise.all([
         memberAttribution.init(),
         mentionsService.init(),
@@ -371,18 +373,49 @@ async function initServices({config}) {
         mediaInliner.init(),
         mailEvents.init(),
         donationService.init(),
-        recommendationsService.init()
+        recommendationsService.init(),
+        statsService.init()
     ]);
     debug('End: Services');
 
-    // Initialize analytics events
-    if (config.get('segment:key')) {
-        require('./server/services/segment').init();
-    }
-
     debug('End: initServices');
 }
 
+/**
+ * Set up an dependencies that need to be injected into NestJS
+ */
+async function initNestDependencies() {
+    debug('Begin: initNestDependencies');
+    const GhostNestApp = require('@tryghost/ghost');
+    const providers = [];
+    providers.push({
+        provide: 'logger',
+        useValue: require('@tryghost/logging')
+    }, {
+        provide: 'SessionService',
+        useValue: require('./server/services/auth/session').sessionService
+    }, {
+        provide: 'AdminAuthenticationService',
+        useValue: require('./server/services/auth/api-key').admin
+    }, {
+        provide: 'DomainEvents',
+        useValue: require('@tryghost/domain-events')
+    }, {
+        provide: 'SettingsCache',
+        useValue: require('./shared/settings-cache')
+    }, {
+        provide: 'knex',
+        useValue: require('./server/data/db').knex
+    }, {
+        provide: 'UrlUtils',
+        useValue: require('./shared/url-utils')
+    });
+    for (const provider of providers) {
+        GhostNestApp.addProvider(provider);
+    }
+    debug('End: initNestDependencies');
+}
+
 /**
  * Kick off recurring jobs and background services
  * These are things that happen on boot, but we don't need to wait for them to finish
@@ -415,6 +448,14 @@ async function initBackgroundServices({config}) {
     const milestonesService = require('./server/services/milestones');
     milestonesService.initAndRun();
 
+    // Ideally OpenTelemetry should be configured as early as possible
+    // However, it can take a long time to initialize, so we load it here
+    // This prevents open telemetry from impacting boot time at the cost of not being able to trace the boot process
+    debug('Begin: Load OpenTelemetry');
+    const opentelemetryInstrumentation = require('./shared/instrumentation');
+    opentelemetryInstrumentation.initOpenTelemetry({config});
+    debug('End: Load OpenTelemetry');
+
     debug('End: initBackgroundServices');
 }
 
@@ -479,7 +520,7 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
 
         // Sentry must be initialized early, but requires config
         debug('Begin: Load sentry');
-        require('./shared/sentry');
+        const sentry = require('./shared/sentry');
         debug('End: Load sentry');
 
         // Step 2 - Start server with minimal app in global maintenance mode
@@ -498,6 +539,10 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
         debug('Begin: Get DB ready');
         await initDatabase({config});
         bootLogger.log('database ready');
+        const connection = require('./server/data/db/connection');
+        sentry.initQueryTracing(
+            connection
+        );
         debug('End: Get DB ready');
 
         // Step 4 - Load Ghost with all its services
@@ -517,16 +562,19 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
 
         // TODO: move this to the correct place once we figure out where that is
         if (ghostServer) {
-            //  NOTE: changes in this labs setting requires server reboot since we don't re-init services after changes a labs flag
-            const websockets = require('./server/services/websockets');
-            await websockets.init(ghostServer);
-
             const lexicalMultiplayer = require('./server/services/lexical-multiplayer');
             await lexicalMultiplayer.init(ghostServer);
             await lexicalMultiplayer.enable();
         }
 
         await initServices({config});
+
+        // Gate the NestJS framework behind an env var to prevent it from being loaded (and slowing down boot)
+        // If we ever ship the new framework, we can remove this
+        // Using an env var because you can't use labs flags here
+        if (process.env.GHOST_ENABLE_NEST_FRAMEWORK) {
+            await initNestDependencies();
+        }
         debug('End: Load Ghost Services & Apps');
 
         // Step 5 - Mount the full Ghost app onto the minimal root app & disable maintenance mode
@@ -543,6 +591,11 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
         // Step 7 - Init our background services, we don't wait for this to finish
         initBackgroundServices({config});
 
+        // If we pass the env var, kill Ghost
+        if (process.env.GHOST_CI_SHUTDOWN_AFTER_BOOT) {
+            process.exit(0);
+        }
+
         // We return the server purely for testing purposes
         if (server) {
             debug('End Boot: Returning Ghost Server');
diff --git a/ghost/core/core/cli/generate-data.js b/ghost/core/core/cli/generate-data.js
index cd0f3cebb5a..496240f3b1f 100644
--- a/ghost/core/core/cli/generate-data.js
+++ b/ghost/core/core/cli/generate-data.js
@@ -1,15 +1,20 @@
+/* eslint-disable ghost/filenames/match-exported-class */
 const Command = require('./command');
 const DataGenerator = require('@tryghost/data-generator');
 const config = require('../shared/config');
 
+const schemaTables = require('../server/data/schema').tables;
+
 module.exports = class DataGeneratorCommand extends Command {
     setup() {
         this.help('Generates random data to populate the database for development & testing');
         this.argument('--base-data-pack', {type: 'string', defaultValue: '', desc: 'Base data pack file location, imported instead of random content'});
-        this.argument('--quantity', {type: 'number', desc: 'When importing a single table, the quantity to import'});
         this.argument('--clear-database', {type: 'boolean', defaultValue: false, desc: 'Clear all entries in the database before importing'});
         this.argument('--tables', {type: 'string', desc: 'Only import the specified list of tables, where quantities can be specified by appending a colon followed by the quantity for each table. Example: --tables=members:1000,posts,tags,members_login_events'});
+        this.argument('--quantities', {type: 'string', desc: 'Allows you to specify different default quantities for specific tables without affecting the tables that are generated. Example: --quantities=members:1000'});
         this.argument('--with-default', {type: 'boolean', defaultValue: false, desc: 'Include default tables as well as those specified (simply override quantities)'});
+        this.argument('--print-dependencies', {type: 'boolean', defaultValue: false, desc: 'Prints the dependency tree for the data generator and exits'});
+        this.argument('--seed', {type: 'number', defaultValue: '', desc: 'Use a seed to reliably generate the same data on multiple runs (timestamps will still change a little bit to remain up to date)'});
     }
 
     initializeContext(context) {
@@ -29,6 +34,8 @@ module.exports = class DataGeneratorCommand extends Command {
     }
 
     async handle(argv = {}) {
+        // If we can't stream, throw an error while creating the connection
+        process.env.REQUIRE_INFILE_STREAM = '1';
         const knex = require('../server/data/db/connection');
 
         const tables = (argv.tables ? argv.tables.split(',') : []).map(table => ({
@@ -36,6 +43,24 @@ module.exports = class DataGeneratorCommand extends Command {
             quantity: parseInt(table.split(':')[1]) || undefined
         }));
 
+        /**
+         * @type {Record<string, number>}
+         */
+        const quantities = {};
+
+        if (argv.quantities) {
+            for (const quantity of argv.quantities.split(',')) {
+                const [table, amount] = quantity.split(':');
+
+                if (amount === undefined || !isFinite(parseInt(amount))) {
+                    this.fatal(`Missing quantity for table ${table}`);
+                    return;
+                }
+
+                quantities[table] = parseInt(amount);
+            }
+        }
+
         const dataGenerator = new DataGenerator({
             baseDataPack: argv['base-data-pack'],
             knex,
@@ -51,7 +76,11 @@ module.exports = class DataGeneratorCommand extends Command {
             baseUrl: config.getSiteUrl(),
             clearDatabase: argv['clear-database'],
             tables,
-            withDefault: argv['with-default']
+            schemaTables,
+            withDefault: argv['with-default'],
+            printDependencies: argv['print-dependencies'],
+            quantities,
+            seed: argv.seed || undefined
         });
         try {
             await dataGenerator.importData();
diff --git a/ghost/core/core/frontend/apps/private-blogging/lib/middleware.js b/ghost/core/core/frontend/apps/private-blogging/lib/middleware.js
index 8912100f978..b02efb0f875 100644
--- a/ghost/core/core/frontend/apps/private-blogging/lib/middleware.js
+++ b/ghost/core/core/frontend/apps/private-blogging/lib/middleware.js
@@ -55,8 +55,7 @@ const privateBlogging = {
             name: 'ghost-private',
             maxAge: constants.ONE_MONTH_MS,
             signed: false,
-            sameSite: urlUtils.isSSL(config.get('url')) ? 'none' : 'lax',
-            secure: urlUtils.isSSL(config.get('url'))
+            sameSite: 'none'
         })(req, res, next);
     },
 
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/helpers/comment_count.js b/ghost/core/core/frontend/helpers/comment_count.js
index 337b0dcd2c1..99e5c0b244d 100644
--- a/ghost/core/core/frontend/helpers/comment_count.js
+++ b/ghost/core/core/frontend/helpers/comment_count.js
@@ -1,7 +1,9 @@
 const {SafeString} = require('../services/handlebars');
-const {html} = require('common-tags');
 
 module.exports = function commentCount(options) {
+    // Lazy require the dependency to keep boot fast
+    const {html} = require('common-tags');
+
     const empty = options.hash.empty === undefined ? '' : options.hash.empty;
     const singular = options.hash.singular === undefined ? 'comment' : options.hash.singular;
     const plural = options.hash.plural === undefined ? 'comments' : options.hash.plural;
diff --git a/ghost/core/core/frontend/helpers/excerpt.js b/ghost/core/core/frontend/helpers/excerpt.js
index f0f73aae239..27a037d19ff 100644
--- a/ghost/core/core/frontend/helpers/excerpt.js
+++ b/ghost/core/core/frontend/helpers/excerpt.js
@@ -23,6 +23,8 @@ module.exports = function excerpt(options) {
         excerptText = '';
     }
 
+    excerptText = _.escape(excerptText);
+
     truncateOptions = _.reduce(truncateOptions, (_truncateOptions, value, key) => {
         if (['words', 'characters'].includes(key)) {
             _truncateOptions[key] = parseInt(value, 10);
@@ -30,8 +32,9 @@ module.exports = function excerpt(options) {
         return _truncateOptions;
     }, {});
 
+    // For custom excerpts, make sure we truncate them only based on length
     if (!_.isEmpty(this.custom_excerpt)) {
-        truncateOptions.characters = this.custom_excerpt.length;
+        truncateOptions.characters = excerptText.length; // length is expanded by use of escaped characters
         if (truncateOptions.words) {
             delete truncateOptions.words;
         }
diff --git a/ghost/core/core/frontend/helpers/get.js b/ghost/core/core/frontend/helpers/get.js
index e682f3bd3a7..9373ee686cc 100644
--- a/ghost/core/core/frontend/helpers/get.js
+++ b/ghost/core/core/frontend/helpers/get.js
@@ -2,14 +2,16 @@
 // Usage: `{{#get "posts" limit="5"}}`, `{{#get "tags" limit="all"}}`
 // Fetches data from the API
 const {config, api, prepareContextResource} = require('../services/proxy');
-const {hbs} = require('../services/handlebars');
+const {hbs, SafeString} = require('../services/handlebars');
 
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
+const Sentry = require('@sentry/node');
 
 const _ = require('lodash');
 const jsonpath = require('jsonpath');
+const nqlLang = require('@tryghost/nql-lang');
 
 const messages = {
     mustBeCalledAsBlock: 'The {\\{{helperName}}} helper must be called as a block. E.g. {{#{helperName}}}...{{/{helperName}}}',
@@ -120,6 +122,84 @@ function parseOptions(globals, data, options) {
     return options;
 }
 
+function optimiseFilterCacheability(resource, options) {
+    const noOptimisation = {
+        options,
+        parseResult(result) {
+            return result;
+        }
+    };
+    if (resource !== 'posts') {
+        return noOptimisation;
+    }
+
+    if (!options.filter) {
+        return noOptimisation;
+    }
+
+    try {
+        if (options.filter.split('id:-').length !== 2) {
+            return noOptimisation;
+        }
+
+        const parsedFilter = nqlLang.parse(options.filter);
+        // Support either `id:blah` or `id:blah+other:stuff`
+        if (!parsedFilter.$and && !parsedFilter.id) {
+            return noOptimisation;
+        }
+        const queries = parsedFilter.$and || [parsedFilter];
+        const query = queries.find((q) => {
+            return q?.id?.$ne;
+        });
+
+        if (!query) {
+            return noOptimisation;
+        }
+
+        const idToFilter = query.id.$ne;
+
+        let limit = options.limit;
+        if (options.limit !== 'all') {
+            limit = options.limit ? 1 + parseInt(options.limit, 10) : 16;
+        }
+
+        // We replace with id:-null so we don't have to deal with leading/trailing AND operators
+        const filter = options.filter.replace(/id:-[a-f0-9A-F]{24}/, 'id:-null');
+
+        const parseResult = function parseResult(result) {
+            const filteredPosts = result?.posts?.filter((post) => {
+                return post.id !== idToFilter;
+            }) || [];
+
+            const modifiedResult = {
+                ...result,
+                posts: limit === 'all' ? filteredPosts : filteredPosts.slice(0, limit - 1)
+            };
+
+            modifiedResult.meta = modifiedResult.meta || {};
+            modifiedResult.meta.cacheabilityOptimisation = true;
+
+            if (typeof modifiedResult?.meta?.pagination?.limit === 'number') {
+                modifiedResult.meta.pagination.limit = modifiedResult.meta.pagination.limit - 1;
+            }
+
+            return modifiedResult;
+        };
+
+        return {
+            options: {
+                ...options,
+                limit,
+                filter
+            },
+            parseResult
+        };
+    } catch (err) {
+        logging.warn(err);
+        return noOptimisation;
+    }
+}
+
 /**
  *
  * @param {String} resource
@@ -130,6 +210,12 @@ function parseOptions(globals, data, options) {
  */
 async function makeAPICall(resource, controllerName, action, apiOptions) {
     const controller = api[controllerName];
+    let makeRequest = options => controller[action](options);
+
+    const {
+        options,
+        parseResult
+    } = optimiseFilterCacheability(resource, apiOptions);
 
     let timer;
 
@@ -140,7 +226,7 @@ async function makeAPICall(resource, controllerName, action, apiOptions) {
             const logLevel = config.get('optimization:getHelper:timeout:level') || 'error';
             const threshold = config.get('optimization:getHelper:timeout:threshold');
 
-            const apiResponse = controller[action](apiOptions);
+            const apiResponse = makeRequest(options).then(parseResult);
 
             const timeout = new Promise((resolve) => {
                 timer = setTimeout(() => {
@@ -153,14 +239,14 @@ async function makeAPICall(resource, controllerName, action, apiOptions) {
                         }
                     }));
 
-                    resolve({[resource]: []});
+                    resolve({[resource]: [], '@@ABORTED_GET_HELPER@@': true});
                 }, threshold);
             });
 
             response = await Promise.race([apiResponse, timeout]);
             clearTimeout(timer);
         } else {
-            response = await controller[action](apiOptions);
+            response = await makeRequest(options).then(parseResult);
         }
 
         return response;
@@ -206,32 +292,53 @@ module.exports = async function get(resource, options) {
 
     // Parse the options we're going to pass to the API
     apiOptions = parseOptions(ghostGlobals, this, apiOptions);
+    let apiOptionsString = Object.entries(apiOptions)
+        .map(([key, value]) => ` ${key}="${value}"`)
+        .join('');
     apiOptions.context = {member: data.member};
-
     try {
-        const response = await makeAPICall(resource, controllerName, action, apiOptions);
+        const spanName = `{{#get "${resource}"${apiOptionsString}}} ${data.member ? 'member' : 'public'}`;
+        const result = await Sentry.startSpan({
+            op: 'frontend.helpers.get',
+            name: spanName,
+            tags: {
+                resource,
+                ...apiOptions,
+                context: data.member ? 'member' : 'public'
+            }
+        }, async (span) => {
+            const response = await makeAPICall(resource, controllerName, action, apiOptions);
 
-        // prepare data properties for use with handlebars
-        if (response[resource] && response[resource].length) {
-            response[resource].forEach(prepareContextResource);
-        }
+            // prepare data properties for use with handlebars
+            if (response[resource] && response[resource].length) {
+                response[resource].forEach(prepareContextResource);
+            }
 
-        // used for logging details of slow requests
-        returnedRowsCount = response[resource] && response[resource].length;
+            // used for logging details of slow requests
+            returnedRowsCount = response[resource] && response[resource].length;
+            span?.setTag('returnedRows', returnedRowsCount);
 
-        // block params allows the theme developer to name the data using something like
-        // `{{#get "posts" as |result pageInfo|}}`
-        const blockParams = [response[resource]];
-        if (response.meta && response.meta.pagination) {
-            response.pagination = response.meta.pagination;
-            blockParams.push(response.meta.pagination);
-        }
+            // block params allows the theme developer to name the data using something like
+            // `{{#get "posts" as |result pageInfo|}}`
+            const blockParams = [response[resource]];
+            if (response.meta && response.meta.pagination) {
+                response.pagination = response.meta.pagination;
+                blockParams.push(response.meta.pagination);
+            }
 
-        // Call the main template function
-        return options.fn(response, {
-            data: data,
-            blockParams: blockParams
+            // Call the main template function
+            const rendered = options.fn(response, {
+                data: data,
+                blockParams: blockParams
+            });
+
+            if (response['@@ABORTED_GET_HELPER@@']) {
+                return new SafeString(`<span data-aborted-get-helper>Could not load content</span>` + rendered);
+            } else {
+                return rendered;
+            }
         });
+        return result;
     } catch (error) {
         logging.error(error);
         data.error = error.message;
@@ -250,10 +357,14 @@ module.exports = async function get(resource, options) {
                         apiOptions,
                         returnedRows: returnedRowsCount
                     }
-                }));
+                }), {
+                    time: totalMs
+                });
             }
         }
     }
 };
 
 module.exports.async = true;
+
+module.exports.optimiseFilterCacheability = optimiseFilterCacheability;
diff --git a/ghost/core/core/frontend/helpers/ghost_head.js b/ghost/core/core/frontend/helpers/ghost_head.js
index ea3b19fac5f..c8ffc9158b0 100644
--- a/ghost/core/core/frontend/helpers/ghost_head.js
+++ b/ghost/core/core/frontend/helpers/ghost_head.js
@@ -46,7 +46,7 @@ function finaliseStructuredData(meta) {
 
 function getMembersHelper(data, frontendKey) {
     // Do not load Portal if both Memberships and Tips & Donations are disabled
-    if (!settingsCache.get('members_enabled') && !(settingsCache.get('donations_enabled') && labs.isSet('tipsAndDonations'))) {
+    if (!settingsCache.get('members_enabled') && !settingsCache.get('donations_enabled')) {
         return '';
     }
 
@@ -141,6 +141,21 @@ function getWebmentionDiscoveryLink() {
     }
 }
 
+function getTinybirdTrackerScript(dataRoot) {
+    const scriptUrl = config.get('tinybird:tracker:scriptUrl');
+    const endpoint = config.get('tinybird:tracker:endpoint');
+    const token = config.get('tinybird:tracker:token');
+
+    const tbParams = _.map({
+        site_uuid: config.get('tinybird:tracker:id'),
+        post_uuid: dataRoot.post?.uuid,
+        member_uuid: dataRoot.member?.uuid,
+        member_status: dataRoot.member?.status
+    }, (value, key) => `tb_${key}="${value}"`).join(' ');
+
+    return `<script defer src="${scriptUrl}" data-host="${endpoint}" data-token="${token}" ${tbParams}></script>`;
+}
+
 /**
  * **NOTE**
  * Express adds `_locals`, see https://github.com/expressjs/express/blob/4.15.4/lib/response.js#L962.
@@ -296,6 +311,18 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                 head.push(`<script defer src="${getAssetUrl('public/member-attribution.min.js')}"></script>`);
             }
 
+            if (options.data.site.accent_color) {
+                const accentColor = escapeExpression(options.data.site.accent_color);
+                const styleTag = `<style>:root {--ghost-accent-color: ${accentColor};}</style>`;
+                const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/));
+
+                if (existingScriptIndex !== -1) {
+                    head[existingScriptIndex] = head[existingScriptIndex] + styleTag;
+                } else {
+                    head.push(styleTag);
+                }
+            }
+
             if (!_.isEmpty(globalCodeinjection)) {
                 head.push(globalCodeinjection);
             }
@@ -307,18 +334,9 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
             if (!_.isEmpty(tagCodeInjection)) {
                 head.push(tagCodeInjection);
             }
-        }
 
-        // AMP template has style injected directly because there can only be one <style amp-custom> tag
-        if (options.data.site.accent_color && !_.includes(context, 'amp')) {
-            const accentColor = escapeExpression(options.data.site.accent_color);
-            const styleTag = `<style>:root {--ghost-accent-color: ${accentColor};}</style>`;
-            const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/));
-
-            if (existingScriptIndex !== -1) {
-                head[existingScriptIndex] = head[existingScriptIndex] + styleTag;
-            } else {
-                head.push(styleTag);
+            if (config.get('tinybird') && config.get('tinybird:tracker') && config.get('tinybird:tracker:scriptUrl')) {
+                head.push(getTinybirdTrackerScript(dataRoot));
             }
         }
 
diff --git a/ghost/core/core/frontend/helpers/img_url.js b/ghost/core/core/frontend/helpers/img_url.js
index 1511a0b71e1..b95fc1962d7 100644
--- a/ghost/core/core/frontend/helpers/img_url.js
+++ b/ghost/core/core/frontend/helpers/img_url.js
@@ -7,19 +7,21 @@
 // Returns the URL for the current object scope i.e. If inside a post scope will return image permalink
 // `absolute` flag outputs absolute URL, else URL is relative.
 const {urlUtils} = require('../services/proxy');
+const {
+    detectInternalImage,
+    getImageWithSize,
+    getUnsplashImage,
+    detectUnsplashImage
+} = require('../utils/images');
 
-const url = require('url');
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
-const imageTransform = require('@tryghost/image-transform');
 
 const messages = {
     attrIsRequired: 'Attribute is required e.g. {{img_url feature_image}}'
 };
 
-const STATIC_IMAGE_URL_PREFIX = `${urlUtils.STATIC_IMAGE_URL_PREFIX}`;
-
 module.exports = function imgUrl(requestedImageUrl, options) {
     // CASE: if no url is passed, e.g. `{{img_url}}` we show a warning
     if (arguments.length < 2) {
@@ -46,7 +48,7 @@ module.exports = function imgUrl(requestedImageUrl, options) {
 
     if (!isInternalImage) {
         // Detect Unsplash width and format
-        const isUnsplashImage = /images\.unsplash\.com/.test(requestedImageUrl);
+        const isUnsplashImage = detectUnsplashImage(requestedImageUrl);
         if (isUnsplashImage) {
             try {
                 return getUnsplashImage(requestedImageUrl, sizeOptions);
@@ -99,95 +101,3 @@ function getImageSizeOptions(options) {
         requestedFormat
     };
 }
-
-function detectInternalImage(requestedImageUrl) {
-    const siteUrl = urlUtils.getSiteUrl();
-    const isAbsoluteImage = /https?:\/\//.test(requestedImageUrl);
-    const isAbsoluteInternalImage = isAbsoluteImage && requestedImageUrl.startsWith(siteUrl);
-
-    // CASE: imagePath is a "protocol relative" url e.g. "//www.gravatar.com/ava..."
-    //       by resolving the the imagePath relative to the blog url, we can then
-    //       detect if the imagePath is external, or internal.
-    const isRelativeInternalImage = !isAbsoluteImage && url.resolve(siteUrl, requestedImageUrl).startsWith(siteUrl);
-
-    return isAbsoluteInternalImage || isRelativeInternalImage;
-}
-
-function getUnsplashImage(imagePath, sizeOptions) {
-    const parsedUrl = new URL(imagePath);
-    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
-
-    if (requestedFormat) {
-        const supportedFormats = ['avif', 'gif', 'jpg', 'png', 'webp'];
-        if (supportedFormats.includes(requestedFormat)) {
-            parsedUrl.searchParams.set('fm', requestedFormat);
-        } else if (requestedFormat === 'jpeg') {
-            // Map to alias
-            parsedUrl.searchParams.set('fm', 'jpg');
-        }
-    }
-
-    if (!imageSizes || !imageSizes[requestedSize]) {
-        return parsedUrl.toString();
-    }
-
-    const {width, height} = imageSizes[requestedSize];
-
-    if (!width && !height) {
-        return parsedUrl.toString();
-    }
-
-    parsedUrl.searchParams.delete('w');
-    parsedUrl.searchParams.delete('h');
-
-    if (width) {
-        parsedUrl.searchParams.set('w', width);
-    }
-    if (height) {
-        parsedUrl.searchParams.set('h', height);
-    }
-    return parsedUrl.toString();
-}
-
-/**
- *
- * @param {string} imagePath
- * @param {Object} sizeOptions
- * @param {string} sizeOptions.requestedSize
- * @param {Object[]} sizeOptions.imageSizes
- * @param {string} [sizeOptions.requestedFormat]
- * @returns
- */
-function getImageWithSize(imagePath, sizeOptions) {
-    const hasLeadingSlash = imagePath[0] === '/';
-
-    if (hasLeadingSlash) {
-        return '/' + getImageWithSize(imagePath.slice(1), sizeOptions);
-    }
-    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
-
-    if (!requestedSize) {
-        return imagePath;
-    }
-
-    if (!imageSizes || !imageSizes[requestedSize]) {
-        return imagePath;
-    }
-
-    const {width, height} = imageSizes[requestedSize];
-
-    if (!width && !height) {
-        return imagePath;
-    }
-
-    const [imgBlogUrl, imageName] = imagePath.split(STATIC_IMAGE_URL_PREFIX);
-
-    const sizeDirectoryName = prefixIfPresent('w', width) + prefixIfPresent('h', height);
-    const formatPrefix = requestedFormat && imageTransform.canTransformToFormat(requestedFormat) ? `/format/${requestedFormat}` : '';
-
-    return [imgBlogUrl, STATIC_IMAGE_URL_PREFIX, `/size/${sizeDirectoryName}`, formatPrefix, imageName].join('');
-}
-
-function prefixIfPresent(prefix, string) {
-    return string ? prefix + string : '';
-}
diff --git a/ghost/core/core/frontend/helpers/t.js b/ghost/core/core/frontend/helpers/t.js
index 57fa2c40cf0..281c18c08c4 100644
--- a/ghost/core/core/frontend/helpers/t.js
+++ b/ghost/core/core/frontend/helpers/t.js
@@ -11,18 +11,11 @@
 // {{tags prefix=(t " on ")}}
 
 const {themeI18n} = require('../services/handlebars');
-const errors = require('@tryghost/errors');
-const tpl = require('@tryghost/tpl');
 
-const messages = {
-    oopsErrorTemplateHasError: 'Oops, seems there is an error in the template.'
-};
-
-module.exports = function t(text, options) {
-    if (text === undefined && options === undefined) {
-        throw new errors.IncorrectUsageError({
-            message: tpl(messages.oopsErrorTemplateHasError)
-        });
+module.exports = function t(text, options = {}) {
+    if (!text || text.length === 0) {
+        // no-op: translation key is missing, return an empty string
+        return '';
     }
 
     const bindings = {};
diff --git a/ghost/core/core/frontend/helpers/tpl/content-cta.hbs b/ghost/core/core/frontend/helpers/tpl/content-cta.hbs
index 643c11e9a5d..e7cfaeac9aa 100644
--- a/ghost/core/core/frontend/helpers/tpl/content-cta.hbs
+++ b/ghost/core/core/frontend/helpers/tpl/content-cta.hbs
@@ -11,10 +11,10 @@
             <h2>This {{#is "page"}}page{{else}}post{{/is}} is for subscribers on the {{tiers}} only </h2>
         {{/has}}
         {{#if @member}}
-            <a class="gh-btn" data-portal="account/plans" style="color:{{@site.accent_color}}">Upgrade your account</a>
+            <a class="gh-btn" data-portal="account/plans" href="#/portal/account/plans" style="color:{{@site.accent_color}}">Upgrade your account</a>
         {{else}}
-            <a class="gh-btn" data-portal="signup" style="color:{{@site.accent_color}}">Subscribe now</a>
-            <p><small>Already have an account? <a data-portal="signin">Sign in</a></small></p>
+            <a class="gh-btn" data-portal="signup" href="#/portal/signup" style="color:{{@site.accent_color}}">Subscribe now</a>
+            <p><small>Already have an account? <a data-portal="signin" href="#/portal/signin">Sign in</a></small></p>
         {{/if}}
     </div>
 </aside>
diff --git a/ghost/core/core/frontend/helpers/tpl/recommendations.hbs b/ghost/core/core/frontend/helpers/tpl/recommendations.hbs
index 2232c4675cd..e589d4e0960 100644
--- a/ghost/core/core/frontend/helpers/tpl/recommendations.hbs
+++ b/ghost/core/core/frontend/helpers/tpl/recommendations.hbs
@@ -3,7 +3,11 @@
         {{#each recommendations as |rec|}}
         <li class="recommendation">
             <a href="{{rec.url}}" data-recommendation="{{rec.id}}" target="_blank" rel="noopener">
-                <img class="recommendation-favicon" src="{{rec.favicon}}" alt="{{rec.title}}" loading="lazy">
+                <div class="recommendation-favicon">
+                    {{#if rec.favicon}}
+                        <img src="{{rec.favicon}}" alt="{{rec.title}}" loading="lazy" onerror="this.style.display='none';">
+                    {{/if}}
+                </div>
                 <h5 class="recommendation-title">{{rec.title}}</h5>
                 <span class="recommendation-url">{{readable_url rec.url}}</span>
                 <p class="recommendation-description">{{rec.description}}</p>
diff --git a/ghost/core/core/frontend/helpers/url.js b/ghost/core/core/frontend/helpers/url.js
index c99213f4a05..4e5e19103b3 100644
--- a/ghost/core/core/frontend/helpers/url.js
+++ b/ghost/core/core/frontend/helpers/url.js
@@ -7,7 +7,6 @@
 const {metaData} = require('../services/proxy');
 const {SafeString} = require('../services/handlebars');
 const logging = require('@tryghost/logging');
-const sentry = require('../../shared/sentry');
 const errors = require('@tryghost/errors');
 
 const {getMetaDataUrl} = metaData;
@@ -26,7 +25,6 @@ module.exports = function url(options) {
             message: `The url "${outputUrl}" couldn't be escaped correctly`,
             err: err
         });
-        sentry.captureException(error);
         logging.error(error);
 
         return new SafeString('');
diff --git a/ghost/core/core/frontend/meta/blog-logo.js b/ghost/core/core/frontend/meta/blog-logo.js
index e472b68be31..dd054ec8e3d 100644
--- a/ghost/core/core/frontend/meta/blog-logo.js
+++ b/ghost/core/core/frontend/meta/blog-logo.js
@@ -11,7 +11,7 @@ function getBlogLogo() {
         // CASE: no publication logo is updated. We can try to use either an uploaded publication icon
         // or use the default one to make
         // Google happy with it. See https://github.com/TryGhost/Ghost/issues/7558
-        logo.url = blogIcon.getIconUrl(true);
+        logo.url = blogIcon.getIconUrl({absolute: true});
     }
 
     return logo;
diff --git a/ghost/core/core/frontend/meta/context-object.js b/ghost/core/core/frontend/meta/context-object.js
index 8fc7638f524..bc1166b79c6 100644
--- a/ghost/core/core/frontend/meta/context-object.js
+++ b/ghost/core/core/frontend/meta/context-object.js
@@ -2,15 +2,6 @@ const settingsCache = require('../../shared/settings-cache');
 const _ = require('lodash');
 
 function getContextObject(data, context) {
-    /**
-     * If the data object does not contain the requested context, we return the fallback object.
-     */
-    const blog = {
-        cover_image: settingsCache.get('cover_image'),
-        twitter: settingsCache.get('twitter'),
-        facebook: settingsCache.get('facebook')
-    };
-
     let chosenContext;
 
     // @TODO: meta layer is very broken, it's really hard to understand what it's doing
@@ -31,9 +22,13 @@ function getContextObject(data, context) {
         chosenContext = data[context];
     }
 
-    // Super fallback.
+    // If the data object does not contain the requested context, we return the fallback object.
     if (!chosenContext) {
-        chosenContext = blog;
+        chosenContext = {
+            cover_image: settingsCache.get('cover_image'),
+            twitter: settingsCache.get('twitter'),
+            facebook: settingsCache.get('facebook')
+        };
     }
 
     return chosenContext;
diff --git a/ghost/core/core/frontend/meta/image-dimensions.js b/ghost/core/core/frontend/meta/image-dimensions.js
index cbd68706485..ef0cee0482e 100644
--- a/ghost/core/core/frontend/meta/image-dimensions.js
+++ b/ghost/core/core/frontend/meta/image-dimensions.js
@@ -1,4 +1,6 @@
 const _ = require('lodash');
+const {getImageWithSize} = require('../utils/images');
+const config = require('../../shared/config');
 const imageSizeCache = require('../../server/lib/image').cachedImageSizeFromUrl;
 
 /**
@@ -9,23 +11,28 @@ const imageSizeCache = require('../../server/lib/image').cachedImageSizeFromUrl;
  * called to receive image width and height
  */
 async function getImageDimensions(metaData) {
+    const MAX_SOCIAL_IMG_WIDTH = config.get('imageOptimization:internalImageSizes:social-image:width') || 1200;
+
     const fetch = {
         coverImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.coverImage.url),
         authorImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.authorImage.url),
         ogImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.ogImage.url),
+        twitterImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.twitterImage),
         logo: imageSizeCache.getCachedImageSizeFromUrl(metaData.site.logo.url)
     };
 
-    const [coverImage, authorImage, ogImage, logo] = await Promise.all([
+    const [coverImage, authorImage, ogImage, twitterImage, logo] = await Promise.all([
         fetch.coverImage,
         fetch.authorImage,
         fetch.ogImage,
+        fetch.twitterImage,
         fetch.logo
     ]);
     const imageObj = {
         coverImage,
         authorImage,
         ogImage,
+        twitterImage,
         logo
     };
 
@@ -53,12 +60,33 @@ async function getImageDimensions(metaData) {
                     });
                 }
             } else {
-                _.assign(metaData[value], {
-                    dimensions: {
-                        width: key.width,
-                        height: key.height
+                if (key.width > MAX_SOCIAL_IMG_WIDTH) {
+                    const ratio = key.height / key.width;
+                    key.width = MAX_SOCIAL_IMG_WIDTH;
+                    key.height = Math.round(MAX_SOCIAL_IMG_WIDTH * ratio);
+
+                    const sizeOptions = {
+                        requestedSize: `social-image`,
+                        imageSizes: config.get('imageOptimization:internalImageSizes')
+                    };
+
+                    if (typeof metaData[value] === 'string') {
+                        const url = getImageWithSize(metaData[value], sizeOptions);
+                        metaData[value] = url;
+                    } else {
+                        const url = getImageWithSize(metaData[value].url, sizeOptions);
+                        _.assign(metaData[value], {url});
                     }
-                });
+                }
+
+                if (typeof metaData[value] === 'object') {
+                    _.assign(metaData[value], {
+                        dimensions: {
+                            width: key.width,
+                            height: key.height
+                        }
+                    });
+                }
             }
         }
     });
diff --git a/ghost/core/core/frontend/meta/og-image.js b/ghost/core/core/frontend/meta/og-image.js
index 00f4d1d64a4..3aa0f14be38 100644
--- a/ghost/core/core/frontend/meta/og-image.js
+++ b/ghost/core/core/frontend/meta/og-image.js
@@ -5,7 +5,7 @@ const settingsCache = require('../../shared/settings-cache');
 
 function getOgImage(data) {
     const context = data.context ? data.context : null;
-    const contextObject = getContextObject(data, context, false);
+    const contextObject = getContextObject(data, context);
 
     if (_.includes(context, 'home')) {
         const imgUrl = settingsCache.get('og_image') || settingsCache.get('cover_image');
diff --git a/ghost/core/core/frontend/meta/twitter-image.js b/ghost/core/core/frontend/meta/twitter-image.js
index edcc2ea2d0d..60a86e1e04c 100644
--- a/ghost/core/core/frontend/meta/twitter-image.js
+++ b/ghost/core/core/frontend/meta/twitter-image.js
@@ -5,7 +5,7 @@ const settingsCache = require('../../shared/settings-cache');
 
 function getTwitterImage(data) {
     const context = data.context ? data.context : null;
-    const contextObject = getContextObject(data, context, false);
+    const contextObject = getContextObject(data, context);
 
     if (_.includes(context, 'home')) {
         const imgUrl = settingsCache.get('twitter_image') || settingsCache.get('cover_image');
diff --git a/ghost/core/core/frontend/public/ghost.css b/ghost/core/core/frontend/public/ghost.css
index f4d1c8a2a1c..d7c5428f2f7 100644
--- a/ghost/core/core/frontend/public/ghost.css
+++ b/ghost/core/core/frontend/public/ghost.css
@@ -656,6 +656,10 @@ h2 {
     background: linear-gradient(315deg,#efefef,#fff);
 }
 
+.gh-flow:has(.gh-flow-content.private) {
+    background: #fff;
+}
+
 .gh-flow-content-wrap {
     display: flex;
     flex-direction: column;
@@ -686,7 +690,7 @@ h2 {
     line-height: 1.5em;
     font-weight: 300;
     border-radius: 3px;
-    box-shadow: 
+    box-shadow:
         0 2.8px 2.2px rgba(0,0,0,.02),
         0 6.7px 5.3px rgba(0,0,0,.02),
         0 12.5px 10px rgba(0,0,0,.02),
@@ -704,6 +708,10 @@ h2 {
         text-align: center;
 }
 
+.gh-flow-content.private {
+    box-shadow: none;
+}
+
 @media (max-width: 500px) {
     .gh-flow-content {
         padding: 0;
@@ -820,6 +828,9 @@ h2 {
     padding: 12px 16px;
     font-size: 1.8rem;
     border-radius: 8px;
+    border: 1px solid #f3f6f7;
+    background: #f3f6f7;
+    color: var(--black);
 }
 
 .gh-signin .gh-input::placeholder {
@@ -846,7 +857,7 @@ h2 {
 
 .gh-signin .gh-input:focus {
     border-color: #30cf43;
-    box-shadow: 0 0 0 3px rgba(26,170,96,.15);
+    box-shadow: 0 0 0 3px rgba(48,207,67,.25);
 }
 
 .gh-signin .gh-btn {
diff --git a/ghost/core/core/frontend/public/robots.txt b/ghost/core/core/frontend/public/robots.txt
index 5895cc5cdaa..fe721db892a 100644
--- a/ghost/core/core/frontend/public/robots.txt
+++ b/ghost/core/core/frontend/public/robots.txt
@@ -1,6 +1,7 @@
 User-agent: *
 Sitemap: {{blog-url}}/sitemap.xml
 Disallow: /ghost/
-Disallow: /p/
 Disallow: /email/
+Disallow: /members/api/comments/counts/
 Disallow: /r/
+Disallow: /webmentions/receive/
diff --git a/ghost/core/core/frontend/services/rendering/renderer.js b/ghost/core/core/frontend/services/rendering/renderer.js
index d2072bec8e7..8396d95c386 100644
--- a/ghost/core/core/frontend/services/rendering/renderer.js
+++ b/ghost/core/core/frontend/services/rendering/renderer.js
@@ -1,6 +1,12 @@
+const path = require('path');
 const debug = require('@tryghost/debug')('services:routing:renderer:renderer');
+const {IncorrectUsageError} = require('@tryghost/errors');
 const setContext = require('./context');
 const templates = require('./templates');
+const tpl = require('@tryghost/tpl');
+const messages = {
+    couldNotReadFile: 'Could not read file {file}'
+};
 
 /**
  * @description Helper function to finally render the data.
@@ -26,5 +32,17 @@ module.exports = function renderer(req, res, data) {
     }
 
     // Render Call
-    res.render(res._template, data);
+    res.render(res._template, data, function (err, html) {
+        if (err) {
+            if (err.code === 'ENOENT') {
+                return req.next(
+                    new IncorrectUsageError({
+                        message: tpl(messages.couldNotReadFile, {file: path.basename(err.path)})
+                    })
+                );
+            }
+            return req.next(err);
+        }
+        res.send(html);
+    });
 };
diff --git a/ghost/core/core/frontend/services/routing/ParentRouter.js b/ghost/core/core/frontend/services/routing/ParentRouter.js
index e36e3721f2b..809092cf9de 100644
--- a/ghost/core/core/frontend/services/routing/ParentRouter.js
+++ b/ghost/core/core/frontend/services/routing/ParentRouter.js
@@ -56,7 +56,7 @@ class ParentRouter {
     /**
      * @description Helper function to find the site router in the express router stack.
      * @param {Object} req
-     * @returns {Express-Router}
+     * @returns {import('express').Router}
      * @private
      */
     _getSiteRouter(req) {
@@ -116,8 +116,8 @@ class ParentRouter {
 
     /**
      * @description Mount a router on a router (sub-routing)
-     * @param {String} path
-     * @param {Express-Router} router
+     * @param {String | import('express').Router} path
+     * @param {import('express').Router} [router]
      */
     mountRouter(path, router) {
         if (arguments.length === 1) {
diff --git a/ghost/core/core/frontend/services/routing/controllers/previews.js b/ghost/core/core/frontend/services/routing/controllers/previews.js
index 8769b999b65..d42f0efd255 100644
--- a/ghost/core/core/frontend/services/routing/controllers/previews.js
+++ b/ghost/core/core/frontend/services/routing/controllers/previews.js
@@ -49,10 +49,16 @@ module.exports = function previewController(req, res, next) {
                 return next();
             }
 
+            // published content should only resolve to /:slug - /p/:uuid is for drafts only in lieu of an actual preview api
             if (post.status === 'published') {
                 return urlUtils.redirect301(res, routerManager.getUrlByResourceId(post.id, {withSubdirectory: true}));
             }
 
+            // once an email-only post has been sent it shouldn't be available via /p/ to avoid leaking members-only content
+            if (post.status === 'sent') {
+                return urlUtils.redirect301(res, urlUtils.urlJoin('/email', post.uuid, '/'));
+            }
+
             post.access = !!post.html;
 
             return renderer.renderEntry(req, res)(post);
diff --git a/ghost/core/core/frontend/services/routing/controllers/unsubscribe.js b/ghost/core/core/frontend/services/routing/controllers/unsubscribe.js
index 0793066e0a4..2fee46760a6 100644
--- a/ghost/core/core/frontend/services/routing/controllers/unsubscribe.js
+++ b/ghost/core/core/frontend/services/routing/controllers/unsubscribe.js
@@ -2,8 +2,9 @@ const debug = require('@tryghost/debug')('services:routing:controllers:unsubscri
 const url = require('url');
 const members = require('../../../../server/services/members');
 const urlUtils = require('../../../../shared/url-utils');
-const labs = require('../../../../shared/labs');
 const logging = require('@tryghost/logging');
+const settingsHelpers = require('../../../../server/services/settings-helpers');
+const crypto = require('crypto');
 
 module.exports = async function unsubscribeController(req, res) {
     debug('unsubscribeController');
@@ -15,11 +16,22 @@ module.exports = async function unsubscribeController(req, res) {
         return res.end('Email address not found.');
     }
 
-    if (req.method === 'POST' && labs.isSet('listUnsubscribeHeader')) {
+    if (req.method === 'POST') {
         logging.info('[List-Unsubscribe] Received POST unsubscribe for ' + query.uuid + ', newsletter: ' + (query.newsletter ?? 'null') + ', comments: ' + (query.comments ?? 'false'));
 
         // Do an actual unsubscribe
         try {
+            if (!query.key) {
+                logging.warn('[List-Unsubscribe] Unsubscribe failed due to missing verification key for ' + query.uuid);
+                return res.status(400).end();
+            }
+            const membersKey = settingsHelpers.getMembersValidationKey();
+            const memberHmac = crypto.createHmac('sha256', membersKey).update(query.uuid).digest('hex');
+            if (memberHmac !== query.key) {
+                logging.warn('[List-Unsubscribe] Unsubscribe failed due to invalid key for ' + query.uuid);
+                return res.status(400).end();
+            }
+
             const member = await members.api.members.get({uuid: query.uuid}, {withRelated: ['newsletters']});
             if (member) {
                 if (query.comments) {
@@ -61,6 +73,9 @@ module.exports = async function unsubscribeController(req, res) {
     if (query.comments) {
         redirectUrl.searchParams.append('comments', query.comments);
     }
+    if (query.key) {
+        redirectUrl.searchParams.append('key', query.key);
+    }
     redirectUrl.searchParams.append('action', 'unsubscribe');
 
     return res.redirect(302, redirectUrl.href);
diff --git a/ghost/core/core/frontend/services/rss/cache.js b/ghost/core/core/frontend/services/rss/cache.js
index 531881b978b..ba619243008 100644
--- a/ghost/core/core/frontend/services/rss/cache.js
+++ b/ghost/core/core/frontend/services/rss/cache.js
@@ -1,5 +1,6 @@
 const crypto = require('crypto');
 const generateFeed = require('./generate-feed');
+const logging = require('@tryghost/logging');
 const feedCache = {};
 
 module.exports.getXML = function getFeedXml(baseUrl, data) {
@@ -10,6 +11,8 @@ module.exports.getXML = function getFeedXml(baseUrl, data) {
             hash: dataHash,
             xml: generateFeed(baseUrl, data)
         };
+    } else {
+        logging.info('[RSS] Serving from in-memory cache');
     }
 
     return feedCache[baseUrl].xml;
diff --git a/ghost/core/core/frontend/services/rss/renderer.js b/ghost/core/core/frontend/services/rss/renderer.js
index 9a15afc9185..ab6be75a632 100644
--- a/ghost/core/core/frontend/services/rss/renderer.js
+++ b/ghost/core/core/frontend/services/rss/renderer.js
@@ -9,7 +9,7 @@ module.exports.render = function render(res, baseUrl, data) {
     return rssCache
         .getXML(baseUrl, rssData)
         .then(function then(feedXml) {
-            res.set('Content-Type', 'text/xml; charset=UTF-8');
+            res.set('Content-Type', 'application/rss+xml; charset=UTF-8');
             res.send(feedXml);
         });
 };
diff --git a/ghost/core/core/frontend/services/theme-engine/active.js b/ghost/core/core/frontend/services/theme-engine/active.js
index be2e053ac70..34fa33bc867 100644
--- a/ghost/core/core/frontend/services/theme-engine/active.js
+++ b/ghost/core/core/frontend/services/theme-engine/active.js
@@ -112,7 +112,7 @@ class ActiveTheme {
         siteApp.cache = {};
         // Set the views and engine
         siteApp.set('views', this.path);
-        siteApp.engine('hbs', engine.configure(this.partialsPath));
+        siteApp.engine('hbs', engine.configure(this.partialsPath, this.path));
 
         this._mounted = true;
     }
diff --git a/ghost/core/core/frontend/services/theme-engine/engine.js b/ghost/core/core/frontend/services/theme-engine/engine.js
index c0c3e3b08ab..d59227654ac 100644
--- a/ghost/core/core/frontend/services/theme-engine/engine.js
+++ b/ghost/core/core/frontend/services/theme-engine/engine.js
@@ -9,12 +9,13 @@ if (config.get('env') !== 'production') {
 
 instance.escapeExpression = instance.handlebars.Utils.escapeExpression;
 
-instance.configure = function configure(partialsPath) {
+instance.configure = function configure(partialsPath, themePath) {
     const hbsOptions = {
         partialsDir: [config.get('paths').helperTemplates],
         onCompile: function onCompile(exhbs, source) {
             return exhbs.handlebars.compile(source, {preventIndent: true});
-        }
+        },
+        restrictLayoutsTo: themePath
     };
 
     if (partialsPath) {
diff --git a/ghost/core/core/frontend/services/theme-engine/i18n/I18n.js b/ghost/core/core/frontend/services/theme-engine/i18n/I18n.js
index 01a0695df98..a6287fc47b3 100644
--- a/ghost/core/core/frontend/services/theme-engine/i18n/I18n.js
+++ b/ghost/core/core/frontend/services/theme-engine/i18n/I18n.js
@@ -14,9 +14,9 @@ const get = require('lodash/get');
 class I18n {
     /**
      * @param {object} [options]
-     * @param {string} basePath - the base path to the translations directory
-     * @param {string} [locale] - a locale string
-     * @param {{dot|fulltext}} [stringMode] - which mode our translation keys use
+     * @param {string} options.basePath - the base path to the translations directory
+     * @param {string} [options.locale] - a locale string
+     * @param {string} [options.stringMode] - which mode our translation keys use
      */
     constructor(options = {}) {
         this._basePath = options.basePath || __dirname;
@@ -100,7 +100,7 @@ class I18n {
     /**
      * Attempt to load strings from a file
      *
-     * @param {sting} [locale]
+     * @param {string} [locale]
      * @returns {object} strings
      */
     _loadStrings(locale) {
@@ -110,7 +110,7 @@ class I18n {
             return this._readTranslationsFile(locale);
         } catch (err) {
             if (err.code === 'ENOENT') {
-                this._handleMissingFileError(locale, err);
+                this._handleMissingFileError(locale);
 
                 if (locale !== this.defaultLocale()) {
                     this._handleFallbackToDefault();
@@ -165,7 +165,7 @@ class I18n {
         let matchingString;
 
         // no path? no string
-        if (msgPath.length === 0 || !isString(msgPath)) {
+        if (!msgPath || msgPath.length === 0 || !isString(msgPath)) {
             this._handleEmptyKeyError();
             return '';
         }
@@ -207,7 +207,7 @@ class I18n {
      */
     _readTranslationsFile(locale) {
         const filePath = path.join(...this._translationFileDirs(), this._translationFileName(locale));
-        const content = fs.readFileSync(filePath);
+        const content = fs.readFileSync(filePath, 'utf8');
         return JSON.parse(content);
     }
 
@@ -276,6 +276,7 @@ class I18n {
     _handleMissingFileError(locale) {
         logging.warn(`i18n was unable to find ${locale}.json.`);
     }
+
     _handleInvalidFileError(locale, err) {
         logging.error(new errors.IncorrectUsageError({
             err,
diff --git a/ghost/core/core/frontend/services/theme-engine/i18n/ThemeI18n.js b/ghost/core/core/frontend/services/theme-engine/i18n/ThemeI18n.js
index a8e66d683ed..4df8fa1a854 100644
--- a/ghost/core/core/frontend/services/theme-engine/i18n/ThemeI18n.js
+++ b/ghost/core/core/frontend/services/theme-engine/i18n/ThemeI18n.js
@@ -4,9 +4,9 @@ const I18n = require('./I18n');
 
 class ThemeI18n extends I18n {
     /**
-     * @param {objec} [options]
-     * @param {string} basePath - the base path for the translation directory (e.g. where themes live)
-     * @param {string} [locale] - a locale string
+     * @param {object} [options]
+     * @param {string} options.basePath - the base path for the translation directory (e.g. where themes live)
+     * @param {string} [options.locale] - a locale string
      */
     constructor(options = {}) {
         super(options);
@@ -48,6 +48,7 @@ class ThemeI18n extends I18n {
             logging.warn(`Theme translations file locales/${locale}.json not found.`);
         }
     }
+
     _handleInvalidFileError(locale, err) {
         logging.error(new errors.IncorrectUsageError({
             err,
diff --git a/ghost/core/core/frontend/src/cards/css/audio.css b/ghost/core/core/frontend/src/cards/css/audio.css
index 05df0afe145..4c735c0c2a3 100644
--- a/ghost/core/core/frontend/src/cards/css/audio.css
+++ b/ghost/core/core/frontend/src/cards/css/audio.css
@@ -7,8 +7,12 @@
     display: flex;
     width: 100%;
     min-height: 96px;
-    border-radius: 3px;
+    border-radius: 6px;
+    padding: 4px;
+    background: #fff;
+    color: #222;
     box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-audio-card+.kg-audio-card {
@@ -25,7 +29,7 @@
     background: transparent;
     object-fit: cover;
     aspect-ratio: 1/1;
-    border-radius: 2px;
+    border-radius: 3px;
 }
 
 .kg-audio-thumbnail.placeholder {
@@ -55,8 +59,8 @@
     padding: 8px 12px;
     border: none;
     font-family: inherit;
-    font-size: 1.15em;
-    font-weight: 700;
+    font-size: 16px;
+    font-weight: 600;
     line-height: 1.15em;
     background: transparent;
 }
@@ -72,9 +76,9 @@
     min-width: 38px;
     padding: 0 4px;
     font-family: inherit;
-    font-size: .85em;
+    font-size: 12.5px;
     font-weight: 500;
-    line-height: 1.4em;
+    line-height: 1em;
     white-space: nowrap;
 }
 
@@ -82,9 +86,9 @@
     width: 56px;
     color: #ababab;
     font-family: inherit;
-    font-size: .85em;
+    font-size: 12.5px;
     font-weight: 500;
-    line-height: 1.4em;
+    line-height: 1em;
     white-space: nowrap;
 }
 
@@ -127,9 +131,9 @@
     min-width: 37px;
     padding: 0 4px;
     font-family: inherit;
-    font-size: .85em;
+    font-size: 12.5px;
     font-weight: 600;
-    line-height: 1.4em;
+    line-height: 1em;
     text-align: left;
     background: transparent;
     white-space: nowrap;
diff --git a/ghost/core/core/frontend/src/cards/css/bookmark.css b/ghost/core/core/frontend/src/cards/css/bookmark.css
index 818308f6332..acb4a6b04c6 100644
--- a/ghost/core/core/frontend/src/cards/css/bookmark.css
+++ b/ghost/core/core/frontend/src/cards/css/bookmark.css
@@ -12,11 +12,12 @@
 .kg-bookmark-card a.kg-bookmark-container,
 .kg-bookmark-card a.kg-bookmark-container:hover {
     display: flex;
+    background: #fff;
     text-decoration: none;
-    border-radius: 3px;
+    border-radius: 6px;
     border: 1px solid rgb(124 139 154 / 25%);
     overflow: hidden;
-    color: inherit;
+    color: #222;
 }
 
 .kg-bookmark-content {
@@ -28,17 +29,18 @@
     justify-content: flex-start;
     padding: 20px;
     overflow: hidden;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-bookmark-title {
-    font-size: 1.5rem;
+    font-size: 15px;
     line-height: 1.4em;
     font-weight: 600;
 }
 
 .kg-bookmark-description {
     display: -webkit-box;
-    font-size: 1.4rem;
+    font-size: 14px;
     line-height: 1.5em;
     margin-top: 3px;
     font-weight: 400;
@@ -54,7 +56,7 @@
     align-items: center;
     margin-top: 22px;
     width: 100%;
-    font-size: 1.4rem;
+    font-size: 14px;
     font-weight: 500;
     white-space: nowrap;
 }
diff --git a/ghost/core/core/frontend/src/cards/css/file.css b/ghost/core/core/frontend/src/cards/css/file.css
index 2ebbb1d8152..75774cca7d9 100644
--- a/ghost/core/core/frontend/src/cards/css/file.css
+++ b/ghost/core/core/frontend/src/cards/css/file.css
@@ -12,13 +12,16 @@
     align-items: stretch;
     justify-content: space-between;
     color: inherit;
-    padding: 6px;
+    padding: 12px;
     min-height: 92px;
+    background: #fff;
+    color: #222;
     border: 1px solid rgb(124 139 154 / 25%);
-    border-radius: 3px;
+    border-radius: 5px;
     transition: all ease-in-out 0.35s;
     text-decoration: none;
     width: 100%;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-file-card a.kg-file-card-container:hover {
@@ -34,26 +37,27 @@
 }
 
 .kg-file-card-title {
-    font-size: 1.15em;
-    font-weight: 700;
+    font-size: 16px;
+    font-weight: 600;
     line-height: 1.3em;
 }
 
 .kg-file-card-caption {
-    font-size: 0.95em;
+    font-size: 14px;
     line-height: 1.3em;
-    opacity: 0.6;
+    opacity: 0.7;
 }
 
 .kg-file-card-title + .kg-file-card-caption {
-    margin-top: -3px;
+    flex-grow: 1;
+    margin-top: 3px;
 }
 
 .kg-file-card-metadata {
     display: inline;
-    font-size: 0.825em;
+    font-size: 14px;
     line-height: 1.3em;
-    margin-top: 2px;
+    margin-top: 5px;
 }
 
 .kg-file-card-filename {
@@ -63,14 +67,15 @@
 
 .kg-file-card-filesize {
     display: inline-block;
-    font-size: 0.925em;
+    font-size: 14px;
     opacity: 0.6;
 }
 
 .kg-file-card-filesize:before {
     display: inline-block;
     content: "\2022";
-    margin-right: 4px;
+    margin-left: 6px;
+    margin-right: 6px;
 }
 
 .kg-file-card-icon {
@@ -81,6 +86,7 @@
     width: 80px;
     min-width: 80px;
     height: 100%;
+    min-height: 80px;
 }
 
 .kg-file-card-icon:before {
@@ -94,7 +100,7 @@
     background: currentColor;
     opacity: 0.06;
     transition: opacity ease-in-out 0.35s;
-    border-radius: 2px;
+    border-radius: 3px;
 }
 
 .kg-file-card a.kg-file-card-container:hover .kg-file-card-icon:before {
@@ -123,7 +129,7 @@
 }
 
 .kg-file-card-small .kg-file-card-metadata {
-    font-size: 1.0em;
+    font-size: 14px;
     margin-top: 0;
 }
 
@@ -134,4 +140,4 @@
 
 .kg-file-card + .kg-file-card {
     margin-top: 1em;
-}
\ No newline at end of file
+}
diff --git a/ghost/core/core/frontend/src/cards/css/header_v2.css b/ghost/core/core/frontend/src/cards/css/header_v2.css
index 209f4b6ddfa..ef5a9a1c7e3 100644
--- a/ghost/core/core/frontend/src/cards/css/header_v2.css
+++ b/ghost/core/core/frontend/src/cards/css/header_v2.css
@@ -104,7 +104,7 @@
 
 .kg-content-wide .kg-header-card-content .kg-header-card-image {
     height: 100%;
-    padding: 8rem 0;
+    padding: 5.6em 0;
     object-fit: contain;
 }
 
@@ -112,22 +112,22 @@
 
 .kg-header-card h2.kg-header-card-heading {
     margin: 0;
-    font-size: clamp(2.4rem, 4vw, 3.6rem);
+    font-size: clamp(1.7em, 4vw, 2.5em);
     font-weight: 700;
-    line-height: 1em;
+    line-height: 1.05em;
     letter-spacing: -0.01em;
 }
 
 .kg-header-card.kg-width-wide h2.kg-header-card-heading {
-    font-size: clamp(2.4rem, 5vw, 4.8rem);
+    font-size: clamp(1.7em, 5vw, 3.3em);
 }
 
 .kg-header-card.kg-width-full h2.kg-header-card-heading {
-    font-size: clamp(2.8rem, 5.6vw, 6rem);
+    font-size: clamp(1.9em, 5.6vw, 4.2em);
 }
 
 .kg-header-card.kg-width-full.kg-layout-split h2.kg-header-card-heading {
-    font-size: clamp(2.8rem, 4vw, 4.8rem);
+    font-size: clamp(1.9em, 4vw, 3.3em);
 }
 
 /* Subheading */
@@ -139,7 +139,7 @@
 .kg-header-card .kg-header-card-subheading {
     max-width: 40em;
     margin: 0;
-    font-size: clamp(1.05em, 2vw, 2rem);
+    font-size: clamp(1.05em, 2vw, 1.4em);
     font-weight: 500;
     line-height: 1.2em;
 }
@@ -153,23 +153,24 @@
 }
 
 .kg-header-card.kg-width-wide .kg-header-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.2rem);
+    font-size: clamp(1.05em, 2vw, 1.55em);
 }
 
 .kg-header-card.kg-width-full .kg-header-card-subheading:not(.kg-layout-split .kg-header-card-subheading) {
     max-width: min(65vmax, 1200px);
-    font-size: clamp(1.05em, 2vw, 2.4rem);
+    font-size: clamp(1.05em, 2vw, 1.7em);
 }
 
 .kg-header-card.kg-width-full.kg-layout-split .kg-header-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.2rem);
+    font-size: clamp(1.05em, 2vw, 1.55em);
 }
 
 .kg-header-card.kg-v2 .kg-header-card-button {
     display: flex;
     position: relative;
     align-items: center;
-    height: 4.6rem;
+    height: 2.9em;
+    min-height: 46px;
     padding: 0 1.2em;
     outline: none;
     border: none;
@@ -243,15 +244,15 @@
     }
 
     .kg-content-wide .kg-header-card-content .kg-header-card-image {
-        padding: 2.4rem 0 0;
+        padding: 1.7em 0 0;
     }
 
     .kg-content-wide.kg-swapped .kg-header-card-content .kg-header-card-image {
-        padding: 0 0 2.4rem;
+        padding: 0 0 1.7em;
     }
 
     .kg-header-card.kg-v2 .kg-header-card-button {
-        height: 4.2rem;
+        height: 2.9em;
     }
 
     .kg-header-card.kg-v2.kg-width-wide .kg-header-card-button,
diff --git a/ghost/core/core/frontend/src/cards/css/product.css b/ghost/core/core/frontend/src/cards/css/product.css
index e7c480365fb..88debe02c71 100644
--- a/ghost/core/core/frontend/src/cards/css/product.css
+++ b/ghost/core/core/frontend/src/cards/css/product.css
@@ -19,8 +19,11 @@
     max-width: 550px;
     padding: 20px;
     width: 100%;
+    background: #fff;
+    color: #222;
     border-radius: 5px;
     box-shadow: inset 0 0 0 1px rgb(124 139 154 / 25%);
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-product-card-image {
@@ -34,10 +37,9 @@
 }
 
 .kg-product-card h4.kg-product-card-title {
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
     text-decoration: none;
-    font-weight: 700;
-    font-size: 1.4em;
+    font-weight: 600;
+    font-size: 21px;
     margin-top: 0;
     margin-bottom: 0;
     line-height: 1.15em;
@@ -50,8 +52,7 @@
 .kg-product-card .kg-product-card-description p,
 .kg-product-card .kg-product-card-description ol,
 .kg-product-card .kg-product-card-description ul {
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-    font-size: 0.95em;
+    font-size: 14px;
     line-height: 1.5em;
     opacity: .7;
     margin-bottom: 0;
@@ -94,7 +95,7 @@
 }
 
 .kg-product-card-rating-star {
-    height: 28px;
+    height: 20px;
     width: 20px;
 }
 
@@ -115,15 +116,14 @@
     display: flex;
     position: static;
     align-items: center;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-    font-size: 0.95em;
+    font-size: 14px;
     font-weight: 600;
     line-height: 1em;
     text-decoration: none;
     width: 100%;
-    height: 2.4em;
-    border-radius: 5px;
-    padding: 0 1.2em;
+    height: 38px;
+    border-radius: 6px;
+    padding: 0 12px;
     transition: opacity 0.2s ease-in-out;
 }
 
diff --git a/ghost/core/core/frontend/src/cards/css/signup.css b/ghost/core/core/frontend/src/cards/css/signup.css
index 5817472a2d2..264fa79d8bf 100644
--- a/ghost/core/core/frontend/src/cards/css/signup.css
+++ b/ghost/core/core/frontend/src/cards/css/signup.css
@@ -97,7 +97,7 @@
 
 .kg-content-wide .kg-signup-card-content .kg-signup-card-image {
     height: 100%;
-    padding: 8rem 0;
+    padding: 5.6em 0;
     object-fit: contain;
 }
 
@@ -105,22 +105,22 @@
 
 .kg-signup-card h2.kg-signup-card-heading {
     margin: 0;
-    font-size: clamp(2.4rem, 4vw, 3.6rem);
+    font-size: clamp(1.7em, 4vw, 2.5em);
     font-weight: 700;
-    line-height: 1em;
+    line-height: 1.05em;
     letter-spacing: -0.01em;
 }
 
 .kg-signup-card.kg-width-wide h2.kg-signup-card-heading {
-    font-size: clamp(2.4rem, 5vw, 4.8rem);
+    font-size: clamp(1.7em, 5vw, 3.3em);
 }
 
 .kg-signup-card.kg-width-full h2.kg-signup-card-heading {
-    font-size: clamp(2.8rem, 5.6vw, 6rem);
+    font-size: clamp(1.9em, 5.6vw, 4.2em);
 }
 
 .kg-signup-card.kg-width-full.kg-layout-split h2.kg-signup-card-heading {
-    font-size: clamp(2.8rem, 4vw, 4.8rem);
+    font-size: clamp(1.9em, 4vw, 3.3em);
 }
 
 /* Subheading */
@@ -132,7 +132,7 @@
 .kg-signup-card .kg-signup-card-subheading {
     max-width: 40em;
     margin: 0;
-    font-size: clamp(1.05em, 2vw, 2rem);
+    font-size: clamp(1.05em, 2vw, 1.4em);
     font-weight: 500;
     line-height: 1.2em;
 }
@@ -146,16 +146,16 @@
 }
 
 .kg-signup-card.kg-width-wide .kg-signup-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.2rem);
+    font-size: clamp(1.05em, 2vw, 1.55em);
 }
 
 .kg-signup-card.kg-width-full .kg-signup-card-subheading:not(.kg-layout-split .kg-signup-card-subheading) {
     max-width: min(65vmax, 1200px);
-    font-size: clamp(1.05em, 2vw, 2.4rem);
+    font-size: clamp(1.05em, 2vw, 1.7em);
 }
 
 .kg-signup-card.kg-width-full.kg-layout-split .kg-signup-card-subheading {
-    font-size: clamp(1.05em, 2vw, 2.2rem);
+    font-size: clamp(1.05em, 2vw, 1.55em);
 }
 
 /* Subscribe form */
@@ -203,7 +203,8 @@
 
 .kg-signup-card-input {
     width: 100%;
-    height: 4.6rem;
+    height: 2.9em;
+    min-height: 46px;
     margin: 0 3px 0 0;
     padding: 12px 16px;
     border: none;
@@ -220,7 +221,8 @@
     display: flex;
     position: relative;
     align-items: center;
-    height: 4.6rem;
+    height: 2.9em;
+    min-height: 46px;
     padding: 0 1.2em;
     outline: none;
     border: none;
@@ -355,21 +357,21 @@
     }
 
     .kg-content-wide .kg-signup-card-content .kg-signup-card-image {
-        padding: 2.4rem 0 0;
+        padding: 1.7em 0 0;
     }
 
     .kg-content-wide.kg-swapped .kg-signup-card-content .kg-signup-card-image {
-        padding: 0 0 2.4rem;
+        padding: 0 0 1.7em;
     }
 
     .kg-signup-card-input {
-        height: 4.2rem;
+        height: 2.9em;
         padding: 6px 12px;
         font-size: 1em;
     }
 
     .kg-signup-card-button {
-        height: 4.2rem;
+        height: 2.9em;
     }
 
     .kg-signup-card.kg-width-wide .kg-signup-card-button,
diff --git a/ghost/core/core/frontend/src/cards/css/toggle.css b/ghost/core/core/frontend/src/cards/css/toggle.css
index 075834ccf2c..29d98c1c50d 100644
--- a/ghost/core/core/frontend/src/cards/css/toggle.css
+++ b/ghost/core/core/frontend/src/cards/css/toggle.css
@@ -70,8 +70,10 @@
     justify-content: center;
     align-items: center;
     margin-left: 1em;
+    padding: 0;
     background: none;
     border: 0;
+    cursor: pointer;
 }
 
 .kg-toggle-heading svg {
@@ -92,4 +94,4 @@
 
 .kg-toggle-card + .kg-toggle-card {
     margin-top: 1em;
-}
\ No newline at end of file
+}
diff --git a/ghost/core/core/frontend/src/cards/css/video.css b/ghost/core/core/frontend/src/cards/css/video.css
index 3d0247b9f10..e3ddd5c797c 100644
--- a/ghost/core/core/frontend/src/cards/css/video.css
+++ b/ghost/core/core/frontend/src/cards/css/video.css
@@ -82,7 +82,7 @@
     padding: 0 4px;
     color: #fff;
     font-family: inherit;
-    font-size: .85em;
+    font-size: 12.5px;
     font-weight: 500;
     line-height: 1.4em;
     white-space: nowrap;
@@ -91,7 +91,7 @@
 .kg-video-time {
     color: rgba(255, 255, 255, 0.6);
     font-family: inherit;
-    font-size: .85em;
+    font-size: 12.5px;
     font-weight: 500;
     line-height: 1.4em;
     white-space: nowrap;
@@ -142,7 +142,7 @@
     padding: 0 4px;
     color: #fff;
     font-family: inherit;
-    font-size: .85em;
+    font-size: 12.5px;
     font-weight: 600;
     line-height: 1.4em;
     text-align: left;
diff --git a/ghost/core/core/frontend/src/member-attribution/member-attribution.js b/ghost/core/core/frontend/src/member-attribution/member-attribution.js
index 6cd8c16eebc..72223d661f2 100644
--- a/ghost/core/core/frontend/src/member-attribution/member-attribution.js
+++ b/ghost/core/core/frontend/src/member-attribution/member-attribution.js
@@ -76,6 +76,8 @@ const LIMIT = 15;
         let sourceParam;
         let utmSourceParam;
         let utmMediumParam;
+        let referrerSource;
+
         try {
             // Fetch source/medium from query param
             const url = new URL(window.location.href);
@@ -83,11 +85,23 @@ const LIMIT = 15;
             sourceParam = url.searchParams.get('source');
             utmSourceParam = url.searchParams.get('utm_source');
             utmMediumParam = url.searchParams.get('utm_medium');
+
+            referrerSource = refParam || sourceParam || utmSourceParam || null;
+
+            // if referrerSource is not set, check to see if the url contains a hash like ghost.org/#/portal/signup?ref=ghost and pull the ref from the hash
+            if (!referrerSource && url.hash && url.hash.includes('#/portal')) {
+                const hashUrl = new URL(window.location.href.replace('/#/portal', ''));
+                refParam = hashUrl.searchParams.get('ref');
+                sourceParam = hashUrl.searchParams.get('source');
+                utmSourceParam = hashUrl.searchParams.get('utm_source');
+                utmMediumParam = hashUrl.searchParams.get('utm_medium');
+    
+                referrerSource = refParam || sourceParam || utmSourceParam || null;
+            }
         } catch (e) {
             console.error('[Member Attribution] Parsing referrer from querystring failed', e);
         }
 
-        const referrerSource = refParam || sourceParam || utmSourceParam || null;
         const referrerMedium = utmMediumParam || null;
         const referrerUrl = window.document.referrer || null;
 
diff --git a/ghost/core/core/frontend/utils/images.js b/ghost/core/core/frontend/utils/images.js
new file mode 100644
index 00000000000..d5e14acd905
--- /dev/null
+++ b/ghost/core/core/frontend/utils/images.js
@@ -0,0 +1,104 @@
+const url = require('url');
+const imageTransform = require('@tryghost/image-transform');
+const urlUtils = require('../../shared/url-utils');
+
+module.exports.detectInternalImage = function detectInternalImage(requestedImageUrl) {
+    const siteUrl = urlUtils.getSiteUrl();
+    const isAbsoluteImage = /https?:\/\//.test(requestedImageUrl);
+    const isAbsoluteInternalImage = isAbsoluteImage && requestedImageUrl.startsWith(siteUrl);
+
+    // CASE: imagePath is a "protocol relative" url e.g. "//www.gravatar.com/ava..."
+    //       by resolving the the imagePath relative to the blog url, we can then
+    //       detect if the imagePath is external, or internal.
+    const isRelativeInternalImage = !isAbsoluteImage && url.resolve(siteUrl, requestedImageUrl).startsWith(siteUrl);
+
+    return isAbsoluteInternalImage || isRelativeInternalImage;
+};
+
+module.exports.detectUnsplashImage = function detectUnsplashImage(requestedImageUrl) {
+    const isUnsplashImage = /images\.unsplash\.com/.test(requestedImageUrl);
+    return isUnsplashImage;
+};
+
+module.exports.getUnsplashImage = function getUnsplashImage(imagePath, sizeOptions) {
+    const parsedUrl = new URL(imagePath);
+    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
+
+    if (requestedFormat) {
+        const supportedFormats = ['avif', 'gif', 'jpg', 'png', 'webp'];
+        if (supportedFormats.includes(requestedFormat)) {
+            parsedUrl.searchParams.set('fm', requestedFormat);
+        } else if (requestedFormat === 'jpeg') {
+            // Map to alias
+            parsedUrl.searchParams.set('fm', 'jpg');
+        }
+    }
+
+    if (!imageSizes || !imageSizes[requestedSize]) {
+        return parsedUrl.toString();
+    }
+
+    const {width, height} = imageSizes[requestedSize];
+
+    if (!width && !height) {
+        return parsedUrl.toString();
+    }
+
+    parsedUrl.searchParams.delete('w');
+    parsedUrl.searchParams.delete('h');
+
+    if (width) {
+        parsedUrl.searchParams.set('w', width);
+    }
+    if (height) {
+        parsedUrl.searchParams.set('h', height);
+    }
+    return parsedUrl.toString();
+};
+
+/**
+ *
+ * @param {string} imagePath
+ * @param {Object} sizeOptions
+ * @param {string} sizeOptions.requestedSize
+ * @param {Object[]} sizeOptions.imageSizes
+ * @param {string} [sizeOptions.requestedFormat]
+ * @returns
+ */
+module.exports.getImageWithSize = function getImageWithSize(imagePath, sizeOptions) {
+    const hasLeadingSlash = imagePath[0] === '/';
+
+    if (hasLeadingSlash) {
+        return '/' + getImageWithSize(imagePath.slice(1), sizeOptions);
+    }
+    const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
+
+    if (!requestedSize) {
+        return imagePath;
+    }
+
+    if (!imageSizes || !imageSizes[requestedSize]) {
+        return imagePath;
+    }
+
+    const {width, height} = imageSizes[requestedSize];
+
+    if (!width && !height) {
+        return imagePath;
+    }
+
+    const [imgBlogUrl, imageName] = imagePath.split(urlUtils.STATIC_IMAGE_URL_PREFIX);
+
+    const sizeDirectoryName = prefixIfPresent('w', width) + prefixIfPresent('h', height);
+    const formatPrefix = requestedFormat && imageTransform.canTransformToFormat(requestedFormat) ? `/format/${requestedFormat}` : '';
+
+    if (!imageName) {
+        return imgBlogUrl;
+    }
+
+    return [imgBlogUrl, urlUtils.STATIC_IMAGE_URL_PREFIX, `/size/${sizeDirectoryName}`, formatPrefix, imageName].join('');
+};
+
+function prefixIfPresent(prefix, string) {
+    return string ? prefix + string : '';
+}
diff --git a/ghost/core/core/frontend/web/middleware/error-handler.js b/ghost/core/core/frontend/web/middleware/error-handler.js
index 9caec2ce200..b1c849414a0 100644
--- a/ghost/core/core/frontend/web/middleware/error-handler.js
+++ b/ghost/core/core/frontend/web/middleware/error-handler.js
@@ -34,7 +34,7 @@ const errorFallbackMessage = err => `<h1>${tpl(messages.oopsErrorTemplateHasErro
      <br ><p>${tpl(messages.whilstTryingToRender)}</p>
      ${err.statusCode} <pre>${escapeExpression(err.message || err)}</pre>`;
 
-const themeErrorRenderer = (err, req, res, next) => {
+const themeErrorRenderer = function themeErrorRenderer(err, req, res, next) {
     // If the error code is explicitly set to STATIC_FILE_NOT_FOUND,
     // Skip trying to render an HTML error, and move on to the basic error renderer
     // We do this because customised 404 templates could reference the image that's missing
diff --git a/ghost/core/core/frontend/web/middleware/frontend-caching.js b/ghost/core/core/frontend/web/middleware/frontend-caching.js
new file mode 100644
index 00000000000..0f7e3ade154
--- /dev/null
+++ b/ghost/core/core/frontend/web/middleware/frontend-caching.js
@@ -0,0 +1,77 @@
+/**
+ * @file Middleware to set the appropriate cache headers on the frontend
+ */
+const config = require('../../../shared/config');
+const shared = require('../../../server/web/shared');
+const {api} = require('../../services/proxy');
+
+/**
+ * Calculate the member's active tier.
+ * @param {object} member - The member object.
+ * @param {object} freeTier - The free tier object.
+ * @returns {string|null} - The member's active tier, or null if the member has more than one active subscription.
+ */
+function calculateMemberTier(member, freeTier) {
+    const activeSubscriptions = member.subscriptions.filter(sub => sub.status === 'active');
+    if (activeSubscriptions.length === 0) {
+        return freeTier;
+    } 
+    if (activeSubscriptions.length === 1) {
+        return activeSubscriptions[0].tier;
+    }
+    return null; // More than one active subscription
+}
+
+/**
+ * @typedef {function(): Promise<object>} GetFreeTier
+ */
+
+/**
+ * Returns the frontend caching middleware.
+ * @param {GetFreeTier} [getFreeTier] - Async function that takes no arguments and resolves to the free tier object.
+ * @returns {function} Middleware function.
+ */
+const getMiddleware = async (getFreeTier = async () => {
+    const {tiers} = await api.tiers.browse();
+    return tiers.find(tier => tier.type === 'free');
+}) => {
+    const freeTier = await getFreeTier();
+    /**
+     * Middleware to set cache headers based on site configuration and request properties.
+     * @param {import('express').Request} req
+     * @param {import('express').Response} res
+     * @param {import('express').NextFunction} next
+     */
+    function setFrontendCacheHeadersMiddleware(req, res, next) {
+        // Caching member's content is an experimental feature, enabled via config
+        const shouldCacheMembersContent = config.get('cacheMembersContent:enabled');
+        // CASE: Never cache if the blog is set to private
+        // CASE: Never cache if the request is made by a member and the site is not configured to cache members content
+        if (res.isPrivateBlog || (req.member && !shouldCacheMembersContent)) {
+            return shared.middleware.cacheControl('private')(req, res, next);
+        }
+
+        // CASE: Cache member's content if this feature is enabled
+        if (req.member && shouldCacheMembersContent) {
+            // Set the 'cache-control' header to 'public'
+            const memberTier = calculateMemberTier(req.member, freeTier);
+            if (!memberTier) {
+                // Member has more than one active subscription, don't cache the content
+                return shared.middleware.cacheControl('private')(req, res, next);
+            }
+            // The member is either on the free tier or has a single active subscription
+            // Cache the content based on the member's tier
+            res.set({'X-Member-Cache-Tier': memberTier.id});
+            return shared.middleware.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next);
+        }
+        // CASE: Site is not private and the request is not made by a member — cache the content
+        return shared.middleware.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next);
+    }
+
+    return setFrontendCacheHeadersMiddleware;
+};
+
+module.exports = {
+    getMiddleware,
+    calculateMemberTier // exported for testing
+};
\ No newline at end of file
diff --git a/ghost/core/core/frontend/web/middleware/handle-image-sizes.js b/ghost/core/core/frontend/web/middleware/handle-image-sizes.js
index a887cc43423..1fcc68e2153 100644
--- a/ghost/core/core/frontend/web/middleware/handle-image-sizes.js
+++ b/ghost/core/core/frontend/web/middleware/handle-image-sizes.js
@@ -9,9 +9,10 @@ const {imageSize} = require('../../../server/lib/image');
 
 const SIZE_PATH_REGEX = /^\/size\/([^/]+)\//;
 const FORMAT_PATH_REGEX = /^\/format\/([^./]+)\//;
-
 const TRAILING_SLASH_REGEX = /\/+$/;
 
+const RESIZE_TIMEOUT_SECONDS = 10;
+
 module.exports = function handleImageSizes(req, res, next) {
     // In admin we need to read images and calculate the average color (blocked by CORS otherwise)
     res.setHeader('Access-Control-Allow-Origin', '*');
@@ -123,7 +124,12 @@ module.exports = function handleImageSizes(req, res, next) {
                 if (originalImageBuffer.length <= 0) {
                     throw new NoContentError();
                 }
-                return imageTransform.resizeFromBuffer(originalImageBuffer, {withoutEnlargement: requestUrlFileExtension !== '.svg', ...imageDimensionConfig, format});
+                return imageTransform.resizeFromBuffer(originalImageBuffer, {
+                    withoutEnlargement: requestUrlFileExtension !== '.svg',
+                    ...imageDimensionConfig,
+                    format,
+                    timeout: RESIZE_TIMEOUT_SECONDS
+                });
             })
             .then((resizedImageBuffer) => {
                 return storageInstance.saveRaw(resizedImageBuffer, req.url);
@@ -139,6 +145,13 @@ module.exports = function handleImageSizes(req, res, next) {
         if (err.code === 'SHARP_INSTALLATION' || err.code === 'IMAGE_PROCESSING' || err.errorType === 'NoContentError') {
             return redirectToOriginal();
         }
+
+        if (err.errorType === 'NotFoundError') {
+            return next();
+        }
+
         next(err);
     });
 };
+
+module.exports.RESIZE_TIMEOUT_SECONDS = RESIZE_TIMEOUT_SECONDS;
diff --git a/ghost/core/core/frontend/web/middleware/index.js b/ghost/core/core/frontend/web/middleware/index.js
index 59fad9092e9..472291a6077 100644
--- a/ghost/core/core/frontend/web/middleware/index.js
+++ b/ghost/core/core/frontend/web/middleware/index.js
@@ -1,6 +1,7 @@
 module.exports = {
     cors: require('./cors'),
     errorHandler: require('./error-handler'),
+    frontendCaching: require('./frontend-caching'),
     handleImageSizes: require('./handle-image-sizes'),
     redirectGhostToAdmin: require('./redirect-ghost-to-admin'),
     serveFavicon: require('./serve-favicon'),
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/frontend/web/site.js b/ghost/core/core/frontend/web/site.js
index 347a537027d..8ffafeb3aa9 100644
--- a/ghost/core/core/frontend/web/site.js
+++ b/ghost/core/core/frontend/web/site.js
@@ -88,14 +88,13 @@ module.exports = function setupSiteApp(routerConfig) {
     // Serve site files using the storage adapter
     siteApp.use(STATIC_FILES_URL_PREFIX, storage.getStorage('files').serve());
 
-    // Global handling for member session, ensures a member is logged in to the frontend
-    siteApp.use(membersService.middleware.loadMemberSession);
-
     // /member/.well-known/* serves files (e.g. jwks.json) so it needs to be mounted before the prettyUrl mw to avoid trailing slashes
     siteApp.use(
         '/members/.well-known',
         shared.middleware.cacheControl('public', {maxAge: config.get('caching:wellKnown:maxAge')}),
-        (req, res, next) => membersService.api.middleware.wellKnown(req, res, next)
+        function lazyWellKnownMw(req, res, next) {
+            return membersService.api.middleware.wellKnown(req, res, next);
+        }
     );
 
     // Recommendations well-known
@@ -113,18 +112,23 @@ module.exports = function setupSiteApp(routerConfig) {
 
     // Theme static assets/files
     siteApp.use(mw.staticTheme());
+
+    // Serve robots.txt if not found in theme
+    siteApp.use(mw.servePublicFile('static', 'robots.txt', 'text/plain', config.get('caching:robotstxt:maxAge')));
+
     debug('Static content done');
 
+    // site map - this should probably be refactored to be an internal app
+    sitemapHandler(siteApp);
+
+    // Global handling for member session, ensures a member is logged in to the frontend
+    siteApp.use(membersService.middleware.loadMemberSession);
+
     // Theme middleware
     // This should happen AFTER any shared assets are served, as it only changes things to do with templates
     siteApp.use(themeMiddleware);
     debug('Themes done');
 
-    // Serve robots.txt if not found in theme
-    siteApp.use(mw.servePublicFile('static', 'robots.txt', 'text/plain', config.get('caching:robotstxt:maxAge')));
-
-    // site map - this should probably be refactored to be an internal app
-    sitemapHandler(siteApp);
     debug('Internal apps done');
 
     // Add in all trailing slashes & remove uppercase
@@ -132,12 +136,12 @@ module.exports = function setupSiteApp(routerConfig) {
     siteApp.use(shared.middleware.prettyUrls);
 
     // ### Caching
-    siteApp.use(function frontendCaching(req, res, next) {
-        // Site frontend is cacheable UNLESS request made by a member or site is in private mode
-        if (req.member || res.isPrivateBlog) {
-            return shared.middleware.cacheControl('private')(req, res, next);
-        } else {
-            return shared.middleware.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next);
+    siteApp.use(async function frontendCaching(req, res, next) {
+        try {
+            const middleware = await mw.frontendCaching.getMiddleware();
+            return middleware(req, res, next);
+        } catch {
+            return next();
         }
     });
 
diff --git a/ghost/core/core/server/GhostServer.js b/ghost/core/core/server/GhostServer.js
index ebcbe0fab58..cc16cc0df96 100644
--- a/ghost/core/core/server/GhostServer.js
+++ b/ghost/core/core/server/GhostServer.js
@@ -67,7 +67,7 @@ class GhostServer {
      * Starts the ghost server listening on the configured port.
      * Requires an express app to be passed in
      *
-     * @param  {Object} rootApp - Required express app instance.
+     * @param  {import('express').Application} rootApp - Required express app instance.
      * @return {Promise} Resolves once Ghost has started
      */
     start(rootApp) {
@@ -127,8 +127,8 @@ class GhostServer {
 
             // ensure that Ghost exits correctly on Ctrl+C and SIGTERM
             process
-                .removeAllListeners('SIGINT').on('SIGINT', self.shutdown.bind(self))
-                .removeAllListeners('SIGTERM').on('SIGTERM', self.shutdown.bind(self));
+                .removeAllListeners('SIGINT').on('SIGINT', () => self.shutdown())
+                .removeAllListeners('SIGTERM').on('SIGTERM', () => self.shutdown());
         });
     }
 
diff --git a/ghost/core/core/server/adapters/storage/LocalStorageBase.js b/ghost/core/core/server/adapters/storage/LocalStorageBase.js
index 6a0e3372f80..5fa076b190f 100644
--- a/ghost/core/core/server/adapters/storage/LocalStorageBase.js
+++ b/ghost/core/core/server/adapters/storage/LocalStorageBase.js
@@ -58,7 +58,15 @@ class LocalStorageBase extends StorageBase {
         targetFilename = filename;
         await fs.mkdirs(targetDir);
 
-        await fs.copy(file.path, targetFilename);
+        try {
+            await fs.copy(file.path, targetFilename);
+        } catch (err) {
+            if (err.code === 'ENAMETOOLONG') {
+                throw new errors.BadRequestError({err});
+            }
+
+            throw err;
+        }
 
         // The src for the image must be in URI format, not a file system path, which in Windows uses \
         // For local file system storage can use relative path so add a slash
@@ -149,6 +157,10 @@ class LocalStorageBase extends StorageBase {
                         return next(new errors.NoPermissionError({err: err}));
                     }
 
+                    if (err.name === 'RangeNotSatisfiableError') {
+                        return next(new errors.RangeNotSatisfiableError({err}));
+                    }
+
                     return next(new errors.InternalServerError({err: err}));
                 }
 
diff --git a/ghost/core/core/server/api/endpoints/actions.js b/ghost/core/core/server/api/endpoints/actions.js
index db4149b222a..49d7b3f3c72 100644
--- a/ghost/core/core/server/api/endpoints/actions.js
+++ b/ghost/core/core/server/api/endpoints/actions.js
@@ -1,6 +1,7 @@
 const models = require('../../models');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'actions',
 
     browse: {
@@ -20,3 +21,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/announcements.js b/ghost/core/core/server/api/endpoints/announcements.js
index 35f1fe3f402..2a6bbdfd85a 100644
--- a/ghost/core/core/server/api/endpoints/announcements.js
+++ b/ghost/core/core/server/api/endpoints/announcements.js
@@ -1,6 +1,7 @@
 const announcementBarSettings = require('../../services/announcement-bar-service');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'announcement',
 
     browse: {
@@ -13,3 +14,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/authentication.js b/ghost/core/core/server/api/endpoints/authentication.js
index 2969b172ccb..abfbd78253f 100644
--- a/ghost/core/core/server/api/endpoints/authentication.js
+++ b/ghost/core/core/server/api/endpoints/authentication.js
@@ -18,7 +18,8 @@ const messages = {
     notTheBlogOwner: 'You are not the site owner.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'authentication',
 
     setup: {
@@ -250,3 +251,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/authors-public.js b/ghost/core/core/server/api/endpoints/authors-public.js
index 408fd64f48a..61dc3d4e3f2 100644
--- a/ghost/core/core/server/api/endpoints/authors-public.js
+++ b/ghost/core/core/server/api/endpoints/authors-public.js
@@ -19,7 +19,8 @@ const rejectPrivateFieldsTransformer = input => mapQuery(input, function (value,
     };
 });
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'authors',
 
     browse: {
@@ -92,3 +93,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/collections-public.js b/ghost/core/core/server/api/endpoints/collections-public.js
index 67a214540a5..b04d7a8c11c 100644
--- a/ghost/core/core/server/api/endpoints/collections-public.js
+++ b/ghost/core/core/server/api/endpoints/collections-public.js
@@ -6,7 +6,8 @@ const messages = {
     collectionNotFound: 'Collection not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'collections',
 
     readBySlug: {
@@ -51,3 +52,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/collections.js b/ghost/core/core/server/api/endpoints/collections.js
index 2bf31facbe5..5c1ea7c5b1d 100644
--- a/ghost/core/core/server/api/endpoints/collections.js
+++ b/ghost/core/core/server/api/endpoints/collections.js
@@ -6,7 +6,8 @@ const messages = {
     collectionNotFound: 'Collection not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'collections',
 
     browse: {
@@ -87,7 +88,7 @@ module.exports = {
 
     edit: {
         headers: {
-            cacheInvalidate: false
+            cacheInvalidate: true
         },
         options: [
             'id'
@@ -111,15 +112,6 @@ module.exports = {
                 });
             }
 
-            // @NOTE: cache invalidation has to be done manually for now
-            //        because the model's wasChanged is not returned from
-            //        the service using in-memory repository layer
-            // if (model.wasChanged()) {
-            this.headers.cacheInvalidate = true;
-            // } else {
-            //     this.headers.cacheInvalidate = false;
-            // }
-
             return model;
         }
     },
@@ -145,3 +137,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/comments-members.js b/ghost/core/core/server/api/endpoints/comments-members.js
index 385f77edb8b..b6f888d86e4 100644
--- a/ghost/core/core/server/api/endpoints/comments-members.js
+++ b/ghost/core/core/server/api/endpoints/comments-members.js
@@ -2,7 +2,8 @@ const commentsService = require('../../services/comments');
 const ALLOWED_INCLUDES = ['member', 'replies', 'replies.member', 'replies.count.likes', 'replies.liked', 'count.replies', 'count.likes', 'liked', 'post', 'parent'];
 const UNSAFE_ATTRS = ['status'];
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'comments',
 
     browse: {
@@ -10,6 +11,7 @@ module.exports = {
             cacheInvalidate: false
         },
         options: [
+            'post_id',
             'include',
             'page',
             'limit',
@@ -142,8 +144,8 @@ module.exports = {
             }
         },
         permissions: true,
-        query(frame) {
-            return commentsService.controller.destroy(frame);
+        query() {
+            return commentsService.controller.destroy();
         }
     },
 
@@ -206,3 +208,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/comments.js b/ghost/core/core/server/api/endpoints/comments.js
index 846dbb9c746..19a103b21da 100644
--- a/ghost/core/core/server/api/endpoints/comments.js
+++ b/ghost/core/core/server/api/endpoints/comments.js
@@ -1,6 +1,7 @@
 const models = require('../../models');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'comments',
 
     edit: {
@@ -26,3 +27,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/config.js b/ghost/core/core/server/api/endpoints/config.js
index 8767a3848c2..62c120b1c0e 100644
--- a/ghost/core/core/server/api/endpoints/config.js
+++ b/ghost/core/core/server/api/endpoints/config.js
@@ -1,6 +1,7 @@
 const publicConfig = require('../../services/public-config');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'config',
 
     read: {
@@ -13,3 +14,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/custom-theme-settings.js b/ghost/core/core/server/api/endpoints/custom-theme-settings.js
index d6c70ddcc38..f0c99ee8848 100644
--- a/ghost/core/core/server/api/endpoints/custom-theme-settings.js
+++ b/ghost/core/core/server/api/endpoints/custom-theme-settings.js
@@ -1,6 +1,7 @@
 const customThemeSettingsService = require('../../services/custom-theme-settings');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'custom_theme_settings',
 
     browse: {
@@ -23,3 +24,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/db.js b/ghost/core/core/server/api/endpoints/db.js
index ce666cc7706..14665fa4cb5 100644
--- a/ghost/core/core/server/api/endpoints/db.js
+++ b/ghost/core/core/server/api/endpoints/db.js
@@ -8,7 +8,8 @@ const {pool} = require('@tryghost/promise');
 const models = require('../../models');
 const settingsCache = require('../../../shared/settings-cache');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'db',
 
     backupContent: {
@@ -173,3 +174,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/email-post.js b/ghost/core/core/server/api/endpoints/email-post.js
index a2740d6a0e5..a78bc8a4024 100644
--- a/ghost/core/core/server/api/endpoints/email-post.js
+++ b/ghost/core/core/server/api/endpoints/email-post.js
@@ -7,7 +7,8 @@ const messages = {
     postNotFound: 'Post not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'email_post',
 
     read: {
@@ -46,3 +47,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/email-previews.js b/ghost/core/core/server/api/endpoints/email-previews.js
index 0fa9d974c42..9f187d4d3bd 100644
--- a/ghost/core/core/server/api/endpoints/email-previews.js
+++ b/ghost/core/core/server/api/endpoints/email-previews.js
@@ -1,6 +1,7 @@
 const emailService = require('../../services/email-service');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'email_previews',
 
     read: {
@@ -47,3 +48,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/emails.js b/ghost/core/core/server/api/endpoints/emails.js
index 6cfca553630..1be0c3b5d96 100644
--- a/ghost/core/core/server/api/endpoints/emails.js
+++ b/ghost/core/core/server/api/endpoints/emails.js
@@ -12,7 +12,8 @@ const messages = {
 const allowedBatchIncludes = ['count.recipients'];
 const allowedFailureIncludes = ['member', 'email_recipient'];
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'emails',
 
     browse: {
@@ -180,3 +181,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/explore.js b/ghost/core/core/server/api/endpoints/explore.js
index 83fd0c8bee2..aa9c380c4d7 100644
--- a/ghost/core/core/server/api/endpoints/explore.js
+++ b/ghost/core/core/server/api/endpoints/explore.js
@@ -1,6 +1,7 @@
 const exploreService = require('../../services/explore');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'explore',
 
     read: {
@@ -13,3 +14,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/feedback-members.js b/ghost/core/core/server/api/endpoints/feedback-members.js
index 0113e18db4b..46f6a20ecd2 100644
--- a/ghost/core/core/server/api/endpoints/feedback-members.js
+++ b/ghost/core/core/server/api/endpoints/feedback-members.js
@@ -1,6 +1,7 @@
 const feedbackService = require('../../services/audience-feedback');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'feedback',
 
     add: {
@@ -24,3 +25,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/files.js b/ghost/core/core/server/api/endpoints/files.js
index dbc6b70301e..72ca1f7b0cb 100644
--- a/ghost/core/core/server/api/endpoints/files.js
+++ b/ghost/core/core/server/api/endpoints/files.js
@@ -1,6 +1,7 @@
 const storage = require('../../adapters/storage');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'files',
     upload: {
         statusCode: 201,
@@ -20,3 +21,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/identities.js b/ghost/core/core/server/api/endpoints/identities.js
index 67b2020361c..165674f491c 100644
--- a/ghost/core/core/server/api/endpoints/identities.js
+++ b/ghost/core/core/server/api/endpoints/identities.js
@@ -1,3 +1,4 @@
+const logging = require('@tryghost/logging');
 const settings = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
 const jwt = require('jsonwebtoken');
@@ -13,7 +14,7 @@ const getKeyID = async () => {
     return key.kid;
 };
 
-const sign = async (claims, options) => {
+const sign = async (claims, options = {}) => {
     const kid = await getKeyID();
     return jwt.sign(claims, dangerousPrivateKey, Object.assign({
         issuer,
@@ -23,7 +24,8 @@ const sign = async (claims, options) => {
     }, options));
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'identities',
     read: {
         headers: {
@@ -31,8 +33,23 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
-            const token = await sign({sub: frame.user.get('email')});
+            let role = null;
+            try {
+                await frame.user.load(['roles']);
+                role = frame.user.relations.roles.toJSON()[0].name;
+            } catch (err) {
+                logging.warn('Could not load role for identity');
+            }
+            const claims = {
+                sub: frame.user.get('email')
+            };
+            if (typeof role === 'string') {
+                claims.role = role;
+            }
+            const token = await sign(claims);
             return {token};
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/images.js b/ghost/core/core/server/api/endpoints/images.js
index 7b6fc2d26bd..b95dedc0abd 100644
--- a/ghost/core/core/server/api/endpoints/images.js
+++ b/ghost/core/core/server/api/endpoints/images.js
@@ -1,10 +1,13 @@
 /* eslint-disable ghost/ghost-custom/max-api-complexity */
-const storage = require('../../adapters/storage');
+const path = require('path');
+const errors = require('@tryghost/errors');
 const imageTransform = require('@tryghost/image-transform');
+
+const storage = require('../../adapters/storage');
 const config = require('../../../shared/config');
-const path = require('path');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'images',
     upload: {
         statusCode: 201,
@@ -33,7 +36,16 @@ module.exports = {
                     width: config.get('imageOptimization:defaultMaxWidth')
                 }, imageOptimizationOptions);
 
-                await imageTransform.resizeFromPath(options);
+                try {
+                    await imageTransform.resizeFromPath(options);
+                } catch (err) {
+                    // If the image processing fails, we don't want to store the image because it's corrupted/invalid
+                    throw new errors.BadRequestError({
+                        message: 'Image processing failed',
+                        context: err.message,
+                        help: 'Please verify that the image is valid'
+                    });
+                }
 
                 // Store the processed/optimized image
                 const processedImageUrl = await store.save({
@@ -69,3 +81,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/incoming-recommendations.js b/ghost/core/core/server/api/endpoints/incoming-recommendations.js
index cb5d38f52f7..66968951a26 100644
--- a/ghost/core/core/server/api/endpoints/incoming-recommendations.js
+++ b/ghost/core/core/server/api/endpoints/incoming-recommendations.js
@@ -1,6 +1,7 @@
 const recommendations = require('../../services/recommendations');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'recommendations',
 
     browse: {
@@ -18,3 +19,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/integrations.js b/ghost/core/core/server/api/endpoints/integrations.js
index 44abcc5d65e..6cc20251135 100644
--- a/ghost/core/core/server/api/endpoints/integrations.js
+++ b/ghost/core/core/server/api/endpoints/integrations.js
@@ -12,7 +12,8 @@ const integrationsService = getIntegrationsServiceInstance({
     ApiKeyModel: models.ApiKey
 });
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'integrations',
     browse: {
         headers: {
@@ -163,3 +164,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/invites.js b/ghost/core/core/server/api/endpoints/invites.js
index 0b87ccb2849..43a9532da2c 100644
--- a/ghost/core/core/server/api/endpoints/invites.js
+++ b/ghost/core/core/server/api/endpoints/invites.js
@@ -10,7 +10,8 @@ const messages = {
     inviteNotFound: 'Invite not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'invites',
 
     browse: {
@@ -127,3 +128,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/labels.js b/ghost/core/core/server/api/endpoints/labels.js
index 80f97b34251..9ac46efbab5 100644
--- a/ghost/core/core/server/api/endpoints/labels.js
+++ b/ghost/core/core/server/api/endpoints/labels.js
@@ -9,7 +9,8 @@ const messages = {
 
 const ALLOWED_INCLUDES = ['count.members'];
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'labels',
 
     browse: {
@@ -129,9 +130,7 @@ module.exports = {
                     }
 
                     if (model.wasChanged()) {
-                        this.headers.cacheInvalidate = true;
-                    } else {
-                        this.headers.cacheInvalidate = false;
+                        frame.setHeader('X-Cache-Invalidate', '/*');
                     }
 
                     return model;
@@ -163,3 +162,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/links.js b/ghost/core/core/server/api/endpoints/links.js
index 2c05dd2a115..8a11d4e3302 100644
--- a/ghost/core/core/server/api/endpoints/links.js
+++ b/ghost/core/core/server/api/endpoints/links.js
@@ -1,7 +1,8 @@
 const linkTrackingService = require('../../services/link-tracking');
 const INVALIDATE_ALL_REDIRECTS = '/r/*';
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'links',
     browse: {
         headers: {
@@ -59,3 +60,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/mail-events.js b/ghost/core/core/server/api/endpoints/mail-events.js
index 7e445958257..2f80d66e14b 100644
--- a/ghost/core/core/server/api/endpoints/mail-events.js
+++ b/ghost/core/core/server/api/endpoints/mail-events.js
@@ -1,6 +1,7 @@
 const mailEvents = require('../../services/mail-events');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'mail_events',
     add: {
         headers: {
@@ -12,3 +13,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/mail.js b/ghost/core/core/server/api/endpoints/mail.js
index c917c2f0036..4967c5aa62b 100644
--- a/ghost/core/core/server/api/endpoints/mail.js
+++ b/ghost/core/core/server/api/endpoints/mail.js
@@ -35,7 +35,8 @@ _private.sendMail = (object) => {
     });
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'mail',
 
     send: {
@@ -46,23 +47,7 @@ module.exports = {
         query(frame) {
             return _private.sendMail(frame.data);
         }
-    },
-
-    sendTest(frame) {
-        return mailService.utils.generateContent({template: 'test'})
-            .then((content) => {
-                const payload = {
-                    mail: [{
-                        message: {
-                            to: frame.user.get('email'),
-                            subject: tpl(messages.testGhostEmail),
-                            html: content.html,
-                            text: content.text
-                        }
-                    }]
-                };
-
-                return _private.sendMail(payload);
-            });
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/media.js b/ghost/core/core/server/api/endpoints/media.js
index eedcc1e7777..a94124ade41 100644
--- a/ghost/core/core/server/api/endpoints/media.js
+++ b/ghost/core/core/server/api/endpoints/media.js
@@ -1,7 +1,8 @@
 const path = require('path');
 const storage = require('../../adapters/storage');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'media',
     upload: {
         statusCode: 201,
@@ -47,3 +48,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/member-signin-urls.js b/ghost/core/core/server/api/endpoints/member-signin-urls.js
index 738ccf12817..b5f0d517e35 100644
--- a/ghost/core/core/server/api/endpoints/member-signin-urls.js
+++ b/ghost/core/core/server/api/endpoints/member-signin-urls.js
@@ -6,8 +6,10 @@ const messages = {
     memberNotFound: 'Member not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'member_signin_urls',
+
     read: {
         headers: {
             cacheInvalidate: false
@@ -34,3 +36,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/members-stripe-connect.js b/ghost/core/core/server/api/endpoints/members-stripe-connect.js
index a8d68572024..011f33f9032 100644
--- a/ghost/core/core/server/api/endpoints/members-stripe-connect.js
+++ b/ghost/core/core/server/api/endpoints/members-stripe-connect.js
@@ -1,6 +1,7 @@
 const membersService = require('../../services/members');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'members_stripe_connect',
     auth: {
         headers: {
@@ -30,3 +31,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/members.js b/ghost/core/core/server/api/endpoints/members.js
index 4cd678c296d..a623de79ff0 100644
--- a/ghost/core/core/server/api/endpoints/members.js
+++ b/ghost/core/core/server/api/endpoints/members.js
@@ -2,6 +2,7 @@
 // as it is a getter and may change during runtime.
 const moment = require('moment-timezone');
 const errors = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
 const models = require('../../models');
 const membersService = require('../../services/members');
 
@@ -11,6 +12,7 @@ const _ = require('lodash');
 
 const messages = {
     memberNotFound: 'Member not found.',
+    notSendingWelcomeEmail: 'Email verification required, welcome email is disabled',
     memberAlreadyExists: {
         message: 'Member already exists',
         context: 'Attempting to {action} member with existing email address.'
@@ -29,7 +31,8 @@ const messages = {
 
 const allowedIncludes = ['email_recipients', 'products', 'tiers'];
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'members',
 
     browse: {
@@ -114,6 +117,10 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
+            if (await membersService.verificationTrigger.checkVerificationRequired()) {
+                logging.warn(tpl(messages.notSendingWelcomeEmail));
+                frame.options.send_email = false;
+            }
             const member = await membersService.api.memberBREADService.add(frame.data.members[0], frame.options);
 
             return member;
@@ -143,6 +150,31 @@ module.exports = {
         }
     },
 
+    logout: {
+        statusCode: 204,
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                }
+            }
+        },
+        permissions: {
+            method: 'edit'
+        },
+        async query(frame) {
+            const member = await membersService.api.memberBREADService.logout(frame.options);
+
+            return member;
+        }
+    },
+
     editSubscription: {
         statusCode: 200,
         headers: {
@@ -478,3 +510,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/mentions.js b/ghost/core/core/server/api/endpoints/mentions.js
index 6ad4d0f19fd..fac92a5e0ba 100644
--- a/ghost/core/core/server/api/endpoints/mentions.js
+++ b/ghost/core/core/server/api/endpoints/mentions.js
@@ -1,6 +1,7 @@
 const mentions = require('../../services/mentions');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'mentions',
     browse: {
         headers: {
@@ -37,3 +38,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/newsletters-public.js b/ghost/core/core/server/api/endpoints/newsletters-public.js
index fc8d081543a..2b7a600a5d4 100644
--- a/ghost/core/core/server/api/endpoints/newsletters-public.js
+++ b/ghost/core/core/server/api/endpoints/newsletters-public.js
@@ -1,6 +1,7 @@
 const models = require('../../models');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'newsletters',
 
     browse: {
@@ -20,3 +21,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/newsletters.js b/ghost/core/core/server/api/endpoints/newsletters.js
index 8fa840e1da7..321010a545a 100644
--- a/ghost/core/core/server/api/endpoints/newsletters.js
+++ b/ghost/core/core/server/api/endpoints/newsletters.js
@@ -1,9 +1,9 @@
-const models = require('../../models');
 const allowedIncludes = ['count.posts', 'count.members', 'count.active_members'];
 
 const newslettersService = require('../../services/newsletters');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'newsletters',
 
     browse: {
@@ -27,7 +27,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            return models.Newsletter.findPage(frame.options);
+            return newslettersService.browse(frame.options);
         }
     },
 
@@ -122,3 +122,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/notifications.js b/ghost/core/core/server/api/endpoints/notifications.js
index 8cd31b748b5..aa5d20711b2 100644
--- a/ghost/core/core/server/api/endpoints/notifications.js
+++ b/ghost/core/core/server/api/endpoints/notifications.js
@@ -3,7 +3,8 @@ const settingsService = require('../../services/settings/settings-service');
 const settingsBREADService = settingsService.getSettingsBREADServiceInstance();
 const internalContext = {context: {internal: true}};
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'notifications',
 
     browse: {
@@ -101,3 +102,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/oembed.js b/ghost/core/core/server/api/endpoints/oembed.js
index d2e2c80c6f0..99209b94c63 100644
--- a/ghost/core/core/server/api/endpoints/oembed.js
+++ b/ghost/core/core/server/api/endpoints/oembed.js
@@ -1,6 +1,7 @@
 const oembed = require('../../services/oembed');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'oembed',
 
     read: {
@@ -20,3 +21,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/offers-public.js b/ghost/core/core/server/api/endpoints/offers-public.js
index 54d0e5dd3f3..f373c9214a8 100644
--- a/ghost/core/core/server/api/endpoints/offers-public.js
+++ b/ghost/core/core/server/api/endpoints/offers-public.js
@@ -6,7 +6,8 @@ const messages = {
     offerNotFound: 'Offer not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'offers',
 
     read: {
@@ -29,3 +30,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/offers.js b/ghost/core/core/server/api/endpoints/offers.js
index 13fa199a5f6..24fd5ce5a97 100644
--- a/ghost/core/core/server/api/endpoints/offers.js
+++ b/ghost/core/core/server/api/endpoints/offers.js
@@ -6,7 +6,8 @@ const messages = {
     offerNotFound: 'Offer not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'offers',
 
     browse: {
@@ -82,3 +83,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/pages-public.js b/ghost/core/core/server/api/endpoints/pages-public.js
index 8dd89c09b07..97616131692 100644
--- a/ghost/core/core/server/api/endpoints/pages-public.js
+++ b/ghost/core/core/server/api/endpoints/pages-public.js
@@ -20,7 +20,8 @@ const rejectPrivateFieldsTransformer = input => mapQuery(input, function (value,
     };
 });
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'pages',
 
     browse: {
@@ -103,3 +104,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/pages.js b/ghost/core/core/server/api/endpoints/pages.js
index bd5661a93b3..f3022b9e315 100644
--- a/ghost/core/core/server/api/endpoints/pages.js
+++ b/ghost/core/core/server/api/endpoints/pages.js
@@ -11,7 +11,8 @@ const messages = {
 
 const postsService = getPostServiceInstance();
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'pages',
     browse: {
         headers: {
@@ -122,7 +123,7 @@ module.exports = {
             return models.Post.add(frame.data.pages[0], frame.options)
                 .then((model) => {
                     if (model.get('status') === 'published') {
-                        this.headers.cacheInvalidate = true;
+                        frame.setHeader('X-Cache-Invalidate', '/*');
                     }
 
                     return model;
@@ -166,7 +167,13 @@ module.exports = {
         async query(frame) {
             const model = await models.Post.edit(frame.data.pages[0], frame.options);
 
-            this.headers.cacheInvalidate = postsService.handleCacheInvalidation(model);
+            const cacheInvalidation = postsService.handleCacheInvalidation(model);
+
+            if (cacheInvalidation === true) {
+                frame.setHeader('X-Cache-Invalidate', '/*');
+            } else if (cacheInvalidation.value) {
+                frame.setHeader('X-Cache-Invalidate', cacheInvalidation.value);
+            }
 
             return model;
         }
@@ -276,3 +283,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/posts-public.js b/ghost/core/core/server/api/endpoints/posts-public.js
index 9979a82acaa..79e1d9656c1 100644
--- a/ghost/core/core/server/api/endpoints/posts-public.js
+++ b/ghost/core/core/server/api/endpoints/posts-public.js
@@ -23,6 +23,12 @@ const rejectPrivateFieldsTransformer = input => mapQuery(input, function (value,
     };
 });
 
+/**
+ *
+ * @param {import('@tryghost/api-framework').Frame} frame
+ * @param {object} options
+ * @returns {object}
+ */
 function generateOptionsData(frame, options) {
     return options.reduce((memo, option) => {
         let value = frame.options?.[option];
@@ -52,7 +58,9 @@ function generateAuthData(frame) {
         };
     }
 }
-module.exports = {
+
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'posts',
 
     browse: {
@@ -172,3 +180,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/posts.js b/ghost/core/core/server/api/endpoints/posts.js
index cc71f529e87..51b2f320eaa 100644
--- a/ghost/core/core/server/api/endpoints/posts.js
+++ b/ghost/core/core/server/api/endpoints/posts.js
@@ -38,7 +38,8 @@ function getCacheHeaderFromEventString(event, dto) {
     }
 }
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'posts',
     browse: {
         headers: {
@@ -167,10 +168,8 @@ module.exports = {
         query(frame) {
             return models.Post.add(frame.data.posts[0], frame.options)
                 .then((model) => {
-                    if (model.get('status') !== 'published') {
-                        this.headers.cacheInvalidate = false;
-                    } else {
-                        this.headers.cacheInvalidate = true;
+                    if (model.get('status') === 'published') {
+                        frame.setHeader('X-Cache-Invalidate', '/*');
                     }
 
                     return model;
@@ -216,7 +215,12 @@ module.exports = {
         async query(frame) {
             let model = await postsService.editPost(frame, {
                 eventHandler: (event, dto) => {
-                    this.headers.cacheInvalidate = getCacheHeaderFromEventString(event, dto);
+                    const cacheInvalidate = getCacheHeaderFromEventString(event, dto);
+                    if (cacheInvalidate === true) {
+                        frame.setHeader('X-Cache-Invalidate', '/*');
+                    } else if (cacheInvalidate?.value) {
+                        frame.setHeader('X-Cache-Invalidate', cacheInvalidate.value);
+                    }
                 }
             });
 
@@ -324,3 +328,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/previews.js b/ghost/core/core/server/api/endpoints/previews.js
index e335e89fe06..0bdc71b61c9 100644
--- a/ghost/core/core/server/api/endpoints/previews.js
+++ b/ghost/core/core/server/api/endpoints/previews.js
@@ -7,7 +7,8 @@ const messages = {
     postNotFound: 'Post not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'previews',
 
     read: {
@@ -47,3 +48,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/recommendations-public.js b/ghost/core/core/server/api/endpoints/recommendations-public.js
index dfc98b9e649..63dd88ebbe5 100644
--- a/ghost/core/core/server/api/endpoints/recommendations-public.js
+++ b/ghost/core/core/server/api/endpoints/recommendations-public.js
@@ -1,6 +1,7 @@
 const recommendations = require('../../services/recommendations');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'recommendations',
 
     browse: {
@@ -62,3 +63,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/recommendations.js b/ghost/core/core/server/api/endpoints/recommendations.js
index 368156f1200..c64d6ee7bb2 100644
--- a/ghost/core/core/server/api/endpoints/recommendations.js
+++ b/ghost/core/core/server/api/endpoints/recommendations.js
@@ -1,6 +1,7 @@
 const recommendations = require('../../services/recommendations');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'recommendations',
 
     browse: {
@@ -48,6 +49,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
@@ -89,3 +108,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/redirects.js b/ghost/core/core/server/api/endpoints/redirects.js
index 6c6ab783a5c..c8159215cc6 100644
--- a/ghost/core/core/server/api/endpoints/redirects.js
+++ b/ghost/core/core/server/api/endpoints/redirects.js
@@ -2,7 +2,8 @@ const path = require('path');
 
 const customRedirects = require('../../services/custom-redirects');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'redirects',
 
     download: {
@@ -44,3 +45,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/roles.js b/ghost/core/core/server/api/endpoints/roles.js
index a34d29ff3d7..a8460599a68 100644
--- a/ghost/core/core/server/api/endpoints/roles.js
+++ b/ghost/core/core/server/api/endpoints/roles.js
@@ -1,6 +1,7 @@
 const models = require('../../models');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'roles',
     browse: {
         headers: {
@@ -20,3 +21,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/schedules.js b/ghost/core/core/server/api/endpoints/schedules.js
index 52a856bc92b..1e964fc4950 100644
--- a/ghost/core/core/server/api/endpoints/schedules.js
+++ b/ghost/core/core/server/api/endpoints/schedules.js
@@ -1,8 +1,8 @@
 const models = require('../../models');
-
 const postSchedulingService = require('../../services/posts/post-scheduling-service')();
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'schedules',
     publish: {
         headers: {
@@ -40,8 +40,13 @@ module.exports = {
             };
 
             const {scheduledResource, preScheduledResource} = await postSchedulingService.publish(resourceType, frame.options.id, frame.data.force, options);
-            const cacheInvalidate = postSchedulingService.handleCacheInvalidation(scheduledResource, preScheduledResource);
-            this.headers.cacheInvalidate = cacheInvalidate;
+            const cacheInvalidation = postSchedulingService.handleCacheInvalidation(scheduledResource, preScheduledResource);
+
+            if (cacheInvalidation === true) {
+                frame.setHeader('X-Cache-Invalidate', '/*');
+            } else if (cacheInvalidation.value) {
+                frame.setHeader('X-Cache-Invalidate', cacheInvalidation.value);
+            }
 
             const response = {};
             response[resourceType] = [scheduledResource];
@@ -80,3 +85,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/session.js b/ghost/core/core/server/api/endpoints/session.js
index 9359339d19b..3ea303ed32d 100644
--- a/ghost/core/core/server/api/endpoints/session.js
+++ b/ghost/core/core/server/api/endpoints/session.js
@@ -8,7 +8,8 @@ const messages = {
     accessDenied: 'Access Denied.'
 };
 
-const session = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     read(frame) {
         /*
          * TODO
@@ -31,7 +32,7 @@ const session = {
             email: object.username,
             password: object.password
         }).then((user) => {
-            return Promise.resolve((req, res, next) => {
+            return Promise.resolve(function sessionMiddleware(req, res, next) {
                 req.brute.reset(function (err) {
                     if (err) {
                         return next(err);
@@ -60,10 +61,10 @@ const session = {
         });
     },
     delete() {
-        return Promise.resolve((req, res, next) => {
+        return Promise.resolve(function destroySessionMw(req, res, next) {
             auth.session.destroySession(req, res, next);
         });
     }
 };
 
-module.exports = session;
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/settings-public.js b/ghost/core/core/server/api/endpoints/settings-public.js
index d89dc61858e..72de70973e3 100644
--- a/ghost/core/core/server/api/endpoints/settings-public.js
+++ b/ghost/core/core/server/api/endpoints/settings-public.js
@@ -2,7 +2,8 @@ const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
 const ghostVersion = require('@tryghost/version');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'settings',
 
     browse: {
@@ -22,3 +23,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/settings.js b/ghost/core/core/server/api/endpoints/settings.js
index b664748d47c..8d128f687f5 100644
--- a/ghost/core/core/server/api/endpoints/settings.js
+++ b/ghost/core/core/server/api/endpoints/settings.js
@@ -21,7 +21,8 @@ async function getStripeConnectData(frame) {
     }
 }
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'settings',
 
     browse: {
@@ -122,7 +123,7 @@ module.exports = {
 
     edit: {
         headers: {
-            cacheInvalidate: true
+            cacheInvalidate: false
         },
         permissions: {
             unsafeAttrsObject(frame) {
@@ -134,10 +135,8 @@ module.exports = {
 
             let result = await settingsBREADService.edit(frame.data.settings, frame.options, stripeConnectData);
 
-            if (_.isEmpty(result)) {
-                this.headers.cacheInvalidate = false;
-            } else {
-                this.headers.cacheInvalidate = true;
+            if (!_.isEmpty(result)) {
+                frame.setHeader('X-Cache-Invalidate', '/*');
             }
 
             // We need to return all settings here, because we have calculated settings that might change
@@ -181,3 +180,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/site.js b/ghost/core/core/server/api/endpoints/site.js
index e3968325fe2..55033566163 100644
--- a/ghost/core/core/server/api/endpoints/site.js
+++ b/ghost/core/core/server/api/endpoints/site.js
@@ -1,6 +1,7 @@
 const publicConfig = require('../../services/public-config');
 
-const site = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'site',
 
     read: {
@@ -14,4 +15,4 @@ const site = {
     }
 };
 
-module.exports = site;
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/slack.js b/ghost/core/core/server/api/endpoints/slack.js
index 8981e6af447..900d9c7f12c 100644
--- a/ghost/core/core/server/api/endpoints/slack.js
+++ b/ghost/core/core/server/api/endpoints/slack.js
@@ -1,7 +1,8 @@
 // Used to call the slack ping service, iirc this was done to avoid circular deps a long time ago
 const events = require('../../lib/common/events');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'slack',
     sendTest: {
         headers: {
@@ -13,3 +14,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/slugs.js b/ghost/core/core/server/api/endpoints/slugs.js
index f4238240610..0e9ed157489 100644
--- a/ghost/core/core/server/api/endpoints/slugs.js
+++ b/ghost/core/core/server/api/endpoints/slugs.js
@@ -12,11 +12,12 @@ const allowedTypes = {
     user: models.User
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'slugs',
     generate: {
         headers: {
-            cacheInvalidate: true
+            cacheInvalidate: false
         },
         options: [
             'include',
@@ -52,3 +53,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/snippets.js b/ghost/core/core/server/api/endpoints/snippets.js
index f235a0a84b2..0bfc44507aa 100644
--- a/ghost/core/core/server/api/endpoints/snippets.js
+++ b/ghost/core/core/server/api/endpoints/snippets.js
@@ -7,7 +7,8 @@ const messages = {
     snippetAlreadyExists: 'Snippet already exists.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'snippets',
 
     browse: {
@@ -131,3 +132,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/stats.js b/ghost/core/core/server/api/endpoints/stats.js
index 40a3e747166..c73722948ea 100644
--- a/ghost/core/core/server/api/endpoints/stats.js
+++ b/ghost/core/core/server/api/endpoints/stats.js
@@ -1,6 +1,7 @@
 const statsService = require('../../services/stats');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'stats',
     memberCountHistory: {
         headers: {
@@ -10,8 +11,14 @@ module.exports = {
             docName: 'members',
             method: 'browse'
         },
+        cache: statsService.cache,
+        generateCacheKeyData() {
+            return {
+                method: 'memberCountHistory'
+            };
+        },
         async query() {
-            return await statsService.getMemberCountHistory();
+            return await statsService.api.getMemberCountHistory();
         }
     },
     mrr: {
@@ -22,8 +29,14 @@ module.exports = {
             docName: 'members',
             method: 'browse'
         },
+        cache: statsService.cache,
+        generateCacheKeyData() {
+            return {
+                method: 'mrr'
+            };
+        },
         async query() {
-            return await statsService.getMRRHistory();
+            return await statsService.api.getMRRHistory();
         }
     },
     subscriptions: {
@@ -34,8 +47,15 @@ module.exports = {
             docName: 'members',
             method: 'browse'
         },
+        cache: statsService.cache,
+        generateCacheKeyData() {
+            return {
+                method: 'subscriptions'
+
+            };
+        },
         async query() {
-            return await statsService.getSubscriptionCountHistory();
+            return await statsService.api.getSubscriptionCountHistory();
         }
     },
     postReferrers: {
@@ -49,8 +69,18 @@ module.exports = {
             docName: 'posts',
             method: 'browse'
         },
+        cache: statsService.cache,
+        generateCacheKeyData(frame) {
+            return {
+                method: 'postReferrers',
+                data: {
+                    id: frame.data.id
+                }
+
+            };
+        },
         async query(frame) {
-            return await statsService.getPostReferrers(frame.data.id);
+            return await statsService.api.getPostReferrers(frame.data.id);
         }
     },
     referrersHistory: {
@@ -64,8 +94,16 @@ module.exports = {
             docName: 'posts',
             method: 'browse'
         },
+        cache: statsService.cache,
+        generateCacheKeyData() {
+            return {
+                method: 'referrersHistory'
+            };
+        },
         async query() {
-            return await statsService.getReferrersHistory();
+            return await statsService.api.getReferrersHistory();
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/tags-public.js b/ghost/core/core/server/api/endpoints/tags-public.js
index 528539c9a38..4ce2530895d 100644
--- a/ghost/core/core/server/api/endpoints/tags-public.js
+++ b/ghost/core/core/server/api/endpoints/tags-public.js
@@ -9,7 +9,8 @@ const messages = {
     tagNotFound: 'Tag not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'tags',
 
     browse: {
@@ -76,3 +77,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/tags.js b/ghost/core/core/server/api/endpoints/tags.js
index 97ef22f787b..f98420f6344 100644
--- a/ghost/core/core/server/api/endpoints/tags.js
+++ b/ghost/core/core/server/api/endpoints/tags.js
@@ -8,7 +8,8 @@ const messages = {
     tagNotFound: 'Tag not found.'
 };
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'tags',
 
     browse: {
@@ -124,9 +125,7 @@ module.exports = {
                     }
 
                     if (model.wasChanged()) {
-                        this.headers.cacheInvalidate = true;
-                    } else {
-                        this.headers.cacheInvalidate = false;
+                        frame.setHeader('X-Cache-Invalidate', '/*');
                     }
 
                     return model;
@@ -158,3 +157,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/themes.js b/ghost/core/core/server/api/endpoints/themes.js
index 5cdfa7ab7c0..4b2f239aa5d 100644
--- a/ghost/core/core/server/api/endpoints/themes.js
+++ b/ghost/core/core/server/api/endpoints/themes.js
@@ -6,7 +6,8 @@ const models = require('../../models');
 const events = require('../../lib/common/events');
 const {settingsCache} = require('../../services/settings-helpers');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'themes',
 
     browse: {
@@ -91,7 +92,7 @@ module.exports = {
                 const {theme, themeOverridden} = await themeService.api.installFromGithub(frame.options.ref);
 
                 if (themeOverridden) {
-                    this.headers.cacheInvalidate = true;
+                    frame.setHeader('X-Cache-Invalidate', '/*');
                 }
 
                 events.emit('theme.uploaded', {name: theme.name});
@@ -125,8 +126,7 @@ module.exports = {
             return themeService.api.setFromZip(zip)
                 .then(({theme, themeOverridden}) => {
                     if (themeOverridden) {
-                        // CASE: clear cache
-                        this.headers.cacheInvalidate = true;
+                        frame.setHeader('X-Cache-Invalidate', '/*');
                     }
                     events.emit('theme.uploaded', {name: theme.name});
                     return theme;
@@ -181,3 +181,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/tiers-public.js b/ghost/core/core/server/api/endpoints/tiers-public.js
index 4e2fbc20f49..f0169b3f3fd 100644
--- a/ghost/core/core/server/api/endpoints/tiers-public.js
+++ b/ghost/core/core/server/api/endpoints/tiers-public.js
@@ -1,6 +1,7 @@
 const tiersService = require('../../services/tiers');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'tiers',
 
     browse: {
@@ -23,3 +24,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/tiers.js b/ghost/core/core/server/api/endpoints/tiers.js
index 832c74a7205..3d3a5608709 100644
--- a/ghost/core/core/server/api/endpoints/tiers.js
+++ b/ghost/core/core/server/api/endpoints/tiers.js
@@ -1,6 +1,7 @@
 const tiersService = require('../../services/tiers');
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'tiers',
 
     browse: {
@@ -80,3 +81,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/users.js b/ghost/core/core/server/api/endpoints/users.js
index 451a609eac2..68e9ce7b72a 100644
--- a/ghost/core/core/server/api/endpoints/users.js
+++ b/ghost/core/core/server/api/endpoints/users.js
@@ -40,7 +40,41 @@ async function fetchOrCreatePersonalToken(userId) {
     return token;
 }
 
-module.exports = {
+function shouldInvalidateCacheAfterChange(model) {
+    // Model attributes that should trigger cache invalidation when changed
+    // (because they affect the frontend)
+    const publicAttrs = [
+        'name',
+        'slug',
+        'profile_image',
+        'cover_image',
+        'bio',
+        'website',
+        'location',
+        'facebook',
+        'twitter',
+        'status',
+        'visibility',
+        'meta_title',
+        'meta_description'
+    ];
+
+    if (model.wasChanged() === false) {
+        return false;
+    }
+
+    // Check if any of the changed attributes are public
+    for (const attr of Object.keys(model._changed)) {
+        if (publicAttrs.includes(attr) === true) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'users',
 
     browse: {
@@ -137,10 +171,8 @@ module.exports = {
                         }));
                     }
 
-                    if (model.wasChanged()) {
-                        this.headers.cacheInvalidate = true;
-                    } else {
-                        this.headers.cacheInvalidate = false;
+                    if (shouldInvalidateCacheAfterChange(model)) {
+                        frame.setHeader('X-Cache-Invalidate', '/*');
                     }
 
                     return model;
@@ -256,3 +288,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/api/endpoints/utils/index.js b/ghost/core/core/server/api/endpoints/utils/index.js
index 221dd20daf3..50c6718a82b 100644
--- a/ghost/core/core/server/api/endpoints/utils/index.js
+++ b/ghost/core/core/server/api/endpoints/utils/index.js
@@ -19,17 +19,25 @@ module.exports = {
      * is a Content API implementation -  see index.js file.
      *
      * @TODO: Move this helper function into a utils.js file.
-     * @param {Object} frame
+     * @param {import('@tryghost/api-framework').Frame} frame
      * @return {boolean}
      */
     isContentAPI: (frame) => {
         return frame.apiType === 'content';
     },
 
+    /**
+     * @param {import('@tryghost/api-framework').Frame} frame
+     * @returns {boolean}
+     */
     isMembersAPI: (frame) => {
         return frame.apiType === 'members';
     },
 
+    /**
+     * @param {import('@tryghost/api-framework').Frame} frame
+     * @returns {boolean}
+     */
     isInternal: (frame) => {
         return frame.options.context && frame.options.context.internal;
     }
diff --git a/ghost/core/core/server/api/endpoints/utils/permissions.js b/ghost/core/core/server/api/endpoints/utils/permissions.js
index b6d29343776..9379f212e68 100644
--- a/ghost/core/core/server/api/endpoints/utils/permissions.js
+++ b/ghost/core/core/server/api/endpoints/utils/permissions.js
@@ -12,7 +12,7 @@ const messages = {
  * @description Handle requests, which need authentication.
  *
  * @param {Object} apiConfig - Docname & method of API ctrl
- * @param {Object} frame
+ * @param {import('@tryghost/api-framework').Frame} frame
  * @return {Promise}
  */
 const nonePublicAuth = (apiConfig, frame) => {
@@ -81,7 +81,7 @@ module.exports = {
      * @description Handle permission stage for API.
      *
      * @param {Object} apiConfig - Docname & method of target ctrl.
-     * @param {Object} frame
+     * @param {import('@tryghost/api-framework').Frame} frame
      * @return {Promise}
      */
     handle(apiConfig, frame) {
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/comments.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/comments.js
index ed60b589019..77a6b09aaaa 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/input/comments.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/comments.js
@@ -14,5 +14,19 @@ module.exports = {
             }
             return relation;
         });
+    },
+
+    browse(apiConfig, frame) {
+        // for top-level comments we show newest comments first and paginate to older
+        if (!frame.options.order) {
+            frame.options.order = 'created_at DESC, id DESC';
+        }
+    },
+
+    replies(apiConfig, frame) {
+        // for replies we show the oldest comments first and paginate to newer
+        if (!frame.options.order) {
+            frame.options.order = 'created_at ASC, id ASC';
+        }
     }
 };
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..afd6da5745b 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
@@ -1,12 +1,21 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:input:pages');
-const mobiledoc = require('../../../../../lib/mobiledoc');
+const {ValidationError} = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');
+const mobiledoc = require('../../../../../lib/mobiledoc');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
+const postsSchema = require('../../../../../data/schema').tables.posts;
 const clean = require('./utils/clean');
 const lexical = require('../../../../../lib/lexical');
+const sentry = require('../../../../../../shared/sentry');
+
+const messages = {
+    failedHtmlToMobiledoc: 'Failed to convert HTML to Mobiledoc',
+    failedHtmlToLexical: 'Failed to convert HTML to Lexical'
+};
 
 function removeSourceFormats(frame) {
     if (frame.options.formats?.includes('mobiledoc') || frame.options.formats?.includes('lexical')) {
@@ -16,6 +25,33 @@ function removeSourceFormats(frame) {
     }
 }
 
+/**
+ * Selects all allowed columns for the given frame.
+ * 
+ * This removes the lexical and mobiledoc columns from the query. This is a performance improvement as we never intend
+ *  to expose those columns in the content API and they are very large datasets to be passing around and de/serializing.
+ * 
+ * NOTE: This is only intended for the Content API. We need these fields within Admin API responses.
+ *
+ * @param {Object} frame - The frame object.
+ */
+function selectAllAllowedColumns(frame) {
+    if (!frame.options.columns && !frame.options.selectRaw) {
+        // Because we're returning columns directly from the schema we need to remove info columns like @@UNIQUE_CONSTRAINTS@@ and @@INDEXES@@
+        frame.options.selectRaw = _.keys(_.omit(postsSchema, ['lexical','mobiledoc','@@INDEXES@@','@@UNIQUE_CONSTRAINTS@@'])).join(',');
+    } else if (frame.options.columns) {
+        frame.options.columns = frame.options.columns.filter((column) => {
+            return !['mobiledoc', 'lexical'].includes(column);
+        });
+    } else if (frame.options.selectRaw) {
+        frame.options.selectRaw = frame.options.selectRaw.split(',').map((column) => {
+            return column.trim();
+        }).filter((column) => {
+            return !['mobiledoc', 'lexical'].includes(column);
+        }).join(',');
+    }
+}
+
 function defaultRelations(frame) {
     if (frame.options.withRelated) {
         return;
@@ -29,18 +65,11 @@ function defaultRelations(frame) {
 }
 
 function setDefaultOrder(frame) {
-    let includesOrderedRelations = false;
-
-    if (frame.options.withRelated) {
-        const orderedRelations = ['author', 'authors', 'tag', 'tags'];
-        includesOrderedRelations = _.intersection(orderedRelations, frame.options.withRelated).length > 0;
-    }
-
-    if (!frame.options.order && !includesOrderedRelations && frame.options.filter) {
+    if (!frame.options.order && frame.options.filter) {
         frame.options.autoOrder = slugFilterOrder('posts', frame.options.filter);
     }
 
-    if (!frame.options.order && !frame.options.autoOrder && !includesOrderedRelations) {
+    if (!frame.options.order && !frame.options.autoOrder) {
         frame.options.order = 'title asc';
     }
 }
@@ -96,7 +125,10 @@ module.exports = {
         forcePageFilter(frame);
 
         if (localUtils.isContentAPI(frame)) {
-            removeSourceFormats(frame);
+            // CASE: the content api endpoint for posts should not return mobiledoc or lexical
+            removeSourceFormats(frame); // remove from the format field
+            selectAllAllowedColumns(frame); // remove from any specified column or selectRaw options            
+
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
         }
@@ -133,11 +165,43 @@ module.exports = {
             const html = frame.data.pages[0].html;
 
             if (frame.options.source === 'html' && !_.isEmpty(html)) {
-                frame.data.pages[0].mobiledoc = JSON.stringify(mobiledoc.htmlToMobiledocConverter(html));
+                if (process.env.CI) {
+                    console.time('htmlToMobiledocConverter (page)'); // eslint-disable-line no-console
+                }
+
+                try {
+                    frame.data.pages[0].mobiledoc = JSON.stringify(mobiledoc.htmlToMobiledocConverter(html));
+                } catch (err) {
+                    sentry.captureException(err);
+                    throw new ValidationError({
+                        message: tpl(messages.failedHtmlToMobiledoc),
+                        err
+                    });
+                }
+
+                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
-                frame.data.pages[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
+                if (process.env.CI) {
+                    console.time('htmlToLexicalConverter (page)'); // eslint-disable-line no-console
+                }
+
+                try {
+                    frame.data.pages[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
+                } catch (err) {
+                    sentry.captureException(err);
+                    throw new ValidationError({
+                        message: tpl(messages.failedHtmlToLexical),
+                        err
+                    });
+                }
+
+                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..94d0ae86f09 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
@@ -1,13 +1,32 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:input:posts');
+const {ValidationError} = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
+const postsSchema = require('../../../../../data/schema').tables.posts;
 const clean = require('./utils/clean');
 const lexical = require('../../../../../lib/lexical');
+const sentry = require('../../../../../../shared/sentry');
 
+const messages = {
+    failedHtmlToMobiledoc: 'Failed to convert HTML to Mobiledoc',
+    failedHtmlToLexical: 'Failed to convert HTML to Lexical'
+};
+
+/**
+ * Selects all allowed columns for the given frame.
+ * 
+ * NOTE: This doesn't stop them from being FETCHED, just returned in the response. This causes
+ *   the output serializer to remove them from the data object before returning.
+ * 
+ * NOTE: This is only intended for the Content API. We need these fields within Admin API responses.
+ *
+ * @param {Object} frame - The frame object.
+ */
 function removeSourceFormats(frame) {
     if (frame.options.formats?.includes('mobiledoc') || frame.options.formats?.includes('lexical')) {
         frame.options.formats = frame.options.formats.filter((format) => {
@@ -16,6 +35,33 @@ function removeSourceFormats(frame) {
     }
 }
 
+/**
+ * Selects all allowed columns for the given frame.
+ * 
+ * This removes the lexical and mobiledoc columns from the query. This is a performance improvement as we never intend
+ *  to expose those columns in the content API and they are very large datasets to be passing around and de/serializing.
+ * 
+ * NOTE: This is only intended for the Content API. We need these fields within Admin API responses.
+ *
+ * @param {Object} frame - The frame object.
+ */
+function selectAllAllowedColumns(frame) {
+    if (!frame.options.columns && !frame.options.selectRaw) {
+        // Because we're returning columns directly from the schema we need to remove info columns like @@UNIQUE_CONSTRAINTS@@ and @@INDEXES@@
+        frame.options.selectRaw = _.keys(_.omit(postsSchema, ['lexical','mobiledoc','@@INDEXES@@','@@UNIQUE_CONSTRAINTS@@'])).join(',');
+    } else if (frame.options.columns) {
+        frame.options.columns = frame.options.columns.filter((column) => {
+            return !['mobiledoc', 'lexical'].includes(column);
+        });
+    } else if (frame.options.selectRaw) {
+        frame.options.selectRaw = frame.options.selectRaw.split(',').map((column) => {
+            return column.trim();
+        }).filter((column) => {
+            return !['mobiledoc', 'lexical'].includes(column);
+        }).join(',');
+    }
+}
+
 /**
  * Map names of relations to the internal names
  */
@@ -46,18 +92,11 @@ function defaultRelations(frame) {
 }
 
 function setDefaultOrder(frame) {
-    let includesOrderedRelations = false;
-
-    if (frame.options.withRelated) {
-        const orderedRelations = ['author', 'authors', 'tag', 'tags'];
-        includesOrderedRelations = _.intersection(orderedRelations, frame.options.withRelated).length > 0;
-    }
-
-    if (!frame.options.order && !includesOrderedRelations && frame.options.filter) {
+    if (!frame.options.order && frame.options.filter) {
         frame.options.autoOrder = slugFilterOrder('posts', frame.options.filter);
     }
 
-    if (!frame.options.order && !frame.options.autoOrder && !includesOrderedRelations) {
+    if (!frame.options.order && !frame.options.autoOrder) {
         frame.options.order = 'published_at desc';
     }
 }
@@ -120,7 +159,8 @@ module.exports = {
          */
         if (localUtils.isContentAPI(frame)) {
             // CASE: the content api endpoint for posts should not return mobiledoc or lexical
-            removeSourceFormats(frame);
+            removeSourceFormats(frame); // remove from the format field
+            selectAllAllowedColumns(frame); // remove from any specified column or selectRaw options
 
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
@@ -167,11 +207,43 @@ module.exports = {
             const html = frame.data.posts[0].html;
 
             if (frame.options.source === 'html' && !_.isEmpty(html)) {
-                frame.data.posts[0].mobiledoc = JSON.stringify(mobiledoc.htmlToMobiledocConverter(html));
+                if (process.env.CI) {
+                    console.time('htmlToMobiledocConverter (post)'); // eslint-disable-line no-console
+                }
+
+                try {
+                    frame.data.posts[0].mobiledoc = JSON.stringify(mobiledoc.htmlToMobiledocConverter(html));
+                } catch (err) {
+                    sentry.captureException(err);
+                    throw new ValidationError({
+                        message: tpl(messages.failedHtmlToMobiledoc),
+                        err
+                    });
+                }
+
+                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
-                frame.data.posts[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
+                if (process.env.CI) {
+                    console.time('htmlToLexicalConverter (post)'); // eslint-disable-line no-console
+                }
+
+                try {
+                    frame.data.posts[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
+                } catch (err) {
+                    sentry.captureException(err);
+                    throw new ValidationError({
+                        message: tpl(messages.failedHtmlToLexical),
+                        err
+                    });
+                }
+
+                if (process.env.CI) {
+                    console.timeEnd('htmlToLexicalConverter (post)'); // eslint-disable-line no-console
+                }
             }
         }
 
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js
index c1de8ce2eb2..2de0321a0f8 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js
@@ -38,6 +38,7 @@ const EDITABLE_SETTINGS = [
     'portal_name',
     'portal_button',
     'portal_plans',
+    'portal_default_plan',
     'portal_button_style',
     'firstpromoter',
     'firstpromoter_id',
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/tiers.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/tiers.js
index 578c3242e06..8442be7895d 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/input/tiers.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/tiers.js
@@ -1,10 +1,26 @@
+const {BadRequestError} = require('@tryghost/errors');
 const localUtils = require('../../index');
+const nql = require('@tryghost/nql-lang');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    invalidNQLFilter: 'The NQL filter you passed was invalid.'
+};
 
 const forceActiveFilter = (frame) => {
     if (frame.options.filter) {
-        frame.options.filter = `(${frame.options.filter})+active:true`;
+        frame.options.filter = {
+            $and: [
+                {
+                    active: true
+                },
+                frame.options.filter
+            ]
+        };
     } else {
-        frame.options.filter = 'active:true';
+        frame.options.filter = {
+            active: true
+        };
     }
 };
 
@@ -41,6 +57,18 @@ function convertTierInput(input) {
 
 module.exports = {
     all(_apiConfig, frame) {
+        if (frame.options.filter) {
+            try {
+                frame.options.filter = nql.parse(frame.options.filter);
+            } catch (err) {
+                throw new BadRequestError({
+                    message: tpl(messages.invalidNQLFilter)
+                });
+            }
+        } else {
+            frame.options.filter = null;
+        }
+
         if (localUtils.isContentAPI(frame)) {
             // CASE: content api can only have active tiers
             forceActiveFilter(frame);
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js
index 51f931a074c..6b2f4bff1de 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js
@@ -25,11 +25,11 @@ const forPost = (attrs, options) => {
             }
 
             if (relation === 'author' && attrs.author) {
-                attrs.author = forUser(attrs.author, options);
+                attrs.author = forUser(attrs.author);
             }
 
             if (relation === 'authors' && attrs.authors) {
-                attrs.authors = attrs.authors.map(author => forUser(author, options));
+                attrs.authors = attrs.authors.map(author => forUser(author));
             }
         });
     }
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js
index d041a915b51..a3410985a32 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js
@@ -4,7 +4,7 @@ const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output
 
 const messages = {
     checkEmailForInstructions: 'Check your email for further instructions.',
-    passwordChanged: 'Password changed successfully.',
+    passwordChanged: 'Password updated',
     invitationAccepted: 'Invitation accepted.'
 };
 
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/config.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/config.js
index 46e7375519f..4bccbae387d 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/config.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/config.js
@@ -20,7 +20,8 @@ module.exports = {
             'hostSettings',
             'tenor',
             'pintura',
-            'signupForm'
+            'signupForm',
+            'stats'
         ];
 
         frame.response = {
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js
index c1c015fb785..3f5c01e1cd2 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js
@@ -107,7 +107,7 @@ const feedbackEventMapper = (json, frame) => {
     } else {
         response.post = null;
     }
-    
+
     if (data.member) {
         response.member = _.pick(data.member, memberFields);
     } else {
@@ -144,7 +144,7 @@ const activityFeedMapper = (event, frame) => {
         return clickEventMapper(event, frame);
     }
     if (event.type === 'aggregated_click_event') {
-        return aggregatedClickEventMapper(event, frame);
+        return aggregatedClickEventMapper(event);
     }
     if (event.type === 'feedback_event') {
         return feedbackEventMapper(event, frame);
@@ -159,6 +159,12 @@ const activityFeedMapper = (event, frame) => {
     if (event.data?.subscriptionCreatedEvent) {
         delete event.data.subscriptionCreatedEvent;
     }
+
+    if (event.data.member) {
+        event.data.member = _.pick(event.data.member, memberFields);
+    } else {
+        event.data.member = null;
+    }
     return event;
 };
 
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/newsletters.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/newsletters.js
index 93093c5267e..6b8dbd37205 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/newsletters.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/newsletters.js
@@ -1,4 +1,5 @@
 const utils = require('../../../index');
+const emailAddressService = require('../../../../../../services/email-address');
 
 module.exports = (model, frame) => {
     const jsonModel = model.toJSON(frame.options);
@@ -19,6 +20,17 @@ module.exports = (model, frame) => {
         };
 
         return serialized;
+    } else {
+        if (jsonModel.sender_email && jsonModel.sender_reply_to === 'newsletter') {
+            // If sender_email is not allowed, we'll return it as the sender_reply_to instead, so we display the current situation correctly in the frontend
+            // If one of the properties was changed, we need to reset sender_email in case it was not changed but is invalid in the database
+            // which can happen after a config change (= auto correcting behaviour)
+            const validated = emailAddressService.service.validate(jsonModel.sender_email, 'from');
+            if (!validated.allowed) {
+                jsonModel.sender_reply_to = jsonModel.sender_email;
+                jsonModel.sender_email = null;
+            }
+        }
     }
 
     return jsonModel;
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..6ab36cd8f08 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
@@ -66,6 +66,10 @@ module.exports = async (model, frame, options = {}) => {
             jsonModel.tiers = tiersData ? tiersData.filter(t => t.type === 'paid') : [];
         }
 
+        if (jsonModel.visibility === 'tiers' && Array.isArray(jsonModel.tiers)) {
+            jsonModel.tiers = jsonModel.tiers.filter(t => t.type === 'paid');
+        }
+
         if (!['members', 'public', 'paid', 'tiers'].includes(jsonModel.visibility)) {
             const tiers = await postsService.getProductsFromVisibilityFilter(jsonModel.visibility);
 
@@ -77,6 +81,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 +92,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/api/endpoints/utils/serializers/output/members.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/members.js
index 0dcb1da3e79..799c9b05641 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/members.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/members.js
@@ -28,7 +28,7 @@ module.exports = {
  *
  * @param {{data: import('bookshelf').Model[], meta: PageMeta}} page
  * @param {APIConfig} _apiConfig
- * @param {Frame} frame
+ * @param {import('@tryghost/api-framework').Frame} frame
  *
  * @returns {{members: SerializedMember[], meta: PageMeta}}
  */
@@ -42,7 +42,7 @@ function paginatedMembers(page, _apiConfig, frame) {
 /**
  * @param {import('bookshelf').Model} model
  * @param {APIConfig} _apiConfig
- * @param {Frame} frame
+ * @param {import('@tryghost/api-framework').Frame} frame
  *
  * @returns {{members: SerializedMember[]}}
  */
@@ -55,7 +55,7 @@ function singleMember(model, _apiConfig, frame) {
 /**
  * @param {object} bulkActionResult
  * @param {APIConfig} _apiConfig
- * @param {Frame} frame
+ * @param {import('@tryghost/api-framework').Frame} frame
  *
  * @returns {{bulk: SerializedBulkAction}}
  */
@@ -219,9 +219,9 @@ function passthrough(data) {
  * @template Data
  * @template Response
  * @param {string} debugString
- * @param {(data: Data, apiConfig: APIConfig, frame: Frame) => Response} serialize - A function to serialize the data into an object suitable for API response
+ * @param {(data: Data, apiConfig: APIConfig, frame: import('@tryghost/api-framework').Frame) => Response} serialize
  *
- * @returns {(data: Data, apiConfig: APIConfig, frame: Frame) => void}
+ * @returns {(data: Data, apiConfig: APIConfig, frame: import('@tryghost/api-framework').Frame) => void}
  */
 function createSerializer(debugString, serialize) {
     return function serializer(data, apiConfig, frame) {
@@ -355,8 +355,3 @@ function createSerializer(debugString, serialize) {
  * @prop {string} docName
  * @prop {string} method
  */
-
-/**
- * @typedef {Object<string, any>} Frame
- * @prop {Object} options
- */
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/settings.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/settings.js
index 9a8c47f51a9..63b89fd3f1f 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/settings.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/settings.js
@@ -2,6 +2,8 @@ const _ = require('lodash');
 const utils = require('../../index');
 const mappers = require('./mappers');
 
+/** @typedef {import('@tryghost/api-framework').Frame} Frame */
+
 /**
  * Filters an object based on a given filter object
  * @private
@@ -25,7 +27,7 @@ function settingsFilter(settings, filter) {
  *
  * @param {Object} models
  * @param {Object} apiConfig
- * @param {Object} frame
+ * @param {Frame} frame
  */
 function serializeSettings(models, apiConfig, frame) {
     let filteredSettings;
@@ -79,7 +81,7 @@ function passthrough(data) {
  * @template Data
  * @param {Data} data
  * @param {Object} apiConfig
- * @param {Object} frame
+ * @param {Frame} frame
  */
 function serializeData(data, apiConfig, frame) {
     frame.response = data;
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/tiers.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/tiers.js
index ea1c71aa126..db475c95736 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/output/tiers.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/tiers.js
@@ -20,7 +20,7 @@ module.exports = {
 function paginatedTiers(page, _apiConfig, frame) {
     return {
         tiers: page.data.map((model) => {
-            return serializeTier(model, frame.options, frame);
+            return serializeTier(model, frame.options);
         }),
         meta: page.meta
     };
@@ -36,7 +36,7 @@ function paginatedTiers(page, _apiConfig, frame) {
 function singleTier(model, _apiConfig, frame) {
     return {
         tiers: [
-            serializeTier(model, frame.options, frame)
+            serializeTier(model, frame.options)
         ]
     };
 }
@@ -131,7 +131,4 @@ function createSerializer(debugString, serialize) {
  * @prop {string} method
  */
 
-/**
- * @typedef {Object<string, any>} Frame
- * @prop {Object} options
- */
+/** @typedef {import('@tryghost/api-framework').Frame} Frame */
diff --git a/ghost/core/core/server/api/endpoints/utils/validators/input/password_reset.js b/ghost/core/core/server/api/endpoints/utils/validators/input/password_reset.js
index 65c39011e14..705b678afb7 100644
--- a/ghost/core/core/server/api/endpoints/utils/validators/input/password_reset.js
+++ b/ghost/core/core/server/api/endpoints/utils/validators/input/password_reset.js
@@ -25,7 +25,7 @@ module.exports = {
     generateResetToken(apiConfig, frame) {
         debug('generateResetToken');
 
-        const email = frame.data.password_reset[0].email;
+        const email = frame.data.password_reset?.[0]?.email;
 
         if (typeof email !== 'string' || !validator.isEmail(email)) {
             throw new errors.BadRequestError({
diff --git a/ghost/core/core/server/api/endpoints/utils/validators/utils/json-schema.js b/ghost/core/core/server/api/endpoints/utils/validators/utils/json-schema.js
index 539686157bf..3cf273f10f0 100644
--- a/ghost/core/core/server/api/endpoints/utils/validators/utils/json-schema.js
+++ b/ghost/core/core/server/api/endpoints/utils/validators/utils/json-schema.js
@@ -5,8 +5,7 @@ const jsonSchema = require('@tryghost/admin-api-schema');
  * @param {Object} apiConfig "frame" api configuration object
  * @param {string} apiConfig.docName the name of the resource
  * @param {string} apiConfig.method API's method name
- * @param {Object} frame "frame" object with data attached to it
- * @param {Object} frame.data request data to validate
+ * @param {import('@tryghost/api-framework').Frame} frame "frame" object with data attached to it
  */
 const validate = async (apiConfig, frame) => await jsonSchema.validate({
     data: frame.data,
diff --git a/ghost/core/core/server/api/endpoints/webhooks.js b/ghost/core/core/server/api/endpoints/webhooks.js
index ef3fe82e0b0..8df54471287 100644
--- a/ghost/core/core/server/api/endpoints/webhooks.js
+++ b/ghost/core/core/server/api/endpoints/webhooks.js
@@ -15,7 +15,8 @@ const webhooksService = getWebhooksServiceInstance({
     WebhookModel: models.Webhook
 });
 
-module.exports = {
+/** @type {import('@tryghost/api-framework').Controller} */
+const controller = {
     docName: 'webhooks',
 
     add: {
@@ -133,3 +134,5 @@ module.exports = {
         }
     }
 };
+
+module.exports = controller;
diff --git a/ghost/core/core/server/data/db/ConnectionPoolInstrumentation.js b/ghost/core/core/server/data/db/ConnectionPoolInstrumentation.js
new file mode 100644
index 00000000000..2df9f47613d
--- /dev/null
+++ b/ghost/core/core/server/data/db/ConnectionPoolInstrumentation.js
@@ -0,0 +1,142 @@
+class ConnectionPoolInstrumentation {
+    constructor({knex, logging, metrics, config}) {
+        this.knex = knex;
+        this.pool = this.knex.client.pool;
+        this.logging = logging;
+        this.metrics = metrics;
+        this.enabled = config.get('telemetry:connectionPool');
+        this.requestStartTimes = {};
+        this.createStartTimes = {};
+    }
+
+    // Get the number of pending creates and acquires plus free and used connections
+    getPoolMetrics() {
+        return {
+            numPendingCreates: this.pool.numPendingCreates(),
+            numPendingAcquires: this.pool.numPendingAcquires(),
+            numFree: this.pool.numFree(),
+            numUsed: this.pool.numUsed()
+        };
+    }
+
+    handleCreateRequest(eventId) {
+        // Track when the request was submitted for calculating wait time
+        this.createStartTimes[eventId] = Date.now();
+        const poolMetrics = this.getPoolMetrics();
+        this.logging.debug(`[ConnectionPool] Creating a connection. EventID: ${eventId} Pending Creates: ${poolMetrics.numPendingCreates} Free: ${poolMetrics.numFree} Used: ${poolMetrics.numUsed}`);
+        this.metrics.metric('connection-pool', {
+            event: 'create-request',
+            eventId,
+            ...poolMetrics
+        });
+    }
+
+    handleCreateSuccess(eventId, resource) {
+        // Calculate the time it took to create the connection
+        const timeToCreate = Date.now() - this.createStartTimes[eventId];
+        // Delete the start time so we don't leak memory
+        delete this.createStartTimes[eventId];
+        this.logging.debug(`[ConnectionPool] Created a connection. EventID: ${eventId} Connection ID: ${resource.connectionId} Knex ID: ${resource.__knexUid} Time to Create: ${timeToCreate}ms`);
+        this.metrics.metric('connection-pool', {
+            event: 'create-success',
+            eventId,
+            connectionId: resource.connectionId,
+            knexUid: resource.__knexUid,
+            timeToCreate
+        });
+    }
+
+    handleCreateFail(eventId, err) {
+        // Calculate the time it took to create the connection
+        const timeToFail = Date.now() - this.createStartTimes[eventId];
+        // Delete the start time so we don't leak memory
+        delete this.createStartTimes[eventId];
+        const poolMetrics = this.getPoolMetrics();
+        this.logging.error(`[ConnectionPool] Failed to create a connection. EventID: ${eventId} Time to Create: ${timeToFail}ms`, err);
+        this.metrics.metric('connection-pool', {
+            event: 'create-fail',
+            eventId,
+            timeToFail,
+            ...poolMetrics
+        });
+    }
+
+    handleAcquireRequest(eventId) {
+        // Track when the request was submitted for calculating wait time
+        this.requestStartTimes[eventId] = Date.now();
+        const poolMetrics = this.getPoolMetrics();
+        this.logging.debug(`[ConnectionPool] Acquiring a connection. EventID: ${eventId} Pending Acquires: ${poolMetrics.numPendingAcquires} Free: ${poolMetrics.numFree} Used: ${poolMetrics.numUsed}`);
+        this.metrics.metric('connection-pool', {
+            event: 'acquire-request',
+            eventId,
+            ...poolMetrics
+        });
+    }
+
+    handleAcquireSuccess(eventId, resource) {
+        // Calculate the time it took to acquire the connection
+        const timeToAcquire = Date.now() - this.requestStartTimes[eventId];
+        // Delete the start time so we don't leak memory
+        delete this.requestStartTimes[eventId];
+        // Track when the connection was acquired for calculating lifetime upon release
+        resource.connectionAcquired = Date.now();
+        this.logging.debug(`[ConnectionPool] Acquired a connection. EventID: ${eventId} Connection ID: ${resource.connectionId} Knex Id: ${resource.__knexUid} Time to Acquire: ${timeToAcquire}ms`);
+        this.metrics.metric('connection-pool', {
+            event: 'acquire-success',
+            eventId,
+            connectionId: resource.connectionId,
+            knexUid: resource.__knexUid,
+            timeToAcquire
+        });
+    }
+
+    handleAcquireFail(eventId, err) {
+        // Calculate the time it took to acquire the connection
+        const timeToFail = Date.now() - this.requestStartTimes[eventId];
+        // Delete the start time so we don't leak memory
+        delete this.requestStartTimes[eventId];
+        const poolMetrics = this.getPoolMetrics();
+        this.logging.error(`[ConnectionPool] Failed to acquire a connection. EventID: ${eventId} Time to Acquire: ${timeToFail}ms`, err);
+        this.metrics.metric('connection-pool', {
+            event: 'acquire-fail',
+            eventId,
+            timeToFail,
+            ...poolMetrics
+        });
+    }
+
+    handleRelease(resource) {
+        const lifetime = Date.now() - resource.connectionAcquired;
+        this.logging.debug(`[ConnectionPool] Released a connection. Connection ID: ${resource.connectionId} Lifetime: ${lifetime}ms`);
+        this.metrics.metric('connection-pool', {
+            event: 'release',
+            connectionId: resource.connectionId,
+            knexUid: resource.__knexUid,
+            lifetime
+        });
+    }
+
+    instrument() {
+        if (this.enabled) {
+            // Check to make sure these event listeners haven't already been added
+            if (this.pool.emitter.eventNames().length === 0) {
+                // Fires when a connection is requested to be created
+                this.pool.on('createRequest', eventId => this.handleCreateRequest(eventId));
+                // Fires when a connection is successfully created
+                this.pool.on('createSuccess', (eventId, resource) => this.handleCreateSuccess(eventId, resource));
+                // Fires when a connection fails to be created
+                this.pool.on('createFail', (eventId, err) => this.handleCreateFail(eventId, err));
+                // Fires when a connection is requested from the pool
+                this.pool.on('acquireRequest', eventId => this.handleAcquireRequest(eventId));
+                // Fires when a connection is allocated from the pool
+                this.pool.on('acquireSuccess', (eventId, resource) => this.handleAcquireSuccess(eventId, resource));
+                // Fires when a connection fails to be allocated from the pool
+                this.pool.on('acquireFail', (eventId, err) => this.handleAcquireFail(eventId, err));
+                // Fires when a connection is released back into the pool
+                this.pool.on('release', resource => this.handleRelease(resource));
+            }
+        }
+    }
+}
+
+module.exports = ConnectionPoolInstrumentation;
diff --git a/ghost/core/core/server/data/db/backup.js b/ghost/core/core/server/data/db/backup.js
index 8153d1a3ce3..55c99abb0bc 100644
--- a/ghost/core/core/server/data/db/backup.js
+++ b/ghost/core/core/server/data/db/backup.js
@@ -42,9 +42,15 @@ const readBackup = async (filename) => {
  * Does an export, and stores this in a local file
  *
  * @param {Object} options
- * @returns {Promise<String>}
+ * @returns {Promise<String> | null}
  */
 const backup = async function backup(options = {}) {
+    // do not create backup if disabled in config (this is intended for large customers who will OOM node)
+    if (config.get('disableJSBackups')) {
+        logging.info('Database backup is disabled in Ghost config');
+        return null;
+    }
+
     logging.info('Creating database backup');
 
     const filename = await exporter.fileName(options);
diff --git a/ghost/core/core/server/data/db/connection.js b/ghost/core/core/server/data/db/connection.js
index 43bc11f1182..4cb555de508 100644
--- a/ghost/core/core/server/data/db/connection.js
+++ b/ghost/core/core/server/data/db/connection.js
@@ -1,9 +1,13 @@
 const _ = require('lodash');
 const knex = require('knex');
 const os = require('os');
+const fs = require('fs');
 
 const logging = require('@tryghost/logging');
+const metrics = require('@tryghost/metrics');
 const config = require('../../../shared/config');
+const errors = require('@tryghost/errors');
+const ConnectionPoolInstrumentation = require('./ConnectionPoolInstrumentation');
 let knexInstance;
 
 // @TODO:
@@ -45,6 +49,14 @@ function configure(dbConfig) {
         dbConfig.connection.timezone = 'Z';
         dbConfig.connection.charset = 'utf8mb4';
         dbConfig.connection.decimalNumbers = true;
+
+        if (process.env.REQUIRE_INFILE_STREAM) {
+            if (process.env.NODE_ENV === 'development' || process.env.ALLOW_INFILE_STREAM) {
+                dbConfig.connection.infileStreamFactory = path => fs.createReadStream(path);
+            } else {
+                throw new errors.InternalServerError({message: 'MySQL infile streaming is required to run the current process, but is not allowed. Run the script in development mode or set ALLOW_INFILE_STREAM=1.'});
+            }
+        }
     }
 
     return dbConfig;
@@ -52,6 +64,10 @@ function configure(dbConfig) {
 
 if (!knexInstance && config.get('database') && config.get('database').client) {
     knexInstance = knex(configure(config.get('database')));
+    if (config.get('telemetry:connectionPool')) {
+        const instrumentation = new ConnectionPoolInstrumentation({knex: knexInstance, logging, metrics, config});
+        instrumentation.instrument();
+    }
 }
 
 module.exports = knexInstance;
diff --git a/ghost/core/core/server/data/importer/import-manager.js b/ghost/core/core/server/data/importer/import-manager.js
index d1d4891785c..360c081af7e 100644
--- a/ghost/core/core/server/data/importer/import-manager.js
+++ b/ghost/core/core/server/data/importer/import-manager.js
@@ -235,6 +235,14 @@ class ImportManager {
                     help: tpl(messages.invalidZipFileNameEncodingHelp),
                     code: 'INVALID_ZIP_FILE_NAME_ENCODING'
                 });
+            } else if (
+                err.message.includes('end of central directory record signature not found')
+                || err.message.includes('invalid comment length')
+            ) { // This comes from Yauzl when the zip is invalid
+                throw new errors.UnsupportedMediaTypeError({
+                    message: tpl(messages.invalidZipFileNameEncoding),
+                    code: 'INVALID_ZIP_FILE'
+                });
             }
             throw err;
         }
diff --git a/ghost/core/core/server/data/importer/importers/data/ProductsImporter.js b/ghost/core/core/server/data/importer/importers/data/ProductsImporter.js
index 200be775603..2a7ca6f54e9 100644
--- a/ghost/core/core/server/data/importer/importers/data/ProductsImporter.js
+++ b/ghost/core/core/server/data/importer/importers/data/ProductsImporter.js
@@ -122,8 +122,26 @@ class ProductsImporter extends BaseImporter {
         this.dataToImport = this.dataToImport.filter(item => !duplicateProducts.includes(item.id));
     }
 
+    preventInvalidFree() {
+        let invalidFreeProducts = [];
+        _.each(this.dataToImport, (product) => {
+            // A free product must not have any pricing data (otherwise it wouldn't be free, duh!)
+            if (product.type === 'free' && product.currency && product.monthly_price && product.yearly_price) {
+                this.problems.push({
+                    message: 'Entry was not imported and ignored. Detected invalid entry.',
+                    help: this.modelName,
+                    context: JSON.stringify({product})
+                });
+                invalidFreeProducts.push(product.id);
+            }
+        });
+        // ignore invalid free products
+        this.dataToImport = this.dataToImport.filter(item => !invalidFreeProducts.includes(item.id));
+    }
+
     beforeImport() {
         this.populatePriceData();
+        this.preventInvalidFree();
         return super.beforeImport();
     }
 
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.0/2022-03-14-12-33-delete-duplicate-offer-redemptions.js b/ghost/core/core/server/data/migrations/versions/5.0/2022-03-14-12-33-delete-duplicate-offer-redemptions.js
index dc7038dc162..12a743a8326 100644
--- a/ghost/core/core/server/data/migrations/versions/5.0/2022-03-14-12-33-delete-duplicate-offer-redemptions.js
+++ b/ghost/core/core/server/data/migrations/versions/5.0/2022-03-14-12-33-delete-duplicate-offer-redemptions.js
@@ -1,4 +1,4 @@
-const DatabaseInfo = require('@tryghost/database-info/lib/database-info');
+const DatabaseInfo = require('@tryghost/database-info');
 const logging = require('@tryghost/logging');
 
 const {createTransactionalMigration} = require('../../utils');
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/migrations/versions/5.74/2023-11-14-11-15-00-add-transient-id-column-nullable.js b/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-15-00-add-transient-id-column-nullable.js
new file mode 100644
index 00000000000..c4e133db339
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-15-00-add-transient-id-column-nullable.js
@@ -0,0 +1,9 @@
+const {createAddColumnMigration} = require('../../utils');
+
+// First make a nullable column
+module.exports = createAddColumnMigration('members', 'transient_id', {
+    type: 'string',
+    maxlength: 191,
+    nullable: true,
+    unique: true
+});
diff --git a/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-16-00-fill-transient-id-column.js b/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-16-00-fill-transient-id-column.js
new file mode 100644
index 00000000000..5d8bbd86d44
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-16-00-fill-transient-id-column.js
@@ -0,0 +1,17 @@
+const logging = require('@tryghost/logging');
+
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Setting transient_id column to email');
+
+        const updatedRows = await knex('members')
+            .update('transient_id', knex.raw('email'));
+
+        logging.info(`Updated ${updatedRows} members with transient_id = email`);
+    },
+    async function down() {
+        // Not required
+    }
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-17-00-drop-nullable-transient-id-column.js b/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-17-00-drop-nullable-transient-id-column.js
new file mode 100644
index 00000000000..c3057c72ca0
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.74/2023-11-14-11-17-00-drop-nullable-transient-id-column.js
@@ -0,0 +1,4 @@
+const {createDropNullableMigration} = require('../../utils');
+
+// We need to disable foreign key checks because if MySQL is missing the STRICT_TRANS_TABLES mode, we cannot revert the migration
+module.exports = createDropNullableMigration('members', 'transient_id', {disableForeignKeyChecks: true});
diff --git a/ghost/core/core/server/data/migrations/versions/5.75/2023-11-27-15-55-add-members-newsletters-index.js b/ghost/core/core/server/data/migrations/versions/5.75/2023-11-27-15-55-add-members-newsletters-index.js
new file mode 100644
index 00000000000..cd52e3c7341
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.75/2023-11-27-15-55-add-members-newsletters-index.js
@@ -0,0 +1,26 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+const {addIndex, dropIndex} = require('../../../schema/commands');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        await addIndex('members_newsletters', ['newsletter_id', 'member_id'], knex);
+    },
+    async function down(knex) {
+        try {
+            await dropIndex('members_newsletters', ['newsletter_id', 'member_id'], knex);
+        } catch (err) {
+            if (err.code === 'ER_DROP_INDEX_FK') {
+                logging.error({
+                    message: 'Error dropping index over members_newsletters(newsletter_id, member_id), re-adding index for newsletter_id'
+                });
+
+                await addIndex('members_newsletters', ['newsletter_id'], knex);
+                await dropIndex('members_newsletters', ['newsletter_id', 'member_id'], knex);
+                return;
+            }
+
+            throw err;
+        }
+    }
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.76/2023-12-05-11-00-add-portal-default-plan-setting.js b/ghost/core/core/server/data/migrations/versions/5.76/2023-12-05-11-00-add-portal-default-plan-setting.js
new file mode 100644
index 00000000000..ed766501809
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.76/2023-12-05-11-00-add-portal-default-plan-setting.js
@@ -0,0 +1,8 @@
+const {addSetting} = require('../../utils');
+
+module.exports = addSetting({
+    key: 'portal_default_plan',
+    value: 'yearly',
+    type: 'string',
+    group: 'portal'
+});
diff --git a/ghost/core/core/server/data/migrations/versions/5.79/2024-01-30-19-36-44-fix-discrepancy-in-free-tier-visibility.js b/ghost/core/core/server/data/migrations/versions/5.79/2024-01-30-19-36-44-fix-discrepancy-in-free-tier-visibility.js
new file mode 100644
index 00000000000..92af89ca802
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.79/2024-01-30-19-36-44-fix-discrepancy-in-free-tier-visibility.js
@@ -0,0 +1,43 @@
+const {createTransactionalMigration} = require('../../utils');
+const logging = require('@tryghost/logging');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const portalPlansRaw = await knex('settings').select('value').where('key', 'portal_plans').first();
+        const freeTier = await knex('products').select('visibility').where('type', 'free').first();
+
+        if (!portalPlansRaw || !freeTier) {
+            logging.warn('Could not read `portal_plans` setting or `visibility` of the free tier - skipping migration');
+            return;
+        }
+
+        let portalPlans;
+        try {
+            portalPlans = JSON.parse(portalPlansRaw.value);
+
+            if (!portalPlans || !Array.isArray(portalPlans)) {
+                logging.warn('`portal_plans` setting is not valid - skipping migration');
+                return;
+            }
+        } catch (err) {
+            logging.warn('Could not parse `portal_plans` setting - skipping migration');
+            return;
+        }
+
+        if (portalPlans.includes('free') && freeTier.visibility === 'none') {
+            logging.info('`portal_plans` setting contains "free", but free tier is not visible - updating free tier visibility to public');
+            await knex('products').update('visibility', 'public').where('type', 'free');
+            return;
+        }
+
+        if (!portalPlans.includes('free') && freeTier.visibility === 'public') {
+            logging.info('`portal_plans` setting does not contain "free", but free tier is visible - updating free tier visibility to none');
+            await knex('products').update('visibility', 'none').where('type', 'free');
+            return;
+        }
+    },
+
+    async function down() {
+        // noop, as this is a data discrepancy fix
+    }
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.81/2024-03-18-16-20-add-missing-post-permissions.js b/ghost/core/core/server/data/migrations/versions/5.81/2024-03-18-16-20-add-missing-post-permissions.js
new file mode 100644
index 00000000000..dd8bf0a863b
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.81/2024-03-18-16-20-add-missing-post-permissions.js
@@ -0,0 +1,20 @@
+const {combineTransactionalMigrations, addPermissionToRole} = require('../../utils');
+
+module.exports = combineTransactionalMigrations(
+    addPermissionToRole({
+        permission: 'Edit posts',
+        role: 'Author'
+    }),
+    addPermissionToRole({
+        permission: 'Edit posts',
+        role: 'Contributor'
+    }),
+    addPermissionToRole({
+        permission: 'Delete posts',
+        role: 'Author'
+    }),
+    addPermissionToRole({
+        permission: 'Delete posts',
+        role: 'Contributor'
+    })
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.82/2024-03-25-16-46-10-add-email-recipients-email-id-indexes.js b/ghost/core/core/server/data/migrations/versions/5.82/2024-03-25-16-46-10-add-email-recipients-email-id-indexes.js
new file mode 100644
index 00000000000..5f97c8f7191
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.82/2024-03-25-16-46-10-add-email-recipients-email-id-indexes.js
@@ -0,0 +1,17 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const {createNonTransactionalMigration} = require('../../utils');
+const commands = require('../../../schema/commands');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        await commands.addIndex('email_recipients', ['email_id', 'delivered_at'], knex);
+        await commands.addIndex('email_recipients', ['email_id', 'opened_at'], knex);
+        await commands.addIndex('email_recipients', ['email_id', 'failed_at'], knex);
+    },
+    async function down(knex) {
+        await commands.dropIndex('email_recipients', ['email_id', 'delivered_at'], knex);
+        await commands.dropIndex('email_recipients', ['email_id', 'opened_at'], knex);
+        await commands.dropIndex('email_recipients', ['email_id', 'failed_at'], knex);
+    }
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.82/2024-03-25-16-51-29-drop-email-recipients-non-email-id-indexes.js b/ghost/core/core/server/data/migrations/versions/5.82/2024-03-25-16-51-29-drop-email-recipients-non-email-id-indexes.js
new file mode 100644
index 00000000000..7b6d5a07172
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.82/2024-03-25-16-51-29-drop-email-recipients-non-email-id-indexes.js
@@ -0,0 +1,17 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const {createNonTransactionalMigration} = require('../../utils');
+const commands = require('../../../schema/commands');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        await commands.dropIndex('email_recipients', ['delivered_at'], knex);
+        await commands.dropIndex('email_recipients', ['opened_at'], knex);
+        await commands.dropIndex('email_recipients', ['failed_at'], knex);
+    },
+    async function down(knex) {
+        await commands.addIndex('email_recipients', ['delivered_at'], knex);
+        await commands.addIndex('email_recipients', ['opened_at'], knex);
+        await commands.addIndex('email_recipients', ['failed_at'], knex);
+    }
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.83/2024-05-28-02-20-55-add-show-subhead-column-newsletters.js b/ghost/core/core/server/data/migrations/versions/5.83/2024-05-28-02-20-55-add-show-subhead-column-newsletters.js
new file mode 100644
index 00000000000..99a630febd3
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.83/2024-05-28-02-20-55-add-show-subhead-column-newsletters.js
@@ -0,0 +1,9 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('newsletters', 'show_subhead', {
+    type: 'boolean',
+    nullable: false,
+    defaultTo: false
+});
diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-09-13-33-rename-newsletters-show-subhead.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-09-13-33-rename-newsletters-show-subhead.js
new file mode 100644
index 00000000000..279b3ddf39b
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-09-13-33-rename-newsletters-show-subhead.js
@@ -0,0 +1,3 @@
+const {createRenameColumnMigration} = require('../../utils');
+
+module.exports = createRenameColumnMigration('newsletters', 'show_subhead', 'show_subtitle');
diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-11-10-37-add-custom-excerpt-to-post-revisions.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-11-10-37-add-custom-excerpt-to-post-revisions.js
new file mode 100644
index 00000000000..44ba3a24cda
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-11-10-37-add-custom-excerpt-to-post-revisions.js
@@ -0,0 +1,7 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('post_revisions', 'custom_excerpt', {
+    type: 'string',
+    maxlength: 2000,
+    nullable: true
+});
diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-08-42-34-populate-post-revisions-custom-excerpt.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-08-42-34-populate-post-revisions-custom-excerpt.js
new file mode 100644
index 00000000000..e6fe2e68177
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-08-42-34-populate-post-revisions-custom-excerpt.js
@@ -0,0 +1,11 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up() {
+        logging.warn('Skipping migration - noop');
+    },
+    async function down() {
+        // Not required
+    }
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-13-48-35-rename-newsletters-show-subtitle.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-13-48-35-rename-newsletters-show-subtitle.js
new file mode 100644
index 00000000000..8a91ffcad84
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-13-48-35-rename-newsletters-show-subtitle.js
@@ -0,0 +1,3 @@
+const {createRenameColumnMigration} = require('../../utils');
+
+module.exports = createRenameColumnMigration('newsletters', 'show_subtitle', 'show_excerpt');
diff --git a/ghost/core/core/server/data/migrations/versions/5.85/2024-06-10-14-53-31-add-posts-updated-at-index.js b/ghost/core/core/server/data/migrations/versions/5.85/2024-06-10-14-53-31-add-posts-updated-at-index.js
new file mode 100644
index 00000000000..124e86e5005
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.85/2024-06-10-14-53-31-add-posts-updated-at-index.js
@@ -0,0 +1,4 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+const {createAddIndexMigration} = require('../../utils');
+
+module.exports = createAddIndexMigration('posts',['updated_at']);
\ No newline at end of file
diff --git a/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-20-add-posts-tags-post-tag-index.js b/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-20-add-posts-tags-post-tag-index.js
new file mode 100644
index 00000000000..4aa38673dbf
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-20-add-posts-tags-post-tag-index.js
@@ -0,0 +1,26 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+const {addIndex, dropIndex} = require('../../../schema/commands');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        await addIndex('posts_tags', ['post_id', 'tag_id'], knex);
+    },
+    async function down(knex) {
+        try {
+            await dropIndex('posts_tags', ['post_id', 'tag_id'], knex);
+        } catch (err) {
+            if (err.code === 'ER_DROP_INDEX_FK') {
+                logging.error({
+                    message: 'Error dropping index over posts_tags(post_id, tag_id), re-adding index for post_id'
+                });
+
+                await addIndex('posts_tags', ['post_id'], knex);
+                await dropIndex('posts_tags', ['post_id', 'tag_id'], knex);
+                return;
+            }
+
+            throw err;
+        }
+    }
+);
\ No newline at end of file
diff --git a/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-45-add-posts-type-status-updated-at-index.js b/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-45-add-posts-type-status-updated-at-index.js
new file mode 100644
index 00000000000..2415fe1d447
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-45-add-posts-type-status-updated-at-index.js
@@ -0,0 +1,4 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+const {createAddIndexMigration} = require('../../utils');
+
+module.exports = createAddIndexMigration('posts',['type','status','updated_at']);
\ No newline at end of file
diff --git a/ghost/core/core/server/data/migrations/versions/5.89/2024-07-30-19-51-06-backfill-offer-redemptions.js b/ghost/core/core/server/data/migrations/versions/5.89/2024-07-30-19-51-06-backfill-offer-redemptions.js
new file mode 100644
index 00000000000..b37b1e3ab72
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.89/2024-07-30-19-51-06-backfill-offer-redemptions.js
@@ -0,0 +1,64 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
+const {default: ObjectID} = require('bson-objectid');
+
+// For DML - data changes
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        // Backfill missing offer redemptions
+        try {
+            // Select all subscriptions that have an `offer_id` but don't have a matching row in the `offer_redemptions` table
+            logging.info('Selecting subscriptions with missing offer redemptions');
+            const result = await knex.raw(`
+                SELECT
+                    mscs.id AS subscription_id,
+                    mscs.offer_id,
+                    mscs.start_date AS created_at,
+                    m.id AS member_id
+                FROM
+                    members_stripe_customers_subscriptions mscs
+                        LEFT JOIN
+                    offer_redemptions r ON r.subscription_id = mscs.id
+                        INNER JOIN 
+                    members_stripe_customers msc ON mscs.customer_id = msc.customer_id
+                        INNER JOIN
+                    members m ON msc.member_id = m.id
+                WHERE
+                    mscs.offer_id IS NOT NULL and r.id IS NULL;
+            `);
+
+            // knex.raw() returns a different result depending on the database. We need to handle either case
+            let rows = [];
+            if (DatabaseInfo.isSQLite(knex)) {
+                rows = result;
+            } else {
+                rows = result[0];
+            }
+
+            // Do the backfil
+            if (rows && rows.length > 0) {
+                logging.info(`Backfilling ${rows.length} offer redemptions`);
+                // Generate IDs for each row
+                const offerRedemptions = rows.map((row) => {
+                    return {
+                        id: (new ObjectID()).toHexString(),
+                        ...row
+                    };
+                });
+                // Batch insert rows into the offer_redemptions table
+                await knex.batchInsert('offer_redemptions', offerRedemptions, 1000);
+            } else {
+                logging.info('No offer redemptions to backfill');
+            }
+        } catch (error) {
+            logging.error(`Error backfilling offer redemptions: ${error.message}`);
+        }
+    },
+    async function down() {
+        // We don't want to un-backfill data, so do nothing here.
+    }
+);
\ No newline at end of file
diff --git a/ghost/core/core/server/data/migrations/versions/5.90/2024-08-20-09-40-24-update-default-donations-suggested-amount.js b/ghost/core/core/server/data/migrations/versions/5.90/2024-08-20-09-40-24-update-default-donations-suggested-amount.js
new file mode 100644
index 00000000000..ee5773bcc8e
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.90/2024-08-20-09-40-24-update-default-donations-suggested-amount.js
@@ -0,0 +1,42 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const logging = require('@tryghost/logging');
+
+// For DDL - schema changes
+// const {createNonTransactionalMigration} = require('../../utils');
+
+// For DML - data changes
+const {createTransactionalMigration} = require('../../utils');
+
+// Or use a specific helper
+// const {addTable, createAddColumnMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        try {
+            // find the existing donations_suggested_amount setting
+            const existingSuggestedAmount = await knex('settings')
+                .where({key: 'donations_suggested_amount'})
+                .first();
+
+            // previous default is '0', if it's been set to something else we don't want to change it
+            if (existingSuggestedAmount.value !== '0') {
+                logging.info('donations_suggested_amount setting does not have previous default of 0, skipping migration');
+                return;
+            }
+
+            // new default is '500', update the setting
+            logging.info('Updating donations_suggested_amount default setting to 500');
+            await knex('settings')
+                .where({key: 'donations_suggested_amount'})
+                .update({value: '500'});
+        } catch (error) {
+            logging.error(`Error updating donations_suggested_amount setting: ${error.message}`);
+        }
+    },
+    async function down() {
+        // no-op
+        // we can't guarantee that a suggested amount of 500 now isn't
+        // something that was set explicitly
+    }
+);
diff --git a/ghost/core/core/server/data/migrations/versions/5.91/2024-08-28-05-28-22-add-donation-message-column-to-donation-payment-events.js b/ghost/core/core/server/data/migrations/versions/5.91/2024-08-28-05-28-22-add-donation-message-column-to-donation-payment-events.js
new file mode 100644
index 00000000000..326612eb53f
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.91/2024-08-28-05-28-22-add-donation-message-column-to-donation-payment-events.js
@@ -0,0 +1,9 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('donation_payment_events', 'donation_message', {
+    type: 'string',
+    maxlength: 255, // as per stripe limitation for custom fields https://docs.stripe.com/payments/checkout/custom-fields
+    nullable: true
+});
diff --git a/ghost/core/core/server/data/migrations/versions/5.93/2024-09-03-18-51-01-update-stripe-prices-nickname-length.js b/ghost/core/core/server/data/migrations/versions/5.93/2024-09-03-18-51-01-update-stripe-prices-nickname-length.js
new file mode 100644
index 00000000000..050f7844abd
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.93/2024-09-03-18-51-01-update-stripe-prices-nickname-length.js
@@ -0,0 +1,19 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        if (DatabaseInfo.isSQLite(knex)) {
+            logging.warn('Skipping migration for SQLite3');
+            return;
+        }
+        logging.info('Changing stripe_prices.nickname column from VARCHAR(50) to VARCHAR(255)');
+        await knex.schema.alterTable('stripe_prices', function (table) {
+            table.string('nickname', 255).alter();
+        });
+    },
+    async function down() {
+        logging.warn('Not changing stripe_prices.nickname column');
+    }
+);
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/default-settings/default-settings.json b/ghost/core/core/server/data/schema/default-settings/default-settings.json
index b321087fab1..34b9e496ac3 100644
--- a/ghost/core/core/server/data/schema/default-settings/default-settings.json
+++ b/ghost/core/core/server/data/schema/default-settings/default-settings.json
@@ -330,6 +330,14 @@
             "defaultValue": "[\"free\"]",
             "type": "array"
         },
+        "portal_default_plan": {
+            "defaultValue": "yearly",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["yearly", "monthly"]]
+            },
+            "type": "string"
+        },
         "portal_products": {
             "defaultValue": "[]",
             "type": "array"
@@ -559,7 +567,7 @@
             "type": "string"
         },
         "donations_suggested_amount": {
-            "defaultValue": 0,
+            "defaultValue": 500,
             "validations": {
                 "isEmpty": false
             },
diff --git a/ghost/core/core/server/data/schema/fixtures/fixtures.json b/ghost/core/core/server/data/schema/fixtures/fixtures.json
index c9478e628b4..e6dd4b8d017 100644
--- a/ghost/core/core/server/data/schema/fixtures/fixtures.json
+++ b/ghost/core/core/server/data/schema/fixtures/fixtures.json
@@ -929,7 +929,7 @@
                     "recommendation": ["browse", "read"]
                 },
                 "Author": {
-                    "post": ["browse", "read", "add"],
+                    "post": ["browse", "read", "edit", "add", "destroy"],
                     "setting": ["browse", "read"],
                     "slug": "all",
                     "tag": ["browse", "read", "add"],
@@ -946,7 +946,7 @@
                     "recommendation": ["browse", "read"]
                 },
                 "Contributor": {
-                    "post": ["browse", "read", "add"],
+                    "post": ["browse", "read", "edit", "add", "destroy"],
                     "setting": ["browse", "read"],
                     "slug": "all",
                     "tag": ["browse", "read"],
diff --git a/ghost/core/core/server/data/schema/schema.js b/ghost/core/core/server/data/schema/schema.js
index 29a748ecacc..7d1b1136181 100644
--- a/ghost/core/core/server/data/schema/schema.js
+++ b/ghost/core/core/server/data/schema/schema.js
@@ -17,7 +17,7 @@ module.exports = {
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
         sender_name: {type: 'string', maxlength: 191, nullable: true},
         sender_email: {type: 'string', maxlength: 191, nullable: true},
-        sender_reply_to: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'newsletter', validations: {isIn: [['newsletter', 'support']]}},
+        sender_reply_to: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'newsletter'},
         status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'active', validations: {isIn: [['active', 'archived']]}},
         visibility: {
             type: 'string',
@@ -30,6 +30,7 @@ module.exports = {
         header_image: {type: 'string', maxlength: 2000, nullable: true},
         show_header_icon: {type: 'boolean', nullable: false, defaultTo: true},
         show_header_title: {type: 'boolean', nullable: false, defaultTo: true},
+        show_excerpt: {type: 'boolean', nullable: false, defaultTo: false},
         title_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
         title_alignment: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'center', validations: {isIn: [['center', 'left']]}},
         show_feature_image: {type: 'boolean', nullable: false, defaultTo: true},
@@ -81,7 +82,7 @@ module.exports = {
          * This is valid for all x_by fields.
          */
         created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
+        updated_at: {type: 'dateTime', nullable: true, index: true},
         updated_by: {type: 'string', maxlength: 24, nullable: true},
         published_at: {type: 'dateTime', nullable: true, index: true},
         published_by: {type: 'string', maxlength: 24, nullable: true},
@@ -92,6 +93,9 @@ module.exports = {
         canonical_url: {type: 'text', maxlength: 2000, nullable: true},
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id'},
         show_title_and_feature_image: {type: 'boolean', nullable: false, defaultTo: true},
+        '@@INDEXES@@': [
+            ['type','status','updated_at']
+        ],
         '@@UNIQUE_CONSTRAINTS@@': [
             ['slug', 'type']
         ]
@@ -294,7 +298,10 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id'},
         tag_id: {type: 'string', maxlength: 24, nullable: false, references: 'tags.id'},
-        sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
+        sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
+        '@@INDEXES@@': [
+            ['post_id','tag_id']
+        ]
     },
     invites: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -412,11 +419,13 @@ module.exports = {
         reason: {type: 'string', maxlength: 50, nullable: true},
         feature_image: {type: 'string', maxlength: 2000, nullable: true},
         feature_image_alt: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 125}}},
-        feature_image_caption: {type: 'text', maxlength: 65535, nullable: true}
+        feature_image_caption: {type: 'text', maxlength: 65535, nullable: true},
+        custom_excerpt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 300}}}
     },
     members: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         uuid: {type: 'string', maxlength: 36, nullable: true, unique: true, validations: {isUUID: true}},
+        transient_id: {type: 'string', maxlength: 191, nullable: false, unique: true},
         email: {type: 'string', maxlength: 191, nullable: false, unique: true, validations: {isEmail: true}},
         status: {
             type: 'string', maxlength: 50, nullable: false, defaultTo: 'free', validations: {
@@ -523,7 +532,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 +718,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']]
@@ -757,7 +766,8 @@ module.exports = {
         referrer_source: {type: 'string', maxlength: 191, nullable: true},
         referrer_medium: {type: 'string', maxlength: 191, nullable: true},
         referrer_url: {type: 'string', maxlength: 2000, nullable: true},
-        created_at: {type: 'dateTime', nullable: false}
+        created_at: {type: 'dateTime', nullable: false},
+        donation_message: {type: 'string', maxlength: 255, nullable: true} // https://docs.stripe.com/payments/checkout/custom-fields
     },
     stripe_products: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -771,7 +781,7 @@ module.exports = {
         stripe_price_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
         stripe_product_id: {type: 'string', maxlength: 255, nullable: false, unique: false, references: 'stripe_products.stripe_product_id'},
         active: {type: 'boolean', nullable: false},
-        nickname: {type: 'string', maxlength: 50, nullable: true},
+        nickname: {type: 'string', maxlength: 255, nullable: true},
         // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
         // so we should decide whether we should reduce it down in the future
         currency: {type: 'string', maxlength: 191, nullable: false},
@@ -864,14 +874,17 @@ module.exports = {
         member_id: {type: 'string', maxlength: 24, nullable: false, index: true},
         batch_id: {type: 'string', maxlength: 24, nullable: false, references: 'email_batches.id'},
         processed_at: {type: 'dateTime', nullable: true},
-        delivered_at: {type: 'dateTime', nullable: true, index: true},
-        opened_at: {type: 'dateTime', nullable: true, index: true},
-        failed_at: {type: 'dateTime', nullable: true, index: true},
+        delivered_at: {type: 'dateTime', nullable: true},
+        opened_at: {type: 'dateTime', nullable: true},
+        failed_at: {type: 'dateTime', nullable: true},
         member_uuid: {type: 'string', maxlength: 36, nullable: false},
         member_email: {type: 'string', maxlength: 191, nullable: false},
         member_name: {type: 'string', maxlength: 191, nullable: true},
         '@@INDEXES@@': [
-            ['email_id', 'member_email']
+            ['email_id', 'member_email'],
+            ['email_id', 'delivered_at'],
+            ['email_id', 'opened_at'],
+            ['email_id', 'failed_at']
         ]
     },
     email_recipient_failures: {
@@ -935,7 +948,10 @@ module.exports = {
     members_newsletters: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
-        newsletter_id: {type: 'string', maxlength: 24, nullable: false, references: 'newsletters.id', cascadeDelete: true}
+        newsletter_id: {type: 'string', maxlength: 24, nullable: false, references: 'newsletters.id', cascadeDelete: true},
+        '@@INDEXES@@': [
+            ['newsletter_id', 'member_id']
+        ]
     },
     comments: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
diff --git a/ghost/core/core/server/lib/image/BlogIcon.js b/ghost/core/core/server/lib/image/BlogIcon.js
index af673419c0e..2238dfc04fc 100644
--- a/ghost/core/core/server/lib/image/BlogIcon.js
+++ b/ghost/core/core/server/lib/image/BlogIcon.js
@@ -98,13 +98,17 @@ class BlogIcon {
     }
 
     /**
-     * Return URL for Blog icon: [subdirectory or not]favicon.[ico, jpeg, or png]
-     * Always returns {string} getIconUrl
-     * @returns {string} [subdirectory or not]favicon.[ico, jpeg, or png]
+     * Return URL for blog icon, if available: [subdirectory or not]favicon.[ico, jpeg, or png]
+     * Otherwise, fallbacks to the default Ghost favicon.ico file, if requested
+     * Otherwise, returns null
+     * @param {Object} [options]
+     * @param {boolean} [options.absolute] - if true, return absolute URL. Default: false
+     * @param {boolean} [options.fallbackToDefault] - if true, fallbacks to Ghost's default favicon.ico when no blog icon is found. Default: true
+     * @returns {string|null} [subdirectory or not]favicon.[ico, jpeg, or png] or null
      * @description Checks if we have a custom uploaded icon and the extension of it. If no custom uploaded icon
      * exists, we're returning the default `favicon.ico`
      */
-    getIconUrl(absolute) {
+    getIconUrl({absolute = false, fallbackToDefault = true} = {}) {
         const blogIcon = this.settingsCache.get('icon');
 
         if (blogIcon) {
@@ -124,9 +128,13 @@ class BlogIcon {
 
             const sizedIcon = blogIcon.replace(/\/content\/images\//, '/content/images/size/w256h256/');
             return this.urlUtils.urlFor({relativeUrl: sizedIcon}, absolute ? true : undefined);
-        } else {
+        }
+
+        if (fallbackToDefault) {
             return this.urlUtils.urlFor({relativeUrl: '/favicon.ico'}, absolute ? true : undefined);
         }
+
+        return null;
     }
 
     /**
diff --git a/ghost/core/core/server/lib/image/ImageSize.js b/ghost/core/core/server/lib/image/ImageSize.js
index 7c9506b1641..fecd52668ce 100644
--- a/ghost/core/core/server/lib/image/ImageSize.js
+++ b/ghost/core/core/server/lib/image/ImageSize.js
@@ -1,6 +1,6 @@
 const debug = require('@tryghost/debug')('utils:image-size');
 const sizeOf = require('image-size');
-const probeSizeOf = require('probe-image-size');
+
 const url = require('url');
 const path = require('path');
 const _ = require('lodash');
@@ -17,13 +17,14 @@ const FETCH_ONLY_FORMATS = [
 ];
 
 class ImageSize {
-    constructor({config, storage, storageUtils, validator, urlUtils, request}) {
+    constructor({config, storage, storageUtils, validator, urlUtils, request, probe}) {
         this.config = config;
         this.storage = storage;
         this.storageUtils = storageUtils;
         this.validator = validator;
         this.urlUtils = urlUtils;
         this.request = request;
+        this.probe = probe;
 
         this.REQUEST_OPTIONS = {
             // we need the user-agent, otherwise some https request may fail (e.g. cloudfare)
@@ -82,7 +83,18 @@ class ImageSize {
             }));
         }
 
-        return probeSizeOf(imageUrl, this.NEEDLE_OPTIONS);
+        // wrap probe-image-size in a promise in case it is unresponsive/the timeout itself doesn't work
+        return (Promise.race([
+            this.probe(imageUrl, this.NEEDLE_OPTIONS),
+            new Promise((res, rej) => {
+                setTimeout(() => {
+                    rej(new errors.InternalServerError({
+                        message: 'Probe unresponsive.',
+                        code: 'IMAGE_SIZE_URL'
+                    }));
+                }, this.NEEDLE_OPTIONS.response_timeout);
+            })
+        ]));
     }
 
     // download full image then use image-size to get it's dimensions
diff --git a/ghost/core/core/server/lib/image/ImageUtils.js b/ghost/core/core/server/lib/image/ImageUtils.js
index 08bbb469037..82ca6cadf4f 100644
--- a/ghost/core/core/server/lib/image/ImageUtils.js
+++ b/ghost/core/core/server/lib/image/ImageUtils.js
@@ -2,11 +2,12 @@ const BlogIcon = require('./BlogIcon');
 const CachedImageSizeFromUrl = require('./CachedImageSizeFromUrl');
 const Gravatar = require('./Gravatar');
 const ImageSize = require('./ImageSize');
+const probe = require('probe-image-size');
 
 class ImageUtils {
     constructor({config, urlUtils, settingsCache, storageUtils, storage, validator, request, cacheStore}) {
         this.blogIcon = new BlogIcon({config, urlUtils, settingsCache, storageUtils});
-        this.imageSize = new ImageSize({config, storage, storageUtils, validator, urlUtils, request});
+        this.imageSize = new ImageSize({config, storage, storageUtils, validator, urlUtils, request, probe});
         this.cachedImageSizeFromUrl = new CachedImageSizeFromUrl({
             getImageSizeFromUrl: this.imageSize.getImageSizeFromUrl.bind(this.imageSize),
             cache: cacheStore
diff --git a/ghost/core/core/server/lib/lexical.js b/ghost/core/core/server/lib/lexical.js
index 7fd5730efe1..7c6397b4fb9 100644
--- a/ghost/core/core/server/lib/lexical.js
+++ b/ghost/core/core/server/lib/lexical.js
@@ -2,6 +2,7 @@ const path = require('path');
 const errors = require('@tryghost/errors');
 const urlUtils = require('../../shared/url-utils');
 const config = require('../../shared/config');
+const labs = require('../../shared/labs');
 const storage = require('../adapters/storage');
 
 let nodes;
@@ -99,11 +100,10 @@ module.exports = {
                     && imageTransform.shouldResizeFileExtension(ext)
                     && typeof storage.getStorage('images').saveRaw === 'function';
             },
-            createDocument() {
-                const {JSDOM} = require('jsdom');
-                return (new JSDOM()).window.document;
-            },
-            getCollectionPosts
+            getCollectionPosts,
+            feature: {
+                contentVisibility: labs.isSet('contentVisibility')
+            }
         }, userOptions);
 
         return await this.lexicalHtmlRenderer.render(lexical, options);
@@ -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/models/base/plugins/crud.js b/ghost/core/core/server/models/base/plugins/crud.js
index 614d5b8dfcb..be67979ff26 100644
--- a/ghost/core/core/server/models/base/plugins/crud.js
+++ b/ghost/core/core/server/models/base/plugins/crud.js
@@ -120,6 +120,25 @@ module.exports = function (Bookshelf) {
                 });
             }
 
+            if (Array.isArray(options.cte)) {
+                options.cte.forEach((cte) => {
+                    itemCollection.query((qb) => {
+                        qb.with(cte.name, qb.client.raw(cte.query));
+                    });
+                });
+            }
+
+            if (options.from) {
+                itemCollection.query((qb) => {
+                    qb.from(options.from);
+                });
+            }
+
+            //option param to skip distinct from count query, distinct adds a lot of latency and in this case the result set will always be unique.
+            if (unfilteredOptions.useBasicCount) {
+                options.useBasicCount = unfilteredOptions.useBasicCount;
+            }
+
             const response = await itemCollection.fetchPage(options);
             // Attributes are being filtered here, so they are not leaked into calling layer
             // where models are serialized to json and do not do more filtering.
diff --git a/ghost/core/core/server/models/base/plugins/events.js b/ghost/core/core/server/models/base/plugins/events.js
index be9bd1bae42..e1e67d95067 100644
--- a/ghost/core/core/server/models/base/plugins/events.js
+++ b/ghost/core/core/server/models/base/plugins/events.js
@@ -7,6 +7,10 @@ const schema = require('../../../data/schema');
 // This wires up our model event system
 const events = require('../../../lib/common/events');
 
+// Run tests or development with NUMERIC_IDS=1 to enable numeric object IDs
+let forceNumericObjectIds = process.env.NODE_ENV !== 'production' && !!process.env.NUMERIC_IDS;
+let numberGenerator = 0;
+
 module.exports = function (Bookshelf) {
     Bookshelf.Model = Bookshelf.Model.extend({
         initializeEvents: function () {
@@ -39,7 +43,7 @@ module.exports = function (Bookshelf) {
          * no auto increment
          */
         setId: function setId() {
-            this.set('id', ObjectId().toHexString());
+            this.set('id', Bookshelf.Model.generateId());
         },
 
         /**
@@ -268,5 +272,20 @@ module.exports = function (Bookshelf) {
 
             this.addAction(model, 'deleted', options);
         }
+    }, {
+        generateId: function generateId() {
+            if (forceNumericObjectIds) {
+                numberGenerator = numberGenerator + 1;
+                const counter = numberGenerator.toString();
+
+                // 77777777 here are to make sure generated ids's are larger than naturally generated ones
+                const base = '777777770000000000000000';
+                const id = base.substring(0, base.length - counter.length) + counter;
+
+                //// This always generates a valid object ID that is fully numeric
+                return id;
+            }
+            return ObjectId().toHexString();
+        }
     });
 };
diff --git a/ghost/core/core/server/models/comment.js b/ghost/core/core/server/models/comment.js
index de64d1db9c9..d5555fa15a1 100644
--- a/ghost/core/core/server/models/comment.js
+++ b/ghost/core/core/server/models/comment.js
@@ -78,7 +78,7 @@ const Comment = ghostBookshelf.Model.extend({
                     // Enforce _blank and safe URLs
                     transformTags: {
                         a: sanitizeHtml.simpleTransform('a', {
-                            target: '_blank', 
+                            target: '_blank',
                             rel: 'ugc noopener noreferrer nofollow'
                         })
                     }
@@ -106,7 +106,7 @@ const Comment = ghostBookshelf.Model.extend({
             if (options.parentId === null) {
                 return 'parent_id:null';
             }
-            return 'parent_id:' + options.parentId;
+            return 'parent_id:\'' + options.parentId + '\'';
         }
 
         return null;
diff --git a/ghost/core/core/server/models/invite.js b/ghost/core/core/server/models/invite.js
index a9575094988..f2af62b6def 100644
--- a/ghost/core/core/server/models/invite.js
+++ b/ghost/core/core/server/models/invite.js
@@ -93,8 +93,7 @@ Invite = ghostBookshelf.Model.extend({
                     } else if (_.some(loadedPermissions.user.roles, {name: 'Editor'})) {
                         allowed = ['Author', 'Contributor'];
                     }
-                }
-                if (loadedPermissions.apiKey) {
+                } else if (loadedPermissions.apiKey) {
                     allowed = ['Editor', 'Author', 'Contributor'];
                 }
 
diff --git a/ghost/core/core/server/models/member-click-event.js b/ghost/core/core/server/models/member-click-event.js
index 25728a1d56f..ff25586d806 100644
--- a/ghost/core/core/server/models/member-click-event.js
+++ b/ghost/core/core/server/models/member-click-event.js
@@ -21,7 +21,10 @@ const MemberClickEvent = ghostBookshelf.Model.extend({
         return expansions;
     },
 
-    filterRelations() {
+    filterRelations(options) {
+        if (options && options.filterRelations === false) {
+            return {};
+        }
         return {
             link: {
                 // Mongo-knex doesn't support belongsTo relations
@@ -47,7 +50,7 @@ const MemberClickEvent = ghostBookshelf.Model.extend({
     permittedOptions(methodName) {
         let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
         const validOptions = {
-            findPage: ['selectRaw', 'whereRaw']
+            findPage: ['selectRaw', 'whereRaw', 'cte', 'from', 'useCTE', 'filterRelations']
         };
 
         if (validOptions[methodName]) {
diff --git a/ghost/core/core/server/models/member.js b/ghost/core/core/server/models/member.js
index db66336d272..5fe0456b2dd 100644
--- a/ghost/core/core/server/models/member.js
+++ b/ghost/core/core/server/models/member.js
@@ -11,6 +11,7 @@ const Member = ghostBookshelf.Model.extend({
         return {
             status: 'free',
             uuid: uuid.v4(),
+            transient_id: uuid.v4(),
             email_count: 0,
             email_opened_count: 0,
             enable_comment_notifications: true
diff --git a/ghost/core/core/server/models/newsletter.js b/ghost/core/core/server/models/newsletter.js
index ed6f1ddd802..2e41447c609 100644
--- a/ghost/core/core/server/models/newsletter.js
+++ b/ghost/core/core/server/models/newsletter.js
@@ -29,7 +29,8 @@ const Newsletter = ghostBookshelf.Model.extend({
             background_color: 'light',
             border_color: null,
             title_color: null,
-            feedback_enabled: false
+            feedback_enabled: false,
+            show_excerpt: false
         };
     },
 
diff --git a/ghost/core/core/server/models/post.js b/ghost/core/core/server/models/post.js
index 7992906ff40..c1313faa76c 100644
--- a/ghost/core/core/server/models/post.js
+++ b/ghost/core/core/server/models/post.js
@@ -904,7 +904,7 @@ Post = ghostBookshelf.Model.extend({
             ops.push(function updateRevisions() {
                 return ghostBookshelf.model('MobiledocRevision')
                     .findAll(Object.assign({
-                        filter: `post_id:${model.id}`,
+                        filter: `post_id:'${model.id}'`,
                         columns: ['id']
                     }, _.pick(options, 'transacting')))
                     .then((revisions) => {
@@ -958,7 +958,7 @@ Post = ghostBookshelf.Model.extend({
             ops.push(async function updateRevisions() {
                 const revisionModels = await ghostBookshelf.model('PostRevision')
                     .findAll(Object.assign({
-                        filter: `post_id:${model.id}`,
+                        filter: `post_id:'${model.id}'`,
                         columns: ['id', 'lexical', 'created_at', 'author_id', 'title', 'reason', 'post_status', 'created_at_ts', 'feature_image']
                     }, _.pick(options, 'transacting')));
 
@@ -973,6 +973,7 @@ Post = ghostBookshelf.Model.extend({
                     feature_image_alt: model.get('posts_meta')?.feature_image_alt,
                     feature_image_caption: model.get('posts_meta')?.feature_image_caption,
                     title: model.get('title'),
+                    custom_excerpt: model.get('custom_excerpt'),
                     post_status: model.get('status')
                 };
 
@@ -1004,6 +1005,12 @@ Post = ghostBookshelf.Model.extend({
             this.set('tiers', this.get('tiers').map(t => ({
                 id: t.id
             })));
+
+            // Don't associate the free tier with the post
+            const freeTier = await ghostBookshelf.model('Product').findOne({type: 'free'}, {require: false, transacting: options.transacting ?? undefined});
+            if (freeTier) {
+                this.set('tiers', this.get('tiers').filter(t => t.id !== freeTier.id));
+            }
         }
 
         if (labs.isSet('collectionsCard') && this.get('type') === 'post' && (newStatus === 'published' || olderStatus === 'published')) {
@@ -1253,7 +1260,7 @@ Post = ghostBookshelf.Model.extend({
         // these are the only options that can be passed to Bookshelf / Knex.
         const validOptions = {
             findOne: ['columns', 'importing', 'withRelated', 'require', 'filter'],
-            findPage: ['status'],
+            findPage: ['status','selectRaw'],
 
             findAll: ['columns', 'filter'],
             destroy: ['destroyAll', 'destroyBy'],
diff --git a/ghost/core/core/server/models/settings.js b/ghost/core/core/server/models/settings.js
index 97154509b35..a355bd28099 100644
--- a/ghost/core/core/server/models/settings.js
+++ b/ghost/core/core/server/models/settings.js
@@ -324,16 +324,6 @@ Settings = ghostBookshelf.Model.extend({
         return allSettings;
     },
 
-    permissible: function permissible(modelId, action, context, unsafeAttrs, loadedPermissions, hasUserPermission, hasApiKeyPermission) {
-        if (hasUserPermission && hasApiKeyPermission) {
-            return Promise.resolve();
-        }
-
-        return Promise.reject(new errors.NoPermissionError({
-            message: tpl(messages.notEnoughPermission)
-        }));
-    },
-
     validators: {
         async all(model) {
             const settingName = model.get('key');
diff --git a/ghost/core/core/server/services/Users.js b/ghost/core/core/server/services/Users.js
index 745de78b0dc..efc1c9f1834 100644
--- a/ghost/core/core/server/services/Users.js
+++ b/ghost/core/core/server/services/Users.js
@@ -1,10 +1,13 @@
 // @ts-check
 const path = require('path');
+const ObjectId = require('bson-objectid').default;
 
 /**
  * @TODO: pass these in as dependencies
  */
 const {PostRevisions} = require('@tryghost/post-revisions');
+const DomainEvents = require('@tryghost/domain-events/lib/DomainEvents');
+const {PostsBulkAddTagsEvent} = require('@tryghost/post-events');
 
 /**
  * @typedef {Object} IdbBackup
@@ -76,8 +79,7 @@ class Users {
     }
 
     async assignTagToUserPosts({id, context, transacting}) {
-        // create an internal tag to assign to reassigned posts
-        // in following format: `#{author_slug}`
+        // get author slug
         const author = await this.models.User.findOne({
             id
         }, {
@@ -85,13 +87,27 @@ class Users {
             context,
             transacting
         });
+
+        // get list of posts that need the tag assigned
+        const userPosts = await this.models.Base.knex('posts_authors')
+            .transacting(transacting)
+            .where('author_id', id)
+            .select('post_id');
+        let usersPostIds = userPosts.map(p => p.post_id);
+
+        if (usersPostIds.length === 0) {
+            return;
+        }
+
+        // create an internal tag to assign to reassigned posts
+        // in following format: `#{author_slug}`
+        let createdTag = false;
         let tag = await this.models.Tag.findOne({
             slug: `hash-${author.get('slug')}`
         }, {
             context,
             transacting
         });
-
         if (!tag) {
             tag = await this.models.Tag.add({
                 slug: `#${author.get('slug')}`
@@ -99,45 +115,38 @@ class Users {
                 context,
                 transacting
             });
+            createdTag = true;
         }
 
-        const userPosts = await this.models.Base.knex('posts_authors')
-            .transacting(transacting)
-            .where('author_id', id)
-            .select('post_id');
-        const usersPostIds = userPosts.map(p => p.post_id);
-
-        // Add a tag to all posts that do not have the author tag yet
-        // NOTE: the method is implemented in an iterative way to avoid
-        //       memory consumption in case the user has thousands of posts
-        //       assigned to them. Also, didn't have any "bulk" way to add
-        //       a tag to multiple posts as the "sort_order" needs custom
-        //       logic to be run for each post.
-        //       Rewrite this bit if/when we hit a performance bottleneck here
-        for (const postId of usersPostIds) {
-            const post = await this.models.Post.findOne({
-                id: postId,
-                status: 'all'
-            }, {
-                id: postId,
-                withRelated: ['tags'],
-                context,
-                transacting
-            });
-
-            // check if tag already assigned to the post
-            const existingTagSlugs = post.relations.tags.models.map(t => t.get('slug'));
-
-            if (!existingTagSlugs.includes(tag.get('slug'))) {
-                await this.models.Post.edit({
-                    tags: [...post.relations.tags.models, tag]
-                }, {
-                    id: postId,
-                    context,
-                    transacting
-                });
-            }
+        // filter out posts that already have the tag if we didn't need to create one
+        if (!createdTag) {
+            const tagId = tag.get('id');
+            const taggedPostIds = await this.models.Base.knex('posts_tags')
+                .transacting(transacting)
+                .where('tag_id', tagId)
+                .select('post_id');
+            usersPostIds = userPosts
+                .map(p => p.post_id)
+                .filter(p => !taggedPostIds.includes(p));
         }
+
+        // assign tag to posts
+        //  do bulk insert for performance reasons
+        //  - go ahead and assign sort_order 0 to all of them
+        await this.models.Base.knex('posts_tags')
+            .transacting(transacting)
+            .insert(usersPostIds.map(postId => ({
+                id: (new ObjectId()).toHexString(),
+                post_id: postId,
+                tag_id: tag.get('id'),
+                sort_order: 0
+            })));
+
+        // manually add an entry in the Actions table that specifies the number of posts edited; see #bulkAddTags for similar logic
+        await this.models.Post.addActions('edited', usersPostIds, {transacting, context});
+
+        // dispatch event to ensure collections are updated
+        DomainEvents.dispatch(PostsBulkAddTagsEvent.create(usersPostIds));
     }
 
     /**
@@ -148,33 +157,40 @@ class Users {
      * @returns
      */
     async destroyUser(frameOptions) {
+        let filename = null;
         const backupPath = await this.dbBackup.backup();
-        const parsedFileName = path.parse(backupPath);
-        const filename = `${parsedFileName.name}${parsedFileName.ext}`;
+
+        if (backupPath) {
+            const parsedFileName = path.parse(backupPath);
+            filename = `${parsedFileName.name}${parsedFileName.ext}`;
+        }
 
         return this.models.Base.transaction(async (t) => {
             frameOptions.transacting = t;
 
+            // null author field for users' post revisions
             const postRevisions = new PostRevisions({
                 model: this.models.PostRevision
             });
-
             await postRevisions.removeAuthorFromRevisions(frameOptions.id, {
                 transacting: frameOptions.transacting
             });
 
+            // create a #author-slug tag and assign it to their posts
             await this.assignTagToUserPosts({
                 id: frameOptions.id,
                 context: frameOptions.context,
                 transacting: frameOptions.transacting
             });
 
+            // reassign posts to owner user
             await this.models.Post.reassignByAuthor({
                 id: frameOptions.id,
                 context: frameOptions.context,
                 transacting: frameOptions.transacting
             });
 
+            // delete user
             try {
                 await this.models.ApiKey.destroy({
                     ...frameOptions,
diff --git a/ghost/core/core/server/services/auth/api-key/admin.js b/ghost/core/core/server/services/auth/api-key/admin.js
index 578eaa56aec..6ac1a3bc8e0 100644
--- a/ghost/core/core/server/services/auth/api-key/admin.js
+++ b/ghost/core/core/server/services/auth/api-key/admin.js
@@ -17,6 +17,7 @@ const messages = {
 };
 
 let JWT_OPTIONS_DEFAULTS = {
+    /** @type import('jsonwebtoken').Algorithm[] */
     algorithms: ['HS256'],
     maxAge: '5m'
 };
@@ -60,7 +61,7 @@ const authenticate = function apiKeyAdminAuth(req, res, next) {
         }));
     }
 
-    return authenticateWithToken(req, res, next, {token, JWT_OPTIONS: JWT_OPTIONS_DEFAULTS});
+    return wrappedAuthenticateWithToken(req, res, next, {token});
 };
 
 const authenticateWithUrl = function apiKeyAuthenticateWithUrl(req, res, next) {
@@ -72,9 +73,20 @@ const authenticateWithUrl = function apiKeyAuthenticateWithUrl(req, res, next) {
         }));
     }
     // CASE: Scheduler publish URLs can have long maxAge but controllerd by expiry and neverBefore
-    return authenticateWithToken(req, res, next, {token, JWT_OPTIONS: _.omit(JWT_OPTIONS_DEFAULTS, 'maxAge')});
+    return wrappedAuthenticateWithToken(req, res, next, {token, ignoreMaxAge: true});
 };
 
+async function wrappedAuthenticateWithToken(req, res, next, options) {
+    try {
+        const {apiKey, user} = await authenticateWithToken(req.originalUrl, options.token, options.ignoreMaxAge);
+        req.api_key = apiKey;
+        req.user = user;
+        next();
+    } catch (err) {
+        next(err);
+    }
+}
+
 /**
  * Admin API key authentication flow:
  * 1. extract the JWT token from the `Authorization: Ghost xxxx` header or from URL(for schedules)
@@ -89,114 +101,104 @@ const authenticateWithUrl = function apiKeyAuthenticateWithUrl(req, res, next) {
  * - the "Audience" claim should match the requested API path
  *   https://tools.ietf.org/html/rfc7519#section-4.1.3
  */
-const authenticateWithToken = async function apiKeyAuthenticateWithToken(req, res, next, {token, JWT_OPTIONS}) {
+const authenticateWithToken = async function apiKeyAuthenticateWithToken(originalUrl, token, ignoreMaxAge) {
     const decoded = jwt.decode(token, {complete: true});
+    const jwtValidationOptions = ignoreMaxAge ? _.omit(JWT_OPTIONS_DEFAULTS, 'maxAge') : JWT_OPTIONS_DEFAULTS;
 
     if (!decoded || !decoded.header) {
-        return next(new errors.BadRequestError({
+        throw new errors.BadRequestError({
             message: tpl(messages.invalidToken),
             code: 'INVALID_JWT'
-        }));
+        });
     }
 
     const apiKeyId = decoded.header.kid;
 
     if (!apiKeyId) {
-        return next(new errors.BadRequestError({
+        throw new errors.BadRequestError({
             message: tpl(messages.adminApiKidMissing),
             code: 'MISSING_ADMIN_API_KID'
-        }));
+        });
     }
 
-    try {
-        const apiKey = await models.ApiKey.findOne({id: apiKeyId}, {withRelated: ['integration']});
-
-        if (!apiKey) {
-            return next(new errors.UnauthorizedError({
-                message: tpl(messages.unknownAdminApiKey),
-                code: 'UNKNOWN_ADMIN_API_KEY'
-            }));
-        }
-
-        if (apiKey.get('type') !== 'admin') {
-            return next(new errors.UnauthorizedError({
-                message: tpl(messages.invalidApiKeyType),
-                code: 'INVALID_API_KEY_TYPE'
-            }));
-        }
-
-        // CASE: blocking all non-internal: "custom" and "builtin" integration requests when the limit is reached
-        if (limitService.isLimited('customIntegrations')
+    const apiKey = await models.ApiKey.findOne({id: apiKeyId}, {withRelated: ['integration']});
+
+    if (!apiKey) {
+        throw new errors.UnauthorizedError({
+            message: tpl(messages.unknownAdminApiKey),
+            code: 'UNKNOWN_ADMIN_API_KEY'
+        });
+    }
+
+    if (apiKey.get('type') !== 'admin') {
+        throw new errors.UnauthorizedError({
+            message: tpl(messages.invalidApiKeyType),
+            code: 'INVALID_API_KEY_TYPE'
+        });
+    }
+
+    // CASE: blocking all non-internal: "custom" and "builtin" integration requests when the limit is reached
+    if (limitService.isLimited('customIntegrations')
             && (apiKey.relations.integration && !['internal', 'core'].includes(apiKey.relations.integration.get('type')))) {
-            // NOTE: using "checkWouldGoOverLimit" instead of "checkIsOverLimit" here because flag limits don't have
-            //       a concept of measuring if the limit has been surpassed
-            await limitService.errorIfWouldGoOverLimit('customIntegrations');
-        }
-
-        // Decoding from hex and transforming into bytes is here to
-        // keep comparison of the bytes that are stored in the secret.
-        // Useful context:
-        // https://github.com/auth0/node-jsonwebtoken/issues/208#issuecomment-231861138
-        const secret = Buffer.from(apiKey.get('secret'), 'hex');
-
-        // Using req.originalUrl means we get the right url even if version-rewrites have happened
-        const {version, api} = legacyApiPathMatch(req.originalUrl);
-
-        // ensure the token was meant for this api
-        let options;
-
-        if (version) {
-            // CASE: legacy versioned api request
-            options = Object.assign({
-                audience: new RegExp(`/?${version}/${api}/?$`)
-            }, JWT_OPTIONS);
-        } else {
-            options = Object.assign({
-                audience: new RegExp(`/?${api}/?$`)
-            }, JWT_OPTIONS);
-        }
-
-        try {
-            jwt.verify(token, secret, options);
-        } catch (err) {
-            if (err.name === 'TokenExpiredError' || err.name === 'JsonWebTokenError') {
-                return next(new errors.UnauthorizedError({
-                    message: tpl(messages.invalidTokenWithMessage, {message: err.message}),
-                    code: 'INVALID_JWT',
-                    err
-                }));
-            }
-
-            // unknown error
-            return next(new errors.InternalServerError({err}));
-        }
-
-        // authenticated OK
-
-        if (apiKey.get('user_id')) {
-            // fetch the user and store it on the request for later checks and logging
-            const user = await models.User.findOne(
-                {id: apiKey.get('user_id'), status: 'active'},
-                {require: true}
-            );
-
-            req.user = user;
-        }
-
-        // store the api key on the request for later checks and logging
-        req.api_key = apiKey;
+        // NOTE: using "checkWouldGoOverLimit" instead of "checkIsOverLimit" here because flag limits don't have
+        //       a concept of measuring if the limit has been surpassed
+        await limitService.errorIfWouldGoOverLimit('customIntegrations');
+    }
 
-        next();
+    // Decoding from hex and transforming into bytes is here to
+    // keep comparison of the bytes that are stored in the secret.
+    // Useful context:
+    // https://github.com/auth0/node-jsonwebtoken/issues/208#issuecomment-231861138
+    const secret = Buffer.from(apiKey.get('secret'), 'hex');
+
+    // Using req.originalUrl means we get the right url even if version-rewrites have happened
+    const {version, api} = legacyApiPathMatch(originalUrl);
+
+    // ensure the token was meant for this api
+    let options;
+
+    if (version) {
+        // CASE: legacy versioned api request
+        options = Object.assign({
+            audience: new RegExp(`/?${version}/${api}/?$`)
+        }, jwtValidationOptions);
+    } else {
+        options = Object.assign({
+            audience: new RegExp(`/?${api}/?$`)
+        }, jwtValidationOptions);
+    }
+
+    try {
+        jwt.verify(token, secret, options);
     } catch (err) {
-        if (err instanceof errors.HostLimitError) {
-            next(err);
-        } else {
-            next(new errors.InternalServerError({err}));
-        }
+        throw new errors.UnauthorizedError({
+            message: tpl(messages.invalidTokenWithMessage, {message: err.message}),
+            code: 'INVALID_JWT',
+            err
+        });
+    }
+
+    // authenticated OK
+    let result = {
+        user: null,
+        apiKey: apiKey
+    };
+
+    if (apiKey.get('user_id')) {
+        // fetch the user and store it on the request for later checks and logging
+        const user = await models.User.findOne(
+            {id: apiKey.get('user_id'), status: 'active'},
+            {require: true}
+        );
+
+        result.user = user;
     }
+
+    return result;
 };
 
 module.exports = {
     authenticate,
-    authenticateWithUrl
+    authenticateWithUrl,
+    authenticateWithToken
 };
diff --git a/ghost/core/core/server/services/comments/CommentsController.js b/ghost/core/core/server/services/comments/CommentsController.js
index 3463a3f9bbd..4a5a4828f06 100644
--- a/ghost/core/core/server/services/comments/CommentsController.js
+++ b/ghost/core/core/server/services/comments/CommentsController.js
@@ -2,7 +2,7 @@ const _ = require('lodash');
 const errors = require('@tryghost/errors');
 
 /**
- * @typedef {import('../../api/shared/frame')} Frame
+ * @typedef {import('@tryghost/api-framework').Frame} Frame
  */
 
 const {MethodNotAllowedError} = require('@tryghost/errors');
@@ -35,6 +35,22 @@ module.exports = class CommentsController {
      * @param {Frame} frame
      */
     async browse(frame) {
+        if (frame.options.post_id) {
+            if (frame.options.filter) {
+                frame.options.mongoTransformer = function (query) {
+                    return {
+                        $and: [
+                            {
+                                post_id: frame.options.post_id
+                            },
+                            query
+                        ]
+                    };
+                };
+            } else {
+                frame.options.filter = `post_id:${frame.options.post_id}`;
+            }
+        }
         return this.service.getComments(frame.options);
     }
 
@@ -58,20 +74,33 @@ module.exports = class CommentsController {
     async edit(frame) {
         this.#checkMember(frame);
 
+        let result;
         if (frame.data.comments[0].status === 'deleted') {
-            return await this.service.deleteComment(
+            result = await this.service.deleteComment(
                 frame.options.id,
                 frame?.options?.context?.member?.id,
                 frame.options
             );
+        } else {
+            result = await this.service.editCommentContent(
+                frame.options.id,
+                frame?.options?.context?.member?.id,
+                frame.data.comments[0].html,
+                frame.options
+            );
         }
 
-        return await this.service.editCommentContent(
-            frame.options.id,
-            frame?.options?.context?.member?.id,
-            frame.data.comments[0].html,
-            frame.options
-        );
+        if (result) {
+            const postId = result.get('post_id');
+            const parentId = result.get('parent_id');
+            const pathsToInvalidate = [
+                postId ? `/api/members/comments/post/${postId}/` : null,
+                parentId ? `/api/members/comments/${parentId}/replies/` : null
+            ].filter(path => path !== null);
+            frame.setHeader('X-Cache-Invalidate', pathsToInvalidate.join(', '));
+        }
+
+        return result;
     }
 
     /**
@@ -81,21 +110,34 @@ module.exports = class CommentsController {
         this.#checkMember(frame);
         const data = frame.data.comments[0];
 
+        let result;
         if (data.parent_id) {
-            return await this.service.replyToComment(
+            result = await this.service.replyToComment(
                 data.parent_id,
                 frame.options.context.member.id,
                 data.html,
                 frame.options
             );
+        } else {
+            result = await this.service.commentOnPost(
+                data.post_id,
+                frame.options.context.member.id,
+                data.html,
+                frame.options
+            );
         }
 
-        return await this.service.commentOnPost(
-            data.post_id,
-            frame.options.context.member.id,
-            data.html,
-            frame.options
-        );
+        if (result) {
+            const postId = result.get('post_id');
+            const parentId = result.get('parent_id');
+            const pathsToInvalidate = [
+                postId ? `/api/members/comments/post/${postId}/` : null,
+                parentId ? `/api/members/comments/${parentId}/replies/` : null
+            ].filter(path => path !== null);
+            frame.setHeader('X-Cache-Invalidate', pathsToInvalidate.join(', '));
+        }
+
+        return result;
     }
 
     async destroy() {
@@ -120,11 +162,25 @@ module.exports = class CommentsController {
     async like(frame) {
         this.#checkMember(frame);
 
-        return await this.service.likeComment(
+        const result = await this.service.likeComment(
             frame.options.id,
             frame.options?.context?.member,
             frame.options
         );
+
+        const comment = await this.service.getCommentByID(frame.options.id);
+
+        if (comment) {
+            const postId = comment.get('post_id');
+            const parentId = comment.get('parent_id');
+            const pathsToInvalidate = [
+                postId ? `/api/members/comments/post/${postId}/` : null,
+                parentId ? `/api/members/comments/${parentId}/replies/` : null
+            ].filter(path => path !== null);
+            frame.setHeader('X-Cache-Invalidate', pathsToInvalidate.join(', '));
+        }
+
+        return result;
     }
 
     /**
@@ -133,11 +189,25 @@ module.exports = class CommentsController {
     async unlike(frame) {
         this.#checkMember(frame);
 
-        return await this.service.unlikeComment(
+        const result = await this.service.unlikeComment(
             frame.options.id,
             frame.options?.context?.member,
             frame.options
         );
+
+        const comment = await this.service.getCommentByID(frame.options.id);
+
+        if (comment) {
+            const postId = comment.get('post_id');
+            const parentId = comment.get('parent_id');
+            const pathsToInvalidate = [
+                postId ? `/api/members/comments/post/${postId}/` : null,
+                parentId ? `/api/members/comments/${parentId}/replies/` : null
+            ].filter(path => path !== null);
+            frame.setHeader('X-Cache-Invalidate', pathsToInvalidate.join(', '));
+        }
+
+        return result;
     }
 
     /**
diff --git a/ghost/core/core/server/services/custom-redirects/CustomRedirectsAPI.js b/ghost/core/core/server/services/custom-redirects/CustomRedirectsAPI.js
index 5241f35d90b..3c46b7de9c7 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)
             });
         }
@@ -215,6 +211,9 @@ class CustomRedirectsAPI {
      */
     async setFromFilePath(filePath, ext = '.json') {
         const redirectsFilePath = await this.getRedirectsFilePath();
+        const content = await readRedirectsFile(filePath);
+        const parsed = parseRedirectsFile(content, ext);
+        this.validate(parsed);
 
         if (redirectsFilePath) {
             const backupRedirectsPath = this.getBackupFilePath(redirectsFilePath);
@@ -227,10 +226,6 @@ class CustomRedirectsAPI {
             await fs.move(redirectsFilePath, backupRedirectsPath);
         }
 
-        const content = await readRedirectsFile(filePath);
-        const parsed = parseRedirectsFile(content, ext);
-        this.validate(parsed);
-
         if (ext === '.json') {
             await fs.writeFile(this.createRedirectsFilePath('.json'), JSON.stringify(parsed), 'utf-8');
         } else if (ext === '.yaml') {
diff --git a/ghost/core/core/server/services/email-address/EmailAddressServiceWrapper.js b/ghost/core/core/server/services/email-address/EmailAddressServiceWrapper.js
new file mode 100644
index 00000000000..e6e60861776
--- /dev/null
+++ b/ghost/core/core/server/services/email-address/EmailAddressServiceWrapper.js
@@ -0,0 +1,39 @@
+class EmailAddressServiceWrapper {
+    /**
+     * @type {import('@tryghost/email-addresses').EmailAddressService}
+     */
+    service;
+
+    init() {
+        if (this.service) {
+            return;
+        }
+
+        const labs = require('../../../shared/labs');
+        const config = require('../../../shared/config');
+        const settingsHelpers = require('../settings-helpers');
+        const validator = require('@tryghost/validator');
+
+        const {
+            EmailAddressService
+        } = require('@tryghost/email-addresses');
+
+        this.service = new EmailAddressService({
+            labs,
+            getManagedEmailEnabled: () => {
+                return config.get('hostSettings:managedEmail:enabled') ?? false;
+            },
+            getSendingDomain: () => {
+                return config.get('hostSettings:managedEmail:sendingDomain') || null;
+            },
+            getDefaultEmail: () => {
+                return settingsHelpers.getDefaultEmail();
+            },
+            isValidEmailAddress: (emailAddress) => {
+                return validator.isEmail(emailAddress);
+            }
+        });
+    }
+}
+
+module.exports = EmailAddressServiceWrapper;
diff --git a/ghost/core/core/server/services/email-address/index.js b/ghost/core/core/server/services/email-address/index.js
new file mode 100644
index 00000000000..c6ba5402422
--- /dev/null
+++ b/ghost/core/core/server/services/email-address/index.js
@@ -0,0 +1,3 @@
+const EmailAddressServiceWrapper = require('./EmailAddressServiceWrapper');
+
+module.exports = new EmailAddressServiceWrapper();
diff --git a/ghost/core/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js b/ghost/core/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js
index cfa52a84aa1..c8892f5809b 100644
--- a/ghost/core/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js
+++ b/ghost/core/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js
@@ -9,7 +9,7 @@ class EmailAnalyticsServiceWrapper {
         const {EmailAnalyticsService} = require('@tryghost/email-analytics-service');
         const {EmailEventStorage, EmailEventProcessor} = require('@tryghost/email-service');
         const MailgunProvider = require('@tryghost/email-analytics-provider-mailgun');
-        const {EmailRecipientFailure, EmailSpamComplaintEvent} = require('../../models');
+        const {EmailRecipientFailure, EmailSpamComplaintEvent, Email} = require('../../models');
         const StartEmailAnalyticsJobEvent = require('./events/StartEmailAnalyticsJobEvent');
 
         const domainEvents = require('@tryghost/domain-events');
@@ -19,14 +19,17 @@ class EmailAnalyticsServiceWrapper {
         const queries = require('./lib/queries');
         const membersService = require('../members');
         const membersRepository = membersService.api.members;
+        const emailSuppressionList = require('../email-suppression-list');
 
         this.eventStorage = new EmailEventStorage({
             db,
             membersRepository,
             models: {
+                Email,
                 EmailRecipientFailure,
                 EmailSpamComplaintEvent
-            }
+            },
+            emailSuppressionList
         });
 
         // Since this is running in a worker thread, we cant dispatch directly
diff --git a/ghost/core/core/server/services/email-analytics/lib/queries.js b/ghost/core/core/server/services/email-analytics/lib/queries.js
index 1504e4b1220..fbe2019fdc3 100644
--- a/ghost/core/core/server/services/email-analytics/lib/queries.js
+++ b/ghost/core/core/server/services/email-analytics/lib/queries.js
@@ -41,10 +41,16 @@ module.exports = {
     },
 
     async aggregateEmailStats(emailId) {
+        const {totalCount} = await db.knex('emails').select(db.knex.raw('email_count as totalCount')).where('id', emailId).first() || {totalCount: 0};
+        // use IS NULL here because that will typically match far fewer rows than IS NOT NULL making the query faster
+        const [undeliveredCount] = await db.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND delivered_at IS NULL', [emailId]);
+        const [openedCount] = await db.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND opened_at IS NOT NULL', [emailId]);
+        const [failedCount] = await db.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND failed_at IS NOT NULL', [emailId]);
+
         await db.knex('emails').update({
-            delivered_count: db.knex.raw(`(SELECT COUNT(id) FROM email_recipients WHERE email_id = ? AND delivered_at IS NOT NULL)`, [emailId]),
-            opened_count: db.knex.raw(`(SELECT COUNT(id) FROM email_recipients WHERE email_id = ? AND opened_at IS NOT NULL)`, [emailId]),
-            failed_count: db.knex.raw(`(SELECT COUNT(id) FROM email_recipients WHERE email_id = ? AND failed_at IS NOT NULL)`, [emailId])
+            delivered_count: totalCount - undeliveredCount.count,
+            opened_count: openedCount.count,
+            failed_count: failedCount.count
         }).where('id', emailId);
     },
 
@@ -56,15 +62,16 @@ module.exports = {
             .where('emails.track_opens', true)
             .first() || {};
 
+        const [emailCount] = await db.knex('email_recipients').count('id as count').whereRaw('member_id = ?', [memberId]);
+        const [emailOpenedCount] = await db.knex('email_recipients').count('id as count').whereRaw('member_id = ? AND opened_at IS NOT NULL', [memberId]);
+
         const updateQuery = {
-            email_count: db.knex.raw('(SELECT COUNT(id) FROM email_recipients WHERE member_id = ?)', [memberId]),
-            email_opened_count: db.knex.raw('(SELECT COUNT(id) FROM email_recipients WHERE member_id = ? AND opened_at IS NOT NULL)', [memberId])
+            email_count: emailCount.count,
+            email_opened_count: emailOpenedCount.count
         };
 
         if (trackedEmailCount >= MIN_EMAIL_COUNT_FOR_OPEN_RATE) {
-            updateQuery.email_open_rate = db.knex.raw(`
-                ROUND(((SELECT COUNT(id) FROM email_recipients WHERE member_id = ? AND opened_at IS NOT NULL) * 1.0 / ? * 100), 0)
-            `, [memberId, trackedEmailCount]);
+            updateQuery.email_open_rate = Math.round(emailOpenedCount.count / trackedEmailCount * 100);
         }
 
         await db.knex('members')
diff --git a/ghost/core/core/server/services/email-service/EmailServiceWrapper.js b/ghost/core/core/server/services/email-service/EmailServiceWrapper.js
index fed21f955ef..9a865287936 100644
--- a/ghost/core/core/server/services/email-service/EmailServiceWrapper.js
+++ b/ghost/core/core/server/services/email-service/EmailServiceWrapper.js
@@ -26,6 +26,7 @@ class EmailServiceWrapper {
         const membersRepository = membersService.api.members;
         const limitService = require('../limits');
         const labs = require('../../../shared/labs');
+        const emailAddressService = require('../email-address');
 
         const mobiledocLib = require('../../lib/mobiledoc');
         const lexicalLib = require('../../lib/lexical');
@@ -70,6 +71,7 @@ class EmailServiceWrapper {
             memberAttributionService: memberAttribution.service,
             audienceFeedbackService: audienceFeedback.service,
             outboundLinkTagger: memberAttribution.outboundLinkTagger,
+            emailAddressService: emailAddressService.service,
             labs,
             models: {Post}
         });
diff --git a/ghost/core/core/server/services/email-suppression-list/MailgunEmailSuppressionList.js b/ghost/core/core/server/services/email-suppression-list/MailgunEmailSuppressionList.js
index 802763b0042..6831574cd57 100644
--- a/ghost/core/core/server/services/email-suppression-list/MailgunEmailSuppressionList.js
+++ b/ghost/core/core/server/services/email-suppression-list/MailgunEmailSuppressionList.js
@@ -47,6 +47,15 @@ class MailgunEmailSuppressionList extends AbstractEmailSuppressionList {
         return true;
     }
 
+    async removeUnsubscribe(email) {
+        try {
+            await this.apiClient.removeUnsubscribe(email);
+        } catch (err) {
+            logging.error(err);
+            return false;
+        }
+    }
+
     async getSuppressionData(email) {
         try {
             const model = await this.Suppression.findOne({
diff --git a/ghost/core/core/server/services/explore/ExploreService.js b/ghost/core/core/server/services/explore/ExploreService.js
index 54334e105e2..fc7c1d19277 100644
--- a/ghost/core/core/server/services/explore/ExploreService.js
+++ b/ghost/core/core/server/services/explore/ExploreService.js
@@ -24,7 +24,7 @@ module.exports = class ExploreService {
      */
     async fetchData() {
         const totalMembers = await this.MembersService.stats.getTotalMembers();
-        const mrrStats = await this.StatsService.getMRRHistory();
+        const mrrStats = await this.StatsService.api.getMRRHistory();
 
         const {description, icon, title, url, accent_color: accentColor, locale} = this.PublicConfigService.site;
 
diff --git a/ghost/core/core/server/services/link-redirection/LinkRedirectRepository.js b/ghost/core/core/server/services/link-redirection/LinkRedirectRepository.js
index 788ebaf3635..22003f39321 100644
--- a/ghost/core/core/server/services/link-redirection/LinkRedirectRepository.js
+++ b/ghost/core/core/server/services/link-redirection/LinkRedirectRepository.js
@@ -1,27 +1,51 @@
 const LinkRedirect = require('@tryghost/link-redirects').LinkRedirect;
 const ObjectID = require('bson-objectid').default;
+const debug = require('@tryghost/debug')('LinkRedirectRepository');
 
 module.exports = class LinkRedirectRepository {
     /** @type {Object} */
     #LinkRedirect;
     /** @type {Object} */
     #urlUtils;
+    /** @type {Boolean} */
+    #cacheEnabled;
+    /** @type {Object} */
+    #cache;
 
     /**
      * @param {object} deps
-     * @param {object} deps.LinkRedirect Bookshelf Model
+     * @param {object} deps.LinkRedirect - Bookshelf Model
      * @param {object} deps.urlUtils
+     * @param {object} deps.cacheAdapter - Cache Adapter instance, or null if cache is disabled
+     * @param {object} deps.EventRegistry 
      */
     constructor(deps) {
+        debug('Creating LinkRedirectRepository');
         this.#LinkRedirect = deps.LinkRedirect;
         this.#urlUtils = deps.urlUtils;
+        this.#cache = null;
+        if (deps.cacheAdapter !== null) {
+            debug('Caching enabled with adapter:', deps.cacheAdapter.constructor.name);
+            this.#cache = deps.cacheAdapter;
+            // This is a bit of a blunt instrument, but it's the best we can do for now
+            // It covers all the cases we would need to invalidate the links cache
+            // We need to invalidate the cache when:
+            // - a redirect is edited
+            // - a site's subdirectory is changed (rare)
+            // - analytics settings are changed
+            deps.EventRegistry.on('site.changed', () => {
+                this.#cache.reset();
+            });
+        }
     }
 
     /**
+     * Save a new LinkRedirect to the DB
      * @param {InstanceType<LinkRedirect>} linkRedirect
      * @returns {Promise<void>}
      */
     async save(linkRedirect) {
+        debug('Saving link redirect', linkRedirect.from.pathname, '->', linkRedirect.to.href);
         const model = await this.#LinkRedirect.add({
             // Only store the pathname (no support for variable query strings)
             from: this.stripSubdirectoryFromPath(linkRedirect.from.pathname),
@@ -29,17 +53,31 @@ module.exports = class LinkRedirectRepository {
         }, {});
 
         linkRedirect.link_id = ObjectID.createFromHexString(model.id);
+        if (this.#cache) {
+            debug('Caching new link redirect', linkRedirect.from.pathname);
+            this.#cache.set(linkRedirect.from.pathname, this.#serialize(linkRedirect));
+        }
     }
 
+    /**
+     * Trim the leading slash from a URL path
+     * @param {string} url 
+     * @returns {string} url without leading slash
+     */
     #trimLeadingSlash(url) {
         return url.replace(/^\//, '');
     }
 
+    /**
+     * Returns a LinkRedirect object from a model
+     * @param {object} model - Bookshelf model instance 
+     * @returns {InstanceType<LinkRedirect>} LinkRedirect
+     */
     fromModel(model) {
         // Store if link has been edited
         // Note: in some edge cases updated_at is set directly after created_at, sometimes with a second difference, so we need to check for that
         const edited = model.get('updated_at')?.getTime() > (model.get('created_at')?.getTime() + 1000);
-
+        
         return new LinkRedirect({
             id: model.id,
             from: new URL(this.#trimLeadingSlash(model.get('from')), this.#urlUtils.urlFor('home', true)),
@@ -48,6 +86,43 @@ module.exports = class LinkRedirectRepository {
         });
     }
 
+    /**
+     * Create a LinkRedirect object from a JSON object (e.g. from the cache)
+     * @param {object} serialized
+     * @param {string} serialized.link_id - string representation of ObjectID
+     * @param {string} serialized.from - path of the URL
+     * @param {string} serialized.to - URL to redirect to
+     * @param {boolean} serialized.edited - whether the link has been edited
+     * @returns {InstanceType<LinkRedirect>} LinkRedirect
+     */
+    #fromSerialized(serialized) {
+        return new LinkRedirect({
+            id: serialized.link_id,
+            from: new URL(this.#trimLeadingSlash(serialized.from), this.#urlUtils.urlFor('home', true)),
+            to: new URL(serialized.to),
+            edited: serialized.edited
+        });
+    }
+
+    /**
+     * Serialize a LinkRedirect object to a plain object (e.g. for caching)
+     * @param {InstanceType<LinkRedirect>} linkRedirect 
+     * @returns {object} - serialized LinkRedirect
+     */
+    #serialize(linkRedirect) {
+        return {
+            link_id: linkRedirect.link_id.toHexString(),
+            from: linkRedirect.from.pathname,
+            to: linkRedirect.to.href,
+            edited: linkRedirect.edited
+        };
+    }
+
+    /**
+     * Get all LinkRedirects from the DB, with optional filters
+     * @param {object} options - options passed directly to LinkRedirect.findAll 
+     * @returns {Promise<InstanceType<LinkRedirect>[]>} array of LinkRedirects
+     */
     async getAll(options) {
         const collection = await this.#LinkRedirect.findAll(options);
 
@@ -60,6 +135,11 @@ module.exports = class LinkRedirectRepository {
         return result;
     }
 
+    /**
+     * Get all LinkRedirect IDs from the DB, with optional filters
+     * @param {object} options - options passed directly to LinkRedirect.getFilteredCollectionQuery
+     * @returns {Promise<string[]>} array of LinkRedirect IDs
+     */
     async getFilteredIds(options) {
         const linkRows = await this.#LinkRedirect.getFilteredCollectionQuery(options)
             .select('redirects.id')
@@ -68,25 +148,42 @@ module.exports = class LinkRedirectRepository {
     }
 
     /**
-     *
+     * Get a LinkRedirect by its URL
      * @param {URL} url
-     * @returns {Promise<InstanceType<LinkRedirect>|undefined>} linkRedirect
+     * @returns {Promise<InstanceType<LinkRedirect>|undefined>} LinkRedirect
      */
     async getByURL(url) {
+        debug('Getting link redirect for', url.pathname);
         // Strip subdirectory from path
         const from = this.stripSubdirectoryFromPath(url.pathname);
 
-        const linkRedirect = await this.#LinkRedirect.findOne({
+        if (this.#cache) {
+            const cachedLink = await this.#cache.get(from);
+            debug(`getByUrl ${url}: Cache ${cachedLink ? 'HIT' : 'MISS'}`);
+            // Cache hit, serve from cache
+            if (cachedLink) {
+                return this.#fromSerialized(cachedLink);
+            }
+        }
+
+        // Cache miss, fetch from the DB
+        const linkRedirectModel = await this.#LinkRedirect.findOne({
             from
         }, {});
 
-        if (linkRedirect) {
-            return this.fromModel(linkRedirect);
+        if (linkRedirectModel) {
+            const linkRedirect = this.fromModel(linkRedirectModel);
+            if (this.#cache) {
+                this.#cache.set(from, this.#serialize(linkRedirect));
+            }
+            return linkRedirect;
         }
     }
 
     /**
      * Convert root relative URLs to subdirectory relative URLs
+     * @param {string} path
+     * @returns {string} path without subdirectory
     */
     stripSubdirectoryFromPath(path) {
         // Bit weird, but only way to do it with the urlUtils atm
diff --git a/ghost/core/core/server/services/link-redirection/index.js b/ghost/core/core/server/services/link-redirection/index.js
index 7ba4962c335..99d86ed3914 100644
--- a/ghost/core/core/server/services/link-redirection/index.js
+++ b/ghost/core/core/server/services/link-redirection/index.js
@@ -1,5 +1,8 @@
 const urlUtils = require('../../../shared/url-utils');
 const LinkRedirectRepository = require('./LinkRedirectRepository');
+const adapterManager = require('../adapter-manager');
+const config = require('../../../shared/config');
+const EventRegistry = require('../../lib/common/events');
 
 class LinkRedirectsServiceWrapper {
     async init() {
@@ -15,7 +18,9 @@ class LinkRedirectsServiceWrapper {
 
         this.linkRedirectRepository = new LinkRedirectRepository({
             LinkRedirect: models.Redirect,
-            urlUtils
+            urlUtils,
+            cacheAdapter: config.get('hostSettings:linkRedirectsPublicCache:enabled') ? adapterManager.getAdapter('cache:linkRedirectsPublic') : null,
+            EventRegistry
         });
 
         // Expose the service
diff --git a/ghost/core/core/server/services/mail/GhostMailer.js b/ghost/core/core/server/services/mail/GhostMailer.js
index d62ae5236e9..abfdc42cd9d 100644
--- a/ghost/core/core/server/services/mail/GhostMailer.js
+++ b/ghost/core/core/server/services/mail/GhostMailer.js
@@ -8,6 +8,8 @@ const tpl = require('@tryghost/tpl');
 const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
 const metrics = require('@tryghost/metrics');
+const settingsHelpers = require('../settings-helpers');
+const emailAddress = require('../email-address');
 const messages = {
     title: 'Ghost at {domain}',
     checkEmailConfigInstructions: 'Please see {url} for instructions on configuring email.',
@@ -16,29 +18,59 @@ const messages = {
     reason: ' Reason: {reason}.',
     messageSent: 'Message sent. Double check inbox and spam folder!'
 };
+const {EmailAddressParser} = require('@tryghost/email-addresses');
+const logging = require('@tryghost/logging');
 
 function getDomain() {
     const domain = urlUtils.urlFor('home', true).match(new RegExp('^https?://([^/:?#]+)(?:[/:?#]|$)', 'i'));
     return domain && domain[1];
 }
 
-function getFromAddress(requestedFromAddress) {
+/**
+ * @param {string} requestedFromAddress
+ * @param {string} requestedReplyToAddress
+ * @returns {{from: string, replyTo?: string|null}}
+ */
+function getFromAddress(requestedFromAddress, requestedReplyToAddress) {
+    if (settingsHelpers.useNewEmailAddresses()) {
+        if (!requestedFromAddress) {
+            // Use the default config
+            requestedFromAddress = emailAddress.service.defaultFromEmail;
+        }
+
+        // Clean up email addresses (checks whether sending is allowed + email address is valid)
+        const addresses = emailAddress.service.getAddressFromString(requestedFromAddress, requestedReplyToAddress);
+
+        // fill in missing name if not set
+        const defaultSiteTitle = settingsCache.get('title') ? settingsCache.get('title') : tpl(messages.title, {domain: getDomain()});
+        if (!addresses.from.name) {
+            addresses.from.name = defaultSiteTitle;
+        }
+
+        return {
+            from: EmailAddressParser.stringify(addresses.from),
+            replyTo: addresses.replyTo ? EmailAddressParser.stringify(addresses.replyTo) : null
+        };
+    }
     const configAddress = config.get('mail') && config.get('mail').from;
 
     const address = requestedFromAddress || configAddress;
     // If we don't have a from address at all
     if (!address) {
         // Default to noreply@[blog.url]
-        return getFromAddress(`noreply@${getDomain()}`);
+        return getFromAddress(`noreply@${getDomain()}`, requestedReplyToAddress);
     }
 
     // If we do have a from address, and it's just an email
     if (validator.isEmail(address, {require_tld: false})) {
         const defaultSiteTitle = settingsCache.get('title') ? settingsCache.get('title').replace(/"/g, '\\"') : tpl(messages.title, {domain: getDomain()});
-        return `"${defaultSiteTitle}" <${address}>`;
+        return {
+            from: `"${defaultSiteTitle}" <${address}>`
+        };
     }
 
-    return address;
+    logging.warn(`Invalid from address used for sending emails: ${address}`);
+    return {from: address};
 }
 
 /**
@@ -47,16 +79,21 @@ function getFromAddress(requestedFromAddress) {
  * @param {Object} message
  * @param {boolean} [message.forceTextContent] - force text content
  * @param {string} [message.from] - sender email address
+ * @param {string} [message.replyTo]
  * @returns {Object}
  */
 function createMessage(message) {
     const encoding = 'base64';
     const generateTextFromHTML = !message.forceTextContent;
-    return Object.assign({}, message, {
-        from: getFromAddress(message.from),
+
+    const addresses = getFromAddress(message.from, message.replyTo);
+
+    return {
+        ...message,
+        ...addresses,
         generateTextFromHTML,
         encoding
-    });
+    };
 }
 
 function createMailError({message, err, ignoreDefaultMessage} = {message: ''}) {
@@ -154,13 +191,13 @@ module.exports = class GhostMailer {
             return tpl(messages.messageSent);
         }
 
-        if (response.pending.length > 0) {
+        if (response.pending && response.pending.length > 0) {
             throw createMailError({
                 message: tpl(messages.reason, {reason: 'Email has been temporarily rejected'})
             });
         }
 
-        if (response.errors.length > 0) {
+        if (response.errors && response.errors.length > 0) {
             throw createMailError({
                 message: tpl(messages.reason, {reason: response.errors[0].message})
             });
diff --git a/ghost/core/core/server/services/members-events/index.js b/ghost/core/core/server/services/members-events/index.js
index a99592d0932..411e28d840a 100644
--- a/ghost/core/core/server/services/members-events/index.js
+++ b/ghost/core/core/server/services/members-events/index.js
@@ -1,5 +1,6 @@
 const labsService = require('../../../shared/labs');
 const DomainEvents = require('@tryghost/domain-events');
+const events = require('../../lib/common/events');
 const settingsCache = require('../../../shared/settings-cache');
 const members = require('../members');
 
@@ -32,7 +33,8 @@ class MembersEventsServiceWrapper {
             getMembersApi() {
                 return members.api;
             },
-            db
+            db,
+            events
         });
 
         this.eventStorage.subscribe(DomainEvents);
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/RequestIntegrityTokenProvider.js b/ghost/core/core/server/services/members/RequestIntegrityTokenProvider.js
new file mode 100644
index 00000000000..7752185830d
--- /dev/null
+++ b/ghost/core/core/server/services/members/RequestIntegrityTokenProvider.js
@@ -0,0 +1,62 @@
+const crypto = require('crypto');
+
+class RequestIntegrityTokenProvider {
+    #themeSecret;
+    #tokenDuration;
+
+    /**
+     * @param {object} options
+     * @param {string} options.themeSecret
+     * @param {number} options.tokenDuration - in milliseconds
+     */
+    constructor(options) {
+        this.#themeSecret = options.themeSecret;
+        this.#tokenDuration = options.tokenDuration;
+    }
+
+    /**
+     * @returns {string}
+     */
+    create() {
+        const currentTime = Date.now();
+        const expiryTime = currentTime + this.#tokenDuration;
+        const nonce = crypto.randomBytes(16).toString('hex');
+        const hmac = crypto.createHmac('sha256', this.#themeSecret);
+        hmac.update(`${expiryTime.toString()}:${nonce}`);
+        return `${expiryTime.toString()}:${nonce}:${hmac.digest('hex')}`;
+    }
+
+    /**
+     * @param {string} token
+     * @returns {boolean}
+     */
+    validate(token) {
+        const parts = token.split(':');
+        if (parts.length !== 3) {
+            // Invalid token string
+            return false;
+        }
+
+        const timestamp = parseInt(parts[0], 10);
+        const nonce = parts[1];
+        const hmacDigest = parts[2];
+
+        const hmac = crypto.createHmac('sha256', this.#themeSecret);
+        hmac.update(`${timestamp.toString()}:${nonce}`);
+        const expectedHmac = hmac.digest('hex');
+
+        if (expectedHmac !== hmacDigest) {
+            // HMAC mismatch
+            return false;
+        }
+
+        if (Date.now() > timestamp) {
+            // Token expired
+            return false;
+        }
+
+        return true;
+    }
+}
+
+module.exports = RequestIntegrityTokenProvider;
diff --git a/ghost/core/core/server/services/members/api.js b/ghost/core/core/server/services/members/api.js
index 69a8b989975..30613bfe152 100644
--- a/ghost/core/core/server/services/members/api.js
+++ b/ghost/core/core/server/services/members/api.js
@@ -18,6 +18,7 @@ const newslettersService = require('../newsletters');
 const memberAttributionService = require('../member-attribution');
 const emailSuppressionList = require('../email-suppression-list');
 const {t} = require('../i18n');
+const sentry = require('../../../shared/sentry');
 
 const MAGIC_LINK_TOKEN_VALIDITY = 24 * 60 * 60 * 1000;
 const MAGIC_LINK_TOKEN_VALIDITY_AFTER_USAGE = 10 * 60 * 1000;
@@ -27,6 +28,24 @@ const ghostMailer = new mail.GhostMailer();
 
 module.exports = createApiInstance;
 
+function trimLeadingWhitespace(strings, ...values) {
+    // Interweave the strings with the
+    // substitution vars first.
+    let output = '';
+    for (let i = 0; i < values.length; i++) {
+        output += strings[i] + values[i];
+    }
+    output += strings[values.length];
+
+    // Split on newlines.
+    const lines = output.split(/(?:\r\n|\n|\r)/);
+
+    // Rip out the leading whitespace on each line.
+    return lines.map((line) => {
+        return line.trimStart();
+    }).join('\n').trim();
+}
+
 function createApiInstance(config) {
     const membersApiInstance = MembersApi({
         tokenConfig: config.getTokenConfig(),
@@ -47,7 +66,7 @@ function createApiInstance(config) {
                         logging.warn(message.text);
                     }
                     let msg = Object.assign({
-                        from: config.getAuthEmailFromAddress(),
+                        from: config.getEmailSupportAddress(),
                         subject: 'Signin',
                         forceTextContent: true
                     }, message);
@@ -75,7 +94,7 @@ function createApiInstance(config) {
                 const siteTitle = settingsCache.get('title');
                 switch (type) {
                 case 'subscribe':
-                    return `
+                    return trimLeadingWhitespace`
                         ${t(`Hey there,`)}
 
                         ${t('You\'re one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:', {siteTitle, interpolation: {escapeValue: false}})}
@@ -92,7 +111,7 @@ function createApiInstance(config) {
                         ${t('If you did not make this request, you can simply delete this message.')} ${t('You will not be subscribed.')}
                         `;
                 case 'signup':
-                    return `
+                    return trimLeadingWhitespace`
                         ${t(`Hey there,`)}
 
                         ${t('Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:', {siteTitle, interpolation: {escapeValue: false}})}
@@ -109,7 +128,7 @@ function createApiInstance(config) {
                         ${t('If you did not make this request, you can simply delete this message.')} ${t('You will not be signed up, and no account will be created for you.')}
                         `;
                 case 'signup-paid':
-                    return `
+                    return trimLeadingWhitespace`
                         ${t(`Hey there,`)}
 
                         ${t('Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:', {siteTitle, interpolation: {escapeValue: false}})}
@@ -126,7 +145,7 @@ function createApiInstance(config) {
                         ${t('Thank you for subscribing to {{siteTitle}}!', {siteTitle, interpolation: {escapeValue: false}})}
                         `;
                 case 'updateEmail':
-                    return `
+                    return trimLeadingWhitespace`
                         ${t(`Hey there,`)}
 
                         ${t('Please confirm your email address with this link:')}
@@ -142,7 +161,7 @@ function createApiInstance(config) {
                         `;
                 case 'signin':
                 default:
-                    return `
+                    return trimLeadingWhitespace`
                         ${t(`Hey there,`)}
 
                         ${t('Welcome back! Use this link to securely sign in to your {{siteTitle}} account:', {siteTitle, interpolation: {escapeValue: false}})}
@@ -216,7 +235,8 @@ function createApiInstance(config) {
         newslettersService: newslettersService,
         memberAttributionService: memberAttributionService.service,
         emailSuppressionList,
-        settingsCache
+        settingsCache,
+        sentry
     });
 
     return membersApiInstance;
diff --git a/ghost/core/core/server/services/members/middleware.js b/ghost/core/core/server/services/members/middleware.js
index 23451c2ecdc..8dd3bd4e1d9 100644
--- a/ghost/core/core/server/services/members/middleware.js
+++ b/ghost/core/core/server/services/members/middleware.js
@@ -1,3 +1,4 @@
+const crypto = require('crypto');
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const membersService = require('./service');
@@ -11,10 +12,76 @@ const {
 } = require('./utils');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
+const onHeaders = require('on-headers');
+const tiersService = require('../tiers/service');
+const config = require('../../../shared/config');
+const settingsHelpers = require('../settings-helpers');
 
 const messages = {
     missingUuid: 'Missing uuid.',
-    invalidUuid: 'Invalid uuid.'
+    invalidUuid: 'Invalid uuid.',
+    invalidKey: 'Invalid key.'
+};
+
+const getFreeTier = async function getFreeTier() {
+    const response = await tiersService.api.browse();
+    const freeTier = response.data.find(tier => tier.type === 'free');
+    return freeTier;
+};
+
+/**
+ * Sets the ghost-access and ghost-access-hmac cookies on the response object
+ * @param {Object} member - The member object
+ * @param {import('express').Request} req - The member object
+ * @param {import('express').Response} res - The express response object to set the cookies on
+ * @param {Object} freeTier - The free tier object
+ * @returns
+ */
+const setAccessCookies = function setAccessCookies(member, req, res, freeTier) {
+    if (!member) {
+        // If there is no cookie sent with the request, return early
+        if (!req.headers.cookie || !req.headers.cookie.includes('ghost-access')) {
+            return;
+        }
+        // If there are cookies sent with the request, set them to null and expire them immediately
+        const accessCookie = `ghost-access=null; Max-Age=0; Path=/; HttpOnly; SameSite=Strict;`;
+        const hmacCookie = `ghost-access-hmac=null; Max-Age=0; Path=/; HttpOnly; SameSite=Strict;`;
+        const existingCookies = res.getHeader('Set-Cookie') || [];
+        const cookiesToSet = [accessCookie, hmacCookie].concat(existingCookies);
+
+        res.setHeader('Set-Cookie', cookiesToSet);
+        return;
+    }
+    const hmacSecret = config.get('cacheMembersContent:hmacSecret');
+    if (!hmacSecret) {
+        return;
+    }
+    const hmacSecretBuffer = Buffer.from(hmacSecret, 'base64');
+    if (hmacSecretBuffer.length === 0) {
+        return;
+    }
+    const activeSubscription = member.subscriptions?.find(sub => sub.status === 'active');
+
+    const cookieTimestamp = Math.floor(Date.now() / 1000); // to mitigate a cookie replay attack
+    const memberTier = activeSubscription && activeSubscription.tier.id || freeTier.id;
+    const memberTierAndTimestamp = `${memberTier}:${cookieTimestamp}`;
+    const memberTierHmac = crypto.createHmac('sha256', hmacSecretBuffer).update(memberTierAndTimestamp).digest('hex');
+
+    const maxAge = 3600;
+    const accessCookie = `ghost-access=${memberTierAndTimestamp}; Max-Age=${maxAge}; Path=/; HttpOnly; SameSite=Strict;`;
+    const hmacCookie = `ghost-access-hmac=${memberTierHmac}; Max-Age=${maxAge}; Path=/; HttpOnly; SameSite=Strict;`;
+
+    const existingCookies = res.getHeader('Set-Cookie') || [];
+    const cookiesToSet = [accessCookie, hmacCookie].concat(existingCookies);
+    res.setHeader('Set-Cookie', cookiesToSet);
+};
+
+const accessInfoSession = async function accessInfoSession(req, res, next) {
+    const freeTier = await getFreeTier();
+    onHeaders(res, function () {
+        setAccessCookies(req.member, req, res, freeTier);
+    });
+    next();
 };
 
 // @TODO: This piece of middleware actually belongs to the frontend, not to the member app
@@ -32,7 +99,7 @@ const loadMemberSession = async function loadMemberSession(req, res, next) {
 };
 
 /**
- * Require member authentication, and make it possible to authenticate via uuid.
+ * Require member authentication, and make it possible to authenticate via uuid + hashed key.
  * You can chain this after loadMemberSession to make it possible to authenticate via both the uuid and the session.
  */
 const authMemberByUuid = async function authMemberByUuid(req, res, next) {
@@ -45,7 +112,23 @@ const authMemberByUuid = async function authMemberByUuid(req, res, next) {
             }
 
             throw new errors.UnauthorizedError({
-                messsage: tpl(messages.missingUuid)
+                message: tpl(messages.missingUuid)
+            });
+        }
+
+        const key = req.query.key;
+        if (!key) {
+            throw new errors.UnauthorizedError({
+                message: tpl(messages.invalidKey)
+            });
+        }
+
+        // the request key is a hashed value from the member uuid and the members validation key so we can verify the source
+        //  (only Ghost should be able to generate the key)
+        const memberHmac = crypto.createHmac('sha256', settingsHelpers.getMembersValidationKey()).update(uuid).digest('hex');
+        if (memberHmac !== key) {
+            throw new errors.UnauthorizedError({
+                message: tpl(messages.invalidKey)
             });
         }
 
@@ -74,6 +157,44 @@ const getIdentityToken = async function getIdentityToken(req, res) {
     }
 };
 
+const createIntegrityToken = async function createIntegrityToken(req, res) {
+    try {
+        const token = membersService.requestIntegrityTokenProvider.create();
+        res.writeHead(200);
+        res.end(token);
+    } catch (err) {
+        res.writeHead(204);
+        res.end();
+    }
+};
+
+const verifyIntegrityToken = async function verifyIntegrityToken(req, res, next) {
+    const shouldThrowForInvalidToken = config.get('verifyRequestIntegrity');
+    try {
+        const token = req.body.integrityToken;
+        if (!token) {
+            logging.warn('Request with missing integrity token.');
+            if (shouldThrowForInvalidToken) {
+                throw new errors.BadRequestError();
+            } else {
+                return next();
+            }
+        }
+        if (membersService.requestIntegrityTokenProvider.validate(token)) {
+            return next();
+        } else {
+            logging.warn('Request with invalid integrity token.');
+            if (shouldThrowForInvalidToken) {
+                throw new errors.BadRequestError();
+            } else {
+                return next();
+            }
+        }
+    } catch (err) {
+        next(err);
+    }
+};
+
 const deleteSession = async function deleteSession(req, res) {
     try {
         await membersService.ssr.deleteSession(req, res);
@@ -128,25 +249,14 @@ const deleteSuppression = async function deleteSuppression(req, res) {
 
 const getMemberNewsletters = async function getMemberNewsletters(req, res) {
     try {
-        const memberUuid = req.query.uuid;
-
-        if (!memberUuid) {
-            res.writeHead(400);
-            return res.end('Invalid member uuid');
-        }
-
-        const memberData = await membersService.api.members.get({
-            uuid: memberUuid
-        }, {
-            withRelated: ['newsletters']
-        });
+        const memberData = req.member; // validation assumed
 
         if (!memberData) {
             res.writeHead(404);
             return res.end('Email address not found.');
         }
 
-        const data = _.pick(memberData.toJSON(), 'uuid', 'email', 'name', 'newsletters', 'enable_comment_notifications', 'status');
+        const data = _.pick(memberData, 'uuid', 'email', 'name', 'newsletters', 'enable_comment_notifications', 'status');
 
         if (data.newsletters) {
             data.newsletters = formatNewsletterResponse(data.newsletters);
@@ -161,23 +271,15 @@ const getMemberNewsletters = async function getMemberNewsletters(req, res) {
 
 const updateMemberNewsletters = async function updateMemberNewsletters(req, res) {
     try {
-        const memberUuid = req.query.uuid;
-        if (!memberUuid) {
-            res.writeHead(400);
-            return res.end('Invalid member uuid');
-        }
-
-        const data = _.pick(req.body, 'newsletters', 'enable_comment_notifications');
-        const memberData = await membersService.api.members.get({
-            uuid: memberUuid
-        });
+        const memberData = req.member; // validation assumed
         if (!memberData) {
             res.writeHead(404);
             return res.end('Email address not found.');
         }
 
+        const data = _.pick(req.body, 'newsletters', 'enable_comment_notifications');
         const options = {
-            id: memberData.get('id'),
+            id: memberData.id,
             withRelated: ['newsletters']
         };
 
@@ -242,6 +344,16 @@ const createSessionFromMagicLink = async function createSessionFromMagicLink(req
         // Note: don't reset 'member_login', or that would give an easy way around user enumeration by logging in to a manually created account
         const subscriptions = member && member.subscriptions || [];
 
+        if (config.get('cacheMembersContent:enabled')) {
+            // Set the ghost-access cookies to enable tier-based caching
+            try {
+                const freeTier = await getFreeTier();
+                setAccessCookies(member, req, res, freeTier);
+            } catch {
+                // This is a non-critical operation, so we can safely ignore any errors
+            }
+        }
+
         const action = req.query.action;
 
         if (action === 'signup' || action === 'signup-paid' || action === 'subscribe') {
@@ -265,8 +377,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);
             }
         }
@@ -314,5 +434,8 @@ module.exports = {
     updateMemberData,
     updateMemberNewsletters,
     deleteSession,
-    deleteSuppression
+    accessInfoSession,
+    deleteSuppression,
+    createIntegrityToken,
+    verifyIntegrityToken
 };
diff --git a/ghost/core/core/server/services/members/service.js b/ghost/core/core/server/services/members/service.js
index c6a6b843a90..b8d50f4b1d4 100644
--- a/ghost/core/core/server/services/members/service.js
+++ b/ghost/core/core/server/services/members/service.js
@@ -19,6 +19,7 @@ const tiersService = require('../tiers');
 const VerificationTrigger = require('@tryghost/verification-trigger');
 const DatabaseInfo = require('@tryghost/database-info');
 const settingsHelpers = require('../settings-helpers');
+const RequestIntegrityTokenProvider = require('./RequestIntegrityTokenProvider');
 
 const messages = {
     noLiveKeysInDevelopment: 'Cannot use live stripe keys in development. Please restart in production mode.',
@@ -55,7 +56,9 @@ const initMembersCSVImporter = ({stripeAPIService}) => {
         },
         getTierByName: async (name) => {
             const tiers = await tiersService.api.browse({
-                filter: `name:'${name}'`
+                filter: {
+                    name
+                }
             });
 
             if (tiers.data.length > 0) {
@@ -89,7 +92,13 @@ const initVerificationTrigger = () => {
         isVerificationRequired: () => settingsCache.get('email_verification_required') === true,
         sendVerificationEmail: async ({subject, message, amountTriggered}) => {
             const escalationAddress = config.get('hostSettings:emailVerification:escalationAddress');
-            const fromAddress = config.get('user_email');
+            let fromAddress = config.get('user_email');
+            let replyTo = undefined;
+
+            if (settingsHelpers.useNewEmailAddresses()) {
+                replyTo = fromAddress;
+                fromAddress = settingsHelpers.getNoReplyAddress();
+            }
 
             if (escalationAddress) {
                 await ghostMailer.send({
@@ -100,6 +109,7 @@ const initVerificationTrigger = () => {
                     }),
                     forceTextContent: true,
                     from: fromAddress,
+                    replyTo,
                     to: escalationAddress
                 });
             }
@@ -184,6 +194,11 @@ module.exports = {
     ssr: null,
     verificationTrigger: null,
 
+    requestIntegrityTokenProvider: new RequestIntegrityTokenProvider({
+        themeSecret: settingsCache.get('theme_session_secret'),
+        tokenDuration: 1000 * 60 * 5
+    }),
+
     stripeConnect: require('./stripe-connect'),
 
     processImport: null,
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/newsletters/NewslettersService.js b/ghost/core/core/server/services/newsletters/NewslettersService.js
index 1b7710cc68a..58f9612340f 100644
--- a/ghost/core/core/server/services/newsletters/NewslettersService.js
+++ b/ghost/core/core/server/services/newsletters/NewslettersService.js
@@ -5,10 +5,13 @@ const verifyEmailTemplate = require('./emails/verify-email');
 const debug = require('@tryghost/debug')('services:newsletters');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
+const sentry = require('../../../shared/sentry');
 
 const messages = {
     nameAlreadyExists: 'A newsletter with the same name already exists',
-    newsletterNotFound: 'Newsletter not found.'
+    newsletterNotFound: 'Newsletter not found.',
+    senderEmailNotAllowed: 'You cannot set the sender email address to {email}',
+    replyToNotAllowed: 'You cannot set the reply-to email address to {email}'
 };
 
 class NewslettersService {
@@ -21,9 +24,10 @@ class NewslettersService {
      * @param {Object} options.singleUseTokenProvider
      * @param {Object} options.urlUtils
      * @param {ILimitService} options.limitService
+     * @param {Object} options.emailAddressService
      * @param {Object} options.labs
      */
-    constructor({NewsletterModel, MemberModel, mail, singleUseTokenProvider, urlUtils, limitService, labs}) {
+    constructor({NewsletterModel, MemberModel, mail, singleUseTokenProvider, urlUtils, limitService, labs, emailAddressService}) {
         this.NewsletterModel = NewsletterModel;
         this.MemberModel = MemberModel;
         this.urlUtils = urlUtils;
@@ -31,6 +35,8 @@ class NewslettersService {
         this.limitService = limitService;
         /** @private */
         this.labs = labs;
+        /** @private */
+        this.emailAddressService = emailAddressService;
 
         /* email verification setup */
 
@@ -79,7 +85,8 @@ class NewslettersService {
             getSigninURL,
             getText,
             getHTML,
-            getSubject
+            getSubject,
+            sentry
         });
     }
 
@@ -87,7 +94,7 @@ class NewslettersService {
      * @public
      * @param {Object} options data (id, uuid, slug...)
      * @param {Object} [options] options
-     * @returns {Promise<object>} JSONified Newsletter models
+     * @returns {Promise<object>}
      */
     async read(data, options = {}) {
         const newsletter = await this.NewsletterModel.findOne(data, options);
@@ -103,11 +110,14 @@ class NewslettersService {
     /**
      * @public
      * @param {Object} [options] options
-     * @returns {Promise<object>} JSONified Newsletter models
+     * @returns {Promise<object>}
      */
     async browse(options = {}) {
-        let newsletters = await this.NewsletterModel.findAll(options);
+        return await this.NewsletterModel.findPage(options);
+    }
 
+    async getAll(options = {}) {
+        const newsletters = await this.NewsletterModel.findAll(options);
         return newsletters.toJSON();
     }
 
@@ -154,8 +164,7 @@ class NewslettersService {
             throw error;
         }
 
-        // Load relations correctly
-        newsletter = await this.NewsletterModel.findOne({id: newsletter.id}, {...options, require: true});
+        let optedInMemberCount = undefined;
 
         // subscribe existing members if opt_in_existing=true
         if (options.opt_in_existing) {
@@ -164,8 +173,7 @@ class NewslettersService {
             // subscribe members that have an existing subscription to an active newsletter
             const memberIds = await this.MemberModel.fetchAllSubscribed(_.pick(options, 'transacting'));
 
-            newsletter.meta = newsletter.meta || {};
-            newsletter.meta.opted_in_member_count = memberIds.length;
+            optedInMemberCount = memberIds.length;
 
             if (memberIds.length) {
                 debug(`Found ${memberIds.length} members to subscribe`);
@@ -174,6 +182,14 @@ class NewslettersService {
             }
         }
 
+        // Load relations correctly
+        newsletter = await this.NewsletterModel.findOne({id: newsletter.id}, {...options, require: true});
+
+        if (optedInMemberCount !== undefined) {
+            newsletter.meta = newsletter.meta || {};
+            newsletter.meta.opted_in_member_count = optedInMemberCount;
+        }
+
         // send any verification emails and respond with the appropriate meta added
         return this.respondWithEmailVerification(newsletter, emailsToVerify);
     }
@@ -232,7 +248,12 @@ class NewslettersService {
         const attrs = {};
         attrs[property] = value;
 
-        return this.NewsletterModel.edit(attrs, {id});
+        const updatedNewsletter = await this.NewsletterModel.edit(attrs, {id});
+
+        updatedNewsletter.meta = updatedNewsletter.meta || {};
+        updatedNewsletter.meta.email_verified = property;
+
+        return updatedNewsletter;
     }
 
     /* Email verification Internals */
@@ -243,14 +264,52 @@ class NewslettersService {
     async prepAttrsForEmailVerification(attrs, newsletter) {
         const cleanedAttrs = _.cloneDeep(attrs);
         const emailsToVerify = [];
+        const emailProperties = [
+            {property: 'sender_email', type: 'from', emptyable: true, error: messages.senderEmailNotAllowed}
+        ];
+
+        if (!this.emailAddressService.service.useNewEmailAddresses) {
+            // Validate reply_to is either newsletter or support
+            if (cleanedAttrs.sender_reply_to !== undefined) {
+                if (!['newsletter', 'support'].includes(cleanedAttrs.sender_reply_to)) {
+                    throw new errors.ValidationError({
+                        message: tpl(messages.replyToNotAllowed, {email: cleanedAttrs.sender_reply_to})
+                    });
+                }
+            }
+        } else {
+            if (cleanedAttrs.sender_reply_to !== undefined) {
+                if (!['newsletter', 'support'].includes(cleanedAttrs.sender_reply_to)) {
+                    emailProperties.push({property: 'sender_reply_to', type: 'replyTo', emptyable: false, error: messages.replyToNotAllowed});
+                }
+            }
+        }
 
-        for (const property of ['sender_email']) {
+        for (const {property, type, emptyable, error} of emailProperties) {
             const email = cleanedAttrs[property];
             const hasChanged = !newsletter || newsletter.get(property) !== email;
 
-            if (await this.requiresEmailVerification({email, hasChanged})) {
-                delete cleanedAttrs[property];
-                emailsToVerify.push({email, property});
+            if (hasChanged && email !== undefined) {
+                if (email === null || email === '' && emptyable) {
+                    continue;
+                }
+
+                const validated = this.emailAddressService.service.validate(email, type);
+
+                if (!validated.allowed) {
+                    throw new errors.ValidationError({
+                        message: tpl(error, {email})
+                    });
+                }
+
+                if (validated.verificationEmailRequired) {
+                    if (type === 'replyTo' && email === newsletter.get('sender_email')) {
+                        // This is some custom behaviour that allows swapping sender_email to sender_reply_to without requiring validation again
+                        continue;
+                    }
+                    delete cleanedAttrs[property];
+                    emailsToVerify.push({email, property});
+                }
             }
         }
 
@@ -261,20 +320,19 @@ class NewslettersService {
             }
         }
 
-        return {cleanedAttrs, emailsToVerify};
-    }
-
-    /**
-     * @private
-     */
-    async requiresEmailVerification({email, hasChanged}) {
-        if (!email || !hasChanged) {
-            return false;
+        // If one of the properties was changed, we need to reset sender_email in case it was not changed but is invalid in the database
+        // which can happen after a config change (= auto correcting behaviour)
+        const didChangeReplyTo = newsletter && attrs.sender_reply_to !== undefined && newsletter.get('sender_reply_to') !== attrs.sender_reply_to;
+        const didChangeSenderEmail = newsletter && (attrs.sender_email !== undefined && newsletter.get('sender_email') !== attrs.sender_email);
+        if (didChangeReplyTo && !didChangeSenderEmail && newsletter.get('sender_email')) {
+            const validated = this.emailAddressService.service.validate(newsletter.get('sender_email'), 'from');
+            if (!validated.allowed) {
+                logging.info(`Resetting sender_email for newsletter ${newsletter.id} because it became invalid`);
+                cleanedAttrs.sender_email = null;
+            }
         }
 
-        // TODO: check other newsletters for known/verified email
-
-        return true;
+        return {cleanedAttrs, emailsToVerify};
     }
 
     /**
@@ -304,6 +362,13 @@ class NewslettersService {
             fromEmail = `no-reply@${toDomain}`;
         }
 
+        if (this.emailAddressService.service.useNewEmailAddresses) {
+            // Gone with the old logic: always use the default email address here
+            // We don't need to validate the FROM address, only the to address
+            // Also because we are not only validating FROM addresses, but also possible REPLY-TO addresses, which we won't send FROM
+            fromEmail = this.emailAddressService.service.defaultFromAddress;
+        }
+
         const {ghostMailer} = this;
 
         this.magicLinkService.transporter = {
diff --git a/ghost/core/core/server/services/newsletters/emails/verify-email.js b/ghost/core/core/server/services/newsletters/emails/verify-email.js
index 51964114981..14238461b4f 100644
--- a/ghost/core/core/server/services/newsletters/emails/verify-email.js
+++ b/ghost/core/core/server/services/newsletters/emails/verify-email.js
@@ -49,6 +49,10 @@ module.exports = ({email, url}) => `
         max-width: 100% !important;
         width: auto !important;
       }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
     }
     /* -------------------------------------
         PRESERVE THESE STYLES IN THE HEAD
@@ -90,26 +94,30 @@ module.exports = ({email, url}) => `
       border-bottom-width: 1px;
       border-bottom-color: #EEF5F8;
     }
+    a {
+      color: #3A464C;
+    }
     </style>
   </head>
-  <body style="background-color: #F4F8FB; 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.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
-    <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F4F8FB;">
+  <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%;">
+    <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;">
       <tr>
         <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>
-        <td class="container" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 600px; padding: 10px; width: 600px;">
-          <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;">
+        <td class="container" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;">
+          <div class="content" style="box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;">
 
             <!-- START CENTERED WHITE CONTAINER -->
+            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Confirm your email address</span>
             <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;">
 
               <!-- START MAIN CONTENT AREA -->
               <tr>
-                <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 40px 50px;">
+                <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
                   <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Hey there,</p>
-                        <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: 32px;">Please confirm your email address with this link:</p>
+                        <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;">Hey there,</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 32px;">Please confirm your email address with this link:</p>
                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
                           <tbody>
                             <tr>
@@ -117,7 +125,7 @@ module.exports = ({email, url}) => `
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;"> <a href="${url}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;" data-test-verify-link>Confirm email address</a> </td>
+                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;"> <a href="${url}" target="_blank" style="display: inline-block; background-color: #15212A; border: solid 1px #15212A; color: #ffffff; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;" data-test-verify-link>Confirm email address</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -125,36 +133,34 @@ module.exports = ({email, url}) => `
                             </tr>
                           </tbody>
                         </table>
-                        <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: 25px;">For your security, the link will expire in 24 hours time.</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 11px;">For your security, the link will expire in 24 hours time.</p>
                         <hr/>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; line-height: 21px; margin-top: 0; color: #738A94;">${url}</p>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;">You can also copy & paste this URL into your browser:</p>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; margin-top: 0; color: #3A464C;">${url}</p>
                       </td>
                     </tr>
                   </table>
                 </td>
               </tr>
 
+              <!-- START FOOTER -->
+
+              <tr>
+                <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;">
+                  <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">If you did not make this request, you can simply delete this message. This email address will not be used.</p>
+                </td>
+              </tr>
+              <tr>
+                <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;">
+                  <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">This message was sent to <a class="small" href="mailto:${email}" style="text-decoration: underline; color: #738A94; font-size: 11px;">${email}</a></p>
+                </td>
+              </tr>
+
+              <!-- END FOOTER -->
+
             <!-- END MAIN CONTENT AREA -->
             </table>
 
-            <!-- START FOOTER -->
-            <div class="footer" style="clear: both; Margin-top: 10px; text-align: center; width: 100%;">
-              <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
-                <tr>
-                  <td class="content-block" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 5px; padding-top: 15px; font-size: 13px; line-height: 21px; color: #738A94; text-align: center;">
-                    If you did not make this request, you can simply delete this message.<br/>This email address will not be used.
-                  </td>
-                </tr>
-                <tr>
-                  <td class="content-block" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 13px; color: #738A94; text-align: center;">
-                    <span class="recipient-link" style="color: #738A94; font-size: 13px; text-align: center;">Sent to <a href="mailto:${email}" style="text-decoration: underline; color: #738A94; font-size: 13px; text-align: center;">${email}</a></span>
-                  </td>
-                </tr>
-              </table>
-            </div>
-            <!-- END FOOTER -->
-
           <!-- END CENTERED WHITE CONTAINER -->
           </div>
         </td>
diff --git a/ghost/core/core/server/services/newsletters/index.js b/ghost/core/core/server/services/newsletters/index.js
index 2e3ada979d8..ef0de972268 100644
--- a/ghost/core/core/server/services/newsletters/index.js
+++ b/ghost/core/core/server/services/newsletters/index.js
@@ -5,6 +5,7 @@ const models = require('../../models');
 const urlUtils = require('../../../shared/url-utils');
 const limitService = require('../limits');
 const labs = require('../../../shared/labs');
+const emailAddressService = require('../email-address');
 
 const MAGIC_LINK_TOKEN_VALIDITY = 24 * 60 * 60 * 1000;
 const MAGIC_LINK_TOKEN_VALIDITY_AFTER_USAGE = 10 * 60 * 1000;
@@ -22,5 +23,6 @@ module.exports = new NewslettersService({
     }),
     urlUtils,
     limitService,
-    labs
+    labs,
+    emailAddressService: emailAddressService
 });
diff --git a/ghost/core/core/server/services/offers/OfferBookshelfRepository.js b/ghost/core/core/server/services/offers/OfferBookshelfRepository.js
index b9933f9e4d1..72b57fdc639 100644
--- a/ghost/core/core/server/services/offers/OfferBookshelfRepository.js
+++ b/ghost/core/core/server/services/offers/OfferBookshelfRepository.js
@@ -33,12 +33,12 @@ const mongoTransformer = flowRight(statusTransformer, rejectNonStatusTransformer
 
 /**
  * @typedef {object} BaseOptions
- * @prop {import('knex').Transaction} transacting
+ * @prop {import('knex').Knex.Transaction} transacting
  */
 
 /**
  * @typedef {object} ListOptions
- * @prop {import('knex').Transaction} transacting
+ * @prop {import('knex').Knex.Transaction} transacting
  * @prop {string} filter
  */
 
@@ -56,7 +56,7 @@ class OfferBookshelfRepository {
 
     /**
      * @template T
-     * @param {(t: import('knex').Transaction) => Promise<T>} cb
+     * @param {(t: import('knex').Knex.Transaction) => Promise<T>} cb
      * @returns {Promise<T>}
      */
     async createTransaction(cb) {
@@ -97,10 +97,15 @@ class OfferBookshelfRepository {
      */
     async mapToOffer(model, options) {
         const json = model.toJSON();
-
         const count = await this.OfferRedemptionModel.where({offer_id: json.id}).count('id', {
             transacting: options.transacting
         });
+
+        const lastRedeemed = await this.OfferRedemptionModel.where({offer_id: json.id}).orderBy('created_at', 'DESC').fetchAll({
+            transacting: options.transacting,
+            limit: 1
+        });
+
         try {
             return await Offer.create({
                 id: json.id,
@@ -119,7 +124,9 @@ class OfferBookshelfRepository {
                 tier: {
                     id: json.product.id,
                     name: json.product.name
-                }
+                },
+                created_at: json.created_at,
+                last_redeemed: lastRedeemed.toJSON().length > 0 ? lastRedeemed.toJSON()[0].created_at : null
             }, null);
         } catch (err) {
             logger.error(err);
diff --git a/ghost/core/core/server/services/permissions/can-this.js b/ghost/core/core/server/services/permissions/can-this.js
index 84cf513cbfc..feb7acfb902 100644
--- a/ghost/core/core/server/services/permissions/can-this.js
+++ b/ghost/core/core/server/services/permissions/can-this.js
@@ -59,26 +59,12 @@ class CanThisResult {
                     let hasMemberPermission = false;
 
                     const checkPermission = function (perm) {
-                        let permObjId;
-
                         // Look for a matching action type and object type first
                         if (perm.get('action_type') !== actType || perm.get('object_type') !== objType) {
                             return false;
                         }
 
-                        // Grab the object id (if specified, could be null)
-                        permObjId = perm.get('object_id');
-
-                        // If we didn't specify a model (any thing)
-                        // or the permission didn't have an id scope set
-                        // then the "thing" has permission
-                        if (!modelId || !permObjId) {
-                            return true;
-                        }
-
-                        // Otherwise, check if the id's match
-                        // TODO: String vs Int comparison possibility here?
-                        return modelId === permObjId;
+                        return true;
                     };
 
                     if (loadedPermissions.user && _.some(loadedPermissions.user.roles, {name: 'Owner'})) {
diff --git a/ghost/core/core/server/services/posts-public/service.js b/ghost/core/core/server/services/posts-public/service.js
index 584f0b5e42e..fe1e2890f2d 100644
--- a/ghost/core/core/server/services/posts-public/service.js
+++ b/ghost/core/core/server/services/posts-public/service.js
@@ -8,34 +8,18 @@ class PostsPublicServiceWrapper {
         // Wire up all the dependencies
         const adapterManager = require('../adapter-manager');
         const config = require('../../../shared/config');
-        const EventAwareCacheWrapper = require('@tryghost/event-aware-cache-wrapper');
         const EventRegistry = require('../../lib/common/events');
 
         let postsCache;
         if (config.get('hostSettings:postsPublicCache:enabled')) {
-            const cache = adapterManager.getAdapter('cache:postsPublic');
-            postsCache = new EventAwareCacheWrapper({
-                cache: cache,
-                resetEvents: ['site.changed'],
-                eventRegistry: EventRegistry
+            postsCache = adapterManager.getAdapter('cache:postsPublic');
+            EventRegistry.on('site.changed', () => {
+                postsCache.reset();
             });
         }
 
-        let cache;
-        if (postsCache) {
-            // @NOTE: exposing cache through getter and setter to not loose the context of "this"
-            cache = {
-                get() {
-                    return postsCache.get(...arguments);
-                },
-                set() {
-                    return postsCache.set(...arguments);
-                }
-            };
-        }
-
         this.api = {
-            cache: cache
+            cache: postsCache
         };
     }
 }
diff --git a/ghost/core/core/server/services/posts/post-scheduling-service.js b/ghost/core/core/server/services/posts/post-scheduling-service.js
index accfe367d52..46f7b8dff05 100644
--- a/ghost/core/core/server/services/posts/post-scheduling-service.js
+++ b/ghost/core/core/server/services/posts/post-scheduling-service.js
@@ -55,7 +55,7 @@ class PostSchedulingService {
      *
      * @param {Object} scheduledResource post or page resource object
      * @param {Object} preScheduledResource post or page resource object in state before publishing
-     * @returns {Boolean|Object}
+     * @returns {boolean|{value: string}}
      */
     handleCacheInvalidation(scheduledResource, preScheduledResource) {
         if (
diff --git a/ghost/core/core/server/services/public-config/config.js b/ghost/core/core/server/services/public-config/config.js
index fd1e95001aa..63c5f77e273 100644
--- a/ghost/core/core/server/services/public-config/config.js
+++ b/ghost/core/core/server/services/public-config/config.js
@@ -19,15 +19,13 @@ module.exports = function getConfigProperties() {
         emailAnalytics: config.get('emailAnalytics'),
         hostSettings: config.get('hostSettings'),
         tenor: config.get('tenor'),
-        editor: config.get('editor'),
         pintura: config.get('pintura'),
-        adminX: config.get('adminX'),
         signupForm: config.get('signupForm')
     };
 
-    const billingUrl = config.get('hostSettings:billing:enabled') ? config.get('hostSettings:billing:url') : '';
-    if (billingUrl) {
-        configProperties.billingUrl = billingUrl;
+    // WIP tinybird stats feature - it's entirely config driven instead of using an alpha flag for now
+    if (config.get('tinybird') && config.get('tinybird:stats')) {
+        configProperties.stats = config.get('tinybird:stats');
     }
 
     return configProperties;
diff --git a/ghost/core/core/server/services/public-config/site.js b/ghost/core/core/server/services/public-config/site.js
index b94672af8b2..2b43a629877 100644
--- a/ghost/core/core/server/services/public-config/site.js
+++ b/ghost/core/core/server/services/public-config/site.js
@@ -19,7 +19,13 @@ module.exports = function getSiteProperties() {
 
     if (config.get('client_sentry') && !config.get('client_sentry').disabled) {
         siteProperties.sentry_dsn = config.get('client_sentry').dsn;
-        siteProperties.sentry_env = config.get('env');
+
+        let environment = config.get('PRO_ENV');
+        if (!environment) {
+            environment = config.get('env');
+        }
+
+        siteProperties.sentry_env = environment;
     }
 
     return siteProperties;
diff --git a/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js b/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js
index 6c00e54dc8d..25c10a93432 100644
--- a/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js
+++ b/ghost/core/core/server/services/recommendations/RecommendationServiceWrapper.js
@@ -39,17 +39,22 @@ class RecommendationServiceWrapper {
     incomingRecommendationService;
 
     init() {
+        const config = require('../../../shared/config');
+        if (config.get('services:recommendations:enabled') === false) {
+            logging.info('[Recommendations] Service is disabled via config');
+            return;
+        }
+
         if (this.repository) {
             return;
         }
 
-        const labs = require('../../../shared/labs');
-        const config = require('../../../shared/config');
         const urlUtils = require('../../../shared/url-utils');
         const models = require('../../models');
         const sentry = require('../../../shared/sentry');
         const settings = require('../settings');
         const RecommendationEnablerService = require('./RecommendationEnablerService');
+
         const {
             BookshelfRecommendationRepository,
             RecommendationService,
@@ -58,7 +63,8 @@ class RecommendationServiceWrapper {
             BookshelfClickEventRepository,
             IncomingRecommendationController,
             IncomingRecommendationService,
-            IncomingRecommendationEmailRenderer
+            IncomingRecommendationEmailRenderer,
+            RecommendationMetadataService
         } = require('@tryghost/recommendations');
 
         const mentions = require('../mentions');
@@ -87,13 +93,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');
@@ -135,10 +150,8 @@ class RecommendationServiceWrapper {
             service: this.incomingRecommendationService
         });
 
-        if (labs.isSet('recommendations')) {
-            this.service.init().catch(logging.error);
-            this.incomingRecommendationService.init().catch(logging.error);
-        }
+        this.service.init().catch(logging.error);
+        this.incomingRecommendationService.init().catch(logging.error);
 
         const PATH_SUFFIX = '/.well-known/recommendations.json';
 
@@ -158,12 +171,10 @@ class RecommendationServiceWrapper {
 
         // Listen for incoming webmentions
         DomainEvents.subscribe(MentionCreatedEvent, async (event) => {
-            if (labs.isSet('recommendations')) {
-                // Check if this is a recommendation
-                if (event.data.mention.verified && isRecommendationUrl(event.data.mention.source)) {
-                    logging.info('[INCOMING RECOMMENDATION] Received recommendation from ' + event.data.mention.source);
-                    await this.incomingRecommendationService.sendRecommendationEmail(event.data.mention);
-                }
+            // Check if this is a recommendation
+            if (event.data.mention.verified && isRecommendationUrl(event.data.mention.source)) {
+                logging.info('[INCOMING RECOMMENDATION] Received recommendation from ' + event.data.mention.source);
+                await this.incomingRecommendationService.sendRecommendationEmail(event.data.mention);
             }
         });
     }
diff --git a/ghost/core/core/server/services/segment/DomainEventsAnalytics.js b/ghost/core/core/server/services/segment/DomainEventsAnalytics.js
deleted file mode 100644
index 45c99880a7c..00000000000
--- a/ghost/core/core/server/services/segment/DomainEventsAnalytics.js
+++ /dev/null
@@ -1,109 +0,0 @@
-const {MilestoneCreatedEvent} = require('@tryghost/milestones');
-const {StripeLiveEnabledEvent, StripeLiveDisabledEvent} = require('@tryghost/members-stripe-service').events;
-
-/**
- * @typedef {import('@tryghost/logging')} logging
- */
-
-/**
- * @typedef {import('analytics-node')} analytics
- */
-
-/**
- * @typedef {object} IExceptionHandler
- * @prop {(err: Error) => void} captureException
- */
-
-/**
- * @typedef {import('@tryghost/domain-events')} DomainEvents
- */
-
-/**
- * @typedef {object} IDomainEventsAnalytics
- * @param {analytics} analytics
- * @param {logging} logging
- * @param {object} trackDefaults
- * @param {string} prefix
- * @param {IExceptionHandler} exceptionHandler
- * @param {DomainEvents} DomainEvents
- * @prop {} subscribeToEvents
- */
-
-module.exports = class DomainEventsAnalytics {
-    /** @type {analytics} */
-    #analytics;
-    /** @type {object} */
-    #trackDefaults;
-    /** @type {string} */
-    #prefix;
-    /** @type {IExceptionHandler} */
-    #exceptionHandler;
-    /** @type {logging} */
-    #logging;
-    /** @type {DomainEvents} */
-    #DomainEvents;
-
-    constructor(deps) {
-        this.#analytics = deps.analytics;
-        this.#trackDefaults = deps.trackDefaults;
-        this.#prefix = deps.prefix;
-        this.#exceptionHandler = deps.exceptionHandler;
-        this.#logging = deps.logging;
-        this.#DomainEvents = deps.DomainEvents;
-    }
-
-    /**
-     *
-     * @param {object} event
-     * @param {object} event.data
-     * @param {object} event.data.milestone
-     * @param {number} event.data.milestone.value
-     * @param {string} event.data.milestone.type
-     * @returns {Promise<void>}
-     */
-    async #handleMilestoneCreatedEvent(event) {
-        if (event.data.milestone
-            && event.data.milestone.value === 100
-        ) {
-            const eventName = event.data.milestone.type === 'arr' ? '$100 ARR reached' : '100 Members reached';
-
-            try {
-                this.#analytics.track(Object.assign(this.#trackDefaults, {}, {event: this.#prefix + eventName}));
-            } catch (err) {
-                this.#logging.error(err);
-                this.#exceptionHandler.captureException(err);
-            }
-        }
-    }
-
-    /**
-     *
-     * @param {StripeLiveEnabledEvent|StripeLiveDisabledEvent} type
-     *
-     * @returns {Promise<void>}
-     */
-    async #handleStripeEvent(type) {
-        const eventName = type === StripeLiveDisabledEvent ? 'Stripe Live Disabled' : 'Stripe Live Enabled';
-
-        try {
-            this.#analytics.track(Object.assign(this.#trackDefaults, {}, {event: this.#prefix + eventName}));
-        } catch (err) {
-            this.#logging.error(err);
-            this.#exceptionHandler.captureException(err);
-        }
-    }
-
-    subscribeToEvents() {
-        this.#DomainEvents.subscribe(MilestoneCreatedEvent, async (event) => {
-            await this.#handleMilestoneCreatedEvent(event);
-        });
-
-        this.#DomainEvents.subscribe(StripeLiveEnabledEvent, async () => {
-            await this.#handleStripeEvent(StripeLiveEnabledEvent);
-        });
-
-        this.#DomainEvents.subscribe(StripeLiveDisabledEvent, async () => {
-            await this.#handleStripeEvent(StripeLiveDisabledEvent);
-        });
-    }
-};
diff --git a/ghost/core/core/server/services/segment/ModelEventsAnalytics.js b/ghost/core/core/server/services/segment/ModelEventsAnalytics.js
deleted file mode 100644
index 470f5ae9e15..00000000000
--- a/ghost/core/core/server/services/segment/ModelEventsAnalytics.js
+++ /dev/null
@@ -1,108 +0,0 @@
-const _ = require('lodash');
-
-/**
- * @typedef {import('@tryghost/logging')} logging
- */
-
-/**
- * @typedef {import('analytics-node')} analytics
- */
-
-/**
- * @typedef {object} IExceptionHandler
- * @prop {(err: Error) => void} captureException
- */
-
-/**
- * @typedef {import('../../lib/common/events')} events
- */
-
-/**
- * @typedef {object} IModelEventsAnalytics
- * @param {analytics} analytics
- * @param {logging} logging
- * @param {object} trackDefaults
- * @param {string} prefix
- * @param {IExceptionHandler} exceptionHandler
- * @param {events} events
- * @prop {} subscribeToEvents
- */
-
-/**
- * Listens to model events to layer on analytics - also uses the "fake" theme.uploaded
- * event from the theme API
- */
-module.exports = class ModelEventsAnalytics {
-    /** @type {analytics} */
-    #analytics;
-    /** @type {object} */
-    #trackDefaults;
-    /** @type {string} */
-    #prefix;
-    /** @type {IExceptionHandler} */
-    #exceptionHandler;
-    /** @type {events} */
-    #events;
-    /** @type {logging} */
-    #logging;
-
-    /**
-     * @type {Array<{event: string, name: string, data?: object}>}
-     */
-    #toTrack = [
-        {
-            event: 'post.published',
-            name: 'Post Published'
-        },
-        {
-            event: 'page.published',
-            name: 'Page Published'
-        },
-        {
-            event: 'theme.uploaded',
-            name: 'Theme Uploaded',
-            // {keyOnSuppliedEventData: keyOnTrackedEventData}
-            // - used to extract specific properties from event data and give them meaningful names
-            data: {name: 'name'}
-        },
-        {
-            event: 'integration.added',
-            name: 'Custom Integration Added'
-        }
-    ];
-
-    constructor(deps) {
-        this.#analytics = deps.analytics;
-        this.#trackDefaults = deps.trackDefaults;
-        this.#prefix = deps.prefix;
-        this.#exceptionHandler = deps.exceptionHandler;
-        this.#events = deps.events;
-        this.#logging = deps.logging;
-    }
-
-    async #handleEvent(event) {
-        try {
-            this.#analytics.track(event);
-        } catch (err) {
-            this.#logging.error(err);
-            this.#exceptionHandler.captureException(err);
-        }
-    }
-
-    subscribeToEvents() {
-        this.#toTrack.forEach(({event, name, data = {}}) => {
-            this.#events.on(event, async (eventData = {}) => {
-                // extract desired properties from eventData and rename keys if necessary
-                const mappedData = _.mapValues(data || {}, v => eventData[v]);
-
-                const eventToTrack = {
-                    ...this.#trackDefaults,
-                    event: this.#prefix + name,
-                    ...mappedData
-                };
-
-                await this.#handleEvent(eventToTrack);
-            });
-        });
-    }
-};
diff --git a/ghost/core/core/server/services/segment/index.js b/ghost/core/core/server/services/segment/index.js
deleted file mode 100644
index e15d3a91ff8..00000000000
--- a/ghost/core/core/server/services/segment/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-const Analytics = require('analytics-node');
-const config = require('../../../shared/config');
-const sentry = require('../../../shared/sentry');
-const logging = require('@tryghost/logging');
-const DomainEvents = require('@tryghost/domain-events');
-const events = require('../../lib/common/events');
-
-const ModelEventsAnalytics = require('./ModelEventsAnalytics');
-const DomainEventsAnalytics = require('./DomainEventsAnalytics');
-
-module.exports.init = function () {
-    const analytics = new Analytics(config.get('segment:key'));
-    const trackDefaults = config.get('segment:trackDefaults') || {};
-    const prefix = config.get('segment:prefix') || '';
-
-    const subscribeToDomainEvents = new DomainEventsAnalytics({
-        analytics,
-        trackDefaults,
-        prefix,
-        exceptionHandler: sentry,
-        DomainEvents,
-        logging
-    });
-
-    const modelEventsAnalytics = new ModelEventsAnalytics({
-        analytics,
-        trackDefaults,
-        prefix,
-        exceptionHandler: sentry,
-        events,
-        logging
-    });
-
-    // Listen to model events
-    modelEventsAnalytics.subscribeToEvents();
-
-    // Listen to domain events
-    subscribeToDomainEvents.subscribeToEvents();
-};
diff --git a/ghost/core/core/server/services/settings-helpers/SettingsHelpers.js b/ghost/core/core/server/services/settings-helpers/SettingsHelpers.js
index ab2ffb3b0b7..f11760976c6 100644
--- a/ghost/core/core/server/services/settings-helpers/SettingsHelpers.js
+++ b/ghost/core/core/server/services/settings-helpers/SettingsHelpers.js
@@ -1,15 +1,18 @@
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
+const {EmailAddressParser} = require('@tryghost/email-addresses');
+const logging = require('@tryghost/logging');
 
 const messages = {
     incorrectKeyType: 'type must be one of "direct" or "connect".'
 };
 
 class SettingsHelpers {
-    constructor({settingsCache, urlUtils, config}) {
+    constructor({settingsCache, urlUtils, config, labs}) {
         this.settingsCache = settingsCache;
         this.urlUtils = urlUtils;
         this.config = config;
+        this.labs = labs;
     }
 
     isMembersEnabled() {
@@ -83,7 +86,18 @@ class SettingsHelpers {
         return this.settingsCache.get('firstpromoter_id');
     }
 
+    /**
+     * @deprecated
+     * Please don't make up new email addresses: use the default email addresses
+     */
     getDefaultEmailDomain() {
+        if (this.#managedEmailEnabled()) {
+            const customSendingDomain = this.#managedSendingDomain();
+            if (customSendingDomain) {
+                return customSendingDomain;
+            }
+        }
+
         const url = this.urlUtils.urlFor('home', true).match(new RegExp('^https?://([^/:?#]+)(?:[/:?#]|$)', 'i'));
         const domain = (url && url[1]) || '';
         if (domain.startsWith('www.')) {
@@ -92,8 +106,26 @@ class SettingsHelpers {
         return domain;
     }
 
+    /**
+     * Retrieves the member validation key from the settings cache. The intent is for this key to be used where member 
+     *  auth is not required. For example, unsubscribe links in emails, which are required to be one-click unsubscribe.
+     *
+     * @returns {string} The member validation key.
+     */
+    getMembersValidationKey() {
+        return this.settingsCache.get('members_email_auth_secret');
+    }
+
     getMembersSupportAddress() {
-        const supportAddress = this.settingsCache.get('members_support_address') || 'noreply';
+        let supportAddress = this.settingsCache.get('members_support_address');
+
+        if (!supportAddress && this.useNewEmailAddresses()) {
+            // In the new flow, we make a difference between an empty setting (= use default) and a 'noreply' setting (=use noreply @ domain)
+            // Also keep the name of the default email!
+            return EmailAddressParser.stringify(this.getDefaultEmail());
+        }
+
+        supportAddress = supportAddress || 'noreply';
 
         // Any fromAddress without domain uses site domain, like default setting `noreply`
         if (supportAddress.indexOf('@') < 0) {
@@ -102,13 +134,60 @@ class SettingsHelpers {
         return supportAddress;
     }
 
+    /**
+     * @deprecated Use getDefaultEmail().address (without name) or EmailAddressParser.stringify(this.getDefaultEmail()) (with name) instead
+     */
     getNoReplyAddress() {
+        return this.getDefaultEmailAddress();
+    }
+
+    getDefaultEmailAddress() {
+        return this.getDefaultEmail().address;
+    }
+
+    getDefaultEmail() {
+        if (this.useNewEmailAddresses()) {
+            // parse the email here and remove the sender name
+            // E.g. when set to "bar" <from@default.com>
+            const configAddress = this.config.get('mail:from');
+            const parsed = EmailAddressParser.parse(configAddress);
+            if (parsed) {
+                return parsed;
+            }
+
+            // For missing configs, we default to the old flow
+            logging.warn('Missing mail.from config, falling back to a generated email address. Please update your config file and set a valid from address');
+        }
+        return {
+            address: this.getLegacyNoReplyAddress()
+        };
+    }
+
+    /**
+     * @deprecated
+     * Please start using the new EmailAddressService
+     */
+    getLegacyNoReplyAddress() {
         return `noreply@${this.getDefaultEmailDomain()}`;
     }
 
     areDonationsEnabled() {
         return this.isStripeConnected();
     }
+
+    useNewEmailAddresses() {
+        return this.#managedEmailEnabled() || this.labs.isSet('newEmailAddresses');
+    }
+
+    // PRIVATE
+
+    #managedEmailEnabled() {
+        return !!this.config.get('hostSettings:managedEmail:enabled');
+    }
+
+    #managedSendingDomain() {
+        return this.config.get('hostSettings:managedEmail:sendingDomain');
+    }
 }
 
 module.exports = SettingsHelpers;
diff --git a/ghost/core/core/server/services/settings-helpers/index.js b/ghost/core/core/server/services/settings-helpers/index.js
index 48d6f01e8b4..1a4f7eae8d7 100644
--- a/ghost/core/core/server/services/settings-helpers/index.js
+++ b/ghost/core/core/server/services/settings-helpers/index.js
@@ -2,5 +2,6 @@ const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
 const config = require('../../../shared/config');
 const SettingsHelpers = require('./SettingsHelpers');
+const labs = require('../../../shared/labs');
 
-module.exports = new SettingsHelpers({settingsCache, urlUtils, config});
+module.exports = new SettingsHelpers({settingsCache, urlUtils, config, labs});
diff --git a/ghost/core/core/server/services/settings/SettingsBREADService.js b/ghost/core/core/server/services/settings/SettingsBREADService.js
index 19c69665023..98f02787e84 100644
--- a/ghost/core/core/server/services/settings/SettingsBREADService.js
+++ b/ghost/core/core/server/services/settings/SettingsBREADService.js
@@ -1,15 +1,17 @@
 const _ = require('lodash');
 const tpl = require('@tryghost/tpl');
-const {NotFoundError, NoPermissionError, BadRequestError, IncorrectUsageError} = require('@tryghost/errors');
+const {NotFoundError, NoPermissionError, BadRequestError, IncorrectUsageError, ValidationError} = require('@tryghost/errors');
 const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./settings-utils');
 const logging = require('@tryghost/logging');
 const MagicLink = require('@tryghost/magic-link');
 const verifyEmailTemplate = require('./emails/verify-email');
+const sentry = require('../../../shared/sentry');
 
 const EMAIL_KEYS = ['members_support_address'];
 const messages = {
     problemFindingSetting: 'Problem finding setting: {key}',
-    accessCoreSettingFromExtReq: 'Attempted to access core setting from external request'
+    accessCoreSettingFromExtReq: 'Attempted to access core setting from external request',
+    invalidEmail: 'Invalid email address'
 };
 
 class SettingsBREADService {
@@ -22,11 +24,13 @@ class SettingsBREADService {
      * @param {Object} options.singleUseTokenProvider
      * @param {Object} options.urlUtils
      * @param {Object} options.labsService - labs service instance
+     * @param {{service: Object}} options.emailAddressService
      */
-    constructor({SettingsModel, settingsCache, labsService, mail, singleUseTokenProvider, urlUtils}) {
+    constructor({SettingsModel, settingsCache, labsService, mail, singleUseTokenProvider, urlUtils, emailAddressService}) {
         this.SettingsModel = SettingsModel;
         this.settingsCache = settingsCache;
         this.labs = labsService;
+        this.emailAddressService = emailAddressService;
 
         /* email verification setup */
 
@@ -77,7 +81,8 @@ class SettingsBREADService {
             getSigninURL,
             getText,
             getHTML,
-            getSubject
+            getSubject,
+            sentry
         });
     }
 
@@ -323,7 +328,18 @@ class SettingsBREADService {
                 const hasChanged = getSetting(setting).value !== email;
 
                 if (await this.requiresEmailVerification({email, hasChanged})) {
-                    emailsToVerify.push({email, key});
+                    const validated = this.emailAddressService.service.validate(email, 'replyTo');
+                    if (!validated.allowed) {
+                        throw new ValidationError({
+                            message: messages.invalidEmail
+                        });
+                    }
+
+                    if (validated.verificationEmailRequired) {
+                        emailsToVerify.push({email, key});
+                    } else {
+                        filteredSettings.push(setting);
+                    }
                 } else {
                     filteredSettings.push(setting);
                 }
@@ -375,6 +391,13 @@ class SettingsBREADService {
             fromEmail = `no-reply@${toDomain}`;
         }
 
+        if (this.emailAddressService.service.useNewEmailAddresses) {
+            // Gone with the old logic: always use the default email address here
+            // We don't need to validate the FROM address, only the to address
+            // Also because we are not only validating FROM addresses, but also possible REPLY-TO addresses, which we won't send FROM
+            fromEmail = this.emailAddressService.service.defaultFromAddress;
+        }
+
         const {ghostMailer} = this;
 
         this.magicLinkService.transporter = {
diff --git a/ghost/core/core/server/services/settings/settings-service.js b/ghost/core/core/server/services/settings/settings-service.js
index a610aa719c6..00af6183ac0 100644
--- a/ghost/core/core/server/services/settings/settings-service.js
+++ b/ghost/core/core/server/services/settings/settings-service.js
@@ -15,6 +15,7 @@ const urlUtils = require('../../../shared/url-utils');
 
 const ObjectId = require('bson-objectid').default;
 const settingsHelpers = require('../settings-helpers');
+const emailAddressService = require('../email-address');
 
 const MAGIC_LINK_TOKEN_VALIDITY = 24 * 60 * 60 * 1000;
 const MAGIC_LINK_TOKEN_VALIDITY_AFTER_USAGE = 10 * 60 * 1000;
@@ -35,7 +36,8 @@ const getSettingsBREADServiceInstance = () => {
             validityPeriodAfterUsage: MAGIC_LINK_TOKEN_VALIDITY_AFTER_USAGE,
             maxUsageCount: MAGIC_LINK_TOKEN_MAX_USAGE_COUNT
         }),
-        urlUtils
+        urlUtils,
+        emailAddressService: emailAddressService
     });
 };
 
@@ -92,6 +94,10 @@ module.exports = {
         fields.push(new CalculatedField({key: 'firstpromoter_account', type: 'string', group: 'firstpromoter', fn: settingsHelpers.getFirstpromoterId.bind(settingsHelpers), dependents: ['firstpromoter', 'firstpromoter_id']}));
         fields.push(new CalculatedField({key: 'donations_enabled', type: 'boolean', group: 'donations', fn: settingsHelpers.areDonationsEnabled.bind(settingsHelpers), dependents: ['stripe_secret_key', 'stripe_publishable_key', 'stripe_connect_secret_key', 'stripe_connect_publishable_key']}));
 
+        // E-mail addresses
+        fields.push(new CalculatedField({key: 'default_email_address', type: 'string', group: 'email', fn: settingsHelpers.getDefaultEmailAddress.bind(settingsHelpers), dependents: ['labs']}));
+        fields.push(new CalculatedField({key: 'support_email_address', type: 'string', group: 'email', fn: settingsHelpers.getMembersSupportAddress.bind(settingsHelpers), dependents: ['labs', 'members_support_address']}));
+
         return fields;
     },
 
diff --git a/ghost/core/core/server/services/slack-notifications/service.js b/ghost/core/core/server/services/slack-notifications/service.js
index 85257e91e7a..3f4ed85cb66 100644
--- a/ghost/core/core/server/services/slack-notifications/service.js
+++ b/ghost/core/core/server/services/slack-notifications/service.js
@@ -12,10 +12,11 @@ class SlackNotificationsServiceWrapper {
      * @param {string} deps.siteUrl
      * @param {boolean} deps.isEnabled
      * @param {URL} deps.webhookUrl
+     * @param {number} deps.minThreshold
      *
      * @returns {import('@tryghost/slack-notifications/lib/SlackNotificationsService')}
      */
-    static create({siteUrl, isEnabled, webhookUrl}) {
+    static create({siteUrl, isEnabled, webhookUrl, minThreshold}) {
         const {
             SlackNotificationsService,
             SlackNotifications
@@ -32,7 +33,8 @@ class SlackNotificationsServiceWrapper {
             logging,
             config: {
                 isEnabled,
-                webhookUrl
+                webhookUrl,
+                minThreshold
             },
             slackNotifications
         });
@@ -49,8 +51,9 @@ class SlackNotificationsServiceWrapper {
         const siteUrl = urlUtils.getSiteUrl();
         const isEnabled = !!(hostSettings?.milestones?.enabled && hostSettings?.milestones?.url);
         const webhookUrl = hostSettings?.milestones?.url;
+        const minThreshold = hostSettings?.milestones?.minThreshold ? parseInt(hostSettings.milestones.minThreshold) : 0;
 
-        this.#api = SlackNotificationsServiceWrapper.create({siteUrl, isEnabled, webhookUrl});
+        this.#api = SlackNotificationsServiceWrapper.create({siteUrl, isEnabled, webhookUrl, minThreshold});
 
         this.#api.subscribeEvents();
     }
diff --git a/ghost/core/core/server/services/slack.js b/ghost/core/core/server/services/slack.js
index b2027ea85fc..e25d2a34a3d 100644
--- a/ghost/core/core/server/services/slack.js
+++ b/ghost/core/core/server/services/slack.js
@@ -63,7 +63,24 @@ function ping(post) {
         if (post.custom_excerpt) {
             description = post.custom_excerpt;
         } else if (post.html) {
-            description = `${post.html.replace(/<[^>]+>/g, '').split('.').slice(0, 3).join('.')}.`;
+            const membersContentIdx = post.html.indexOf('<!--members-only-->');
+            const substringEnd = membersContentIdx > -1 ? membersContentIdx : post.html.length;
+
+            description = `${
+                post.html
+                    // Remove members-only content
+                    .substring(0, substringEnd)
+                    // Strip out HTML
+                    .replace(/<[^>]+>/g, '')
+                    // Split into sentences
+                    .split('.')
+                    // Remove empty strings
+                    .filter(sentence => sentence.trim() !== '')
+                    // Get the first three sentences
+                    .slice(0, 3)
+                    // Join 'em back together
+                    .join('.')
+            }.`;
         } else {
             description = null;
         }
@@ -93,7 +110,7 @@ function ping(post) {
                 // if it is a post or a test message to check webhook working.
                 text: `Notification from *${blogTitle}* :ghost:`,
                 unfurl_links: true,
-                icon_url: blogIcon.getIconUrl(true),
+                icon_url: blogIcon.getIconUrl({absolute: true}),
                 username: slackSettings.username,
                 // We don't want to send attachment if it is a test notification.
                 attachments: [
@@ -124,7 +141,7 @@ function ping(post) {
                             }
                         ],
                         footer: blogTitle,
-                        footer_icon: blogIcon.getIconUrl(true),
+                        footer_icon: blogIcon.getIconUrl({absolute: true}),
                         ts: moment().unix()
                     }
                 ]
@@ -133,7 +150,7 @@ function ping(post) {
             slackData = {
                 text: message,
                 unfurl_links: true,
-                icon_url: blogIcon.getIconUrl(true),
+                icon_url: blogIcon.getIconUrl({absolute: true}),
                 username: slackSettings.username
             };
         }
@@ -160,7 +177,10 @@ function slackListener(model, options) {
         return;
     }
 
-    ping(model.toJSON());
+    ping({
+        ...model.toJSON(),
+        authors: model.related('authors').toJSON()
+    });
 }
 
 function slackTestPing() {
diff --git a/ghost/core/core/server/services/staff/index.js b/ghost/core/core/server/services/staff/index.js
index 2b57d20de6b..56c08cab2dd 100644
--- a/ghost/core/core/server/services/staff/index.js
+++ b/ghost/core/core/server/services/staff/index.js
@@ -17,6 +17,7 @@ class StaffServiceWrapper {
         const mailer = new GhostMailer();
         const settingsCache = require('../../../shared/settings-cache');
         const urlUtils = require('../../../shared/url-utils');
+        const {blogIcon} = require('../../../server/lib/image');
         const settingsHelpers = require('../settings-helpers');
 
         this.api = new StaffService({
@@ -26,6 +27,7 @@ class StaffServiceWrapper {
             settingsHelpers,
             settingsCache,
             urlUtils,
+            blogIcon,
             DomainEvents,
             memberAttributionService: memberAttribution.service,
             labs
diff --git a/ghost/core/core/server/services/stats/service.js b/ghost/core/core/server/services/stats/service.js
index 8c639569103..8cb9df07c04 100644
--- a/ghost/core/core/server/services/stats/service.js
+++ b/ghost/core/core/server/services/stats/service.js
@@ -1,4 +1,27 @@
-const StatsService = require('@tryghost/stats-service');
-const db = require('../../data/db');
+class StatsServiceWrapper {
+    constructor() {
+        this.api = null;
+        this.cache = null;
+    }
 
-module.exports = StatsService.create({knex: db.knex});
+    async init() {
+        if (this.api) {
+            // Already done
+            return;
+        }
+
+        const StatsService = require('@tryghost/stats-service');
+        const db = require('../../data/db');
+
+        this.api = StatsService.create({knex: db.knex});
+
+        const adapterManager = require('../adapter-manager');
+        const config = require('../../../shared/config');
+
+        if (config.get('hostSettings:statsCache:enabled')) {
+            this.cache = adapterManager.getAdapter('cache:stats');
+        }
+    }
+}
+
+module.exports = new StatsServiceWrapper();
diff --git a/ghost/core/core/server/services/stripe/service.js b/ghost/core/core/server/services/stripe/service.js
index 0bbeb24db7b..3ae213aef0d 100644
--- a/ghost/core/core/server/services/stripe/service.js
+++ b/ghost/core/core/server/services/stripe/service.js
@@ -11,6 +11,7 @@ const {getConfig} = require('./config');
 const settingsHelpers = require('../settings-helpers');
 const donationService = require('../donations');
 const staffService = require('../staff');
+const labs = require('../../../shared/labs');
 
 async function configureApi() {
     const cfg = getConfig({settingsHelpers, config, urlUtils});
@@ -30,6 +31,7 @@ const debouncedConfigureApi = _.debounce(() => {
 }, 600);
 
 module.exports = new StripeService({
+    labs,
     membersService,
     models: _.pick(models, [
         'Product',
diff --git a/ghost/core/core/server/services/tags-public/service.js b/ghost/core/core/server/services/tags-public/service.js
index 3cc82bde3b9..fe591546964 100644
--- a/ghost/core/core/server/services/tags-public/service.js
+++ b/ghost/core/core/server/services/tags-public/service.js
@@ -8,33 +8,18 @@ class TagsPublicServiceWrapper {
         // Wire up all the dependencies
         const adapterManager = require('../adapter-manager');
         const config = require('../../../shared/config');
-        const EventAwareCacheWrapper = require('@tryghost/event-aware-cache-wrapper');
         const EventRegistry = require('../../lib/common/events');
 
         let tagsCache;
         if (config.get('hostSettings:tagsPublicCache:enabled')) {
-            let tagsPublicCache = adapterManager.getAdapter('cache:tagsPublic');
-            tagsCache = new EventAwareCacheWrapper({
-                cache: tagsPublicCache,
-                resetEvents: ['site.changed'],
-                eventRegistry: EventRegistry
+            tagsCache = adapterManager.getAdapter('cache:tagsPublic');
+            EventRegistry.on('site.changed', () => {
+                tagsCache.reset();
             });
         }
 
-        let cache;
-        if (tagsCache) {
-            // @NOTE: exposing cache through getter and setter to not loose the context of "this"
-            cache = {
-                get() {
-                    return tagsCache.get(...arguments);
-                },
-                set() {
-                    return tagsCache.set(...arguments);
-                }
-            };
-        }
         this.api = {
-            cache: cache
+            cache: tagsCache
         };
     }
 }
diff --git a/ghost/core/core/server/services/themes/installer.js b/ghost/core/core/server/services/themes/installer.js
index c0288197d0f..6da9631bc68 100644
--- a/ghost/core/core/server/services/themes/installer.js
+++ b/ghost/core/core/server/services/themes/installer.js
@@ -3,7 +3,7 @@ const os = require('os');
 const path = require('path');
 const security = require('@tryghost/security');
 const request = require('@tryghost/request');
-const errors = require('@tryghost/errors/lib/errors');
+const errors = require('@tryghost/errors');
 const limitService = require('../../services/limits');
 const {setFromZip} = require('./storage');
 
diff --git a/ghost/core/core/server/services/tiers/TierRepository.js b/ghost/core/core/server/services/tiers/TierRepository.js
index aa874b60e88..12012a854b5 100644
--- a/ghost/core/core/server/services/tiers/TierRepository.js
+++ b/ghost/core/core/server/services/tiers/TierRepository.js
@@ -86,7 +86,8 @@ module.exports = class TierRepository {
      * @returns {Promise<import('@tryghost/tiers/lib/Tier')[]>}
      */
     async getAll(options = {}) {
-        const filter = nql(options.filter, {});
+        const filter = nql();
+        filter.filter = options.filter || {};
         return Promise.all(this.#store.slice().filter((item) => {
             return filter.queryJSON(this.toPrimitive(item));
         }).map((tier) => {
diff --git a/ghost/core/core/server/services/url/UrlService.js b/ghost/core/core/server/services/url/UrlService.js
index f9feebd6a8e..c6ed4bb76b2 100644
--- a/ghost/core/core/server/services/url/UrlService.js
+++ b/ghost/core/core/server/services/url/UrlService.js
@@ -219,14 +219,12 @@ class UrlService {
      * They would show localhost:2368/null/.
      *
      * @param {String} id
-     * @param {Object} options
+     * @param {Object} [options]
      * @param {Object} [options.absolute]
      * @param {Object} [options.withSubdirectory]
      * @returns {String}
      */
-    getUrlByResourceId(id, options) {
-        options = options || {};
-
+    getUrlByResourceId(id, options = {}) {
         const obj = this.urls.getByResourceId(id);
 
         if (obj) {
diff --git a/ghost/core/core/server/services/webhooks/WebhookTrigger.js b/ghost/core/core/server/services/webhooks/WebhookTrigger.js
index 8e3f1c7f2a1..68b92395233 100644
--- a/ghost/core/core/server/services/webhooks/WebhookTrigger.js
+++ b/ghost/core/core/server/services/webhooks/WebhookTrigger.js
@@ -87,6 +87,7 @@ class WebhookTrigger {
             const reqPayload = JSON.stringify(hookPayload);
             const url = webhook.get('target_url');
             const secret = webhook.get('secret') || '';
+            const ts = Date.now();
 
             const headers = {
                 'Content-Length': Buffer.byteLength(reqPayload),
@@ -95,7 +96,7 @@ class WebhookTrigger {
             };
 
             if (secret !== '') {
-                headers['X-Ghost-Signature'] = `sha256=${crypto.createHmac('sha256', secret).update(reqPayload).digest('hex')}, t=${Date.now()}`;
+                headers['X-Ghost-Signature'] = `sha256=${crypto.createHmac('sha256', secret).update(`${reqPayload}${ts}`).digest('hex')}, t=${ts}`;
             }
 
             const opts = {
diff --git a/ghost/core/core/server/services/webhooks/listen.js b/ghost/core/core/server/services/webhooks/listen.js
index 1300b42dc35..d76e6fcd621 100644
--- a/ghost/core/core/server/services/webhooks/listen.js
+++ b/ghost/core/core/server/services/webhooks/listen.js
@@ -52,7 +52,7 @@ const listen = async () => {
         const overLimit = await limitService.checkWouldGoOverLimit('customIntegrations');
 
         if (overLimit) {
-            logging.info(`Skipped subscribing webhooks to events. The "customIntegrations" plan limit is enabled."`);
+            logging.info(`Skipped subscribing webhooks to events. The "customIntegrations" plan limit is enabled.`);
             return;
         }
     }
diff --git a/ghost/core/core/server/services/websockets/index.js b/ghost/core/core/server/services/websockets/index.js
deleted file mode 100644
index 18113736f44..00000000000
--- a/ghost/core/core/server/services/websockets/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./service');
\ No newline at end of file
diff --git a/ghost/core/core/server/services/websockets/service.js b/ghost/core/core/server/services/websockets/service.js
deleted file mode 100644
index 9dced3572b2..00000000000
--- a/ghost/core/core/server/services/websockets/service.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const {Server} = require('socket.io');
-const debug = require('@tryghost/debug')('websockets');
-const logging = require('@tryghost/logging');
-
-const labs = require('../../../shared/labs');
-
-module.exports = {
-    async init(ghostServer) {
-        debug(`[Websockets] Is labs set? ${labs.isSet('websockets')}`);
-
-        if (labs.isSet('websockets')) {
-            logging.info(`Starting websockets service`);
-
-            const io = new Server(ghostServer.httpServer);
-            let count = 0;
-
-            io.on(`connection`, (socket) => {
-                logging.info(`Websockets client connected (id: ${socket.id})`);
-
-                // on connect, send current value
-                socket.emit('addCount', count);
-                // listen to to changes in value from client
-                socket.on('addCount', () => {
-                    count = count + 1;
-                    debug(`[Websockets] received addCount from client, count is now ${count}`);
-                    socket.broadcast.emit('addCount', count);
-                });
-            });
-
-            ghostServer.registerCleanupTask(async () => {
-                logging.warn(`Stopping websockets service`);
-                await new Promise((resolve) => {
-                    io.close(resolve);
-                });
-            });
-        }
-    }
-};
diff --git a/ghost/core/core/server/services/xmlrpc.js b/ghost/core/core/server/services/xmlrpc.js
index b33a64141d9..681f305d595 100644
--- a/ghost/core/core/server/services/xmlrpc.js
+++ b/ghost/core/core/server/services/xmlrpc.js
@@ -7,7 +7,6 @@ const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
 const request = require('@tryghost/request');
 const settingsCache = require('../../shared/settings-cache');
-const sentry = require('../../shared/sentry');
 
 // Used to receive post.published model event
 const events = require('../lib/common/events');
@@ -110,7 +109,6 @@ function ping(post) {
                     });
                 }
                 logging.error(error);
-                sentry.captureException(error);
             });
     });
 }
diff --git a/ghost/core/core/server/views/maintenance.html b/ghost/core/core/server/views/maintenance.html
index cdda43886a3..42e78a65834 100644
--- a/ghost/core/core/server/views/maintenance.html
+++ b/ghost/core/core/server/views/maintenance.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html>
 <head>
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/ghost/core/core/server/web/admin/app.js b/ghost/core/core/server/web/admin/app.js
index 8217439c218..02280dbb9da 100644
--- a/ghost/core/core/server/web/admin/app.js
+++ b/ghost/core/core/server/web/admin/app.js
@@ -10,6 +10,10 @@ const errorHandler = require('@tryghost/mw-error-handler');
 const sentry = require('../../../shared/sentry');
 const redirectAdminUrls = require('./middleware/redirect-admin-urls');
 
+/**
+ *
+ * @returns {import('express').Application}
+ */
 module.exports = function setupAdminApp() {
     debug('Admin setup start');
     const adminApp = express('admin');
@@ -30,7 +34,24 @@ module.exports = function setupAdminApp() {
         }
     ));
 
-    adminApp.use('/auth-frame', serveStatic(
+    // Auth Frame renders a HTML page that loads some JS which then makes an API
+    // request to the Admin API /users/me/ endpoint to check if the user is logged in.
+    //
+    // Used by comments-ui to add moderation options to front-end comments when logged in.
+    adminApp.use('/auth-frame', function authFrameMw(req, res, next) {
+        // only render content when we have an Admin session cookie,
+        // otherwise return a 204 to avoid JS and API requests being made unnecessarily
+        try {
+            if (req.headers.cookie?.includes('ghost-admin-api-session')) {
+                next();
+            } else {
+                res.setHeader('Cache-Control', 'public, max-age=0');
+                res.sendStatus(204);
+            }
+        } catch (err) {
+            next(err);
+        }
+    }, serveStatic(
         path.join(config.getContentPath('public'), 'admin-auth')
     ));
 
diff --git a/ghost/core/core/server/web/admin/controller.js b/ghost/core/core/server/web/admin/controller.js
index 20277694b74..cb00ab7b502 100644
--- a/ghost/core/core/server/web/admin/controller.js
+++ b/ghost/core/core/server/web/admin/controller.js
@@ -20,8 +20,8 @@ const messages = {
  *
  * Every request to the admin panel will re-trigger the update check service.
  *
- * @param req
- * @param res
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
  */
 module.exports = function adminController(req, res) {
     debug('index called');
@@ -47,16 +47,15 @@ module.exports = function adminController(req, res) {
         }
 
         res.sendFile(templatePath, {headers});
-    } catch (error) {
-        if (error.code === 'ENOENT') {
+    } catch (err) {
+        if (err.code === 'ENOENT') {
             throw new errors.IncorrectUsageError({
                 message: tpl(messages.templateError.message, {templatePath}),
                 context: tpl(messages.templateError.context),
                 help: tpl(messages.templateError.help, {link: 'https://ghost.org/docs/install/source/'}),
-                error: error
+                err
             });
-        } else {
-            throw error;
         }
+        throw err;
     }
 };
diff --git a/ghost/core/core/server/web/admin/middleware/redirect-admin-urls.js b/ghost/core/core/server/web/admin/middleware/redirect-admin-urls.js
index 097c0d784a2..09d08d10478 100644
--- a/ghost/core/core/server/web/admin/middleware/redirect-admin-urls.js
+++ b/ghost/core/core/server/web/admin/middleware/redirect-admin-urls.js
@@ -1,5 +1,11 @@
 const urlUtils = require('../../../../shared/url-utils');
 
+/**
+ *
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
+ * @param {import('express').NextFunction} next
+ */
 function redirectAdminUrls(req, res, next) {
     const subdir = urlUtils.getSubdir();
     const ghostPathRegex = new RegExp(`^${subdir}/ghost/(.+)`);
diff --git a/ghost/core/core/server/web/announcement/routes.js b/ghost/core/core/server/web/announcement/routes.js
index 9b97b2358a3..054069e75cd 100644
--- a/ghost/core/core/server/web/announcement/routes.js
+++ b/ghost/core/core/server/web/announcement/routes.js
@@ -3,6 +3,9 @@ const api = require('../../api').endpoints;
 const {http} = require('@tryghost/api-framework');
 const shared = require('../shared');
 
+/**
+ * @returns {import('express').Router}
+ */
 module.exports = function apiRoutes() {
     const router = express.Router('announcements');
 
diff --git a/ghost/core/core/server/web/api/app.js b/ghost/core/core/server/web/api/app.js
index cb26e1e18b5..a99445d54de 100644
--- a/ghost/core/core/server/web/api/app.js
+++ b/ghost/core/core/server/web/api/app.js
@@ -5,6 +5,9 @@ const sentry = require('../../../shared/sentry');
 const errorHandler = require('@tryghost/mw-error-handler');
 const APIVersionCompatibilityService = require('../../services/api-version-compatibility');
 
+/**
+ * @returns {import('express').Application}
+ */
 module.exports = function setupApiApp() {
     debug('Parent API setup start');
     const apiApp = express('api');
diff --git a/ghost/core/core/server/web/api/endpoints/admin/app.js b/ghost/core/core/server/web/api/endpoints/admin/app.js
index 3ac02257f41..2eeaf830b95 100644
--- a/ghost/core/core/server/web/api/endpoints/admin/app.js
+++ b/ghost/core/core/server/web/api/endpoints/admin/app.js
@@ -4,12 +4,17 @@ const bodyParser = require('body-parser');
 const errorHandler = require('@tryghost/mw-error-handler');
 const versionMatch = require('@tryghost/mw-version-match');
 
+const labs = require('../../../../../shared/labs');
 const shared = require('../../../shared');
 const express = require('../../../../../shared/express');
 const sentry = require('../../../../../shared/sentry');
 const routes = require('./routes');
 const APIVersionCompatibilityService = require('../../../../services/api-version-compatibility');
+const GhostNestApp = require('@tryghost/ghost');
 
+/**
+ * @returns {import('express').Application}
+ */
 module.exports = function setupApiApp() {
     debug('Admin API setup start');
     const apiApp = express('admin api');
@@ -33,6 +38,24 @@ module.exports = function setupApiApp() {
     // Routing
     apiApp.use(routes());
 
+    apiApp.use(async function nestApp(req, res, next) {
+        if (process.env.GHOST_ENABLE_NEST_FRAMEWORK && labs.isSet('NestPlayground')) {
+            const originalExpressApp = req.app;
+            const app = await GhostNestApp.getApp();
+
+            const instance = app.getHttpAdapter().getInstance();
+            instance(Object.assign({}, req, {
+                url: req.originalUrl,
+                baseUrl: ''
+            }), res, function (err) {
+                req.app = originalExpressApp;
+                next(err);
+            });
+            return;
+        }
+        return next();
+    });
+
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
     apiApp.use(APIVersionCompatibilityService.errorHandler);
diff --git a/ghost/core/core/server/web/api/endpoints/admin/middleware.js b/ghost/core/core/server/web/api/endpoints/admin/middleware.js
index a3595c061cb..ca96e95f5ab 100644
--- a/ghost/core/core/server/web/api/endpoints/admin/middleware.js
+++ b/ghost/core/core/server/web/api/endpoints/admin/middleware.js
@@ -8,6 +8,11 @@ const messages = {
     notImplemented: 'The server does not support the functionality required to fulfill the request.'
 };
 
+/**
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
+ * @param {import('express').NextFunction} next
+ */
 const notImplemented = function notImplemented(req, res, next) {
     // CASE: user is logged in, allow
     if (!req.api_key) {
@@ -59,12 +64,16 @@ const notImplemented = function notImplemented(req, res, next) {
     next(new errors.InternalServerError({
         errorType: 'NotImplementedError',
         message: tpl(messages.notImplemented),
-        statusCode: '501'
+        statusCode: 501
     }));
 };
 
+/** @typedef {import('express').RequestHandler} RequestHandler */
+
 /**
  * Authentication for private endpoints
+ *
+ * @type {RequestHandler[]}
  */
 module.exports.authAdminApi = [
     auth.authenticate.authenticateAdminApi,
@@ -79,6 +88,8 @@ module.exports.authAdminApi = [
 /**
  * Authentication for private endpoints with token in URL
  * Ex.: For scheduler publish endpoint
+ *
+ * @type {RequestHandler[]}
  */
 module.exports.authAdminApiWithUrl = [
     auth.authenticate.authenticateAdminApiWithUrl,
@@ -92,6 +103,8 @@ module.exports.authAdminApiWithUrl = [
 
 /**
  * Middleware for public admin endpoints
+ *
+ * @type {RequestHandler[]}
  */
 module.exports.publicAdminApi = [
     apiMw.cors,
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..3ea39dbb7f0 100644
--- a/ghost/core/core/server/web/api/endpoints/admin/routes.js
+++ b/ghost/core/core/server/web/api/endpoints/admin/routes.js
@@ -7,6 +7,9 @@ const mw = require('./middleware');
 const shared = require('../../../shared');
 const labs = require('../../../../../shared/labs');
 
+/**
+ * @returns {import('express').Router}
+ */
 module.exports = function apiRoutes() {
     const router = express.Router('admin api');
 
@@ -144,6 +147,7 @@ module.exports = function apiRoutes() {
     router.get('/members/:id', mw.authAdminApi, http(api.members.read));
     router.put('/members/:id', mw.authAdminApi, http(api.members.edit));
     router.del('/members/:id', mw.authAdminApi, http(api.members.destroy));
+    router.del('/members/:id/sessions', mw.authAdminApi, http(api.members.logout));
 
     router.post('/members/:id/subscriptions/', mw.authAdminApi, http(api.members.createSubscription));
     router.put('/members/:id/subscriptions/:subscription_id', mw.authAdminApi, http(api.members.editSubscription));
@@ -351,6 +355,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/server/web/api/endpoints/content/app.js b/ghost/core/core/server/web/api/endpoints/content/app.js
index 7d8aa98b890..0d6c371143b 100644
--- a/ghost/core/core/server/web/api/endpoints/content/app.js
+++ b/ghost/core/core/server/web/api/endpoints/content/app.js
@@ -9,6 +9,9 @@ const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
 const apiVersionCompatibility = require('../../../../services/api-version-compatibility');
 
+/**
+ * @returns {import('express').Application}
+ */
 module.exports = function setupApiApp() {
     debug('Content API setup start');
     const apiApp = express('content api');
diff --git a/ghost/core/core/server/web/api/endpoints/content/middleware.js b/ghost/core/core/server/web/api/endpoints/content/middleware.js
index b16cfd947de..c5c484c95b6 100644
--- a/ghost/core/core/server/web/api/endpoints/content/middleware.js
+++ b/ghost/core/core/server/web/api/endpoints/content/middleware.js
@@ -12,6 +12,8 @@ const shared = require('../../../shared');
 
 /**
  * Authentication for public endpoints
+ *
+ * @type {import('express').RequestHandler[]}
  */
 module.exports.authenticatePublic = [
     shared.middleware.brute.contentApiKey,
diff --git a/ghost/core/core/server/web/api/endpoints/content/routes.js b/ghost/core/core/server/web/api/endpoints/content/routes.js
index f9ec9178e6b..1db03d362a3 100644
--- a/ghost/core/core/server/web/api/endpoints/content/routes.js
+++ b/ghost/core/core/server/web/api/endpoints/content/routes.js
@@ -4,8 +4,10 @@ const api = require('../../../../api').endpoints;
 const {http} = require('@tryghost/api-framework');
 const mw = require('./middleware');
 const config = require('../../../../../shared/config');
-const membersService = require('../../../../../server/services/members');
 
+/**
+ * @returns {import('express').Router}
+ */
 module.exports = function apiRoutes() {
     const router = express.Router('content api');
 
@@ -32,7 +34,7 @@ module.exports = function apiRoutes() {
     router.get('/tags/slug/:slug', mw.authenticatePublic, http(api.tagsPublic.read));
 
     // ## Settings
-    router.get('/settings', mw.authenticatePublic, membersService.middleware.loadMemberSession, http(api.publicSettings.browse));
+    router.get('/settings', mw.authenticatePublic, http(api.publicSettings.browse));
 
     // ## Members
     router.get('/newsletters', mw.authenticatePublic, http(api.newslettersPublic.browse));
diff --git a/ghost/core/core/server/web/api/middleware/upload.js b/ghost/core/core/server/web/api/middleware/upload.js
index 99afc4cd3c1..a1b5cf0868b 100644
--- a/ghost/core/core/server/web/api/middleware/upload.js
+++ b/ghost/core/core/server/web/api/middleware/upload.js
@@ -6,6 +6,7 @@ const errors = require('@tryghost/errors');
 const config = require('../../../../shared/config');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
+const {JSDOM} = require('jsdom');
 
 const messages = {
     db: {
@@ -24,6 +25,10 @@ const messages = {
         missingFile: 'Please select a theme.',
         invalidFile: 'Please select a valid zip file.'
     },
+    members: {
+        missingFile: 'Please select a members CSV file.',
+        invalidFile: 'Please select a valid CSV file.'
+    },
     images: {
         missingFile: 'Please select an image.',
         invalidFile: 'Please select a valid image.'
@@ -45,13 +50,26 @@ const messages = {
 const enabledClear = config.get('uploadClear') || true;
 const upload = multer({dest: os.tmpdir()});
 
-const deleteSingleFile = file => fs.unlink(file.path).catch(err => logging.error(err));
+const deleteSingleFile = (file) => {
+    if (!file.path) {
+        return;
+    }
+
+    fs.unlink(file.path).catch(err => logging.error(err));
+};
 
 const single = name => function singleUploadFunction(req, res, next) {
     const singleUpload = upload.single(name);
 
     singleUpload(req, res, (err) => {
         if (err) {
+            // Busboy, Multer or Dicer errors are usually caused by invalid file uploads
+            if (err instanceof multer.MulterError || err.stack?.includes('dicer') || err.stack?.includes('busboy')) {
+                return next(new errors.BadRequestError({
+                    err
+                }));
+            }
+
             return next(err);
         }
         if (enabledClear) {
@@ -88,6 +106,13 @@ const media = (fileName, thumbName) => function mediaUploadFunction(req, res, ne
 
     mediaUpload(req, res, (err) => {
         if (err) {
+            // Busboy, Multer or Dicer errors are usually caused by invalid file uploads
+            if (err instanceof multer.MulterError || err.stack?.includes('dicer') || err.stack?.includes('busboy')) {
+                return next(new errors.BadRequestError({
+                    err
+                }));
+            }
+
             return next(err);
         }
 
@@ -120,22 +145,51 @@ const checkFileExists = (fileData) => {
 
 const checkFileIsValid = (fileData, types, extensions) => {
     const type = fileData.mimetype;
-
     if (types.includes(type) && extensions.includes(fileData.ext)) {
         return true;
     }
-
     return false;
 };
 
+/**
+ *
+ * @param {String} filepath
+ * @returns {Boolean}
+ *
+ * Checks for the presence of <script> tags or 'on' attributes in an SVG file
+ *
+ */
+const isSvgSafe = (filepath) => {
+    const fileContent = fs.readFileSync(filepath, 'utf8');
+    const document = new JSDOM(fileContent).window.document;
+    document.body.innerHTML = fileContent;
+    const svgEl = document.body.firstElementChild;
+
+    if (!svgEl) {
+        return false;
+    }
+
+    const attributes = Array.from(svgEl.attributes).map(({name}) => name);
+    const hasScriptAttr = !!attributes.find(attr => attr.startsWith('on'));
+    const scripts = svgEl.getElementsByTagName('script');
+
+    return scripts.length === 0 && !hasScriptAttr ? true : false;
+};
+
 /**
  *
  * @param {Object} options
  * @param {String} options.type - type of the file
- * @returns {Function}
+ * @returns {import('express').RequestHandler}
  */
 const validation = function ({type}) {
     // if we finish the data/importer logic, we forward the request to the specified importer
+
+    /**
+     * @param {import('express').Request} req
+     * @param {import('express').Response} res
+     * @param {import('express').NextFunction} next
+     */
     return function uploadValidation(req, res, next) {
         const extensions = (config.get('uploads')[type] && config.get('uploads')[type].extensions) || [];
         const contentTypes = (config.get('uploads')[type] && config.get('uploads')[type].contentTypes) || [];
@@ -160,6 +214,14 @@ const validation = function ({type}) {
             }));
         }
 
+        if (req.file.ext === '.svg') {
+            if (!isSvgSafe(req.file.path)) {
+                return next(new errors.UnsupportedMediaTypeError({
+                    message: 'SVG files cannot contain <script> tags or "on" attributes.'
+                }));
+            }
+        }
+
         next();
     };
 };
@@ -168,7 +230,7 @@ const validation = function ({type}) {
  *
  * @param {Object} options
  * @param {String} options.type - type of the file
- * @returns {Function}
+ * @returns {import('express').RequestHandler}
  */
 const mediaValidation = function ({type}) {
     return function mediaUploadValidation(req, res, next) {
@@ -231,5 +293,6 @@ module.exports = {
 // Exports for testing only
 module.exports._test = {
     checkFileExists,
-    checkFileIsValid
+    checkFileIsValid,
+    isSvgSafe
 };
diff --git a/ghost/core/core/server/web/comments/routes.js b/ghost/core/core/server/web/comments/routes.js
index c0b8eacabd6..82a350674da 100644
--- a/ghost/core/core/server/web/comments/routes.js
+++ b/ghost/core/core/server/web/comments/routes.js
@@ -7,20 +7,24 @@ const shared = require('../shared');
 const bodyParser = require('body-parser');
 const membersService = require('../../../server/services/members');
 
+/**
+ * @returns {import('express').Router}
+ */
 module.exports = function apiRoutes() {
     const router = express.Router('comment api');
     router.use(bodyParser.json({limit: '50mb'}));
 
-    // Global handling for member session, ensures a member is logged in to the frontend
-    router.use(membersService.middleware.loadMemberSession);
-
     const countsCache = shared.middleware.cacheControl(
         'public',
         {maxAge: config.get('caching:commentsCountAPI:maxAge')}
     );
     router.get('/counts', countsCache, http(api.commentsMembers.counts));
 
+    // Authenticated Routes
+    router.use(membersService.middleware.loadMemberSession);
+
     router.get('/', http(api.commentsMembers.browse));
+    router.get('/post/:post_id', http(api.commentsMembers.browse));
     router.get('/:id', http(api.commentsMembers.read));
     router.post('/', http(api.commentsMembers.add));
     router.put('/:id', http(api.commentsMembers.edit));
diff --git a/ghost/core/core/server/web/members/app.js b/ghost/core/core/server/web/members/app.js
index fdf0378b116..3cbf89aa3d1 100644
--- a/ghost/core/core/server/web/members/app.js
+++ b/ghost/core/core/server/web/members/app.js
@@ -16,6 +16,9 @@ const api = require('../../api').endpoints;
 const commentRouter = require('../comments');
 const announcementRouter = require('../announcement');
 
+/**
+ * @returns {import('express').Application}
+ */
 module.exports = function setupMembersApp() {
     debug('Members App setup start');
     const membersApp = express('members');
@@ -37,12 +40,26 @@ module.exports = function setupMembersApp() {
     // Initializes members specific routes as well as assigns members specific data to the req/res objects
     // We don't want to add global bodyParser middleware as that interferes with stripe webhook requests on - `/webhooks`.
 
-    // Manage newsletter subscription via unsubscribe link
-    membersApp.get('/api/member/newsletters', middleware.getMemberNewsletters);
-    membersApp.put('/api/member/newsletters', bodyParser.json({limit: '50mb'}), middleware.updateMemberNewsletters);
+    // Manage newsletter subscription via unsubscribe link - these should be authenticated by uuid and hashed key
+    membersApp.get('/api/member/newsletters', 
+        middleware.authMemberByUuid,
+        middleware.getMemberNewsletters
+    );
+    membersApp.put('/api/member/newsletters',
+        bodyParser.json({limit: '50mb'}),
+        middleware.authMemberByUuid,
+        middleware.updateMemberNewsletters
+    );
 
     // Get and update member data
-    membersApp.get('/api/member', middleware.getMemberData);
+    // Caching members content is an experimental feature
+    const shouldCacheMembersContent = config.get('cacheMembersContent:enabled');
+    if (shouldCacheMembersContent) {
+        membersApp.get('/api/member', middleware.loadMemberSession, middleware.accessInfoSession, middleware.getMemberData);
+    } else {
+        membersApp.get('/api/member', middleware.getMemberData);
+    }
+    
     membersApp.put('/api/member', bodyParser.json({limit: '50mb'}), middleware.updateMemberData);
     membersApp.post('/api/member/email', bodyParser.json({limit: '50mb'}), (req, res) => membersService.api.middleware.updateEmailAddress(req, res));
 
@@ -51,21 +68,32 @@ module.exports = function setupMembersApp() {
 
     // Manage session
     membersApp.get('/api/session', middleware.getIdentityToken);
-    membersApp.delete('/api/session', middleware.deleteSession);
+    membersApp.delete('/api/session', bodyParser.json({limit: '5mb'}), middleware.deleteSession);
+
+    membersApp.get('/api/integrity-token', middleware.createIntegrityToken);
 
     // NOTE: this is wrapped in a function to ensure we always go via the getter
     membersApp.post(
         '/api/send-magic-link',
         bodyParser.json(),
+        middleware.verifyIntegrityToken,
         // Prevent brute forcing email addresses (user enumeration)
         shared.middleware.brute.membersAuthEnumeration,
         // Prevent brute forcing passwords for the same email address
         shared.middleware.brute.membersAuth,
-        (req, res, next) => membersService.api.middleware.sendMagicLink(req, res, next)
+        function lazySendMagicLinkMw(req, res, next) {
+            return membersService.api.middleware.sendMagicLink(req, res, next);
+        }
     );
-    membersApp.post('/api/create-stripe-checkout-session', (req, res, next) => membersService.api.middleware.createCheckoutSession(req, res, next));
-    membersApp.post('/api/create-stripe-update-session', (req, res, next) => membersService.api.middleware.createCheckoutSetupSession(req, res, next));
-    membersApp.put('/api/subscriptions/:id', (req, res, next) => membersService.api.middleware.updateSubscription(req, res, next));
+    membersApp.post('/api/create-stripe-checkout-session', function lazyCreateCheckoutSessionMw(req, res, next) {
+        return membersService.api.middleware.createCheckoutSession(req, res, next);
+    });
+    membersApp.post('/api/create-stripe-update-session', function lazyCreateCheckoutSetupSessionMw(req, res, next) {
+        return membersService.api.middleware.createCheckoutSetupSession(req, res, next);
+    });
+    membersApp.put('/api/subscriptions/:id', function lazyUpdateSubscriptionMw(req, res, next) {
+        return membersService.api.middleware.updateSubscription(req, res, next);
+    });
 
     // Comments
     membersApp.use('/api/comments', commentRouter());
diff --git a/ghost/core/core/server/web/parent/app.js b/ghost/core/core/server/web/parent/app.js
index 9b9baf94466..289eb44eac8 100644
--- a/ghost/core/core/server/web/parent/app.js
+++ b/ghost/core/core/server/web/parent/app.js
@@ -4,6 +4,9 @@ const express = require('../../../shared/express');
 const compress = require('compression');
 const mw = require('./middleware');
 
+/**
+ * @returns {import('express').Application}
+ */
 module.exports = function setupParentApp() {
     debug('ParentApp setup start');
     const parentApp = express('parent');
@@ -23,6 +26,13 @@ module.exports = function setupParentApp() {
     // @TODO: figure out if this is really needed everywhere? Is it not frontend only...
     parentApp.use(mw.ghostLocals);
 
+    // Enable request queuing if configured
+    const queueConfig = config.get('optimization:requestQueue');
+
+    if (queueConfig) {
+        parentApp.use(mw.queueRequest(queueConfig));
+    }
+
     debug('ParentApp setup end');
 
     return parentApp;
diff --git a/ghost/core/core/server/web/parent/backend.js b/ghost/core/core/server/web/parent/backend.js
index 792ef3686a0..66c1019340a 100644
--- a/ghost/core/core/server/web/parent/backend.js
+++ b/ghost/core/core/server/web/parent/backend.js
@@ -4,7 +4,7 @@ const {BASE_API_PATH} = require('../../../shared/url-utils');
 
 /**
  *
- * @returns {import('express').RequestHandler}
+ * @returns {import('express').Application}
  */
 module.exports = () => {
     debug('BackendApp setup start');
diff --git a/ghost/core/core/server/web/parent/frontend.js b/ghost/core/core/server/web/parent/frontend.js
index 4b0a8fc9919..69d27c7372e 100644
--- a/ghost/core/core/server/web/parent/frontend.js
+++ b/ghost/core/core/server/web/parent/frontend.js
@@ -5,7 +5,7 @@ const shared = require('../shared');
 /**
  *
  * @param {import('../../../frontend/services/routing/RouterManager').RouterConfig} routerConfig
- * @returns {import('express').RequestHandler}
+ * @returns {import('express').Application}
  */
 module.exports = (routerConfig) => {
     debug('FrontendApp setup start', routerConfig);
diff --git a/ghost/core/core/server/web/parent/middleware/emit-events.js b/ghost/core/core/server/web/parent/middleware/emit-events.js
index 318bd326121..5d58d3b3865 100644
--- a/ghost/core/core/server/web/parent/middleware/emit-events.js
+++ b/ghost/core/core/server/web/parent/middleware/emit-events.js
@@ -3,6 +3,11 @@ const INVALIDATE_ALL = '/*';
 // Emit the site.changed event, a special model event used for webhooks
 const events = require('../../../lib/common/events');
 
+/**
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
+ * @param {import('express').NextFunction} next
+ */
 module.exports = function emitEvents(req, res, next) {
     res.on('finish', function triggerEvents() {
         if (res.get('X-Cache-Invalidate') === INVALIDATE_ALL) {
diff --git a/ghost/core/core/server/web/parent/middleware/ghost-locals.js b/ghost/core/core/server/web/parent/middleware/ghost-locals.js
index 213abedba75..146a6d20fa4 100644
--- a/ghost/core/core/server/web/parent/middleware/ghost-locals.js
+++ b/ghost/core/core/server/web/parent/middleware/ghost-locals.js
@@ -1,7 +1,12 @@
 const ghostVersion = require('@tryghost/version');
 
-// ### GhostLocals Middleware
-// Expose the standard locals that every request will need to have available
+/**
+ * Expose the standard locals that every request will need to have available
+ *
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
+ * @param {import('express').NextFunction} next
+ */
 module.exports = function ghostLocals(req, res, next) {
     // Make sure we have a locals value.
     res.locals = res.locals || {};
diff --git a/ghost/core/core/server/web/parent/middleware/index.js b/ghost/core/core/server/web/parent/middleware/index.js
index 11ac6e25572..2717886c9c4 100644
--- a/ghost/core/core/server/web/parent/middleware/index.js
+++ b/ghost/core/core/server/web/parent/middleware/index.js
@@ -2,5 +2,6 @@ module.exports = {
     emitEvents: require('./emit-events'),
     ghostLocals: require('./ghost-locals'),
     logRequest: require('./log-request'),
+    queueRequest: require('./queue-request'),
     requestId: require('./request-id')
 };
diff --git a/ghost/core/core/server/web/parent/middleware/log-request.js b/ghost/core/core/server/web/parent/middleware/log-request.js
index 121b63d385a..bc1391eaf61 100644
--- a/ghost/core/core/server/web/parent/middleware/log-request.js
+++ b/ghost/core/core/server/web/parent/middleware/log-request.js
@@ -2,6 +2,10 @@ const logging = require('@tryghost/logging');
 
 /**
  * @TODO: move this middleware to Framework monorepo?
+ *
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
+ * @param {import('express').NextFunction} next
  */
 module.exports = function logRequest(req, res, next) {
     const startTime = Date.now();
diff --git a/ghost/core/core/server/web/parent/middleware/queue-request.js b/ghost/core/core/server/web/parent/middleware/queue-request.js
new file mode 100644
index 00000000000..debdf8fb2ef
--- /dev/null
+++ b/ghost/core/core/server/web/parent/middleware/queue-request.js
@@ -0,0 +1,65 @@
+const errors = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
+const path = require('node:path');
+const expressQueue = require('express-queue');
+
+const debug = (message) => {
+    logging.debug(`[queue-request] ${message}`);
+};
+
+module.exports = function queueRequest(
+    config,
+    queueFactory = expressQueue
+) {
+    if (config.concurrencyLimit === undefined) {
+        throw new errors.IncorrectUsageError({
+            message: 'concurrencyLimit must be defined when using queueRequest middleware'
+        });
+    }
+
+    debug(`Initialising queueRequest middleware with config: ${JSON.stringify(config)}`);
+
+    // @see https://github.com/alykoshin/express-queue#usage
+    const queue = queueFactory({
+        activeLimit: config.concurrencyLimit,
+        queuedLimit: -1 // Do not limit the number of queued requests
+    });
+
+    /**
+     * Available events:
+     * - queue - when a request is queued
+     * - dequeue - when a request is dequeued
+     * - process - when a request is being processed
+     * - reject - when a request is rejected
+     * - cancel - when a request is cancelled
+     * - complete - when a request has completed
+     *
+     * @see https://github.com/search?q=repo:alykoshin/mini-queue%20job._toState&type=code
+     */
+    queue.queue.on('queue', (job) => {
+        debug(`Request queued: ${job.data.req.path}`);
+    });
+
+    queue.queue.on('complete', (job) => {
+        debug(`Request completed: ${job.data.req.path}`);
+    });
+
+    /**
+     * @param {import('express').Request} req
+     * @param {import('express').Response} res
+     * @param {import('express').NextFunction} next
+     */
+    return function queueRequestMw(req, res, next) {
+        req.queueDepth = queue.queue.getLength();
+
+        // Do not queue requests for static assets - We assume that any path
+        // with a file extension is a static asset
+        if (path.extname(req.path)) {
+            debug(`Request for assumed static asset skipping queue: ${req.path}`);
+
+            return next();
+        }
+
+        return queue(req, res, next);
+    };
+};
diff --git a/ghost/core/core/server/web/parent/middleware/request-id.js b/ghost/core/core/server/web/parent/middleware/request-id.js
index 14ea5cf1238..1e537cb191a 100644
--- a/ghost/core/core/server/web/parent/middleware/request-id.js
+++ b/ghost/core/core/server/web/parent/middleware/request-id.js
@@ -2,6 +2,10 @@ const uuid = require('uuid');
 
 /**
  * @TODO: move this middleware to Framework monorepo?
+ *
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
+ * @param {import('express').NextFunction} next
  */
 module.exports = function requestIdMw(req, res, next) {
     const requestId = req.get('X-Request-ID') || uuid.v4();
diff --git a/ghost/core/core/server/web/webmentions/routes.js b/ghost/core/core/server/web/webmentions/routes.js
index f4bdf0723f0..d41978461fa 100644
--- a/ghost/core/core/server/web/webmentions/routes.js
+++ b/ghost/core/core/server/web/webmentions/routes.js
@@ -5,6 +5,9 @@ const shared = require('../shared');
 
 const bodyParser = require('body-parser');
 
+/**
+ * @returns {import('express').Router}
+ */
 module.exports = function apiRoutes() {
     const router = express.Router('webmentions');
 
diff --git a/ghost/core/core/shared/SentryKnexTracingIntegration.js b/ghost/core/core/shared/SentryKnexTracingIntegration.js
new file mode 100644
index 00000000000..a5dfc807a1a
--- /dev/null
+++ b/ghost/core/core/shared/SentryKnexTracingIntegration.js
@@ -0,0 +1,67 @@
+/**
+ * @typedef {import('knex').Knex.Client} KnexClient
+ */
+
+/**
+ * @typedef {import('@sentry/types').Integration} SentryIntegration
+ */
+
+/**
+ * Sentry Knex tracing integration
+ *
+ * @implements {SentryIntegration}
+ */
+class SentryKnexTracingIntegration {
+    static id = 'Knex';
+
+    name = SentryKnexTracingIntegration.id;
+
+    /** @type {KnexClient} */
+    #knex;
+
+    /** @type {Map} */
+    #spanCache = new Map();
+
+    /**
+     * @param {KnexClient} knex
+     */
+    constructor(knex) {
+        this.#knex = knex;
+    }
+
+    /**
+     * @param {Function} addGlobalEventProcessor
+     * @param {Function} getCurrentHub
+     */
+    setupOnce(addGlobalEventProcessor, getCurrentHub) {
+        this.#knex.on('query', (query) => {
+            const scope = getCurrentHub().getScope();
+            const parentSpan = scope?.getSpan();
+
+            const span = parentSpan?.startChild({
+                op: 'db.query',
+                description: query.sql
+            });
+
+            if (span) {
+                this.#spanCache.set(query.__knexQueryUid, span);
+            }
+        });
+
+        const handleQueryExecuted = (err, query) => {
+            const queryId = query.__knexQueryUid;
+            const span = this.#spanCache.get(queryId);
+
+            if (span) {
+                span.finish();
+
+                this.#spanCache.delete(queryId);
+            }
+        };
+
+        this.#knex.on('query-response', handleQueryExecuted);
+        this.#knex.on('query-error', handleQueryExecuted);
+    }
+}
+
+module.exports = SentryKnexTracingIntegration;
diff --git a/ghost/core/core/shared/config/defaults.json b/ghost/core/core/shared/config/defaults.json
index bb2f2ebc91f..817353439da 100644
--- a/ghost/core/core/shared/config/defaults.json
+++ b/ghost/core/core/shared/config/defaults.json
@@ -182,7 +182,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.36"
+        "version": "2.43"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",
@@ -195,7 +195,7 @@
     },
     "comments": {
         "url": "https://cdn.jsdelivr.net/ghost/comments-ui@~{version}/umd/comments-ui.min.js",
-        "version": "0.13"
+        "version": "0.17"
     },
     "signupForm": {
         "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
@@ -228,5 +228,6 @@
         },
     "bulkEmail": {
         "batchSize": 1000
-    }
+    },
+    "disableJSBackups": false
 }
diff --git a/ghost/core/core/shared/config/env/config.development.json b/ghost/core/core/shared/config/env/config.development.json
index 5cd8e57c8bc..662af14c91b 100644
--- a/ghost/core/core/shared/config/env/config.development.json
+++ b/ghost/core/core/shared/config/env/config.development.json
@@ -1,5 +1,17 @@
 {
     "url": "http://localhost:2368",
+    "mail": {
+        "from": "test@example.com",
+        "transport": "SMTP",
+        "options": {
+            "host": "127.0.0.1",
+            "port": 1025,
+            "auth": {
+                "user": "user",
+                "pass": "unsecure"
+            }
+        }
+    },
     "database": {
         "client": "sqlite3",
         "connection": {
@@ -23,4 +35,4 @@
             "maxAge": 0
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ghost/core/core/shared/config/overrides.json b/ghost/core/core/shared/config/overrides.json
index e67c7ab98a2..2f384b2aaa9 100644
--- a/ghost/core/core/shared/config/overrides.json
+++ b/ghost/core/core/shared/config/overrides.json
@@ -124,7 +124,8 @@
             "signup-form-icon": {"width": 192, "height": 192},
             "email-header-image": {"width": 1200},
             "email-latest-posts-image": {"width": 200, "height": 200},
-            "email-latest-posts-image-mobile": {"width": 1200, "height": 960}
+            "email-latest-posts-image-mobile": {"width": 1200, "height": 960},
+            "social-image": {"width": 1200}
         }
     }
 }
diff --git a/ghost/core/core/shared/express.js b/ghost/core/core/shared/express.js
index bf207f7b460..338babcac3c 100644
--- a/ghost/core/core/shared/express.js
+++ b/ghost/core/core/shared/express.js
@@ -5,6 +5,11 @@ const sentry = require('./sentry');
 
 const lazyLoad = createLazyRouter();
 
+/**
+ *
+ * @param {String} name
+ * @returns {import('express').Application}
+ */
 module.exports = (name) => {
     debug('new app start', name);
     const app = express();
diff --git a/ghost/core/core/shared/instrumentation.js b/ghost/core/core/shared/instrumentation.js
new file mode 100644
index 00000000000..1dd03720f75
--- /dev/null
+++ b/ghost/core/core/shared/instrumentation.js
@@ -0,0 +1,46 @@
+const logging = require('@tryghost/logging');
+
+async function initOpenTelemetry({config}) {
+    // Only enable if explicitly enabled via config `opentelemetry:enabled`
+    try {
+        const enabled = config.get('opentelemetry:enabled');
+        if (!enabled) {
+            logging.debug('OpenTelemetry is not enabled');
+            return false;
+        }
+        const perf = require('perf_hooks').performance;
+        perf.mark('opentelemetry:init:start');
+        logging.debug('Initializing OpenTelemetry');
+    
+        // Lazyloaded to avoid boot time overhead when not enabled
+        const {NodeSDK} = require('@opentelemetry/sdk-node');
+        const {PrometheusExporter} = require('@opentelemetry/exporter-prometheus');
+        const {RuntimeNodeInstrumentation} = require('@opentelemetry/instrumentation-runtime-node');
+    
+        const prometheusExporter = new PrometheusExporter({
+            port: config.get('opentelemetry:prometheus:port'),
+            startServer: true
+        });
+    
+        const sdk = new NodeSDK({
+            serviceName: 'ghost',
+            metricReader: prometheusExporter,
+            instrumentations: [
+                new RuntimeNodeInstrumentation({
+                    eventLoopUtilizationMeasurementInterval: 5000
+                })
+            ]
+        });
+        sdk.start();
+        perf.mark('opentelemetry:init:finished');
+        logging.debug('OpenTelemetry initialized in', Math.round(perf.measure('opentelemetry:init:duration', 'opentelemetry:init:start', 'opentelemetry:init:finished').duration), 'ms');
+        return true;
+    } catch (error) {
+        logging.error('Error initializing OpenTelemetry', error);
+        return false;
+    }
+}
+
+module.exports = {
+    initOpenTelemetry
+};
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index a1b0e2e1736..eabd57ee2bb 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -19,31 +19,32 @@ const GA_FEATURES = [
     'themeErrorsNotification',
     'outboundLinkTagging',
     'announcementBar',
-    'signupForm',
-    'recommendations'
+    'newEmailAddresses'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
 const BETA_FEATURES = [
+    'additionalPaymentMethods',
     'i18n',
     'activitypub',
-    'webmentions'
+    'stripeAutomaticTax',
+    'webmentions',
+    'editorExcerpt'
 ];
 
 const ALPHA_FEATURES = [
+    'ActivityPub',
+    'NestPlayground',
     'urlCache',
     'lexicalMultiplayer',
-    'websockets',
-    'stripeAutomaticTax',
     'emailCustomization',
     'mailEvents',
     'collectionsCard',
-    'tipsAndDonations',
     'importMemberTier',
     'lexicalIndicators',
-    'listUnsubscribeHeader',
-    'editorEmojiPicker'
+    'adminXDemo',
+    'contentVisibility'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];
@@ -72,6 +73,10 @@ module.exports.getAll = () => {
     return labs;
 };
 
+module.exports.getAllFlags = function () {
+    return [...GA_FEATURES, ...BETA_FEATURES, ...ALPHA_FEATURES];
+};
+
 /**
  * @param {string} flag
  * @returns {boolean}
@@ -130,7 +135,7 @@ module.exports.enabledHelper = function enabledHelper(options, callback) {
     return errString;
 };
 
-module.exports.enabledMiddleware = flag => (req, res, next) => {
+module.exports.enabledMiddleware = flag => function labsEnabledMw(req, res, next) {
     if (module.exports.isSet(flag) === true) {
         return next();
     } else {
diff --git a/ghost/core/core/shared/sentry.js b/ghost/core/core/shared/sentry.js
index c410247c75e..ee5e29682bc 100644
--- a/ghost/core/core/shared/sentry.js
+++ b/ghost/core/core/shared/sentry.js
@@ -1,54 +1,165 @@
 const config = require('./config');
+const logging = require('@tryghost/logging');
+const SentryKnexTracingIntegration = require('./SentryKnexTracingIntegration');
 const sentryConfig = config.get('sentry');
 const errors = require('@tryghost/errors');
 
+/**
+ * @param {import('@sentry/node').Event} event
+ * @param {import('@sentry/node').EventHint} hint
+ * @returns {import('@sentry/node').Event | null}
+ */
+const beforeSend = function (event, hint) {
+    try {
+        const exception = hint.originalException;
+        const code = exception?.code ?? null;
+        const context = exception?.context ?? null;
+        const errorType = exception?.errorType ?? null;
+        const id = exception?.id ?? null;
+        const statusCode = exception?.statusCode ?? null;
+        event.tags = event.tags || {};
+
+        if (errors.utils.isGhostError(exception)) {
+            // Unexpected errors have a generic error message, set it back to context if there is one
+            if (code === 'UNEXPECTED_ERROR' && context !== null) {
+                if (event.exception.values?.length > 0) {
+                    event.exception.values[0].type = context;
+                }
+            }
+
+            // This is a mysql2 error — add some additional context
+            if (exception.sql) {
+                const sql = exception.sql;
+                const errno = exception.errno ?? null;
+                const sqlErrorCode = exception.sqlErrorCode ?? null;
+                const sqlMessage = exception.sqlMessage ?? null;
+                const sqlState = exception.sqlState ?? null;
+
+                if (event.exception.values?.length > 0) {
+                    event.exception.values[0].type = `SQL Error ${errno}: ${sqlErrorCode}`;
+                    event.exception.values[0].value = sqlMessage;
+                    event.contexts = event.contexts || {};
+                    event.contexts.mysql = {
+                        errno: errno,
+                        code: sqlErrorCode,
+                        sql: sql,
+                        message: sqlMessage,
+                        state: sqlState
+                    };
+                }
+            }
+
+            // This is a Ghost Error, copy all our extra data to tags
+            event.tags.type = errorType;
+            event.tags.code = code;
+            event.tags.id = id;
+            event.tags.status_code = statusCode;
+
+            // Only handle 500 errors for now
+            // This is because the only other 5XX error should be 503, which are deliberate maintenance/boot errors
+            if (statusCode === 500) {
+                return event;
+            } else {
+                return null;
+            }
+        }
+        return event;
+    } catch (error) {
+        // If any errors occur in beforeSend, send the original event to Sentry
+        // Better to have some information than no information
+        return event;
+    }
+};
+
+const ALLOWED_HTTP_TRANSACTIONS = [
+    '/ghost/api', // any Ghost API call
+    '/members/api', // any Members API call
+    '/:slug', // any frontend post/page
+    '/author', // any frontend author page
+    '/tag' // any frontend tag page
+].map((path) => {
+    // Sentry names HTTP transactions like: "<HTTP_METHOD> <PATH>" i.e. "GET /ghost/api/content/settings"
+    // Match any of the paths above with any HTTP method, and also the homepage "GET /"
+    return new RegExp(`^(GET|POST|PUT|DELETE)\\s(?<path>${path}\\/.+|\\/$)`);
+});
+
+/**
+ * @param {import('@sentry/node').Event} event
+ * @returns {import('@sentry/node').Event | null}
+ */
+const beforeSendTransaction = function (event) {
+    // Drop transactions that are not in the allowed list
+    for (const transaction of ALLOWED_HTTP_TRANSACTIONS) {
+        const match = event.transaction.match(transaction);
+
+        if (match?.groups?.path) {
+            return event;
+        }
+    }
+
+    return null;
+};
+
 if (sentryConfig && !sentryConfig.disabled) {
     const Sentry = require('@sentry/node');
     const version = require('@tryghost/version').full;
-    const environment = config.get('env');
-    Sentry.init({
+
+    let environment = config.get('PRO_ENV');
+    if (!environment) {
+        environment = config.get('env');
+    }
+
+    /** @type {import('@sentry/node').NodeOptions} */
+    const sentryInitConfig = {
         dsn: sentryConfig.dsn,
         release: 'ghost@' + version,
         environment: environment,
         maxValueLength: 1000,
-        beforeSend: function (event, hint) {
-            const exception = hint.originalException;
-
-            event.tags = event.tags || {};
-
-            if (errors.utils.isGhostError(exception)) {
-                // Unexpected errors have a generic error message, set it back to context if there is one
-                if (exception.code === 'UNEXPECTED_ERROR' && exception.context !== null) {
-                    event.exception.values[0].type = exception.context;
-                }
+        integrations: [
+            Sentry.extraErrorDataIntegration()
+        ],
+        beforeSend,
+        beforeSendTransaction
+    };
 
-                // 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;
+    // Enable tracing if sentry.tracing.enabled is true
+    if (sentryConfig.tracing?.enabled === true) {
+        sentryInitConfig.integrations.push(new Sentry.Integrations.Http({tracing: true}));
+        sentryInitConfig.tracesSampleRate = parseFloat(sentryConfig.tracing.sampleRate) || 0.0;
+        // Enable profiling, if configured, only if tracing is also configured
+        if (sentryConfig.profiling?.enabled === true) {
+            // Import Sentry's profiling integration if available
+            let ProfilingIntegration;
+            try {
+                ({ProfilingIntegration} = require('@sentry/profiling-node'));
+            } catch (err) {
+                logging.warn('Sentry Profiling Integration not available');
+                ProfilingIntegration = null;
             }
 
-            return event;
+            if (ProfilingIntegration) {
+                sentryInitConfig.integrations.push(new ProfilingIntegration());
+                sentryInitConfig.profilesSampleRate = parseFloat(sentryConfig.profiling.sampleRate) || 0.0;
+            }
         }
-    });
+    }
+    Sentry.init(sentryInitConfig);
 
     module.exports = {
         requestHandler: Sentry.Handlers.requestHandler(),
-        errorHandler: Sentry.Handlers.errorHandler({
-            shouldHandleError(error) {
-                // Sometimes non-Ghost issues will come into here but they won't
-                // have a statusCode so we should always handle them
-                if (!errors.utils.isGhostError(error)) {
-                    return true;
-                }
+        errorHandler: Sentry.Handlers.errorHandler(),
+        tracingHandler: Sentry.Handlers.tracingHandler(),
+        captureException: Sentry.captureException,
+        captureMessage: Sentry.captureMessage,
+        beforeSend: beforeSend,
+        beforeSendTransaction: beforeSendTransaction,
+        initQueryTracing: (knex) => {
+            if (sentryConfig.tracing?.enabled === true) {
+                const integration = new SentryKnexTracingIntegration(knex);
 
-                // Only handle 500 errors for now
-                // This is because the only other 5XX error should be 503, which are deliberate maintenance/boot errors
-                return (error.statusCode === 500);
+                Sentry.addIntegration(integration);
             }
-        }),
-        captureException: Sentry.captureException
+        }
     };
 } else {
     const expressNoop = function (req, res, next) {
@@ -60,6 +171,8 @@ if (sentryConfig && !sentryConfig.disabled) {
     module.exports = {
         requestHandler: expressNoop,
         errorHandler: expressNoop,
-        captureException: noop
+        tracingHandler: expressNoop,
+        captureException: noop,
+        initQueryTracing: noop
     };
 }
diff --git a/ghost/core/core/shared/settings-cache/public.js b/ghost/core/core/shared/settings-cache/public.js
index 46bb460e979..30fe80f3469 100644
--- a/ghost/core/core/shared/settings-cache/public.js
+++ b/ghost/core/core/shared/settings-cache/public.js
@@ -38,9 +38,13 @@ module.exports = {
     portal_signup_terms_html: 'portal_signup_terms_html',
     portal_signup_checkbox_required: 'portal_signup_checkbox_required',
     portal_plans: 'portal_plans',
+    portal_default_plan: 'portal_default_plan',
     portal_name: 'portal_name',
     portal_button: 'portal_button',
     comments_enabled: 'comments_enabled',
     recommendations_enabled: 'recommendations_enabled',
-    outbound_link_tagging: 'outbound_link_tagging'
+    outbound_link_tagging: 'outbound_link_tagging',
+    default_email_address: 'default_email_address',
+    support_email_address: 'support_email_address',
+    editor_default_email_recipients: 'editor_default_email_recipients'
 };
diff --git a/ghost/core/ghost.js b/ghost/core/ghost.js
index 709916cd35c..0bcf73bddcb 100644
--- a/ghost/core/ghost.js
+++ b/ghost/core/ghost.js
@@ -12,15 +12,13 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 const argv = process.argv;
 const mode = argv[2];
 
-const command = require('./core/cli/command');
-
 // Switch between boot modes
 switch (mode) {
 case 'repl':
 case 'timetravel':
 case 'generate-data':
 case 'record-test':
-    command.run(mode);
+    require('./core/cli/command').run(mode);
     break;
 default:
     // New boot sequence
diff --git a/ghost/core/index.js b/ghost/core/index.js
index 4bfb4b247ce..3eb69a6823d 100644
--- a/ghost/core/index.js
+++ b/ghost/core/index.js
@@ -1,6 +1 @@
-// Load New Relic
-if (process.env.PRO_ENV) {
-    require('newrelic');
-}
-
 require('./ghost');
diff --git a/ghost/core/monobundle.js b/ghost/core/monobundle.js
new file mode 100755
index 00000000000..72157fbf563
--- /dev/null
+++ b/ghost/core/monobundle.js
@@ -0,0 +1,177 @@
+#!/usr/bin/env node
+
+/* eslint-disable no-console */
+
+const fs = require('fs');
+const path = require('path');
+
+const concurrently = require('concurrently');
+const detectIndent = require('detect-indent');
+const detectNewline = require('detect-newline');
+const findRoot = require('find-root');
+const {flattenDeep} = require('lodash');
+const glob = require('glob');
+
+const DETECT_TRAILING_WHITESPACE = /\s+$/;
+
+const jsonFiles = new Map();
+
+class JSONFile {
+    /**
+     * @param {string} filePath
+     * @returns {JSONFile}
+     */
+    static for(filePath) {
+        if (jsonFiles.has(filePath)) {
+            return jsonFiles.get(filePath);
+        }
+
+        let jsonFile = new this(filePath);
+        jsonFiles.set(filePath, jsonFile);
+
+        return jsonFile;
+    }
+
+    /**
+     * @param {string} filename
+     */
+    constructor(filename) {
+        this.filename = filename;
+        this.reload();
+    }
+
+    reload() {
+        const contents = fs.readFileSync(this.filename, {encoding: 'utf8'});
+
+        this.pkg = JSON.parse(contents);
+        this.lineEndings = detectNewline(contents);
+        this.indent = detectIndent(contents).amount;
+
+        let trailingWhitespace = DETECT_TRAILING_WHITESPACE.exec(contents);
+        this.trailingWhitespace = trailingWhitespace ? trailingWhitespace : '';
+    }
+
+    write() {
+        let contents = JSON.stringify(this.pkg, null, this.indent).replace(/\n/g, this.lineEndings);
+
+        fs.writeFileSync(this.filename, contents + this.trailingWhitespace, {encoding: 'utf8'});
+    }
+}
+
+/**
+ * @param {object} packageJson
+ */
+function getPackages(packageJson) {
+    if (!('workspaces' in packageJson)) {
+        return null;
+    }
+    const {workspaces} = packageJson;
+    if (Array.isArray(workspaces)) {
+        return workspaces;
+    }
+    return workspaces.packages || null;
+}
+
+/**
+ * @param {string} from
+ * @returns {string[]}
+ */
+function getWorkspaces(from) {
+    const root = findRoot(from, (dir) => {
+        const pkg = path.join(dir, 'package.json');
+        return fs.existsSync(pkg) && getPackages(require(pkg)) !== null;
+    });
+
+    const packages = getPackages(require(path.join(root, 'package.json')));
+    return flattenDeep(packages.map(name => glob.sync(path.join(root, `${name}/`))));
+}
+
+(async () => {
+    const cwd = process.cwd();
+    const nearestPkgJson = findRoot(cwd);
+    console.log('nearestPkgJson', nearestPkgJson);
+    const pkgInfo = JSONFile.for(path.join(nearestPkgJson, 'package.json'));
+
+    if (pkgInfo.pkg.name !== 'ghost') {
+        console.log('This script must be run from the `ghost` npm package directory');
+        process.exit(1);
+    }
+
+    const bundlePath = './components';
+    if (!fs.existsSync(bundlePath)){
+        fs.mkdirSync(bundlePath);
+    }
+
+    const workspaces = getWorkspaces(cwd)
+        .filter(w => !w.startsWith(cwd) && fs.existsSync(path.join(w, 'package.json')))
+        .filter(w => !w.includes('apps/'))
+        .filter(w => !w.includes('ghost/admin'));
+
+    console.log('workspaces', workspaces);
+    console.log('\n-------------------------\n');
+
+    const packagesToPack = [];
+
+    for (const w of workspaces) {
+        const workspacePkgInfo = JSONFile.for(path.join(w, 'package.json'));
+
+        if (!workspacePkgInfo.pkg.private) {
+            continue;
+        }
+
+        console.log(`packaging ${w}`);
+
+        workspacePkgInfo.pkg.version = pkgInfo.pkg.version;
+        workspacePkgInfo.write();
+
+        const slugifiedName = workspacePkgInfo.pkg.name.replace(/@/g, '').replace(/\//g, '-');
+        const packedFilename = `file:` + path.join(bundlePath, `${slugifiedName}-${workspacePkgInfo.pkg.version}.tgz`);
+
+        if (pkgInfo.pkg.dependencies[workspacePkgInfo.pkg.name]) {
+            console.log(`- dependencies override for ${workspacePkgInfo.pkg.name} to ${packedFilename}`);
+            pkgInfo.pkg.dependencies[workspacePkgInfo.pkg.name] = packedFilename;
+        }
+
+        if (pkgInfo.pkg.devDependencies[workspacePkgInfo.pkg.name]) {
+            console.log(`- devDependencies override for ${workspacePkgInfo.pkg.name} to ${packedFilename}`);
+            pkgInfo.pkg.devDependencies[workspacePkgInfo.pkg.name] = packedFilename;
+        }
+
+        if (pkgInfo.pkg.optionalDependencies[workspacePkgInfo.pkg.name]) {
+            console.log(`- optionalDependencies override for ${workspacePkgInfo.pkg.name} to ${packedFilename}`);
+            pkgInfo.pkg.optionalDependencies[workspacePkgInfo.pkg.name] = packedFilename;
+        }
+
+        console.log(`- resolution override for ${workspacePkgInfo.pkg.name} to ${packedFilename}\n`);
+        pkgInfo.pkg.resolutions[workspacePkgInfo.pkg.name] = packedFilename;
+
+        packagesToPack.push(w);
+    }
+
+    pkgInfo.write();
+
+    const {result} = concurrently(packagesToPack.map(w => ({
+        name: w,
+        cwd: w,
+        command: 'npm pack --pack-destination ../core/components'
+    })));
+
+    try {
+        await result;
+    } catch (e) {
+        console.error(e);
+        throw e;
+    }
+
+    const filesToCopy = [
+        'README.md',
+        'LICENSE',
+        'PRIVACY.md',
+        'yarn.lock'
+    ];
+
+    for (const file of filesToCopy) {
+        console.log(`copying ../../${file} to ${file}`);
+        fs.copyFileSync(path.join('../../', file), file);
+    }
+})();
diff --git a/ghost/core/newrelic.js b/ghost/core/newrelic.js
deleted file mode 100644
index dfc9a223e46..00000000000
--- a/ghost/core/newrelic.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const config = require('./core/shared/config');
-
-exports.config = {
-    app_name: ['Ghost'],
-    license_key: config.get('newRelic:licenseKey'),
-    labels: {
-        env: process.env.PRO_ENV || 'unknown',
-        site: config.get('hostSettings:siteId')
-    },
-    // Agent only imported when enabled, but this will further cement that
-    agent_enabled: config.get('newRelic:enabled'),
-    distributed_tracing: {
-        enabled: true
-    },
-    logging: {
-        level: 'info'
-    },
-    slow_sql: {
-        // Default is false.
-        enabled: true,
-        // Default is 10. Increasing this limit increases memory usage
-        // Defines the maximum number of slow queries the agent collects per minute.
-        // The agent discards additional queries after the limit is reached.
-        max_samples: 10
-    },
-    error_collector: {
-        ignore_classes: [
-            // @NOTE: add more error classes to ignore here
-            'ValidationError',
-            'NoPermissionError'
-        ]
-    },
-    transaction_tracer: {
-        enabled: true,
-        record_sql: 'obfuscated'
-    },
-    allow_all_headers: true,
-    attributes: {
-        exclude: [
-            // Default exclusions (TODO: add more!):
-            'request.headers.cookie',
-            'request.headers.authorization',
-            'request.headers.proxyAuthorization',
-            'request.headers.setCookie*',
-            'request.headers.x*',
-            'response.headers.cookie',
-            'response.headers.authorization',
-            'response.headers.proxyAuthorization',
-            'response.headers.setCookie*',
-            'response.headers.x*'
-        ]
-    }
-};
diff --git a/ghost/core/package.json b/ghost/core/package.json
index e957470ace8..500f60ef617 100644
--- a/ghost/core/package.json
+++ b/ghost/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.70.2",
+  "version": "5.93.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -22,7 +22,7 @@
   "scripts": {
     "archive": "npm pack",
     "dev": "node --watch index.js",
-    "build": "postcss core/frontend/public/ghost.css --no-map --use cssnano -o core/frontend/public/ghost.min.css",
+    "build:assets": "postcss core/frontend/public/ghost.css --no-map --use cssnano -o core/frontend/public/ghost.min.css",
     "test": "yarn test:unit",
     "test:base": "mocha --reporter dot --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js",
     "test:single": "yarn test:base --timeout=60000",
@@ -50,67 +50,73 @@
     "lint:test": "eslint -c test/.eslintrc.js --ignore-path test/.eslintignore 'test/**/*.js' --cache",
     "lint:code": "yarn lint:server && yarn lint:shared && yarn lint:frontend",
     "lint": "yarn lint:server && yarn lint:shared && yarn lint:frontend && yarn lint:test",
-    "prepack": "monobundle"
+    "prepack": "node monobundle.js"
   },
   "engines": {
-    "node": "^18.12.1",
-    "cli": "^1.25.0"
+    "node": "^18.12.1 || ^20.11.1",
+    "cli": "^1.26.0"
   },
   "dependencies": {
     "@extractus/oembed-extractor": "3.2.1",
-    "@sentry/node": "7.70.0",
-    "@tryghost/adapter-base-cache": "0.1.5",
+    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/exporter-prometheus": "0.52.1",
+    "@opentelemetry/instrumentation-runtime-node": "0.6.0",
+    "@opentelemetry/sdk-metrics": "1.25.1",
+    "@opentelemetry/sdk-node": "0.52.1",
+    "@opentelemetry/sdk-trace-node": "1.25.1",
+    "@sentry/node": "7.119.0",
+    "@tryghost/adapter-base-cache": "0.1.12",
     "@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.5",
     "@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.23",
     "@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.2",
+    "@tryghost/config-url-helpers": "1.0.12",
     "@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.27",
+    "@tryghost/debug": "0.1.32",
     "@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.8",
     "@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/errors": "1.3.5",
     "@tryghost/express-dynamic-redirects": "0.0.0",
     "@tryghost/external-media-inliner": "0.0.0",
-    "@tryghost/helpers": "1.1.82",
+    "@tryghost/ghost": "0.0.0",
+    "@tryghost/helpers": "1.1.90",
     "@tryghost/html-to-plaintext": "0.0.0",
-    "@tryghost/http-cache-utils": "0.1.9",
+    "@tryghost/http-cache-utils": "0.1.17",
     "@tryghost/i18n": "0.0.0",
-    "@tryghost/image-transform": "1.2.6",
+    "@tryghost/image-transform": "1.3.0",
     "@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-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-card-factory": "5.0.5",
+    "@tryghost/kg-converters": "1.0.7",
+    "@tryghost/kg-default-atoms": "5.0.3",
+    "@tryghost/kg-default-cards": "10.0.9",
+    "@tryghost/kg-default-nodes": "1.1.17",
+    "@tryghost/kg-html-to-lexical": "1.1.18",
+    "@tryghost/kg-lexical-html-renderer": "1.1.20",
+    "@tryghost/kg-mobiledoc-html-renderer": "7.0.6",
+    "@tryghost/limit-service": "1.2.14",
     "@tryghost/link-redirects": "0.0.0",
     "@tryghost/link-replacer": "0.0.0",
     "@tryghost/link-tracking": "0.0.0",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/logging": "2.4.18",
     "@tryghost/magic-link": "0.0.0",
     "@tryghost/mail-events": "0.0.0",
     "@tryghost/mailgun-client": "0.0.0",
@@ -124,7 +130,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.34",
     "@tryghost/milestones": "0.0.0",
     "@tryghost/minifier": "0.0.0",
     "@tryghost/model-to-domain-event-interceptor": "0.0.0",
@@ -134,38 +140,37 @@
     "@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/nql": "0.11.0",
+    "@tryghost/nodemailer": "0.3.45",
+    "@tryghost/nql": "0.12.4",
     "@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.44",
+    "@tryghost/promise": "0.3.12",
     "@tryghost/recommendations": "0.0.0",
-    "@tryghost/request": "1.0.0",
+    "@tryghost/request": "1.0.8",
     "@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.43",
     "@tryghost/staff-service": "0.0.0",
     "@tryghost/stats-service": "0.0.0",
-    "@tryghost/string": "0.2.4",
+    "@tryghost/string": "0.2.12",
     "@tryghost/tiers": "0.0.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.32",
     "@tryghost/update-check-service": "0.0.0",
-    "@tryghost/url-utils": "4.4.0",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/url-utils": "4.4.8",
+    "@tryghost/validator": "0.2.14",
     "@tryghost/verification-trigger": "0.0.0",
-    "@tryghost/version": "0.1.22",
+    "@tryghost/version": "0.1.30",
     "@tryghost/webmentions": "0.0.0",
-    "@tryghost/zip": "1.1.38",
+    "@tryghost/zip": "1.1.46",
     "amperize": "0.6.1",
-    "analytics-node": "6.2.0",
     "body-parser": "1.20.2",
     "bookshelf": "1.2.0",
-    "bookshelf-relations": "2.6.0",
+    "bookshelf-relations": "2.7.0",
     "brute-knex": "4.0.1",
     "bson-objectid": "2.0.4",
     "chalk": "4.1.2",
@@ -173,82 +178,82 @@
     "common-tags": "1.8.2",
     "compression": "1.7.4",
     "connect-slashes": "1.4.0",
-    "cookie-session": "2.0.0",
+    "cookie-session": "2.1.0",
     "cors": "2.8.5",
     "downsize": "0.0.8",
-    "express": "4.18.2",
+    "express": "4.19.2",
     "express-brute": "1.0.1",
-    "express-hbs": "2.4.2",
+    "express-hbs": "2.5.0",
     "express-jwt": "8.4.1",
     "express-lazy-router": "1.0.6",
     "express-query-boolean": "2.0.0",
-    "express-session": "1.17.3",
-    "fs-extra": "11.1.1",
+    "express-queue": "0.0.13",
+    "express-session": "1.18.0",
+    "fs-extra": "11.2.0",
     "ghost-storage-base": "1.0.0",
     "glob": "8.1.0",
     "got": "11.8.6",
-    "gscan": "4.39.4",
+    "gscan": "4.43.3",
     "human-number": "2.0.4",
-    "image-size": "1.0.2",
+    "image-size": "1.1.1",
     "intl": "1.2.5",
     "intl-messageformat": "5.4.3",
     "js-yaml": "4.1.0",
-    "jsdom": "22.1.0",
-    "json-stable-stringify": "1.0.2",
+    "json-stable-stringify": "1.1.1",
     "jsonpath": "1.1.1",
     "jsonwebtoken": "8.5.1",
-    "juice": "9.1.0",
     "keypair": "1.0.4",
     "knex": "2.4.2",
-    "knex-migrator": "5.1.5",
-    "lib0": "0.2.87",
+    "knex-migrator": "5.2.1",
+    "lib0": "0.2.94",
     "lodash": "4.17.21",
-    "luxon": "3.4.3",
+    "luxon": "3.5.0",
     "moment": "2.24.0",
-    "moment-timezone": "0.5.23",
+    "moment-timezone": "0.5.45",
     "multer": "1.4.4",
-    "mysql2": "3.6.2",
+    "mysql2": "3.11.0",
     "nconf": "0.12.1",
-    "newrelic": "11.3.0",
     "node-jose": "2.2.0",
     "path-match": "1.2.4",
     "probe-image-size": "7.2.3",
     "rss": "1.2.2",
-    "sanitize-html": "2.11.0",
-    "semver": "7.5.4",
-    "socket.io": "4.7.2",
+    "sanitize-html": "2.13.0",
+    "semver": "7.6.3",
     "stoppable": "1.1.0",
     "uuid": "9.0.1",
-    "ws": "8.14.2",
+    "ws": "8.18.0",
     "xml": "1.0.1",
     "y-protocols": "1.0.6",
-    "yjs": "13.6.8"
+    "yjs": "13.6.18"
   },
   "optionalDependencies": {
-    "@tryghost/html-to-mobiledoc": "2.0.36",
-    "sqlite3": "5.1.6"
+    "@sentry/profiling-node": "7.119.0",
+    "@tryghost/html-to-mobiledoc": "3.1.2",
+    "sqlite3": "5.1.7"
   },
   "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/express-test": "0.13.15",
+    "@tryghost/webhook-mock-receiver": "0.2.14",
+    "@types/common-tags": "1.8.4",
     "c8": "8.0.1",
     "cli-progress": "3.12.0",
-    "cssnano": "6.0.1",
+    "cssnano": "7.0.4",
+    "detect-indent": "6.1.0",
+    "detect-newline": "3.1.0",
     "expect": "29.3.1",
+    "find-root": "1.1.0",
     "form-data": "4.0.0",
     "inquirer": "8.2.6",
     "jwks-rsa": "3.1.0",
     "mocha": "10.2.0",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "TryGhost/mock-knex#d8b93b1c20d4820323477f2c60db016ab3e73192",
-    "monobundle": "TryGhost/monobundle#44fdf2c8e304e797a04858bfd7339b2a1fa47441",
     "nock": "13.3.3",
     "papaparse": "5.3.2",
-    "postcss": "8.4.31",
-    "postcss-cli": "10.1.0",
+    "postcss": "8.4.39",
+    "postcss-cli": "11.0.0",
     "rewire": "6.0.0",
     "should": "13.2.3",
     "sinon": "15.2.0",
@@ -257,17 +262,17 @@
     "toml": "3.0.0"
   },
   "resolutions": {
-    "@elastic/elasticsearch": "8.5.0",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
+    "jackspeak": "2.1.1",
     "moment": "2.24.0",
-    "moment-timezone": "0.5.23"
+    "moment-timezone": "0.5.45"
   },
   "nx": {
     "targets": {
       "archive": {
         "dependsOn": [
-          "build",
+          "build:assets",
           "^build:ts",
           {
             "projects": [
diff --git a/ghost/core/playwright.config.js b/ghost/core/playwright.config.js
index 9852831aa71..19b016c6d27 100644
--- a/ghost/core/playwright.config.js
+++ b/ghost/core/playwright.config.js
@@ -1,14 +1,16 @@
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 
 const config = {
-    timeout: 60 * 1000,
+    timeout: 75 * 1000,
     expect: {
         timeout: 10000
     },
+    // save trace on fail
     retries: process.env.CI ? 2 : 0,
     workers: process.env.CI ? '100%' : (process.env.PLAYWRIGHT_SLOWMO ? 1 : undefined),
     reporter: process.env.CI ? [['list', {printSteps: true}], ['html']] : [['list', {printSteps: true}]],
     use: {
+        trace: 'retain-on-failure',
         // Use a single browser since we can't simultaneously test multiple browsers
         browserName: 'chromium',
         headless: !process.env.PLAYWRIGHT_DEBUG,
diff --git a/ghost/core/test/.eslintrc.js b/ghost/core/test/.eslintrc.js
index 4419c59db01..b1a848dad9d 100644
--- a/ghost/core/test/.eslintrc.js
+++ b/ghost/core/test/.eslintrc.js
@@ -31,8 +31,6 @@ module.exports = {
         'ghost/mocha/no-skipped-tests': 'error',
 
         // TODO: remove these custom rules and fix problems in test files
-        'ghost/mocha/max-top-level-suites': 'off',
-        'ghost/mocha/no-identical-title': 'off',
         'ghost/mocha/no-setup-in-describe': 'off',
         'ghost/mocha/no-sibling-hooks': 'off'
     }
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/activity-feed.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/activity-feed.test.js.snap
index 5fb91d5b0a9..558a7444a19 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/activity-feed.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/activity-feed.test.js.snap
@@ -22699,7 +22699,7 @@ exports[`Activity Feed API Can filter events by post id 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": "20655",
+  "content-length": "17559",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -23567,6 +23567,102 @@ Object {
 }
 `;
 
+exports[`Activity Feed API Returns aggregated_click events in activity feed 1: [body] 1`] = `
+Object {
+  "events": Array [
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+  ],
+  "meta": Object {
+    "pagination": Object {
+      "limit": 10,
+      "next": null,
+      "page": null,
+      "pages": 1,
+      "prev": null,
+      "total": 8,
+    },
+  },
+}
+`;
+
+exports[`Activity Feed API Returns aggregated_click events in activity feed 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": "2443",
+  "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[`Activity Feed API Returns aggregated_click events in activity feed with post_id filter 1: [body] 1`] = `
+Object {
+  "events": Array [
+    Object {
+      "data": Any<Object>,
+      "type": "aggregated_click_event",
+    },
+  ],
+  "meta": Object {
+    "pagination": Object {
+      "limit": 10,
+      "next": null,
+      "page": null,
+      "pages": 1,
+      "prev": null,
+      "total": 1,
+    },
+  },
+}
+`;
+
+exports[`Activity Feed API Returns aggregated_click events in activity feed with post_id filter 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": "391",
+  "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[`Activity Feed API Returns click events in activity feed 1: [body] 1`] = `
 Object {
   "events": Array [
@@ -23852,7 +23948,7 @@ exports[`Activity Feed API Returns email delivered events in activity feed 2: [h
 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": "1361",
+  "content-length": "1051",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -23886,7 +23982,7 @@ exports[`Activity Feed API Returns email opened events in activity feed 2: [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": "1358",
+  "content-length": "1048",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -23944,7 +24040,7 @@ exports[`Activity Feed API Returns email sent events in activity feed 2: [header
 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": "5096",
+  "content-length": "3860",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -24204,7 +24300,7 @@ exports[`Activity Feed API Returns signup events in activity feed 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": "23603",
+  "content-length": "21127",
   "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__/authentication.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/authentication.test.js.snap
new file mode 100644
index 00000000000..a6c9c0c90e6
--- /dev/null
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/authentication.test.js.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Authentication API generateResetToken Cannot generate reset token without required info 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "The server did not receive a valid email",
+      "property": null,
+      "type": "BadRequestError",
+    },
+  ],
+}
+`;
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap
index c7747b2ec6a..8c24463095a 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap
@@ -207,7 +207,7 @@ exports[`Collections API Automatic Collection Filtering Creates an automatic Col
 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": "12653",
+  "content-length": "12649",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -728,7 +728,7 @@ exports[`Collections API Automatic Collection Filtering Creates an automatic Col
 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": "78564",
+  "content-length": "78560",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -987,7 +987,7 @@ exports[`Collections API Automatic Collection Filtering Creates an automatic Col
 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": "14427",
+  "content-length": "14423",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1246,7 +1246,7 @@ exports[`Collections API Automatic Collection Filtering Creates an automatic Col
 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": "14427",
+  "content-length": "14423",
   "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__/config.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/config.test.js.snap
new file mode 100644
index 00000000000..c80a2e73b77
--- /dev/null
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/config.test.js.snap
@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Config API As Owner Can retrieve config and all expected properties 1: [body] 1`] = `
+Object {
+  "config": Object {
+    "clientExtensions": Object {},
+    "database": StringMatching /sqlite3\\|mysql\\|mysql2/,
+    "emailAnalytics": true,
+    "enableDeveloperExperiments": false,
+    "environment": StringMatching /\\^testing/,
+    "labs": Object {
+      "ActivityPub": true,
+      "NestPlayground": true,
+      "activitypub": true,
+      "additionalPaymentMethods": true,
+      "adminXDemo": true,
+      "announcementBar": true,
+      "audienceFeedback": true,
+      "collections": true,
+      "collectionsCard": true,
+      "contentVisibility": true,
+      "editorExcerpt": true,
+      "emailCustomization": true,
+      "i18n": true,
+      "importMemberTier": true,
+      "lexicalIndicators": true,
+      "lexicalMultiplayer": true,
+      "mailEvents": true,
+      "members": true,
+      "newEmailAddresses": true,
+      "outboundLinkTagging": true,
+      "stripeAutomaticTax": true,
+      "themeErrorsNotification": true,
+      "urlCache": true,
+      "webmentions": true,
+    },
+    "mail": "",
+    "mailgunIsConfigured": false,
+    "signupForm": Object {
+      "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
+      "version": "0.1",
+    },
+    "stripeDirect": false,
+    "tenor": Object {
+      "contentFilter": "off",
+      "googleApiKey": null,
+    },
+    "useGravatar": false,
+    "version": StringMatching /\\\\d\\+\\\\\\.\\\\d\\+\\\\\\.\\\\d\\+/,
+  },
+}
+`;
+
+exports[`Config API As Owner Can retrieve config and all expected properties 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": StringMatching /\\\\d\\+/,
+  "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",
+}
+`;
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..9d567e3bafb 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
@@ -118,38 +118,24 @@ Object {
         <title>Post with email-only card</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -168,16 +154,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -188,12 +170,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -231,21 +233,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -276,16 +294,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -298,45 +320,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -381,7 +387,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;
   }
@@ -407,30 +414,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -480,9 +523,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">This is the actual post content...</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -491,25 +534,25 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Default Newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Default Newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -517,24 +560,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"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;; vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Post with email-only card</a>
+                                                <td class=\\"post-title post-title-no-excerpt\\" 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;; vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">Post with email-only card</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">1 Jan 1970 </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -542,7 +585,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content-sans-serif\\" 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;; vertical-align: top; font-size: 17px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content-sans-serif\\" 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;; vertical-align: top; font-size: 17px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hey Jamie %%{unknown}%%</p><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><strong style=\\"font-weight: 700;\\">Welcome to your first Ghost email!</strong></p><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">This is the actual post content...</p><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Another email card with a similar replacement, Jamie</p>
                                                 <!-- POST CONTENT END -->
@@ -559,14 +602,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -576,7 +619,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -706,11 +749,11 @@ Another email card with a similar replacement, Jamie
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -735,7 +778,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": "24733",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -767,38 +810,24 @@ Object {
         <title>HTML Ipsum</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -817,16 +846,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -837,14 +862,34 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
     font-size: 16px !important;
   }
 
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
   table.body pre {
     white-space: pre-wrap !important;
     word-break: break-word !important;
@@ -880,21 +925,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -925,16 +986,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -947,45 +1012,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -1030,7 +1079,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;
   }
@@ -1056,30 +1106,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -1129,9 +1215,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">This is my custom excerpt!</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -1140,25 +1226,25 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Default Newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Default Newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -1166,24 +1252,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"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;; vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/html-ipsum/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">HTML Ipsum</a>
+                                                <td class=\\"post-title post-title-with-excerpt\\" 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;; vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 8px;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/html-ipsum/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">HTML Ipsum</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">1 Jan 2015 </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/html-ipsum/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/html-ipsum/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/html-ipsum/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/html-ipsum/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -1192,12 +1278,13 @@ table.body figcaption a {
 
                                             <tr class=\\"feature-image-row\\">
                                                 <td class=\\"feature-image
-                                                \\" 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-bottom: 30px; width: 100%;\\" width=\\"100%\\" valign=\\"top\\"><img src=\\"https://example.com/super_photo.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\"></td>
+                                                \\" align=\\"center\\" 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: #15212A; padding-bottom: 30px; width: 100%; text-align: center;\\" width=\\"100%\\" valign=\\"top\\"><img src=\\"https://example.com/super_photo.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\"></td>
                                             </tr>
+
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content-sans-serif\\" 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;; vertical-align: top; font-size: 17px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content-sans-serif\\" 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;; vertical-align: top; font-size: 17px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
-                                                <!--kg-card-begin: markdown--><h1 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; color: #000000; margin: 1.5em 0 0.5em 0; font-size: 42px; font-weight: 700;\\">HTML Ipsum Presents</h1><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><strong style=\\"font-weight: 700;\\">Pellentesque habitant morbi tristique</strong> senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code style=\\"font-size: 0.9em; background: #F2F7FA; word-break: break-all; padding: 1px 7px; border-radius: 3px; color: #FF1A75;\\">commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. <a href=\\"#\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline;\\" target=\\"_blank\\">Donec non enim</a> in turpis pulvinar facilisis. Ut felis.</p><h2 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; font-weight: 700; text-rendering: optimizeLegibility; color: #000000; margin: 1.5em 0 0.5em 0; font-size: 32px;\\">Header Level 2</h2><ol style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; padding-left: 1.3em; padding-right: 1.5em; list-style: decimal; max-width: 100%;\\"><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Aliquam tincidunt mauris eu risus.</li></ol><blockquote style=\\"margin: 2em 0 2em 0; padding: 0 25px 0 25px; border-left: #FF1A75 2px solid; color: #000000; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 0.8em 0; font-size: 1em;\\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est.</p></blockquote><h3 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; font-weight: 700; text-rendering: optimizeLegibility; color: #000000; margin: 1.5em 0 0.5em 0; font-size: 26px;\\">Header Level 3</h3><ul style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; padding-left: 1.3em; padding-right: 1.5em; list-style: disc; max-width: 100%;\\"><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Aliquam tincidunt mauris eu risus.</li></ul><pre style=\\"white-space: pre-wrap; overflow: auto; background: #15212A; padding: 15px; border-radius: 3px; line-height: 1.2em; color: #ffffff;\\"><code style=\\"font-size: 0.9em;\\">#header h1 a{display: block;width: 300px;height: 80px;}</code></pre><!--kg-card-end: markdown-->
+                                                <!--kg-card-begin: markdown--><h1 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: 1.5em 0 0.5em 0; font-size: 42px; font-weight: 700;\\">HTML Ipsum Presents</h1><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><strong style=\\"font-weight: 700;\\">Pellentesque habitant morbi tristique</strong> senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code style=\\"font-size: 0.9em; background: #F2F7FA; word-break: break-all; padding: 1px 7px; border-radius: 3px; color: #FF1A75;\\">commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. <a href=\\"#\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline;\\" target=\\"_blank\\">Donec non enim</a> in turpis pulvinar facilisis. Ut felis.</p><h2 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 32px;\\">Header Level 2</h2><ol style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; padding-left: 1.3em; padding-right: 1.5em; list-style: decimal; max-width: 100%;\\"><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Aliquam tincidunt mauris eu risus.</li></ol><blockquote style=\\"margin: 0; padding: 0; border-left: #FF1A75 2px solid; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; padding: 0;\\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est.</p></blockquote><h3 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 26px;\\">Header Level 3</h3><ul style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; padding-left: 1.3em; padding-right: 1.5em; list-style: disc; max-width: 100%;\\"><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li><li style=\\"margin: 0.5em 0; padding-left: 0.3em; line-height: 1.6em;\\">Aliquam tincidunt mauris eu risus.</li></ul><pre style=\\"white-space: pre-wrap; overflow: auto; background: #15212A; padding: 15px; border-radius: 3px; line-height: 1.2em; color: #ffffff;\\"><code style=\\"font-size: 0.9em;\\">#header h1 a{display: block;width: 300px;height: 80px;}</code></pre><!--kg-card-end: markdown-->
                                                 <!-- POST CONTENT END -->
 
                                             </td>
@@ -1212,14 +1299,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -1229,7 +1316,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -1337,6 +1424,7 @@ View in browser [http://127.0.0.1:2369/html-ipsum/]
 
 
 
+
 HTML Ipsum Presents
 
 Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis.
@@ -1375,11 +1463,11 @@ Header Level 3
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -1404,7 +1492,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": "29513",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1467,38 +1555,24 @@ Object {
         <title>Post with email-only card</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -1517,16 +1591,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -1537,12 +1607,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -1580,21 +1670,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -1625,16 +1731,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -1647,45 +1757,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -1730,7 +1824,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;
   }
@@ -1756,30 +1851,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -1829,9 +1960,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Testing links in email excerpt and apostrophes &#39;</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -1840,25 +1971,25 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Default Newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Default Newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -1866,24 +1997,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"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;; vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Post with email-only card</a>
+                                                <td class=\\"post-title post-title-no-excerpt\\" 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;; vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">Post with email-only card</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">1 Jan 1970 </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -1891,7 +2022,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content-sans-serif\\" 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;; vertical-align: top; font-size: 17px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content-sans-serif\\" 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;; vertical-align: top; font-size: 17px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Testing <a href=\\"https://ghost.org/\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline;\\" target=\\"_blank\\">links</a> in email excerpt and apostrophes &#39;</p>
                                                 <!-- POST CONTENT END -->
@@ -1908,14 +2039,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -1925,7 +2056,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -2049,11 +2180,11 @@ Testing links [https://ghost.org/] in email excerpt and apostrophes '
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -2091,7 +2222,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": "24487",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2483,38 +2614,24 @@ Object {
         <title>Post with email-only card</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -2533,16 +2650,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -2553,12 +2666,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -2596,21 +2729,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -2641,16 +2790,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -2663,45 +2816,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -2746,7 +2883,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;
   }
@@ -2772,30 +2910,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -2845,9 +3019,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Testing links in email excerpt and apostrophes &#39;</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -2856,30 +3030,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -2887,24 +3063,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Post with email-only card</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">Post with email-only card</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">1 Jan 1970 </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -2912,7 +3088,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Testing <a href=\\"https://ghost.org/\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline;\\" target=\\"_blank\\">links</a> in email excerpt and apostrophes &#39;</p>
                                                 <!-- POST CONTENT END -->
@@ -2929,14 +3105,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -2946,7 +3122,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -3003,6 +3179,8 @@ Object {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -3075,11 +3253,11 @@ Testing links [https://ghost.org/] in email excerpt and apostrophes '
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -3117,7 +3295,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": "25270",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3535,38 +3713,24 @@ Object {
         <title>Post with email-only card</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -3585,16 +3749,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -3605,12 +3765,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -3648,21 +3828,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -3693,16 +3889,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -3715,45 +3915,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -3798,7 +3982,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;
   }
@@ -3824,30 +4009,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -3897,9 +4118,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Testing links in email excerpt and apostrophes &#39;</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -3908,30 +4129,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -3939,24 +4162,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Post with email-only card</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">Post with email-only card</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">1 Jan 1970 </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/p/d52c42ae-2755-455c-80ec-70b2ec55c904/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -3964,7 +4187,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Testing <a href=\\"https://ghost.org/\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline;\\" target=\\"_blank\\">links</a> in email excerpt and apostrophes &#39;</p>
                                                 <!-- POST CONTENT END -->
@@ -3981,14 +4204,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -3998,7 +4221,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -4055,6 +4278,8 @@ Object {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -4127,11 +4352,11 @@ Testing links [https://ghost.org/] in email excerpt and apostrophes '
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=requested-newsletter-uuid]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -4169,7 +4394,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": "25270",
   "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__/emails.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/emails.test.js.snap
index 37f8f6f0aab..1702fc26492 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/emails.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/emails.test.js.snap
@@ -491,7 +491,7 @@ Object {
     Object {
       "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "delivered_count": 1,
-      "email_count": 2,
+      "email_count": 6,
       "error": null,
       "error_data": null,
       "failed_count": 1,
@@ -517,7 +517,7 @@ Object {
     },
     Object {
       "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
-      "delivered_count": 0,
+      "delivered_count": 3,
       "email_count": 3,
       "error": "Everything went south",
       "error_data": null,
@@ -690,7 +690,7 @@ Object {
     Object {
       "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "delivered_count": 1,
-      "email_count": 2,
+      "email_count": 6,
       "error": null,
       "error_data": null,
       "failed_count": 1,
@@ -736,7 +736,7 @@ Object {
   "emails": Array [
     Object {
       "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
-      "delivered_count": 0,
+      "delivered_count": 3,
       "email_count": 3,
       "error": "Everything went south",
       "error_data": null,
@@ -790,12 +790,12 @@ Object {
       "failed_count": 0,
       "feedback_enabled": false,
       "from": "support@example.com",
-      "html": "<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hey Jamie, Hey Jamie,</p><a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=preview\\">Unsubscribe</a>",
+      "html": "<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hey Jamie, Hey Jamie,</p><a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=preview\\">Unsubscribe</a>",
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "newsletter_id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
       "opened_count": 0,
       "plaintext": "Hey Jamie, Hey Jamie
-Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&newsletter=preview]",
+Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-uuid&key=803e513e2d8b88e759d8f433779659af335d7308b4cbac809600d563f6b49a76&newsletter=preview]",
       "post_id": "618ba1ffbe2896088840a6e3",
       "recipient_filter": "all",
       "reply_to": null,
@@ -817,7 +817,7 @@ exports[`Emails API Does default replacements on the HTML body of an old email 2
 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": "923",
+  "content-length": "1061",
   "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__/images.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/images.test.js.snap
index 859e570433b..b2fdbf7f2f7 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/images.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/images.test.js.snap
@@ -71,3 +71,111 @@ Object {
   ],
 }
 `;
+
+exports[`Images API Does not return HTTP 500 when image processing fails 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "Image processing failed Image processing failed",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": "Please verify that the image is valid",
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Request not understood error, cannot upload image.",
+      "property": null,
+      "type": "BadRequestError",
+    },
+  ],
+}
+`;
+
+exports[`Images API Does not try to delete non-existing file upon invalid request 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Please select an image.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Images API Errors when image request body is broken #2 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "The request could not be understood.",
+      "property": null,
+      "type": "BadRequestError",
+    },
+  ],
+}
+`;
+
+exports[`Images API Errors when image request body is broken 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": "LIMIT_UNEXPECTED_FILE",
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "The request could not be understood.",
+      "property": null,
+      "type": "BadRequestError",
+    },
+  ],
+}
+`;
+
+exports[`Images API Errors when trying to upload invalid form body 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "The request could not be understood.",
+      "property": null,
+      "type": "BadRequestError",
+    },
+  ],
+}
+`;
+
+exports[`Images API Will error when filename is too long 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": "ENAMETOOLONG",
+      "context": "The request could not be understood.",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Request not understood error, cannot upload image.",
+      "property": null,
+      "type": "BadRequestError",
+    },
+  ],
+}
+`;
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..b25ae54dc7f 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
@@ -381,7 +381,7 @@ exports[`Members API - member attribution Returns sign up attributions of all ty
 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": "9604",
+  "content-length": "8053",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1790,28 +1790,29 @@ exports[`Members API Can add and send a signup confirmation email 3: [html 1] 1`
 `;
 
 exports[`Members API Can add and send a signup confirmation email 4: [text 1] 1`] = `
-"
-                        Hey there,
+"Hey there,
 
-                        Tap the link below to complete the signup process for Ghost's Test Site, and be automatically signed in:
+Tap the link below to complete the signup process for Ghost's Test Site, and be automatically signed in:
 
-                        http://127.0.0.1:2369/members/?token=REPLACED_TOKEN&action=signup
+http://127.0.0.1:2369/members/?token=REPLACED_TOKEN&action=signup
 
-                        For your security, the link will expire in 24 hours time.
+For your security, the link will expire in 24 hours time.
 
-                        See you soon!
+See you soon!
 
-                        ---
+---
 
-                        Sent to member_getting_confirmation@test.com
-                        If you did not make this request, you can simply delete this message. You will not be signed up, and no account will be created for you.
-                        "
+Sent to member_getting_confirmation@test.com
+If you did not make this request, you can simply delete this message. You will not be signed up, and no account will be created for you."
 `;
 
 exports[`Members API Can add and send a signup confirmation email 5: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
   "forceTextContent": true,
-  "from": "noreply@127.0.0.1",
+  "from": "\\"Ghost's Test Site\\" <noreply@127.0.0.1>",
+  "generateTextFromHTML": false,
+  "replyTo": null,
   "subject": "🙌 Complete your sign up to Ghost's Test Site!",
   "to": "member_getting_confirmation@test.com",
 }
@@ -2909,12 +2910,12 @@ Object {
     Object {
       "comped": 4,
       "date": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}/,
-      "free": 4,
+      "free": 5,
       "paid": 2,
     },
   ],
   "resource": "members",
-  "total": 10,
+  "total": 11,
 }
 `;
 
@@ -2931,6 +2932,68 @@ Object {
 }
 `;
 
+exports[`Members API Can filter by conversion attribution 1: [body] 1`] = `
+Object {
+  "members": Array [
+    Object {
+      "avatar_image": null,
+      "comped": false,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "email": "member1@test.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": "Mr Egg",
+      "newsletters": Array [
+        Object {
+          "description": null,
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "name": "Daily newsletter",
+          "status": "active",
+        },
+      ],
+      "note": null,
+      "status": "free",
+      "subscribed": true,
+      "subscriptions": Any<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\\}/,
+    },
+  ],
+  "meta": Object {
+    "pagination": Object {
+      "limit": 15,
+      "next": null,
+      "page": 1,
+      "pages": 1,
+      "prev": null,
+      "total": 1,
+    },
+  },
+}
+`;
+
+exports[`Members API Can filter by conversion attribution 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": "830",
+  "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 Can filter by paid status 1: [body] 1`] = `
 Object {
   "members": Array [
@@ -4279,6 +4342,19 @@ Object {
 }
 `;
 
+exports[`Members API Can log out 1: [body] 1`] = `Object {}`;
+
+exports[`Members API Can log out 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-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Version, Origin",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Members API Can order by email_open_rate 1: [body] 1`] = `
 Object {
   "members": Array [
@@ -5275,7 +5351,7 @@ exports[`Members API Can subscribe to a newsletter 5: [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": "5778",
+  "content-length": "4601",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -5402,6 +5478,24 @@ Object {
 }
 `;
 
+exports[`Members API Cannot add unknown tiers to a member 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "Could not find Product blahblahid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Request not understood error, cannot edit member.",
+      "property": null,
+      "type": "BadRequestError",
+    },
+  ],
+}
+`;
+
 exports[`Members API Cannot delete a non-existent member 1: [body] 1`] = `
 Object {
   "errors": Array [
@@ -5495,6 +5589,86 @@ Object {
 }
 `;
 
+exports[`Members API Does not send a signup email when email verification is required 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": "member_not_getting_confirmation@test.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": Array [],
+      "last_seen_at": null,
+      "name": "Do not Send Me Confirmation",
+      "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": "Daily newsletter",
+          "status": "active",
+        },
+      ],
+      "note": null,
+      "status": "free",
+      "subscribed": true,
+      "subscriptions": 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 Does not send a signup email when email verification is required 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": "901",
+  "content-type": "application/json; charset=utf-8",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "location": Any<String>,
+  "vary": "Accept-Version, Origin, Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Members API Does not send a signup email when email verification is required 3: [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-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Version, Origin",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Members API Errors when fetching stats with unknown days param value 1: [body] 1`] = `
 Object {
   "errors": Array [
@@ -5947,6 +6121,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 [
@@ -6064,6 +6403,130 @@ Object {
 }
 `;
 
+exports[`Members API can change the email address 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": "jon.snow@test.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": "Jon Snow",
+      "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 can change the email address 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": "665",
+  "content-type": "application/json; charset=utf-8",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/members\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
+  "vary": "Accept-Version, Origin, Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Members API can change the email address 3: [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": "aegon.targaryen@test.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": "Jon Snow",
+      "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 can change the email address 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": "672",
+  "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 can change the email address 5: [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": "1118",
+  "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 without Stripe Add should fail when comped flag is passed in but Stripe is not enabled 1: [body] 1`] = `
 Object {
   "errors": Array [
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap
index c4fc78b0c0f..d97120bc4b2 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap
@@ -1,5 +1,210 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Newsletters API [Legacy] Can only set newsletter reply to to newsletter or support value 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Updated newsletter name",
+      "sender_email": "jamie@example.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "support",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API [Legacy] Can only set newsletter reply to to newsletter or support value 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": "947",
+  "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[`Newsletters API [Legacy] Can only set newsletter reply to to newsletter or support value 3: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Updated newsletter name",
+      "sender_email": "jamie@example.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API [Legacy] Can only set newsletter reply to to newsletter or support value 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": "950",
+  "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[`Newsletters API [Legacy] Cannot set newsletter clear sender_reply_to 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to ",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API [Legacy] Cannot set newsletter clear sender_reply_to 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": "272",
+  "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[`Newsletters API [Legacy] Cannot set newsletter reply-to to any email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to hello@acme.com",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API [Legacy] Cannot set newsletter reply-to to any email address 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": "286",
+  "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[`Newsletters API [Legacy] Cannot set newsletter sender_email to invalid email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the sender email address to notvalid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API [Legacy] Cannot set newsletter sender_email to invalid email address 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": "278",
+  "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[`Newsletters API Can add a newsletter - and subscribe existing members 1: [body] 1`] = `
 Object {
   "meta": Object {
@@ -22,6 +227,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -48,7 +254,7 @@ exports[`Newsletters API Can add a newsletter - and subscribe existing members 2
 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": "951",
+  "content-length": "972",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -83,6 +289,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -109,7 +316,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email 2: [hea
 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": "960",
+  "content-length": "981",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -122,8 +329,10 @@ Object {
 
 exports[`Newsletters API Can add a newsletter - with custom sender_email 3: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
   "forceTextContent": true,
-  "from": "noreply@example.com",
+  "from": "\\"Ghost\\" <noreply@example.com>",
+  "generateTextFromHTML": false,
   "subject": "Verify email address",
   "to": "test@example.com",
 }
@@ -181,6 +390,10 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email 4: [htm
         max-width: 100% !important;
         width: auto !important;
       }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
     }
     /* -------------------------------------
         PRESERVE THESE STYLES IN THE HEAD
@@ -222,26 +435,30 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email 4: [htm
       border-bottom-width: 1px;
       border-bottom-color: #EEF5F8;
     }
+    a {
+      color: #3A464C;
+    }
     </style>
   </head>
-  <body style=\\"background-color: #F4F8FB; 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.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;\\">
-    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F4F8FB;\\">
+  <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%;\\">
+    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;\\">
       <tr>
         <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
-        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 600px; padding: 10px; width: 600px;\\">
-          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
+        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;\\">
+          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
 
             <!-- START CENTERED WHITE CONTAINER -->
+            <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Confirm your email address</span>
             <table class=\\"main\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;\\">
 
               <!-- START MAIN CONTENT AREA -->
               <tr>
-                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 40px 50px;\\">
+                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;\\">
                   <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                     <tr>
                       <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
-                        <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: 32px;\\">Please confirm your email address with this link:</p>
+                        <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 32px;\\">Please confirm your email address with this link:</p>
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
                           <tbody>
                             <tr>
@@ -249,7 +466,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email 4: [htm
                                 <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
+                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; background-color: #15212A; border: solid 1px #15212A; color: #ffffff; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -257,36 +474,34 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email 4: [htm
                             </tr>
                           </tbody>
                         </table>
-                        <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: 25px;\\">For your security, the link will expire in 24 hours time.</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 11px;\\">For your security, the link will expire in 24 hours time.</p>
                         <hr/>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; line-height: 21px; margin-top: 0; color: #738A94;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;\\">You can also copy & paste this URL into your browser:</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; margin-top: 0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
                       </td>
                     </tr>
                   </table>
                 </td>
               </tr>
 
+              <!-- START FOOTER -->
+
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">If you did not make this request, you can simply delete this message. This email address will not be used.</p>
+                </td>
+              </tr>
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">This message was sent to <a class=\\"small\\" href=\\"mailto:test@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">test@example.com</a></p>
+                </td>
+              </tr>
+
+              <!-- END FOOTER -->
+
             <!-- END MAIN CONTENT AREA -->
             </table>
 
-            <!-- START FOOTER -->
-            <div class=\\"footer\\" style=\\"clear: both; Margin-top: 10px; text-align: center; width: 100%;\\">
-              <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 5px; padding-top: 15px; font-size: 13px; line-height: 21px; color: #738A94; text-align: center;\\">
-                    If you did not make this request, you can simply delete this message.<br/>This email address will not be used.
-                  </td>
-                </tr>
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 13px; color: #738A94; text-align: center;\\">
-                    <span class=\\"recipient-link\\" style=\\"color: #738A94; font-size: 13px; text-align: center;\\">Sent to <a href=\\"mailto:test@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 13px; text-align: center;\\">test@example.com</a></span>
-                  </td>
-                </tr>
-              </table>
-            </div>
-            <!-- END FOOTER -->
-
           <!-- END CENTERED WHITE CONTAINER -->
           </div>
         </td>
@@ -340,6 +555,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -366,7 +582,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub
 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": "1033",
+  "content-length": "1054",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -548,8 +764,10 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub
 
 exports[`Newsletters API Can add a newsletter - with custom sender_email and subscribe existing members 3: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
   "forceTextContent": true,
-  "from": "noreply@example.com",
+  "from": "\\"Ghost\\" <noreply@example.com>",
+  "generateTextFromHTML": false,
   "subject": "Verify email address",
   "to": "test@example.com",
 }
@@ -607,6 +825,10 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub
         max-width: 100% !important;
         width: auto !important;
       }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
     }
     /* -------------------------------------
         PRESERVE THESE STYLES IN THE HEAD
@@ -648,26 +870,30 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub
       border-bottom-width: 1px;
       border-bottom-color: #EEF5F8;
     }
+    a {
+      color: #3A464C;
+    }
     </style>
   </head>
-  <body style=\\"background-color: #F4F8FB; 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.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;\\">
-    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F4F8FB;\\">
+  <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%;\\">
+    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;\\">
       <tr>
         <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
-        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 600px; padding: 10px; width: 600px;\\">
-          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
+        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;\\">
+          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
 
             <!-- START CENTERED WHITE CONTAINER -->
+            <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Confirm your email address</span>
             <table class=\\"main\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;\\">
 
               <!-- START MAIN CONTENT AREA -->
               <tr>
-                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 40px 50px;\\">
+                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;\\">
                   <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                     <tr>
                       <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
-                        <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: 32px;\\">Please confirm your email address with this link:</p>
+                        <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 32px;\\">Please confirm your email address with this link:</p>
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
                           <tbody>
                             <tr>
@@ -675,7 +901,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub
                                 <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
+                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; background-color: #15212A; border: solid 1px #15212A; color: #ffffff; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -683,36 +909,34 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub
                             </tr>
                           </tbody>
                         </table>
-                        <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: 25px;\\">For your security, the link will expire in 24 hours time.</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 11px;\\">For your security, the link will expire in 24 hours time.</p>
                         <hr/>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; line-height: 21px; margin-top: 0; color: #738A94;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;\\">You can also copy & paste this URL into your browser:</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; margin-top: 0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
                       </td>
                     </tr>
                   </table>
                 </td>
               </tr>
 
+              <!-- START FOOTER -->
+
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">If you did not make this request, you can simply delete this message. This email address will not be used.</p>
+                </td>
+              </tr>
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">This message was sent to <a class=\\"small\\" href=\\"mailto:test@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">test@example.com</a></p>
+                </td>
+              </tr>
+
+              <!-- END FOOTER -->
+
             <!-- END MAIN CONTENT AREA -->
             </table>
 
-            <!-- START FOOTER -->
-            <div class=\\"footer\\" style=\\"clear: both; Margin-top: 10px; text-align: center; width: 100%;\\">
-              <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 5px; padding-top: 15px; font-size: 13px; line-height: 21px; color: #738A94; text-align: center;\\">
-                    If you did not make this request, you can simply delete this message.<br/>This email address will not be used.
-                  </td>
-                </tr>
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 13px; color: #738A94; text-align: center;\\">
-                    <span class=\\"recipient-link\\" style=\\"color: #738A94; font-size: 13px; text-align: center;\\">Sent to <a href=\\"mailto:test@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 13px; text-align: center;\\">test@example.com</a></span>
-                  </td>
-                </tr>
-              </table>
-            </div>
-            <!-- END FOOTER -->
-
           <!-- END CENTERED WHITE CONTAINER -->
           </div>
         </td>
@@ -777,6 +1001,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -803,7 +1028,7 @@ exports[`Newsletters API Can add a newsletter 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": "916",
+  "content-length": "937",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -833,6 +1058,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -859,7 +1085,7 @@ exports[`Newsletters API Can add multiple newsletters 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": "878",
+  "content-length": "899",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -889,6 +1115,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -915,7 +1142,7 @@ exports[`Newsletters API Can add multiple newsletters 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": "880",
+  "content-length": "901",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -955,6 +1182,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -989,6 +1217,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1023,6 +1252,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1057,6 +1287,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1083,7 +1314,7 @@ exports[`Newsletters API Can browse newsletters 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": "3667",
+  "content-length": "3751",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1116,6 +1347,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1142,7 +1374,7 @@ exports[`Newsletters API Can edit a newsletters and update the sender_email when
 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": "981",
+  "content-length": "1002",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1154,8 +1386,10 @@ Object {
 
 exports[`Newsletters API Can edit a newsletters and update the sender_email when already set 3: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
   "forceTextContent": true,
-  "from": "noreply@example.com",
+  "from": "\\"Ghost\\" <noreply@example.com>",
+  "generateTextFromHTML": false,
   "subject": "Verify email address",
   "to": "updated@example.com",
 }
@@ -1213,6 +1447,10 @@ exports[`Newsletters API Can edit a newsletters and update the sender_email when
         max-width: 100% !important;
         width: auto !important;
       }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
     }
     /* -------------------------------------
         PRESERVE THESE STYLES IN THE HEAD
@@ -1254,26 +1492,30 @@ exports[`Newsletters API Can edit a newsletters and update the sender_email when
       border-bottom-width: 1px;
       border-bottom-color: #EEF5F8;
     }
+    a {
+      color: #3A464C;
+    }
     </style>
   </head>
-  <body style=\\"background-color: #F4F8FB; 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.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;\\">
-    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F4F8FB;\\">
+  <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%;\\">
+    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;\\">
       <tr>
         <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
-        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 600px; padding: 10px; width: 600px;\\">
-          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
+        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;\\">
+          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
 
             <!-- START CENTERED WHITE CONTAINER -->
+            <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Confirm your email address</span>
             <table class=\\"main\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;\\">
 
               <!-- START MAIN CONTENT AREA -->
               <tr>
-                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 40px 50px;\\">
+                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;\\">
                   <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                     <tr>
                       <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
-                        <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: 32px;\\">Please confirm your email address with this link:</p>
+                        <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 32px;\\">Please confirm your email address with this link:</p>
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
                           <tbody>
                             <tr>
@@ -1281,7 +1523,7 @@ exports[`Newsletters API Can edit a newsletters and update the sender_email when
                                 <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
+                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; background-color: #15212A; border: solid 1px #15212A; color: #ffffff; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -1289,36 +1531,34 @@ exports[`Newsletters API Can edit a newsletters and update the sender_email when
                             </tr>
                           </tbody>
                         </table>
-                        <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: 25px;\\">For your security, the link will expire in 24 hours time.</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 11px;\\">For your security, the link will expire in 24 hours time.</p>
                         <hr/>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; line-height: 21px; margin-top: 0; color: #738A94;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;\\">You can also copy & paste this URL into your browser:</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; margin-top: 0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
                       </td>
                     </tr>
                   </table>
                 </td>
               </tr>
 
+              <!-- START FOOTER -->
+
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">If you did not make this request, you can simply delete this message. This email address will not be used.</p>
+                </td>
+              </tr>
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">This message was sent to <a class=\\"small\\" href=\\"mailto:updated@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">updated@example.com</a></p>
+                </td>
+              </tr>
+
+              <!-- END FOOTER -->
+
             <!-- END MAIN CONTENT AREA -->
             </table>
 
-            <!-- START FOOTER -->
-            <div class=\\"footer\\" style=\\"clear: both; Margin-top: 10px; text-align: center; width: 100%;\\">
-              <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 5px; padding-top: 15px; font-size: 13px; line-height: 21px; color: #738A94; text-align: center;\\">
-                    If you did not make this request, you can simply delete this message.<br/>This email address will not be used.
-                  </td>
-                </tr>
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 13px; color: #738A94; text-align: center;\\">
-                    <span class=\\"recipient-link\\" style=\\"color: #738A94; font-size: 13px; text-align: center;\\">Sent to <a href=\\"mailto:updated@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 13px; text-align: center;\\">updated@example.com</a></span>
-                  </td>
-                </tr>
-              </table>
-            </div>
-            <!-- END FOOTER -->
-
           <!-- END CENTERED WHITE CONTAINER -->
           </div>
         </td>
@@ -1366,6 +1606,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1392,7 +1633,7 @@ exports[`Newsletters API Can edit newsletters 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": "929",
+  "content-length": "950",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1486,6 +1727,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1512,7 +1754,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 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": "913",
+  "content-length": "934",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1557,6 +1799,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1596,6 +1839,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1635,6 +1879,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1674,6 +1919,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1700,7 +1946,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 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": "3871",
+  "content-length": "3955",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1733,6 +1979,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1759,7 +2006,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 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": "982",
+  "content-length": "1003",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1793,6 +2040,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1819,7 +2067,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 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": "973",
+  "content-length": "994",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1847,6 +2095,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -1873,7 +2122,7 @@ exports[`Newsletters API Can read a newsletter 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": "922",
+  "content-length": "943",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1925,8 +2174,10 @@ Object {
 
 exports[`Newsletters API Can verify property updates 1: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
   "forceTextContent": true,
-  "from": "noreply@example.com",
+  "from": "\\"Ghost\\" <noreply@example.com>",
+  "generateTextFromHTML": false,
   "subject": "Verify email address",
   "to": "verify@example.com",
 }
@@ -1984,6 +2235,10 @@ exports[`Newsletters API Can verify property updates 2: [html 1] 1`] = `
         max-width: 100% !important;
         width: auto !important;
       }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
     }
     /* -------------------------------------
         PRESERVE THESE STYLES IN THE HEAD
@@ -2025,26 +2280,30 @@ exports[`Newsletters API Can verify property updates 2: [html 1] 1`] = `
       border-bottom-width: 1px;
       border-bottom-color: #EEF5F8;
     }
+    a {
+      color: #3A464C;
+    }
     </style>
   </head>
-  <body style=\\"background-color: #F4F8FB; 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.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;\\">
-    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F4F8FB;\\">
+  <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%;\\">
+    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;\\">
       <tr>
         <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
-        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 600px; padding: 10px; width: 600px;\\">
-          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
+        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;\\">
+          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
 
             <!-- START CENTERED WHITE CONTAINER -->
+            <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Confirm your email address</span>
             <table class=\\"main\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;\\">
 
               <!-- START MAIN CONTENT AREA -->
               <tr>
-                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 40px 50px;\\">
+                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;\\">
                   <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                     <tr>
                       <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
-                        <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: 32px;\\">Please confirm your email address with this link:</p>
+                        <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 32px;\\">Please confirm your email address with this link:</p>
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
                           <tbody>
                             <tr>
@@ -2052,7 +2311,7 @@ exports[`Newsletters API Can verify property updates 2: [html 1] 1`] = `
                                 <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
+                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; background-color: #15212A; border: solid 1px #15212A; color: #ffffff; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -2060,36 +2319,34 @@ exports[`Newsletters API Can verify property updates 2: [html 1] 1`] = `
                             </tr>
                           </tbody>
                         </table>
-                        <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: 25px;\\">For your security, the link will expire in 24 hours time.</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 11px;\\">For your security, the link will expire in 24 hours time.</p>
                         <hr/>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; line-height: 21px; margin-top: 0; color: #738A94;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;\\">You can also copy & paste this URL into your browser:</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; margin-top: 0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
                       </td>
                     </tr>
                   </table>
                 </td>
               </tr>
 
+              <!-- START FOOTER -->
+
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">If you did not make this request, you can simply delete this message. This email address will not be used.</p>
+                </td>
+              </tr>
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">This message was sent to <a class=\\"small\\" href=\\"mailto:verify@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">verify@example.com</a></p>
+                </td>
+              </tr>
+
+              <!-- END FOOTER -->
+
             <!-- END MAIN CONTENT AREA -->
             </table>
 
-            <!-- START FOOTER -->
-            <div class=\\"footer\\" style=\\"clear: both; Margin-top: 10px; text-align: center; width: 100%;\\">
-              <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 5px; padding-top: 15px; font-size: 13px; line-height: 21px; color: #738A94; text-align: center;\\">
-                    If you did not make this request, you can simply delete this message.<br/>This email address will not be used.
-                  </td>
-                </tr>
-                <tr>
-                  <td class=\\"content-block\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 13px; color: #738A94; text-align: center;\\">
-                    <span class=\\"recipient-link\\" style=\\"color: #738A94; font-size: 13px; text-align: center;\\">Sent to <a href=\\"mailto:verify@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 13px; text-align: center;\\">verify@example.com</a></span>
-                  </td>
-                </tr>
-              </table>
-            </div>
-            <!-- END FOOTER -->
-
           <!-- END CENTERED WHITE CONTAINER -->
           </div>
         </td>
@@ -2120,6 +2377,9 @@ exports[`Newsletters API Can verify property updates 3: [text 1] 1`] = `
 
 exports[`Newsletters API Can verify property updates 4: [body] 1`] = `
 Object {
+  "meta": Object {
+    "email_verified": "sender_email",
+  },
   "newsletters": Array [
     Object {
       "background_color": "light",
@@ -2137,6 +2397,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -2178,6 +2439,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -2204,7 +2466,7 @@ exports[`Newsletters API Can't add multiple newsletters with same name 2: [heade
 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": "870",
+  "content-length": "891",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2299,6 +2561,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -2325,7 +2588,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Adding a new
 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": "901",
+  "content-length": "922",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2358,6 +2621,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -2384,7 +2648,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Adding an ar
 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": "905",
+  "content-length": "926",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2458,6 +2722,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -2484,7 +2749,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Archiving a
 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": "868",
+  "content-length": "889",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2513,6 +2778,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -2539,7 +2805,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Editing an a
 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": "935",
+  "content-length": "956",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2568,6 +2834,7 @@ Object {
       "sender_reply_to": "newsletter",
       "show_badge": true,
       "show_comment_cta": true,
+      "show_excerpt": false,
       "show_feature_image": true,
       "show_header_icon": true,
       "show_header_name": true,
@@ -2594,7 +2861,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Editing an a
 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": "937",
+  "content-length": "958",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2645,3 +2912,2748 @@ Object {
   ],
 }
 `;
+
+exports[`Newsletters API Managed email with custom sending domain Auto correcting invalid domains Browse returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 1: [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": "5501",
+  "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[`Newsletters API Managed email with custom sending domain Auto correcting invalid domains Does not reset sender_email when editing the newsletter (not the reply-to address) 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "notvalid@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Auto correcting invalid domains Does not reset sender_email when editing the newsletter (not the reply-to address) 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": "945",
+  "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[`Newsletters API Managed email with custom sending domain Auto correcting invalid domains Read returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "notvalid@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Auto correcting invalid domains Read returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 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": "945",
+  "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[`Newsletters API Managed email with custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "support",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address 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": "935",
+  "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[`Newsletters API Managed email with custom sending domain Can clear sender_email 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can clear sender_email 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": "938",
+  "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[`Newsletters API Managed email with custom sending domain Can keep sender_email 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "existing@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can keep sender_email 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": "945",
+  "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[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to any email address with required verification 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "sent_email_verification": Array [
+      "sender_reply_to",
+    ],
+  },
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to any email address with required verification 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": "993",
+  "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[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to any email address with required verification 3: [metadata 1] 1`] = `
+Object {
+  "encoding": "base64",
+  "forceTextContent": true,
+  "from": "\\"Ghost\\" <noreply@sendingdomain.com>",
+  "generateTextFromHTML": false,
+  "replyTo": null,
+  "subject": "Verify email address",
+  "to": "hello@acme.com",
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to any email address with required verification 4: [html 1] 1`] = `
+"
+<!doctype html>
+<html>
+  <head>
+    <meta name=\\"viewport\\" content=\\"width=device-width\\">
+    <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
+    <title>Confirm your email address</title>
+    <style>
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 620px) {
+      table[class=body] h1 {
+        font-size: 28px !important;
+        margin-bottom: 10px !important;
+      }
+      table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+        font-size: 16px !important;
+      }
+      table[class=body] .wrapper,
+            table[class=body] .article {
+        padding: 10px !important;
+      }
+      table[class=body] .content {
+        padding: 0 !important;
+      }
+      table[class=body] .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+      table[class=body] .main {
+        border-left-width: 0 !important;
+        border-radius: 0 !important;
+        border-right-width: 0 !important;
+      }
+      table[class=body] .btn table {
+        width: 100% !important;
+      }
+      table[class=body] .btn a {
+        width: 100% !important;
+      }
+      table[class=body] .img-responsive {
+        height: auto !important;
+        max-width: 100% !important;
+        width: auto !important;
+      }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
+    }
+    /* -------------------------------------
+        PRESERVE THESE STYLES IN THE HEAD
+    ------------------------------------- */
+    @media all {
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+        line-height: 100%;
+      }
+      .recipient-link a {
+        color: inherit !important;
+        font-family: inherit !important;
+        font-size: inherit !important;
+        font-weight: inherit !important;
+        line-height: inherit !important;
+        text-decoration: none !important;
+      }
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+    }
+    hr {
+      border-width: 0;
+      height: 0;
+      margin-top: 34px;
+      margin-bottom: 34px;
+      border-bottom-width: 1px;
+      border-bottom-color: #EEF5F8;
+    }
+    a {
+      color: #3A464C;
+    }
+    </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%;\\">
+    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;\\">
+      <tr>
+        <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
+        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;\\">
+          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
+
+            <!-- START CENTERED WHITE CONTAINER -->
+            <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Confirm your email address</span>
+            <table class=\\"main\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;\\">
+
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;\\">
+                  <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                    <tr>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
+                        <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 32px;\\">Please confirm your email address with this link:</p>
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
+                          <tbody>
+                            <tr>
+                              <td align=\\"left\\" 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; vertical-align: top; padding-bottom: 35px;\\">
+                                <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
+                                  <tbody>
+                                    <tr>
+                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; background-color: #15212A; border: solid 1px #15212A; color: #ffffff; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 11px;\\">For your security, the link will expire in 24 hours time.</p>
+                        <hr/>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;\\">You can also copy & paste this URL into your browser:</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; margin-top: 0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+
+              <!-- START FOOTER -->
+
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">If you did not make this request, you can simply delete this message. This email address will not be used.</p>
+                </td>
+              </tr>
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">This message was sent to <a class=\\"small\\" href=\\"mailto:hello@acme.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">hello@acme.com</a></p>
+                </td>
+              </tr>
+
+              <!-- END FOOTER -->
+
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+
+          <!-- END CENTERED WHITE CONTAINER -->
+          </div>
+        </td>
+        <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
+"
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to any email address with required verification 5: [text 1] 1`] = `
+"
+                Hey there,
+
+                Please confirm your email address with this link:
+
+                http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN
+
+                For your security, the link will expire in 24 hours time.
+
+                ---
+
+                Sent to hello@acme.com
+                If you did not make this request, you can simply delete this message. This email address will not be used.
+                "
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to matchiing sending domain without required verification 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": "jamie@example.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "anything@sendingdomain.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to matchiing sending domain without required verification 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": "938",
+  "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[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to matching sending domain without required verification 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "anything@sendingdomain.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to matching sending domain without required verification 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": "954",
+  "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[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to newsletter or support 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "support",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to newsletter or support 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": "935",
+  "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[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to newsletter or support 3: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set newsletter reply-to to newsletter or support 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": "938",
+  "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[`Newsletters API Managed email with custom sending domain Can set sender_email to address matching sending domain, without verification 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": "anything@sendingdomain.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Can set sender_email to address matching sending domain, without verification 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": "962",
+  "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[`Newsletters API Managed email with custom sending domain Cannot change sender_email to non matching domain 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the sender email address to hello@acme.com",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Cannot change sender_email to non matching domain 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": "284",
+  "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[`Newsletters API Managed email with custom sending domain Cannot clear newsletter reply-to 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to ",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Cannot clear newsletter reply-to 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": "272",
+  "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[`Newsletters API Managed email with custom sending domain Cannot set newsletter reply-to to invalid email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to notvalid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Cannot set newsletter reply-to to invalid email address 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": "280",
+  "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[`Newsletters API Managed email with custom sending domain Cannot set newsletter sender_email to invalid email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the sender email address to notvalid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email with custom sending domain Cannot set newsletter sender_email to invalid email address 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": "278",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Browse returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 1: [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": "5491",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Can switch sender_email to sender_reply_to without validation 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "notvalid@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Can switch sender_email to sender_reply_to without validation 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": "935",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Does not reset sender_email when editing the newsletter (not the reply-to address) 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "notvalid@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Does not reset sender_email when editing the newsletter (not the reply-to address) 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": "945",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Does not reset sender_email when editing the newsletter address (not the reply-to address) 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Does not reset sender_email when editing the newsletter address (not the reply-to address) 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": "917",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Read returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "notvalid@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Read returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 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": "935",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "support",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address 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": "925",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address in combination with keeping sender email 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "sent_email_verification": Array [
+      "sender_reply_to",
+    ],
+  },
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address in combination with keeping sender email 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": "983",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address in combination with resetting sender email 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "sent_email_verification": Array [
+      "sender_reply_to",
+    ],
+  },
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Resets sender_email when editing the newsletter reply_to address in combination with resetting sender email 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": "983",
+  "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[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": "notvalid@acme.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Auto correcting invalid domains Returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter 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": "922",
+  "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[`Newsletters API Managed email without custom sending domain Can clear sender_email 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can clear sender_email 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": "928",
+  "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[`Newsletters API Managed email without custom sending domain Can keep sender_email 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "existing@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can keep sender_email 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": "935",
+  "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[`Newsletters API Managed email without custom sending domain Can only set newsletter reply-to to newsletter or support 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": "jamie@example.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "support",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can only set newsletter reply-to to newsletter or support 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": "919",
+  "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[`Newsletters API Managed email without custom sending domain Can only set newsletter reply-to to newsletter or support 3: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": "jamie@example.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can only set newsletter reply-to to newsletter or support 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": "922",
+  "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[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to any email address with required verification 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "sent_email_verification": Array [
+      "sender_reply_to",
+    ],
+  },
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to any email address with required verification 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": "983",
+  "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[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to any email address with required verification 3: [metadata 1] 1`] = `
+Object {
+  "encoding": "base64",
+  "forceTextContent": true,
+  "from": "\\"Ghost\\" <default@email.com>",
+  "generateTextFromHTML": false,
+  "replyTo": null,
+  "subject": "Verify email address",
+  "to": "hello@acme.com",
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to any email address with required verification 4: [html 1] 1`] = `
+"
+<!doctype html>
+<html>
+  <head>
+    <meta name=\\"viewport\\" content=\\"width=device-width\\">
+    <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
+    <title>Confirm your email address</title>
+    <style>
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 620px) {
+      table[class=body] h1 {
+        font-size: 28px !important;
+        margin-bottom: 10px !important;
+      }
+      table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+        font-size: 16px !important;
+      }
+      table[class=body] .wrapper,
+            table[class=body] .article {
+        padding: 10px !important;
+      }
+      table[class=body] .content {
+        padding: 0 !important;
+      }
+      table[class=body] .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+      table[class=body] .main {
+        border-left-width: 0 !important;
+        border-radius: 0 !important;
+        border-right-width: 0 !important;
+      }
+      table[class=body] .btn table {
+        width: 100% !important;
+      }
+      table[class=body] .btn a {
+        width: 100% !important;
+      }
+      table[class=body] .img-responsive {
+        height: auto !important;
+        max-width: 100% !important;
+        width: auto !important;
+      }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
+    }
+    /* -------------------------------------
+        PRESERVE THESE STYLES IN THE HEAD
+    ------------------------------------- */
+    @media all {
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+        line-height: 100%;
+      }
+      .recipient-link a {
+        color: inherit !important;
+        font-family: inherit !important;
+        font-size: inherit !important;
+        font-weight: inherit !important;
+        line-height: inherit !important;
+        text-decoration: none !important;
+      }
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+    }
+    hr {
+      border-width: 0;
+      height: 0;
+      margin-top: 34px;
+      margin-bottom: 34px;
+      border-bottom-width: 1px;
+      border-bottom-color: #EEF5F8;
+    }
+    a {
+      color: #3A464C;
+    }
+    </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%;\\">
+    <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;\\">
+      <tr>
+        <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
+        <td class=\\"container\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;\\">
+          <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;\\">
+
+            <!-- START CENTERED WHITE CONTAINER -->
+            <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Confirm your email address</span>
+            <table class=\\"main\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;\\">
+
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class=\\"wrapper\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;\\">
+                  <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                    <tr>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
+                        <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;\\">Hey there,</p>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 32px;\\">Please confirm your email address with this link:</p>
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
+                          <tbody>
+                            <tr>
+                              <td align=\\"left\\" 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; vertical-align: top; padding-bottom: 35px;\\">
+                                <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
+                                  <tbody>
+                                    <tr>
+                                      <td 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; vertical-align: top; background-color: #15212A; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN\\" target=\\"_blank\\" style=\\"display: inline-block; background-color: #15212A; border: solid 1px #15212A; color: #ffffff; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;\\" data-test-verify-link>Confirm email address</a> </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <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; line-height: 24px; margin: 0; margin-bottom: 11px;\\">For your security, the link will expire in 24 hours time.</p>
+                        <hr/>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;\\">You can also copy & paste this URL into your browser:</p>
+                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; margin-top: 0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN</p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+
+              <!-- START FOOTER -->
+
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">If you did not make this request, you can simply delete this message. This email address will not be used.</p>
+                </td>
+              </tr>
+              <tr>
+                <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px;\\">
+                  <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;\\">This message was sent to <a class=\\"small\\" href=\\"mailto:hello@acme.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">hello@acme.com</a></p>
+                </td>
+              </tr>
+
+              <!-- END FOOTER -->
+
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+
+          <!-- END CENTERED WHITE CONTAINER -->
+          </div>
+        </td>
+        <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
+"
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to any email address with required verification 5: [text 1] 1`] = `
+"
+                Hey there,
+
+                Please confirm your email address with this link:
+
+                http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN
+
+                For your security, the link will expire in 24 hours time.
+
+                ---
+
+                Sent to hello@acme.com
+                If you did not make this request, you can simply delete this message. This email address will not be used.
+                "
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to newsletter or support 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "support",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to newsletter or support 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": "925",
+  "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[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to newsletter or support 3: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to newsletter or support 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": "928",
+  "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[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to the default address without requiring verification 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "default@email.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set newsletter reply-to to the default address without requiring verification 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": "935",
+  "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[`Newsletters API Managed email without custom sending domain Can set sender_email to default address 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": "default@email.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Can set sender_email to default address 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": "943",
+  "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[`Newsletters API Managed email without custom sending domain Cannot change sender_email 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the sender email address to hello@acme.com",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Cannot change sender_email 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": "284",
+  "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[`Newsletters API Managed email without custom sending domain Cannot clear newsletter reply-to 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to ",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Cannot clear newsletter reply-to 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": "272",
+  "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[`Newsletters API Managed email without custom sending domain Cannot set newsletter reply-to to invalid email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to notvalid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Cannot set newsletter reply-to to invalid email address 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": "280",
+  "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[`Newsletters API Managed email without custom sending domain Cannot set newsletter sender_email to invalid email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the sender email address to notvalid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Managed email without custom sending domain Cannot set newsletter sender_email to invalid email address 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": "278",
+  "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[`Newsletters API Self hoster without managed email Can change sender_email to any address without verification 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": "hello@acme.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "hello@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Can change sender_email to any address without verification 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": "954",
+  "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[`Newsletters API Self hoster without managed email Can clear sender_email 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "hello@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Can clear sender_email 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": "942",
+  "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[`Newsletters API Self hoster without managed email Can keep sender_email 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": "anything@sendingdomain.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "hello@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Can keep sender_email 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": "935",
+  "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[`Newsletters API Self hoster without managed email Can set newsletter reply-to to any email address without required verification 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "hello@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Can set newsletter reply-to to any email address without required verification 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": "942",
+  "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[`Newsletters API Self hoster without managed email Can set newsletter reply-to to newsletter or support 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "support",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Can set newsletter reply-to to newsletter or support 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": "935",
+  "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[`Newsletters API Self hoster without managed email Can set newsletter reply-to to newsletter or support 3: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "My changed newsletter name",
+      "sender_email": null,
+      "sender_name": "Jamie",
+      "sender_reply_to": "newsletter",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_excerpt": false,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Can set newsletter reply-to to newsletter or support 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": "938",
+  "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[`Newsletters API Self hoster without managed email Can set sender_email to address matching sending domain, without verification 1: [body] 1`] = `
+Object {
+  "newsletters": Array [
+    Object {
+      "background_color": "light",
+      "body_font_category": "serif",
+      "border_color": null,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "description": null,
+      "feedback_enabled": false,
+      "footer_content": null,
+      "header_image": "http://127.0.0.1:2369/content/images/2022/05/test.jpg",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "name": "Daily newsletter",
+      "sender_email": "anything@sendingdomain.com",
+      "sender_name": "Jamie",
+      "sender_reply_to": "hello@acme.com",
+      "show_badge": true,
+      "show_comment_cta": true,
+      "show_feature_image": true,
+      "show_header_icon": true,
+      "show_header_name": true,
+      "show_header_title": true,
+      "show_latest_posts": false,
+      "show_post_title_section": true,
+      "show_subscription_details": false,
+      "slug": "daily-newsletter",
+      "sort_order": 1,
+      "status": "active",
+      "subscribe_on_signup": false,
+      "title_alignment": "center",
+      "title_color": null,
+      "title_font_category": "serif",
+      "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\\}/,
+      "visibility": "members",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Can set sender_email to address matching sending domain, without verification 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": "935",
+  "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[`Newsletters API Self hoster without managed email Cannot clear newsletter reply-to 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to ",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Cannot clear newsletter reply-to 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": "272",
+  "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[`Newsletters API Self hoster without managed email Cannot set newsletter reply-to to invalid email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the reply-to email address to notvalid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Cannot set newsletter reply-to to invalid email address 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": "280",
+  "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[`Newsletters API Self hoster without managed email Cannot set newsletter sender_email to invalid email address 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "You cannot set the sender email address to notvalid",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit newsletter.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Newsletters API Self hoster without managed email Cannot set newsletter sender_email to invalid email address 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": "278",
+  "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",
+}
+`;
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/offers.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/offers.test.js.snap
index 358d97156cb..d1d881621cb 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/offers.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/offers.test.js.snap
@@ -7,6 +7,7 @@ Object {
       "amount": 100,
       "cadence": "year",
       "code": "4th",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": "USD",
       "currency_restriction": true,
       "display_description": "",
@@ -14,6 +15,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Fourth of July Sales",
       "redemption_count": 0,
       "status": "active",
@@ -30,7 +32,7 @@ exports[`Offers API Can add a fixed offer 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": "347",
+  "content-length": "408",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -48,6 +50,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "black-friday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan",
@@ -55,6 +58,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Black Friday",
       "redemption_count": 0,
       "status": "active",
@@ -67,11 +71,26 @@ Object {
 }
 `;
 
+exports[`Offers API Can add a new offer 1: [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": "450",
+  "content-type": "application/json; charset=utf-8",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/offers\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
+  "vary": "Accept-Version, Origin, Accept-Encoding",
+  "x-cache-invalidate": "/*",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Offers API Can add a new offer 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": "389",
+  "content-length": "450",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -89,6 +108,7 @@ Object {
       "amount": 50,
       "cadence": "month",
       "code": "easter",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -96,6 +116,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Easter Sales",
       "redemption_count": 0,
       "status": "active",
@@ -112,7 +133,7 @@ exports[`Offers API Can add a new offer with minimal fields 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": "344",
+  "content-length": "405",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -130,6 +151,7 @@ Object {
       "amount": 20,
       "cadence": "year",
       "code": "4th-trial",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -137,6 +159,7 @@ Object {
       "duration": "trial",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Fourth of July Sales trial",
       "redemption_count": 0,
       "status": "active",
@@ -153,7 +176,7 @@ exports[`Offers API Can add a trial offer 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": "359",
+  "content-length": "420",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -171,6 +194,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "cyber-monday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan, only today",
@@ -178,6 +202,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Cyber Monday",
       "redemption_count": 0,
       "status": "archived",
@@ -195,7 +220,7 @@ exports[`Offers API Can archive an offer 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": "428",
+  "content-length": "489",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -212,6 +237,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "black-friday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan",
@@ -219,6 +245,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Black Friday",
       "redemption_count": 0,
       "status": "active",
@@ -232,6 +259,7 @@ Object {
       "amount": 50,
       "cadence": "month",
       "code": "easter",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -239,6 +267,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Easter Sales",
       "redemption_count": 0,
       "status": "active",
@@ -252,6 +281,7 @@ Object {
       "amount": 20,
       "cadence": "year",
       "code": "summer-sale",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -259,6 +289,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Summer Sale",
       "redemption_count": 0,
       "status": "active",
@@ -272,6 +303,7 @@ Object {
       "amount": 100,
       "cadence": "year",
       "code": "4th",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": "USD",
       "currency_restriction": true,
       "display_description": "",
@@ -279,6 +311,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Fourth of July Sales",
       "redemption_count": 0,
       "status": "active",
@@ -292,6 +325,7 @@ Object {
       "amount": 20,
       "cadence": "year",
       "code": "4th-trial",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -299,6 +333,7 @@ Object {
       "duration": "trial",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Fourth of July Sales trial",
       "redemption_count": 0,
       "status": "active",
@@ -316,7 +351,7 @@ exports[`Offers API Can browse 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": "1863",
+  "content-length": "2168",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -332,6 +367,7 @@ Object {
       "amount": 50,
       "cadence": "month",
       "code": "easter",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -339,6 +375,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Easter Sales",
       "redemption_count": 0,
       "status": "active",
@@ -352,6 +389,7 @@ Object {
       "amount": 20,
       "cadence": "year",
       "code": "summer-sale",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -359,6 +397,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Summer Sale",
       "redemption_count": 0,
       "status": "active",
@@ -372,6 +411,7 @@ Object {
       "amount": 100,
       "cadence": "year",
       "code": "4th",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": "USD",
       "currency_restriction": true,
       "display_description": "",
@@ -379,6 +419,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Fourth of July Sales",
       "redemption_count": 0,
       "status": "active",
@@ -392,6 +433,7 @@ Object {
       "amount": 20,
       "cadence": "year",
       "code": "4th-trial",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -399,6 +441,7 @@ Object {
       "duration": "trial",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Fourth of July Sales trial",
       "redemption_count": 0,
       "status": "active",
@@ -416,7 +459,7 @@ exports[`Offers API Can browse active 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": "1461",
+  "content-length": "1705",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -432,6 +475,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "cyber-monday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan, only today",
@@ -439,6 +483,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Cyber Monday",
       "redemption_count": 0,
       "status": "archived",
@@ -456,7 +501,7 @@ exports[`Offers API Can browse archived 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": "428",
+  "content-length": "489",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -472,6 +517,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "cyber-monday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan, only today",
@@ -479,6 +525,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Cyber Monday",
       "redemption_count": 0,
       "status": "active",
@@ -496,7 +543,7 @@ exports[`Offers API Can edit an offer 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": "426",
+  "content-length": "487",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -513,6 +560,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "black-friday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan",
@@ -520,6 +568,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Black Friday",
       "redemption_count": 0,
       "status": "active",
@@ -537,7 +586,7 @@ exports[`Offers API Can get a single offer 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": "414",
+  "content-length": "475",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -553,6 +602,7 @@ Object {
       "amount": 20,
       "cadence": "year",
       "code": "4th-trial",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -560,6 +610,7 @@ Object {
       "duration": "trial",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Fourth of July Sales trial",
       "redemption_count": 0,
       "status": "active",
@@ -577,7 +628,7 @@ exports[`Offers API Can get a trial offer 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": "384",
+  "content-length": "445",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -686,6 +737,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "cyber-monday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan, only today",
@@ -693,6 +745,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Cyber Monday",
       "redemption_count": 0,
       "status": "archived",
@@ -710,7 +763,7 @@ exports[`Offers API Cannot update offer amount 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": "428",
+  "content-length": "489",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -727,6 +780,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "cyber-monday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan, only today",
@@ -734,6 +788,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Cyber Monday",
       "redemption_count": 0,
       "status": "archived",
@@ -751,7 +806,7 @@ exports[`Offers API Cannot update offer cadence 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": "428",
+  "content-length": "489",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -861,6 +916,7 @@ Object {
       "amount": 12,
       "cadence": "year",
       "code": "cyber-monday",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "10% off on yearly plan, only today",
@@ -868,6 +924,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Cyber Monday",
       "redemption_count": 0,
       "status": "archived",
@@ -885,7 +942,7 @@ exports[`Offers API Cannot update offer tier 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": "428",
+  "content-length": "489",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -921,6 +978,7 @@ Object {
       "amount": 20,
       "cadence": "year",
       "code": "summer-sale",
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "currency": null,
       "currency_restriction": false,
       "display_description": "",
@@ -928,6 +986,7 @@ Object {
       "duration": "once",
       "duration_in_months": null,
       "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "last_redeemed": null,
       "name": "Summer Sale",
       "redemption_count": 0,
       "status": "active",
@@ -944,7 +1003,7 @@ exports[`Offers API Slugifies offer codes 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": "347",
+  "content-length": "408",
   "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__/pages.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/pages.test.js.snap
index 964c9d58896..fd6baad54e9 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/pages.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/pages.test.js.snap
@@ -647,7 +647,7 @@ exports[`Pages API Convert can convert a mobiledoc page to lexical 2: [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": "4065",
+  "content-length": "4063",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -753,7 +753,7 @@ exports[`Pages API Convert can convert a mobiledoc page to lexical 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": "4065",
+  "content-length": "4063",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -799,7 +799,7 @@ Object {
       "primary_tag": Any<Object>,
       "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
       "show_title_and_feature_image": Any<Boolean>,
-      "slug": "test-page-2",
+      "slug": "test-page-3",
       "status": "published",
       "tags": Any<Array>,
       "tiers": Array [
@@ -947,7 +947,7 @@ exports[`Pages API Copy Can copy a page 3: [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": "3859",
+  "content-length": "3857",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1053,7 +1053,7 @@ exports[`Pages API Create Can create a page with html 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": "4089",
+  "content-length": "4087",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1157,6 +1157,192 @@ Hopefully you don't find it a bore.",
 }
 `;
 
+exports[`Pages API Update Access Visibility is set to tiers Does not allow to attach the free tier 1: [body] 1`] = `
+Object {
+  "pages": Array [
+    Object {
+      "authors": Any<Array>,
+      "canonical_url": null,
+      "codeinjection_foot": null,
+      "codeinjection_head": null,
+      "comment_id": Any<String>,
+      "count": Object {
+        "negative_feedback": 0,
+        "paid_conversions": 0,
+        "positive_feedback": 0,
+        "signups": 0,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "custom_excerpt": null,
+      "custom_template": null,
+      "excerpt": null,
+      "feature_image": null,
+      "feature_image_alt": null,
+      "feature_image_caption": null,
+      "featured": false,
+      "frontmatter": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "lexical": "{\\"root\\":{\\"children\\":[{\\"children\\":[],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"paragraph\\",\\"version\\":1}],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"root\\",\\"version\\":1}}",
+      "meta_description": null,
+      "meta_title": null,
+      "mobiledoc": null,
+      "og_description": null,
+      "og_image": null,
+      "og_title": null,
+      "primary_author": Any<Object>,
+      "primary_tag": Any<Object>,
+      "published_at": null,
+      "show_title_and_feature_image": Any<Boolean>,
+      "slug": "test-page",
+      "status": "draft",
+      "tags": Any<Array>,
+      "tiers": Array [
+        Object {
+          "active": true,
+          "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "currency": "usd",
+          "description": null,
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "monthly_price": 500,
+          "monthly_price_id": null,
+          "name": "Default Product",
+          "slug": "default-product",
+          "trial_days": 0,
+          "type": "paid",
+          "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "visibility": "public",
+          "welcome_page_url": null,
+          "yearly_price": 5000,
+          "yearly_price_id": null,
+        },
+      ],
+      "title": "Test Page",
+      "twitter_description": null,
+      "twitter_image": null,
+      "twitter_title": null,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "url": Any<String>,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "visibility": "tiers",
+    },
+  ],
+}
+`;
+
+exports[`Pages API Update Access Visibility is set to tiers Does not allow to attach the free tier 1: [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": "3504",
+  "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": Any<String>,
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Pages API Update Access Visibility is set to tiers Does not allow to attach the free tier 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": "3492",
+  "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": Any<String>,
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Pages API Update Access Visibility is set to tiers Saves only paid tiers 1: [body] 1`] = `
+Object {
+  "pages": Array [
+    Object {
+      "authors": Any<Array>,
+      "canonical_url": null,
+      "codeinjection_foot": null,
+      "codeinjection_head": null,
+      "comment_id": Any<String>,
+      "count": Object {
+        "negative_feedback": 0,
+        "paid_conversions": 0,
+        "positive_feedback": 0,
+        "signups": 0,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "custom_excerpt": null,
+      "custom_template": null,
+      "excerpt": null,
+      "feature_image": null,
+      "feature_image_alt": null,
+      "feature_image_caption": null,
+      "featured": false,
+      "frontmatter": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "lexical": "{\\"root\\":{\\"children\\":[{\\"children\\":[],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"paragraph\\",\\"version\\":1}],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"root\\",\\"version\\":1}}",
+      "meta_description": null,
+      "meta_title": null,
+      "mobiledoc": null,
+      "og_description": null,
+      "og_image": null,
+      "og_title": null,
+      "primary_author": Any<Object>,
+      "primary_tag": Any<Object>,
+      "published_at": null,
+      "show_title_and_feature_image": Any<Boolean>,
+      "slug": "test-page-2",
+      "status": "draft",
+      "tags": Any<Array>,
+      "tiers": Array [
+        Object {
+          "active": true,
+          "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "currency": "usd",
+          "description": null,
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "monthly_price": 500,
+          "monthly_price_id": null,
+          "name": "Default Product",
+          "slug": "default-product",
+          "trial_days": 0,
+          "type": "paid",
+          "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "visibility": "public",
+          "welcome_page_url": null,
+          "yearly_price": 5000,
+          "yearly_price_id": null,
+        },
+      ],
+      "title": "Test Page",
+      "twitter_description": null,
+      "twitter_image": null,
+      "twitter_title": null,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "url": Any<String>,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "visibility": "tiers",
+    },
+  ],
+}
+`;
+
+exports[`Pages API Update Access Visibility is set to tiers Saves only paid tiers 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": "3492",
+  "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": Any<String>,
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Pages API Update Can modify show_title_and_feature_image property 1: [body] 1`] = `
 Object {
   "pages": Array [
@@ -1252,7 +1438,7 @@ exports[`Pages API Update Can modify show_title_and_feature_image property 2: [h
 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": "3860",
+  "content-length": "3858",
   "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__/posts.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap
index 585ec0e9818..3e90545e516 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
@@ -197,7 +197,7 @@ exports[`Posts API Can browse 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": "10736",
+  "content-length": "10732",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -421,7 +421,7 @@ exports[`Posts API Can browse filtering by a collection 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": "11731",
+  "content-length": "11727",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -766,7 +766,7 @@ exports[`Posts API Can browse with formats 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": "13534",
+  "content-length": "13530",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -874,7 +874,7 @@ exports[`Posts API Convert can convert a mobiledoc post to lexical 2: [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": "4102",
+  "content-length": "4100",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -983,7 +983,7 @@ exports[`Posts API Convert can convert a mobiledoc post to lexical 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": "4102",
+  "content-length": "4100",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1089,7 +1089,7 @@ exports[`Posts API Copy Can copy a post 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": "3894",
+  "content-length": "3892",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1198,7 +1198,7 @@ exports[`Posts API Create Can create a post with html 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": "4124",
+  "content-length": "4122",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1307,7 +1307,7 @@ exports[`Posts API Create Can create a post with lexical 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": "4136",
+  "content-length": "4134",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1416,7 +1416,7 @@ exports[`Posts API Create Can create a post with mobiledoc 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": "3952",
+  "content-length": "3950",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1703,7 +1703,7 @@ exports[`Posts API Delete Can delete posts belonging to a collection and returns
 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": "11731",
+  "content-length": "11727",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -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
@@ -1889,6 +1889,181 @@ Object {
 }
 `;
 
+exports[`Posts API Update Access Visibility is set to tiers Does not allow to attach the free tier 1: [body] 1`] = `
+Object {
+  "pages": Array [
+    Object {
+      "authors": Any<Array>,
+      "canonical_url": null,
+      "codeinjection_foot": null,
+      "codeinjection_head": null,
+      "comment_id": Any<String>,
+      "count": Object {
+        "negative_feedback": 0,
+        "paid_conversions": 0,
+        "positive_feedback": 0,
+        "signups": 0,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "custom_excerpt": null,
+      "custom_template": null,
+      "excerpt": null,
+      "feature_image": null,
+      "feature_image_alt": null,
+      "feature_image_caption": null,
+      "featured": false,
+      "frontmatter": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "lexical": "{\\"root\\":{\\"children\\":[{\\"children\\":[],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"paragraph\\",\\"version\\":1}],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"root\\",\\"version\\":1}}",
+      "meta_description": null,
+      "meta_title": null,
+      "mobiledoc": null,
+      "og_description": null,
+      "og_image": null,
+      "og_title": null,
+      "primary_author": Any<Object>,
+      "primary_tag": Any<Object>,
+      "published_at": null,
+      "show_title_and_feature_image": true,
+      "slug": "test-page",
+      "status": "draft",
+      "tags": Any<Array>,
+      "tiers": Array [
+        Object {
+          "active": true,
+          "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "currency": "usd",
+          "description": null,
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "monthly_price": 500,
+          "monthly_price_id": null,
+          "name": "Default Product",
+          "slug": "default-product",
+          "trial_days": 0,
+          "type": "paid",
+          "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "visibility": "public",
+          "welcome_page_url": null,
+          "yearly_price": 5000,
+          "yearly_price_id": null,
+        },
+      ],
+      "title": "Test Page",
+      "twitter_description": null,
+      "twitter_image": null,
+      "twitter_title": null,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "url": Any<String>,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "visibility": "tiers",
+    },
+  ],
+}
+`;
+
+exports[`Posts API Update Access Visibility is set to tiers Does not allow to attach the free tier 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": "3492",
+  "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": Any<String>,
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Posts API Update Access Visibility is set to tiers Saves only paid tiers 1: [body] 1`] = `
+Object {
+  "posts": Array [
+    Object {
+      "authors": Any<Array>,
+      "canonical_url": null,
+      "codeinjection_foot": null,
+      "codeinjection_head": null,
+      "comment_id": Any<String>,
+      "count": Object {
+        "clicks": 0,
+        "negative_feedback": 0,
+        "positive_feedback": 0,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "custom_excerpt": null,
+      "custom_template": null,
+      "email": null,
+      "email_only": false,
+      "email_segment": "all",
+      "email_subject": null,
+      "excerpt": null,
+      "feature_image": null,
+      "feature_image_alt": null,
+      "feature_image_caption": null,
+      "featured": false,
+      "frontmatter": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "lexical": "{\\"root\\":{\\"children\\":[{\\"children\\":[],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"paragraph\\",\\"version\\":1}],\\"direction\\":null,\\"format\\":\\"\\",\\"indent\\":0,\\"type\\":\\"root\\",\\"version\\":1}}",
+      "meta_description": null,
+      "meta_title": null,
+      "mobiledoc": null,
+      "newsletter": null,
+      "og_description": null,
+      "og_image": null,
+      "og_title": null,
+      "primary_author": Any<Object>,
+      "primary_tag": Any<Object>,
+      "published_at": null,
+      "slug": "test-page",
+      "status": "draft",
+      "tags": Any<Array>,
+      "tiers": Array [
+        Object {
+          "active": true,
+          "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "currency": "usd",
+          "description": null,
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "monthly_price": 500,
+          "monthly_price_id": null,
+          "name": "Default Product",
+          "slug": "default-product",
+          "trial_days": 0,
+          "type": "paid",
+          "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "visibility": "public",
+          "welcome_page_url": null,
+          "yearly_price": 5000,
+          "yearly_price_id": null,
+        },
+      ],
+      "title": "Test Page",
+      "twitter_description": null,
+      "twitter_image": null,
+      "twitter_title": null,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "url": Any<String>,
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "visibility": "tiers",
+    },
+  ],
+}
+`;
+
+exports[`Posts API Update Access Visibility is set to tiers Saves only paid tiers 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": "3525",
+  "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": Any<String>,
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Posts API Update Can add and remove collections 1: [body] 1`] = `
 Object {
   "posts": Array [
@@ -1986,7 +2161,7 @@ exports[`Posts API Update Can add and remove collections 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": "3908",
+  "content-length": "3906",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2209,7 +2384,7 @@ exports[`Posts API Update Can add and remove collections 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": "5504",
+  "content-length": "5502",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2432,7 +2607,7 @@ exports[`Posts API Update Can add and remove collections 6: [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": "5498",
+  "content-length": "5496",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2541,7 +2716,7 @@ exports[`Posts API Update Can update a post with lexical 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": "4087",
+  "content-length": "4085",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2650,7 +2825,7 @@ exports[`Posts API Update Can update a post with lexical 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": "4084",
+  "content-length": "4082",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2759,7 +2934,7 @@ exports[`Posts API Update Can update a post with mobiledoc 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": "3897",
+  "content-length": "3895",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2868,7 +3043,7 @@ exports[`Posts API Update Can update a post with mobiledoc 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": "3894",
+  "content-length": "3892",
   "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__/recommendations.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/recommendations.test.js.snap
index d6cf4091170..ed337e98494 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,72 @@ 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 check Returns nullified values if site fails to fetch 1: [body] 1`] = `
+Object {
+  "recommendations": Array [
+    Object {
+      "created_at": null,
+      "description": null,
+      "excerpt": null,
+      "favicon": null,
+      "featured_image": null,
+      "id": null,
+      "one_click_subscribe": false,
+      "title": null,
+      "updated_at": null,
+      "url": "https://dogpictures.com/",
+    },
+  ],
+}
+`;
+
+exports[`Recommendations Admin API check Returns nullified values if site fails to fetch 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": "214",
+  "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__/session.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/session.test.js.snap
index 7a43819c7aa..1b6a4e31cc6 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/session.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/session.test.js.snap
@@ -48,7 +48,7 @@ Object {
   "meta_title": null,
   "milestone_notifications": true,
   "name": "Joe Bloggs",
-  "paid_subscription_canceled_notification": false,
+  "paid_subscription_canceled_notification": true,
   "paid_subscription_started_notification": true,
   "profile_image": "https://example.com/super_photo.jpg",
   "recommendation_notifications": true,
@@ -67,7 +67,7 @@ exports[`Sessions API can read session now the owner is logged in 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": "803",
+  "content-length": "802",
   "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__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index 2f7c7edf53a..a6211d42378 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
@@ -180,6 +180,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -310,7 +314,7 @@ Object {
     },
     Object {
       "key": "donations_suggested_amount",
-      "value": "0",
+      "value": "500",
     },
     Object {
       "key": "recommendations_enabled",
@@ -340,6 +344,14 @@ Object {
       "key": "donations_enabled",
       "value": true,
     },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "noreply@127.0.0.1",
+    },
   ],
 }
 `;
@@ -363,45 +375,3472 @@ Object {
     "filters": Object {
       "group": "theme",
     },
-  },
-  "settings": Array [
+  },
+  "settings": Array [
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Browse Can request settings by group 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": "91",
+  "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[`Settings API Browse Requesting core settings by group ignores the parameter and returns no settings 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "filters": Object {
+      "group": "core",
+    },
+  },
+  "settings": Array [],
+}
+`;
+
+exports[`Settings API Browse Requesting core settings by group ignores the parameter and returns no settings 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": "51",
+  "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[`Settings API Edit [LEGACY] editing members_support_address triggers email verification flow 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "sent_email_verification": Array [
+      "members_support_address",
+    ],
+  },
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "noreply",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": "pk_test_for_stripe",
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": "••••••••",
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit [LEGACY] editing members_support_address triggers email verification flow 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": StringMatching /\\\\d\\+/,
+  "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[`Settings API Edit Can edit a setting 1: [body] 1`] = `
+Object {
+  "meta": Object {},
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "noreply",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": "pk_test_for_stripe",
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": "••••••••",
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+  ],
+}
+`;
+
+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": "4431",
+  "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[`Settings API Edit cannot edit uneditable settings 1: [body] 1`] = `
+Object {
+  "meta": Object {},
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "noreply",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": "pk_test_for_stripe",
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": "••••••••",
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit cannot edit uneditable settings 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": StringMatching /\\\\d\\+/,
+  "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[`Settings API Edit does not trigger email verification flow if members_support_address remains the same 1: [body] 1`] = `
+Object {
+  "meta": Object {},
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "support@example.com",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": "pk_test_for_stripe",
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": "••••••••",
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "support@example.com",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit does not trigger email verification flow if members_support_address remains the same 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": StringMatching /\\\\d\\+/,
+  "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[`Settings API Edit editing members_support_address triggers email verification flow 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "sent_email_verification": Array [
+      "members_support_address",
+    ],
+  },
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "noreply",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": "pk_test_for_stripe",
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": "••••••••",
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "0",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit editing members_support_address triggers email verification flow 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": StringMatching /\\\\d\\+/,
+  "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[`Settings API Edit fails to edit setting with unsupported announcement_background value 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "Please enter a valid announcement background value",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit setting.",
+      "property": "announcement_background",
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit fails to edit setting with unsupported announcement_background value 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": "295",
+  "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[`Settings API Edit fails to edit setting with unsupported announcement_visibility value 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "Please enter a valid announcement visibility value",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit setting.",
+      "property": "announcement_visibility",
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit fails to edit setting with unsupported announcement_visibility value 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": "295",
+  "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[`Settings API Edit fails to edit setting with unsupported value 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": "Please enter a valid announcement visibility value",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot edit setting.",
+      "property": "announcement_visibility",
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit fails to edit setting with unsupported value 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": "295",
+  "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[`Settings API Edit removes image size prefixes when setting the icon 1: [body] 1`] = `
+Object {
+  "meta": Object {},
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "noreply",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": "pk_test_for_stripe",
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": "••••••••",
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Edit removes image size prefixes when setting the icon 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": StringMatching /\\\\d\\+/,
+  "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[`Settings API Managed email with custom sending domain editing members_support_address equaling default does not trigger verification flow 1: [body] 1`] = `
+Object {
+  "meta": Object {},
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "default@email.com",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "default@email.com",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Managed email with custom sending domain editing members_support_address equaling default does not trigger verification flow 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": StringMatching /\\\\d\\+/,
+  "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[`Settings API Managed email with custom sending domain editing members_support_address with matching domain does not trigger email verification flow 1: [body] 1`] = `
+Object {
+  "meta": Object {},
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "support@sendingdomain.com",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
+    Object {
+      "key": "donations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "support@sendingdomain.com",
+    },
+  ],
+}
+`;
+
+exports[`Settings API Managed email with custom sending domain editing members_support_address with matching domain does not trigger email verification flow 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": StringMatching /\\\\d\\+/,
+  "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[`Settings API Managed email with custom sending domain editing members_support_address without matching domain triggers email verification flow 1: [body] 1`] = `
+Object {
+  "meta": Object {
+    "sent_email_verification": Array [
+      "members_support_address",
+    ],
+  },
+  "settings": Array [
+    Object {
+      "key": "members_track_sources",
+      "value": true,
+    },
+    Object {
+      "key": "title",
+      "value": null,
+    },
+    Object {
+      "key": "description",
+      "value": "Thoughts, stories and ideas",
+    },
+    Object {
+      "key": "logo",
+      "value": "",
+    },
+    Object {
+      "key": "cover_image",
+      "value": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    },
+    Object {
+      "key": "icon",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
+    },
+    Object {
+      "key": "accent_color",
+      "value": "#FF1A75",
+    },
+    Object {
+      "key": "locale",
+      "value": "ua",
+    },
+    Object {
+      "key": "timezone",
+      "value": "Pacific/Auckland",
+    },
+    Object {
+      "key": "codeinjection_head",
+      "value": null,
+    },
+    Object {
+      "key": "codeinjection_foot",
+      "value": "",
+    },
+    Object {
+      "key": "facebook",
+      "value": "ghost",
+    },
+    Object {
+      "key": "twitter",
+      "value": "@ghost",
+    },
+    Object {
+      "key": "navigation",
+      "value": "[{\\"label\\":\\"label1\\"}]",
+    },
+    Object {
+      "key": "secondary_navigation",
+      "value": "[{\\"label\\":\\"Data & privacy\\",\\"url\\":\\"/privacy/\\"},{\\"label\\":\\"Contact\\",\\"url\\":\\"/contact/\\"},{\\"label\\":\\"Contribute →\\",\\"url\\":\\"/contribute/\\"}]",
+    },
+    Object {
+      "key": "meta_title",
+      "value": "SEO title",
+    },
+    Object {
+      "key": "meta_description",
+      "value": "SEO description",
+    },
+    Object {
+      "key": "og_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/facebook.png",
+    },
+    Object {
+      "key": "og_title",
+      "value": "facebook title",
+    },
+    Object {
+      "key": "og_description",
+      "value": "facebook description",
+    },
+    Object {
+      "key": "twitter_image",
+      "value": "http://127.0.0.1:2369/content/images/2019/07/twitter.png",
+    },
+    Object {
+      "key": "twitter_title",
+      "value": "twitter title",
+    },
+    Object {
+      "key": "twitter_description",
+      "value": "twitter description",
+    },
+    Object {
+      "key": "active_theme",
+      "value": "source",
+    },
+    Object {
+      "key": "is_private",
+      "value": false,
+    },
+    Object {
+      "key": "password",
+      "value": "",
+    },
+    Object {
+      "key": "public_hash",
+      "value": StringMatching /\\[a-z0-9\\]\\{30\\}/,
+    },
+    Object {
+      "key": "default_content_visibility",
+      "value": "public",
+    },
+    Object {
+      "key": "default_content_visibility_tiers",
+      "value": "[]",
+    },
+    Object {
+      "key": "members_signup_access",
+      "value": "all",
+    },
+    Object {
+      "key": "members_support_address",
+      "value": "default@email.com",
+    },
+    Object {
+      "key": "stripe_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_plans",
+      "value": "[]",
+    },
+    Object {
+      "key": "stripe_connect_publishable_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_secret_key",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_livemode",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_display_name",
+      "value": null,
+    },
+    Object {
+      "key": "stripe_connect_account_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_monthly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "members_yearly_price_id",
+      "value": null,
+    },
+    Object {
+      "key": "portal_name",
+      "value": true,
+    },
+    Object {
+      "key": "portal_button",
+      "value": true,
+    },
+    Object {
+      "key": "portal_plans",
+      "value": "[\\"free\\"]",
+    },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
+    Object {
+      "key": "portal_products",
+      "value": "[]",
+    },
+    Object {
+      "key": "portal_button_style",
+      "value": "icon-and-text",
+    },
+    Object {
+      "key": "portal_button_icon",
+      "value": null,
+    },
+    Object {
+      "key": "portal_button_signup_text",
+      "value": "Subscribe",
+    },
+    Object {
+      "key": "portal_signup_terms_html",
+      "value": null,
+    },
+    Object {
+      "key": "portal_signup_checkbox_required",
+      "value": false,
+    },
+    Object {
+      "key": "mailgun_domain",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_api_key",
+      "value": null,
+    },
+    Object {
+      "key": "mailgun_base_url",
+      "value": null,
+    },
+    Object {
+      "key": "email_track_opens",
+      "value": true,
+    },
+    Object {
+      "key": "email_track_clicks",
+      "value": true,
+    },
+    Object {
+      "key": "email_verification_required",
+      "value": false,
+    },
+    Object {
+      "key": "amp",
+      "value": false,
+    },
+    Object {
+      "key": "amp_gtag_id",
+      "value": null,
+    },
+    Object {
+      "key": "firstpromoter",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_id",
+      "value": null,
+    },
+    Object {
+      "key": "labs",
+      "value": StringMatching /\\\\\\{\\[\\^\\\\s\\]\\+\\\\\\}/,
+    },
+    Object {
+      "key": "slack_url",
+      "value": "",
+    },
+    Object {
+      "key": "slack_username",
+      "value": "New Slack Username",
+    },
+    Object {
+      "key": "unsplash",
+      "value": false,
+    },
+    Object {
+      "key": "shared_views",
+      "value": "[]",
+    },
+    Object {
+      "key": "editor_default_email_recipients",
+      "value": "visibility",
+    },
+    Object {
+      "key": "editor_default_email_recipients_filter",
+      "value": "all",
+    },
+    Object {
+      "key": "announcement_content",
+      "value": "<p>Great news coming soon!</p>",
+    },
+    Object {
+      "key": "announcement_visibility",
+      "value": "[\\"visitors\\",\\"free_members\\"]",
+    },
+    Object {
+      "key": "announcement_background",
+      "value": "dark",
+    },
+    Object {
+      "key": "comments_enabled",
+      "value": "off",
+    },
+    Object {
+      "key": "outbound_link_tagging",
+      "value": true,
+    },
+    Object {
+      "key": "pintura",
+      "value": true,
+    },
+    Object {
+      "key": "pintura_js_url",
+      "value": null,
+    },
+    Object {
+      "key": "pintura_css_url",
+      "value": null,
+    },
+    Object {
+      "key": "donations_currency",
+      "value": "USD",
+    },
+    Object {
+      "key": "donations_suggested_amount",
+      "value": "500",
+    },
+    Object {
+      "key": "recommendations_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "members_enabled",
+      "value": true,
+    },
+    Object {
+      "key": "members_invite_only",
+      "value": false,
+    },
+    Object {
+      "key": "allow_self_signup",
+      "value": true,
+    },
+    Object {
+      "key": "paid_members_enabled",
+      "value": false,
+    },
+    Object {
+      "key": "firstpromoter_account",
+      "value": null,
+    },
     Object {
-      "key": "active_theme",
-      "value": "source",
+      "key": "donations_enabled",
+      "value": false,
     },
-  ],
-}
-`;
-
-exports[`Settings API Browse Can request settings by group 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": "91",
-  "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[`Settings API Browse Requesting core settings by group ignores the parameter and returns no settings 1: [body] 1`] = `
-Object {
-  "meta": Object {
-    "filters": Object {
-      "group": "core",
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
     },
-  },
-  "settings": Array [],
+    Object {
+      "key": "support_email_address",
+      "value": "default@email.com",
+    },
+  ],
 }
 `;
 
-exports[`Settings API Browse Requesting core settings by group ignores the parameter and returns no settings 2: [headers] 1`] = `
+exports[`Settings API Managed email with custom sending domain editing members_support_address without matching domain triggers email verification flow 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": "51",
+  "content-length": StringMatching /\\\\d\\+/,
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -410,7 +3849,7 @@ Object {
 }
 `;
 
-exports[`Settings API Edit Can edit a setting 1: [body] 1`] = `
+exports[`Settings API Managed email without custom sending domain editing members_support_address equaling default does not trigger verification flow 1: [body] 1`] = `
 Object {
   "meta": Object {},
   "settings": Array [
@@ -420,7 +3859,7 @@ Object {
     },
     Object {
       "key": "title",
-      "value": "[]",
+      "value": null,
     },
     Object {
       "key": "description",
@@ -436,7 +3875,7 @@ Object {
     },
     Object {
       "key": "icon",
-      "value": "",
+      "value": "http://127.0.0.1:2369/content/images/size/w256h256/2019/07/icon.png",
     },
     Object {
       "key": "accent_color",
@@ -536,7 +3975,7 @@ Object {
     },
     Object {
       "key": "members_support_address",
-      "value": "noreply",
+      "value": "default@email.com",
     },
     Object {
       "key": "stripe_secret_key",
@@ -552,11 +3991,11 @@ Object {
     },
     Object {
       "key": "stripe_connect_publishable_key",
-      "value": "pk_test_for_stripe",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_secret_key",
-      "value": "••••••••",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_livemode",
@@ -590,6 +4029,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -720,7 +4163,7 @@ Object {
     },
     Object {
       "key": "donations_suggested_amount",
-      "value": "0",
+      "value": "500",
     },
     Object {
       "key": "recommendations_enabled",
@@ -740,7 +4183,7 @@ Object {
     },
     Object {
       "key": "paid_members_enabled",
-      "value": true,
+      "value": false,
     },
     Object {
       "key": "firstpromoter_account",
@@ -748,17 +4191,25 @@ Object {
     },
     Object {
       "key": "donations_enabled",
-      "value": true,
+      "value": false,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "default@email.com",
     },
   ],
 }
 `;
 
-exports[`Settings API Edit Can edit a setting 2: [headers] 1`] = `
+exports[`Settings API Managed email without custom sending domain editing members_support_address equaling default does not trigger verification flow 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": StringMatching /\\\\d\\+/,
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -768,9 +4219,13 @@ Object {
 }
 `;
 
-exports[`Settings API Edit cannot edit uneditable settings 1: [body] 1`] = `
+exports[`Settings API Managed email without custom sending domain editing members_support_address triggers email verification flow 1: [body] 1`] = `
 Object {
-  "meta": Object {},
+  "meta": Object {
+    "sent_email_verification": Array [
+      "members_support_address",
+    ],
+  },
   "settings": Array [
     Object {
       "key": "members_track_sources",
@@ -778,7 +4233,7 @@ Object {
     },
     Object {
       "key": "title",
-      "value": "[]",
+      "value": null,
     },
     Object {
       "key": "description",
@@ -894,7 +4349,7 @@ Object {
     },
     Object {
       "key": "members_support_address",
-      "value": "noreply",
+      "value": "support@example.com",
     },
     Object {
       "key": "stripe_secret_key",
@@ -910,11 +4365,11 @@ Object {
     },
     Object {
       "key": "stripe_connect_publishable_key",
-      "value": "pk_test_for_stripe",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_secret_key",
-      "value": "••••••••",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_livemode",
@@ -948,6 +4403,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -1078,7 +4537,7 @@ Object {
     },
     Object {
       "key": "donations_suggested_amount",
-      "value": "0",
+      "value": "500",
     },
     Object {
       "key": "recommendations_enabled",
@@ -1098,7 +4557,7 @@ Object {
     },
     Object {
       "key": "paid_members_enabled",
-      "value": true,
+      "value": false,
     },
     Object {
       "key": "firstpromoter_account",
@@ -1106,13 +4565,21 @@ Object {
     },
     Object {
       "key": "donations_enabled",
-      "value": true,
+      "value": false,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "support@example.com",
     },
   ],
 }
 `;
 
-exports[`Settings API Edit cannot edit uneditable settings 2: [headers] 1`] = `
+exports[`Settings API Managed email without custom sending domain editing members_support_address triggers email verification flow 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",
@@ -1125,9 +4592,13 @@ Object {
 }
 `;
 
-exports[`Settings API Edit does not trigger email verification flow if members_support_address remains the same 1: [body] 1`] = `
+exports[`Settings API Managed email without custom sending domain editing members_support_address without matching domain triggers email verification flow 1: [body] 1`] = `
 Object {
-  "meta": Object {},
+  "meta": Object {
+    "sent_email_verification": Array [
+      "members_support_address",
+    ],
+  },
   "settings": Array [
     Object {
       "key": "members_track_sources",
@@ -1135,7 +4606,7 @@ Object {
     },
     Object {
       "key": "title",
-      "value": "[]",
+      "value": null,
     },
     Object {
       "key": "description",
@@ -1267,11 +4738,11 @@ Object {
     },
     Object {
       "key": "stripe_connect_publishable_key",
-      "value": "pk_test_for_stripe",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_secret_key",
-      "value": "••••••••",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_livemode",
@@ -1455,7 +4926,7 @@ Object {
     },
     Object {
       "key": "paid_members_enabled",
-      "value": true,
+      "value": false,
     },
     Object {
       "key": "firstpromoter_account",
@@ -1463,13 +4934,21 @@ Object {
     },
     Object {
       "key": "donations_enabled",
-      "value": true,
+      "value": false,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "support@example.com",
     },
   ],
 }
 `;
 
-exports[`Settings API Edit does not trigger email verification flow if members_support_address remains the same 2: [headers] 1`] = `
+exports[`Settings API Managed email without custom sending domain editing members_support_address without matching domain triggers email verification flow 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",
@@ -1478,18 +4957,13 @@ Object {
   "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[`Settings API Edit editing members_support_address triggers email verification flow 1: [body] 1`] = `
+exports[`Settings API Self hoster without managed email editing members_support_address does not trigger email verification flow 1: [body] 1`] = `
 Object {
-  "meta": Object {
-    "sent_email_verification": Array [
-      "members_support_address",
-    ],
-  },
+  "meta": Object {},
   "settings": Array [
     Object {
       "key": "members_track_sources",
@@ -1497,7 +4971,7 @@ Object {
     },
     Object {
       "key": "title",
-      "value": "[]",
+      "value": null,
     },
     Object {
       "key": "description",
@@ -1613,7 +5087,7 @@ Object {
     },
     Object {
       "key": "members_support_address",
-      "value": "noreply",
+      "value": "support@customdomain.com",
     },
     Object {
       "key": "stripe_secret_key",
@@ -1629,11 +5103,11 @@ Object {
     },
     Object {
       "key": "stripe_connect_publishable_key",
-      "value": "pk_test_for_stripe",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_secret_key",
-      "value": "••••••••",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_livemode",
@@ -1667,6 +5141,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -1797,7 +5275,7 @@ Object {
     },
     Object {
       "key": "donations_suggested_amount",
-      "value": "0",
+      "value": "500",
     },
     Object {
       "key": "recommendations_enabled",
@@ -1817,7 +5295,7 @@ Object {
     },
     Object {
       "key": "paid_members_enabled",
-      "value": true,
+      "value": false,
     },
     Object {
       "key": "firstpromoter_account",
@@ -1825,119 +5303,35 @@ Object {
     },
     Object {
       "key": "donations_enabled",
-      "value": true,
-    },
-  ],
-}
-`;
-
-exports[`Settings API Edit editing members_support_address triggers email verification flow 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": StringMatching /\\\\d\\+/,
-  "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[`Settings API Edit fails to edit setting with unsupported announcement_background value 1: [body] 1`] = `
-Object {
-  "errors": Array [
-    Object {
-      "code": null,
-      "context": "Please enter a valid announcement background value",
-      "details": null,
-      "ghostErrorCode": null,
-      "help": null,
-      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
-      "message": "Validation error, cannot edit setting.",
-      "property": "announcement_background",
-      "type": "ValidationError",
+      "value": false,
     },
-  ],
-}
-`;
-
-exports[`Settings API Edit fails to edit setting with unsupported announcement_background value 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": "295",
-  "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[`Settings API Edit fails to edit setting with unsupported announcement_visibility value 1: [body] 1`] = `
-Object {
-  "errors": Array [
     Object {
-      "code": null,
-      "context": "Please enter a valid announcement visibility value",
-      "details": null,
-      "ghostErrorCode": null,
-      "help": null,
-      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
-      "message": "Validation error, cannot edit setting.",
-      "property": "announcement_visibility",
-      "type": "ValidationError",
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
     },
-  ],
-}
-`;
-
-exports[`Settings API Edit fails to edit setting with unsupported announcement_visibility value 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": "295",
-  "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[`Settings API Edit fails to edit setting with unsupported value 1: [body] 1`] = `
-Object {
-  "errors": Array [
     Object {
-      "code": null,
-      "context": "Please enter a valid announcement visibility value",
-      "details": null,
-      "ghostErrorCode": null,
-      "help": null,
-      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
-      "message": "Validation error, cannot edit setting.",
-      "property": "announcement_visibility",
-      "type": "ValidationError",
+      "key": "support_email_address",
+      "value": "support@customdomain.com",
     },
   ],
 }
 `;
 
-exports[`Settings API Edit fails to edit setting with unsupported value 2: [headers] 1`] = `
+exports[`Settings API Self hoster without managed email editing members_support_address does not trigger email verification flow 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": "295",
+  "content-length": StringMatching /\\\\d\\+/,
   "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[`Settings API Edit removes image size prefixes when setting the icon 1: [body] 1`] = `
+exports[`Settings API Self hoster without managed email editing members_support_address equaling default does not trigger verification flow 1: [body] 1`] = `
 Object {
   "meta": Object {},
   "settings": Array [
@@ -1947,7 +5341,7 @@ Object {
     },
     Object {
       "key": "title",
-      "value": "[]",
+      "value": null,
     },
     Object {
       "key": "description",
@@ -2063,7 +5457,7 @@ Object {
     },
     Object {
       "key": "members_support_address",
-      "value": "noreply",
+      "value": "default@email.com",
     },
     Object {
       "key": "stripe_secret_key",
@@ -2079,11 +5473,11 @@ Object {
     },
     Object {
       "key": "stripe_connect_publishable_key",
-      "value": "pk_test_for_stripe",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_secret_key",
-      "value": "••••••••",
+      "value": null,
     },
     Object {
       "key": "stripe_connect_livemode",
@@ -2117,6 +5511,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -2247,7 +5645,7 @@ Object {
     },
     Object {
       "key": "donations_suggested_amount",
-      "value": "0",
+      "value": "500",
     },
     Object {
       "key": "recommendations_enabled",
@@ -2267,7 +5665,7 @@ Object {
     },
     Object {
       "key": "paid_members_enabled",
-      "value": true,
+      "value": false,
     },
     Object {
       "key": "firstpromoter_account",
@@ -2275,13 +5673,21 @@ Object {
     },
     Object {
       "key": "donations_enabled",
-      "value": true,
+      "value": false,
+    },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "default@email.com",
     },
   ],
 }
 `;
 
-exports[`Settings API Edit removes image size prefixes when setting the icon 2: [headers] 1`] = `
+exports[`Settings API Self hoster without managed email editing members_support_address equaling default does not trigger verification flow 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",
@@ -2369,7 +5775,7 @@ Object {
     },
     Object {
       "key": "title",
-      "value": "[]",
+      "value": null,
     },
     Object {
       "key": "description",
@@ -2539,6 +5945,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -2669,7 +6079,7 @@ Object {
     },
     Object {
       "key": "donations_suggested_amount",
-      "value": "0",
+      "value": "500",
     },
     Object {
       "key": "recommendations_enabled",
@@ -2699,6 +6109,14 @@ Object {
       "key": "donations_enabled",
       "value": true,
     },
+    Object {
+      "key": "default_email_address",
+      "value": "noreply@127.0.0.1",
+    },
+    Object {
+      "key": "support_email_address",
+      "value": "support@example.com",
+    },
   ],
 }
 `;
diff --git a/ghost/core/test/e2e-api/admin/actions.test.js b/ghost/core/test/e2e-api/admin/actions.test.js
index 34af10d94a6..cbbd600d9ef 100644
--- a/ghost/core/test/e2e-api/admin/actions.test.js
+++ b/ghost/core/test/e2e-api/admin/actions.test.js
@@ -33,7 +33,7 @@ describe('Actions API', function () {
         postUpdatedAt = res.body.posts[0].updated_at;
 
         const res2 = await request
-            .get(localUtils.API.getApiQuery(`actions/?filter=resource_id:${postId}&include=actor`))
+            .get(localUtils.API.getApiQuery(`actions/?filter=${encodeURIComponent(`resource_id:'${postId}'`)}&include=actor`))
             .set('Origin', config.get('url'))
             .expect('Content-Type', /json/)
             .expect('Cache-Control', testUtils.cacheRules.private)
@@ -73,7 +73,7 @@ describe('Actions API', function () {
         postUpdatedAt = res3.body.posts[0].updated_at;
 
         const res4 = await request
-            .get(localUtils.API.getApiQuery(`actions/?filter=resource_id:${postId}&include=actor`))
+            .get(localUtils.API.getApiQuery(`actions/?filter=${encodeURIComponent(`resource_id:'${postId}'`)}&include=actor`))
             .set('Origin', config.get('url'))
             .expect('Content-Type', /json/)
             .expect('Cache-Control', testUtils.cacheRules.private)
@@ -113,7 +113,7 @@ describe('Actions API', function () {
             .expect(200);
 
         const res5 = await request
-            .get(localUtils.API.getApiQuery(`actions/?filter=resource_id:${postId}&include=actor`))
+            .get(localUtils.API.getApiQuery(`actions/?filter=${encodeURIComponent(`resource_id:'${postId}'`)}&include=actor`))
             .set('Origin', config.get('url'))
             .expect('Content-Type', /json/)
             .expect('Cache-Control', testUtils.cacheRules.private)
diff --git a/ghost/core/test/e2e-api/admin/activity-feed.test.js b/ghost/core/test/e2e-api/admin/activity-feed.test.js
index 13c2fe23967..897a895b6e1 100644
--- a/ghost/core/test/e2e-api/admin/activity-feed.test.js
+++ b/ghost/core/test/e2e-api/admin/activity-feed.test.js
@@ -9,7 +9,7 @@ const logging = require('@tryghost/logging');
 let agent;
 
 async function testPagination(skippedTypes, postId, totalExpected, limit) {
-    const postFilter = postId ? `+data.post_id:${postId}` : '';
+    const postFilter = postId ? `+data.post_id:'${postId}'` : '';
 
     // To make the test cover more edge cases, we test different limit configurations
     const {body: firstPage} = await agent
@@ -49,7 +49,7 @@ async function testPagination(skippedTypes, postId, totalExpected, limit) {
         const remaining = totalExpected - (page - 1) * limit;
 
         const {body: secondPage} = await agent
-            .get(`/members/events?filter=${encodeURIComponent(`type:-[${skippedTypes.join(',')}]${postFilter}+(data.created_at:<'${lastCreatedAt}',(data.created_at:'${lastCreatedAt}'+id:<${lastId}))`)}&limit=${limit}`)
+            .get(`/members/events?filter=${encodeURIComponent(`type:-[${skippedTypes.join(',')}]${postFilter}+(data.created_at:<'${lastCreatedAt}',(data.created_at:'${lastCreatedAt}'+id:<'${lastId}'))`)}&limit=${limit}`)
             .expectStatus(200)
             .matchHeaderSnapshot({
                 etag: anyEtag,
@@ -162,7 +162,7 @@ describe('Activity Feed API', function () {
             const memberId = fixtureManager.get('members', 0).id;
 
             await agent
-                .get(`/members/events?filter=${encodeURIComponent(`data.post_id:${postId},data.member_id:${memberId}`)}`)
+                .get(`/members/events?filter=${encodeURIComponent(`data.post_id:'${postId}',data.member_id:'${memberId}'`)}`)
                 .expectStatus(200)
                 .matchBodySnapshot({
                     events: new Array(10).fill({
@@ -180,7 +180,7 @@ describe('Activity Feed API', function () {
             const memberId = fixtureManager.get('members', 0).id;
 
             await agent
-                .get(`/members/events?filter=${encodeURIComponent(`(type:comment_event,type:click_event)+(data.post_id:${postId},data.member_id:${memberId})`)}`)
+                .get(`/members/events?filter=${encodeURIComponent(`(type:comment_event,type:click_event)+(data.post_id:'${postId}',data.member_id:'${memberId}')`)}`)
                 .expectStatus(200)
                 .matchBodySnapshot({
                     events: new Array(3).fill({
@@ -319,6 +319,48 @@ describe('Activity Feed API', function () {
             });
     });
 
+    it('Returns aggregated_click events in activity feed', async function () {
+        // Check activity feed
+        await agent
+            .get(`/members/events?filter=type:aggregated_click_event`)
+            .expectStatus(200)
+            .matchHeaderSnapshot({
+                etag: anyEtag,
+                'content-version': anyContentVersion
+            })
+            .matchBodySnapshot({
+                events: new Array(8).fill({
+                    type: 'aggregated_click_event',
+                    data: anyObject
+                })
+            })
+            .expect(({body}) => {
+                assert(body.events.find(e => e.type === 'aggregated_click_event'), 'Expected a aggregated_click event');
+                assert(!body.events.find(e => e.type !== 'aggregated_click_event'), 'Expected only aggregated_click events');
+            });
+    });
+
+    it('Returns aggregated_click events in activity feed with post_id filter', async function () {
+        const postId = fixtureManager.get('posts', 0).id;
+        await agent
+            .get(`/members/events?filter=type:aggregated_click_event${encodeURIComponent(`+data.post_id:'${postId}'`)}`)
+            .expectStatus(200)
+            .matchHeaderSnapshot({
+                etag: anyEtag,
+                'content-version': anyContentVersion
+            })
+            .matchBodySnapshot({
+                events: new Array(1).fill({
+                    type: 'aggregated_click_event',
+                    data: anyObject
+                })
+            })
+            .expect(({body}) => {
+                assert(body.events.find(e => e.type === 'aggregated_click_event'), 'Expected a aggregated_click event');
+                assert(!body.events.find(e => e.type !== 'aggregated_click_event'), 'Expected only aggregated_click events');
+            });
+    });
+
     it('Returns signup events in activity feed', async function () {
         // Check activity feed
         await agent
@@ -407,7 +449,7 @@ describe('Activity Feed API', function () {
         const postId = fixtureManager.get('posts', 0).id;
 
         await agent
-            .get(`/members/events?filter=data.post_id:${postId}&limit=20`)
+            .get(`/members/events?filter=data.post_id:'${postId}'&limit=20`)
             .expectStatus(200)
             .matchHeaderSnapshot({
                 etag: anyEtag,
@@ -441,7 +483,7 @@ describe('Activity Feed API', function () {
     it('Can limit events', async function () {
         const postId = fixtureManager.get('posts', 0).id;
         await agent
-            .get(`/members/events?filter=data.post_id:${postId}&limit=2`)
+            .get(`/members/events?filter=data.post_id:'${postId}'&limit=2`)
             .expectStatus(200)
             .matchHeaderSnapshot({
                 etag: anyEtag,
diff --git a/ghost/core/test/e2e-api/admin/authentication.test.js b/ghost/core/test/e2e-api/admin/authentication.test.js
new file mode 100644
index 00000000000..bb6504a3b43
--- /dev/null
+++ b/ghost/core/test/e2e-api/admin/authentication.test.js
@@ -0,0 +1,25 @@
+const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
+const {anyErrorId} = matchers;
+
+describe('Authentication API', function () {
+    let agent;
+
+    before(async function () {
+        agent = await agentProvider.getAdminAPIAgent();
+        await fixtureManager.init('users');
+        await agent.loginAsOwner();
+    });
+
+    describe('generateResetToken', function () {
+        it('Cannot generate reset token without required info', async function () {
+            await agent
+                .post('authentication/password_reset')
+                .expectStatus(400)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                });
+        });
+    });
+});
diff --git a/ghost/core/test/e2e-api/admin/config.test.js b/ghost/core/test/e2e-api/admin/config.test.js
index 4e2ad93bc40..d5816f727c4 100644
--- a/ghost/core/test/e2e-api/admin/config.test.js
+++ b/ghost/core/test/e2e-api/admin/config.test.js
@@ -1,69 +1,47 @@
-const should = require('should');
-const supertest = require('supertest');
-const testUtils = require('../../utils');
-const localUtils = require('./utils');
-const config = require('../../../core/shared/config');
-const configUtils = require('../../utils/configUtils');
-
+const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
+const {anyContentVersion, anyEtag, anyContentLength, stringMatching} = matchers;
+
+/**
+ * This is a snapshot test for the happy path of the config API
+ * It does not test the full range of possible config values
+ * as that should be tested in the unit tests for the public-config service
+ */
 describe('Config API', function () {
-    let request;
+    let agent;
 
     before(async function () {
-        await localUtils.startGhost();
-        request = supertest.agent(config.get('url'));
-        await localUtils.doAuth(request);
-    });
-
-    afterEach(function () {
-        configUtils.set('tenor:googleApiKey', undefined);
+        agent = await agentProvider.getAdminAPIAgent();
+        await fixtureManager.init('users');
     });
 
-    it('can retrieve config and all expected properties', async function () {
-        // set any non-default keys so we can be sure they're exposed
-        configUtils.set('tenor:googleApiKey', 'TENOR_KEY');
-
-        const res = await request
-            .get(localUtils.API.getApiQuery('config/'))
-            .set('Origin', config.get('url'))
-            .expect('Content-Type', /json/)
-            .expect('Cache-Control', testUtils.cacheRules.private)
-            .expect(200);
-
-        localUtils.API.checkResponse(res.body.config, 'config');
-
-        // full version
-        res.body.config.version.should.match(/\d+\.\d+\.\d+/);
+    describe('As Unauthorized User', function () {
+        it('Cannot fetch the config endpoint', async function () {
+            await agent.get('/config/')
+                .expectStatus(403);
+        });
     });
 
-    describe('mailgunIsConfigured', function () {
-        it('is a boolean when it is configured', async function () {
-            // set any non-default keys so we can be sure they're exposed
-            configUtils.set('bulkEmail', {
-                mailgun: 'exists'
-            });
-
-            const res = await request
-                .get(localUtils.API.getApiQuery('config/'))
-                .set('Origin', config.get('url'))
-                .expect('Content-Type', /json/)
-                .expect('Cache-Control', testUtils.cacheRules.private)
-                .expect(200);
-
-            should.equal(typeof res.body.config.mailgunIsConfigured, 'boolean');
+    describe('As Owner', function () {
+        before(async function () {
+            await agent.loginAsOwner();
         });
 
-        it('is a boolean when it is not configured', async function () {
-            // set any non-default keys so we can be sure they're exposed
-            configUtils.set('bulkEmail', {});
-
-            const res = await request
-                .get(localUtils.API.getApiQuery('config/'))
-                .set('Origin', config.get('url'))
-                .expect('Content-Type', /json/)
-                .expect('Cache-Control', testUtils.cacheRules.private)
-                .expect(200);
-
-            should.equal(typeof res.body.config.mailgunIsConfigured, 'boolean');
+        it('Can retrieve config and all expected properties', async function () {
+            await agent
+                .get('/config/')
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    config: {
+                        database: stringMatching(/sqlite3|mysql|mysql2/),
+                        environment: stringMatching(/^testing/),
+                        version: stringMatching(/\d+\.\d+\.\d+/)
+                    }
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    'content-length': anyContentLength, // Length can differ slightly based on the database, environment and version values
+                    etag: anyEtag
+                });
         });
     });
 });
diff --git a/ghost/core/test/e2e-api/admin/db.test.js b/ghost/core/test/e2e-api/admin/db.test.js
index daacc0b32ed..98000357993 100644
--- a/ghost/core/test/e2e-api/admin/db.test.js
+++ b/ghost/core/test/e2e-api/admin/db.test.js
@@ -103,4 +103,24 @@ describe('DB API', function () {
             }]
         });
     });
+
+    it('Handles invalid zip file uploads (central directory)', async function () {
+        const res = await request.post(localUtils.API.getApiQuery('db/'))
+            .set('Origin', config.get('url'))
+            .attach('importfile', 'test/utils/fixtures/import/zips/empty.zip')
+            .expect('Content-Type', /json/)
+            .expect(415);
+
+        res.body.errors[0].message.should.eql('The uploaded zip could not be read');
+    });
+
+    it('Handles invalid zip file uploads (malformed comments)', async function () {
+        const res = await request.post(localUtils.API.getApiQuery('db/'))
+            .set('Origin', config.get('url'))
+            .attach('importfile', 'test/utils/fixtures/import/zips/malformed-comments.zip')
+            .expect('Content-Type', /json/)
+            .expect(415);
+
+        res.body.errors[0].message.should.eql('The uploaded zip could not be read');
+    });
 });
diff --git a/ghost/core/test/e2e-api/admin/email-previews.test.js b/ghost/core/test/e2e-api/admin/email-previews.test.js
index a3d66da4878..1b5567d4ee9 100644
--- a/ghost/core/test/e2e-api/admin/email-previews.test.js
+++ b/ghost/core/test/e2e-api/admin/email-previews.test.js
@@ -4,6 +4,7 @@ const assert = require('assert/strict');
 const sinon = require('sinon');
 const escapeRegExp = require('lodash/escapeRegExp');
 const should = require('should');
+const settingsHelpers = require('../../../core/server/services/settings-helpers');
 
 // @TODO: factor out these requires
 const ObjectId = require('bson-objectid').default;
@@ -37,6 +38,7 @@ describe('Email Preview API', function () {
 
     beforeEach(function () {
         mockManager.mockMailgun();
+        sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test-validation-key');
     });
 
     before(async function () {
diff --git a/ghost/core/test/e2e-api/admin/emails.test.js b/ghost/core/test/e2e-api/admin/emails.test.js
index 7f49929930b..31b24b1edf4 100644
--- a/ghost/core/test/e2e-api/admin/emails.test.js
+++ b/ghost/core/test/e2e-api/admin/emails.test.js
@@ -4,6 +4,7 @@ const assert = require('assert/strict');
 const sinon = require('sinon');
 const jobManager = require('../../../core/server/services/jobs/job-service');
 const models = require('../../../core/server/models');
+const settingsHelpers = require('../../../core/server/services/settings-helpers');
 
 const matchEmail = {
     id: anyObjectId,
@@ -43,6 +44,7 @@ describe('Emails API', function () {
     beforeEach(function () {
         mockManager.mockEvents();
         mockManager.mockMailgun();
+        sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test-validation-key');
     });
 
     afterEach(function () {
diff --git a/ghost/core/test/e2e-api/admin/images.test.js b/ghost/core/test/e2e-api/admin/images.test.js
index 1df51c5e7e6..ee882b35cb4 100644
--- a/ghost/core/test/e2e-api/admin/images.test.js
+++ b/ghost/core/test/e2e-api/admin/images.test.js
@@ -1,6 +1,7 @@
 const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
 const FormData = require('form-data');
 const p = require('path');
+const fsExtra = require('fs-extra');
 const {promises: fs} = require('fs');
 const assert = require('assert/strict');
 const config = require('../../../core/shared/config');
@@ -185,6 +186,20 @@ describe('Images API', function () {
         await uploadImageCheck({path: originalFilePath, filename: 'loadingcat_square.gif', contentType: 'image/gif'});
     });
 
+    it('Will error when filename is too long', async function () {
+        const originalFilePath = p.join(__dirname, '/../../utils/fixtures/images/ghost-logo.png');
+        const fileContents = await fs.readFile(originalFilePath);
+        const loggingStub = sinon.stub(logging, 'error');
+        await uploadImageRequest({fileContents, filename: `${'a'.repeat(300)}.png`, contentType: 'image/png'})
+            .expectStatus(400)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+        sinon.assert.calledOnce(loggingStub);
+    });
+
     it('Can not upload a json file', async function () {
         const originalFilePath = p.join(__dirname, '/../../utils/fixtures/data/redirects.json');
         const fileContents = await fs.readFile(originalFilePath);
@@ -287,4 +302,102 @@ describe('Images API', function () {
         await uploadImageCheck({path: originalFilePath, filename: 'a.png', contentType: 'image/png'});
         clock.restore();
     });
+
+    it('Does not try to delete non-existing file upon invalid request', async function () {
+        sinon.stub(logging, 'error');
+        const unlinkStub = sinon.stub(fsExtra, 'unlink');
+
+        await agent
+            .post('/images/upload/')
+            .body(JSON.stringify({}))
+            .expectStatus(422)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+
+        // We didn't upload an image, so we shouldn't have called unlink
+        sinon.assert.notCalled(unlinkStub);
+    });
+
+    it('Errors when trying to upload invalid form body', async function () {
+        sinon.stub(logging, 'error');
+
+        await agent
+            .post('/images/upload/')
+            .header('Content-Type', 'multipart/form-data')
+            .body(new FormData())
+            .expectStatus(400)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+    });
+
+    it('Errors when image request body is broken', async function () {
+        // Manually construct a broken request body
+        const blob = await fetch('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==').then(res => res.blob());
+        const brokenPayload = '--boundary\r\nContent-Disposition: form-data; name=\"image\"; filename=\"example.png\"\r\nContent-Type: image/png\r\n\r\n';
+
+        // eslint-disable-next-line no-undef
+        const brokenDataBlob = await (new Blob([brokenPayload, blob.slice(0, blob.size / 2)], {
+            type: 'multipart/form-data; boundary=boundary'
+        })).text();
+
+        sinon.stub(logging, 'error');
+        await agent
+            .post('/images/upload/')
+            .header('Content-Type', 'multipart/form-data; boundary=boundary')
+            .body(brokenDataBlob)
+            .expectStatus(400)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+    });
+
+    it('Errors when image request body is broken #2', async function () {
+        // Manually construct a broken request body
+        const blob = await fetch('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==').then(res => res.blob());
+
+        // Note: this differs from above test by not including the boundary at the end of the payload
+        const brokenPayload = '--boundary\r\nContent-Disposition: form-data; name=\"image\"; filename=\"example.png\"\r\nContent-Type: image/png\r\n';
+
+        // eslint-disable-next-line no-undef
+        const brokenDataBlob = await (new Blob([brokenPayload, blob.slice(0, blob.size / 2)], {
+            type: 'multipart/form-data; boundary=boundary'
+        })).text();
+
+        sinon.stub(logging, 'error');
+        await agent
+            .post('/images/upload/')
+            .header('Content-Type', 'multipart/form-data; boundary=boundary')
+            .body(brokenDataBlob)
+            .expectStatus(400)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+    });
+
+    it('Does not return HTTP 500 when image processing fails', async function () {
+        sinon.stub(imageTransform, 'resizeFromPath').rejects(new Error('Image processing failed'));
+
+        const originalFilePath = p.join(__dirname, '/../../utils/fixtures/images/ghost-logo.png');
+        const fileContents = await fs.readFile(originalFilePath);
+
+        const loggingStub = sinon.stub(logging, 'error');
+        await uploadImageRequest({fileContents, filename: 'test.png', contentType: 'image/png'})
+            .expectStatus(400)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+        sinon.assert.calledOnce(loggingStub);
+    });
 });
diff --git a/ghost/core/test/e2e-api/admin/integrations.test.js b/ghost/core/test/e2e-api/admin/integrations.test.js
index 977aba19068..b24001f67b0 100644
--- a/ghost/core/test/e2e-api/admin/integrations.test.js
+++ b/ghost/core/test/e2e-api/admin/integrations.test.js
@@ -262,7 +262,7 @@ describe('Integrations API', function () {
         should.equal(updatedIntegration.id, createdIntegration.id);
         updatedAdminApiKey.secret.should.not.eql(adminApiKey.secret);
 
-        const res3 = await request.get(localUtils.API.getApiQuery(`actions/?filter=resource_id:${adminApiKey.id}&include=actor`))
+        const res3 = await request.get(localUtils.API.getApiQuery(`actions/?filter=resource_id:'${adminApiKey.id}'&include=actor`))
             .set('Origin', config.get('url'))
             .expect('Content-Type', /json/)
             .expect('Cache-Control', testUtils.cacheRules.private)
diff --git a/ghost/core/test/e2e-api/admin/invites.test.js b/ghost/core/test/e2e-api/admin/invites.test.js
index 16d6ee62a3c..3c55fbff5ec 100644
--- a/ghost/core/test/e2e-api/admin/invites.test.js
+++ b/ghost/core/test/e2e-api/admin/invites.test.js
@@ -224,32 +224,5 @@ describe('Invites API', function () {
                 .expect('Cache-Control', testUtils.cacheRules.private)
                 .expect(403);
         });
-
-        it('Can add a new invite by API Key with the Contributor Role', async function () {
-            const roleId = testUtils.getExistingData().roles.find(role => role.name === 'Contributor').id;
-            const res = await request
-                .post(localUtils.API.getApiQuery('invites/'))
-                .set('Authorization', `Ghost ${localUtils.getValidAdminToken('/admin/')}`)
-                .send({
-                    invites: [{email: 'admin-api-key-test@example.com', role_id: roleId}]
-                })
-                .expect('Content-Type', /json/)
-                .expect('Cache-Control', testUtils.cacheRules.private)
-                .expect(201);
-
-            should.not.exist(res.headers['x-cache-invalidate']);
-            const jsonResponse = res.body;
-            should.exist(jsonResponse);
-            should.exist(jsonResponse.invites);
-            jsonResponse.invites.should.have.length(1);
-
-            localUtils.API.checkResponse(jsonResponse.invites[0], 'invite');
-            jsonResponse.invites[0].role_id.should.eql(roleId);
-
-            mailService.GhostMailer.prototype.send.called.should.be.true();
-
-            should.exist(res.headers.location);
-            res.headers.location.should.equal(`http://127.0.0.1:2369${localUtils.API.getApiQuery('invites/')}${res.body.invites[0].id}/`);
-        });
     });
 });
diff --git a/ghost/core/test/e2e-api/admin/key-authentication.test.js b/ghost/core/test/e2e-api/admin/key-authentication.test.js
index 04a52420c75..a33acb93c1c 100644
--- a/ghost/core/test/e2e-api/admin/key-authentication.test.js
+++ b/ghost/core/test/e2e-api/admin/key-authentication.test.js
@@ -40,6 +40,16 @@ describe('Admin API key authentication', function () {
         sinon.assert.calledOnce(loggingStub);
     });
 
+    it('Responds with a 401 when token is used before not before', async function () {
+        await request.get(localUtils.API.getApiQuery('posts/'))
+            .set('Authorization', `Ghost ${localUtils.getValidAdminToken('/admin/', 0, {
+                notBefore: '7d'
+            })}`)
+            .expect('Content-Type', /json/)
+            .expect('Cache-Control', testUtils.cacheRules.private)
+            .expect(401);
+    });
+
     it('Can access browse endpoint with correct token', async function () {
         await request.get(localUtils.API.getApiQuery('posts/'))
             .set('Authorization', `Ghost ${localUtils.getValidAdminToken('/admin/')}`)
diff --git a/ghost/core/test/e2e-api/admin/links.test.js b/ghost/core/test/e2e-api/admin/links.test.js
index 2ae49a791bd..3b49610af4c 100644
--- a/ghost/core/test/e2e-api/admin/links.test.js
+++ b/ghost/core/test/e2e-api/admin/links.test.js
@@ -50,7 +50,7 @@ describe('Links API', function () {
         });
         const postId = siteLink.post_id;
         const originalTo = siteLink.link.to;
-        const filter = `post_id:${postId}+to:'${originalTo}'`;
+        const filter = `post_id:'${postId}'+to:'${originalTo}'`;
 
         // Wait minimum 2 seconds
         clock.tick(2 * 1000);
@@ -122,7 +122,7 @@ describe('Links API', function () {
         });
         const postId = siteLink.post_id;
         const originalTo = siteLink.link.to;
-        const filter = `post_id:${postId}+to:'${originalTo}'`;
+        const filter = `post_id:'${postId}'+to:'${originalTo}'`;
 
         // Wait minimum 2 seconds
         clock.tick(2 * 1000);
@@ -187,7 +187,7 @@ describe('Links API', function () {
         });
         const postId = siteLink.post_id;
         const originalTo = 'https://empty.example.com';
-        const filter = `post_id:${postId}+to:'${originalTo}'`;
+        const filter = `post_id:'${postId}'+to:'${originalTo}'`;
         await agent
             .put(`links/bulk/?filter=${encodeURIComponent(filter)}`)
             .body({
diff --git a/ghost/core/test/e2e-api/admin/media.test.js b/ghost/core/test/e2e-api/admin/media.test.js
index 2113164ca03..0baaef3e5ad 100644
--- a/ghost/core/test/e2e-api/admin/media.test.js
+++ b/ghost/core/test/e2e-api/admin/media.test.js
@@ -130,6 +130,52 @@ describe('Media API', function () {
             res.body.errors[0].message.should.match(/select a valid media file/gi);
             sinon.assert.calledOnce(loggingStub);
         });
+
+        it('Errors when media request body is broken', async function () {
+            // Manually construct a broken request body
+
+            // Note: still using png mime type here but it doesn't matter because we're sending an invalid
+            // request body anyway
+            const blob = await fetch('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==').then(res => res.blob());
+            const brokenPayload = '--boundary\r\nContent-Disposition: form-data; name=\"image\"; filename=\"example.png\"\r\nContent-Type: image/png\r\n\r\n';
+
+            // eslint-disable-next-line no-undef
+            const brokenDataBlob = await (new Blob([brokenPayload, blob.slice(0, blob.size / 2)], {
+                type: 'multipart/form-data; boundary=boundary'
+            })).text();
+
+            sinon.stub(logging, 'error');
+            const res = await request.post(localUtils.API.getApiQuery('media/upload'))
+                .set('Content-Type', 'multipart/form-data; boundary=boundary')
+                .send(brokenDataBlob)
+                .expect(400);
+
+            res.body.errors[0].message.should.match(/The request could not be understood./gi);
+        });
+
+        it('Errors when media request body is broken #2', async function () {
+            // Manually construct a broken request body
+
+            // Note: still using png mime type here but it doesn't matter because we're sending an invalid
+            // request body anyway
+            const blob = await fetch('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==').then(res => res.blob());
+
+            // Note: this differs from above test by not including the boundary at the end of the payload
+            const brokenPayload = '--boundary\r\nContent-Disposition: form-data; name=\"image\"; filename=\"example.png\"\r\nContent-Type: image/png\r\n';
+
+            // eslint-disable-next-line no-undef
+            const brokenDataBlob = await (new Blob([brokenPayload, blob.slice(0, blob.size / 2)], {
+                type: 'multipart/form-data; boundary=boundary'
+            })).text();
+
+            sinon.stub(logging, 'error');
+            const res = await request.post(localUtils.API.getApiQuery('media/upload'))
+                .set('Content-Type', 'multipart/form-data; boundary=boundary')
+                .send(brokenDataBlob)
+                .expect(400);
+
+            res.body.errors[0].message.should.match(/The request could not be understood./gi);
+        });
     });
 
     describe('media/thumbnail/upload', function () {
diff --git a/ghost/core/test/e2e-api/admin/members-exporter.test.js b/ghost/core/test/e2e-api/admin/members-exporter.test.js
index 97b9f76aac1..84b81fb3f96 100644
--- a/ghost/core/test/e2e-api/admin/members-exporter.test.js
+++ b/ghost/core/test/e2e-api/admin/members-exporter.test.js
@@ -38,7 +38,7 @@ function basicAsserts(member, row) {
 async function testOutput(member, asserts, filters = []) {
     // Add default filters that always should match
     filters.push('limit=all');
-    filters.push(`filter=id:${member.id}`);
+    filters.push(`filter=id:'${member.id}'`);
 
     for (const filter of filters) {
         // Test all
@@ -61,7 +61,7 @@ async function testOutput(member, asserts, filters = []) {
 
         asserts(row);
 
-        if (filter === 'filter=id:${member.id}') {
+        if (filter === `filter=id:'${member.id}'`) {
             csv.data.length.should.eql(1);
         }
     }
diff --git a/ghost/core/test/e2e-api/admin/members-importer.test.js b/ghost/core/test/e2e-api/admin/members-importer.test.js
index 3bc9da57ec2..aac482e664d 100644
--- a/ghost/core/test/e2e-api/admin/members-importer.test.js
+++ b/ghost/core/test/e2e-api/admin/members-importer.test.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const assert = require('assert/strict');
 const should = require('should');
 const supertest = require('supertest');
 const testUtils = require('../../utils');
@@ -312,4 +313,15 @@ describe('Members Importer API', function () {
 
         postLabelRemoveBrowseResponse.body.members.should.have.length(0);
     });
+
+    it('Can handle empty body', async function () {
+        const res = await request
+            .post(localUtils.API.getApiQuery(`members/upload/`))
+            .set('Origin', config.get('url'))
+            .expect('Content-Type', /json/)
+            .expect('Cache-Control', testUtils.cacheRules.private)
+            .expect(422);
+
+        assert.equal(res.body.errors[0].message, 'Please select a members CSV file.');
+    });
 });
diff --git a/ghost/core/test/e2e-api/admin/members.test.js b/ghost/core/test/e2e-api/admin/members.test.js
index 72c4caac3da..fb7f6bdfdb4 100644
--- a/ghost/core/test/e2e-api/admin/members.test.js
+++ b/ghost/core/test/e2e-api/admin/members.test.js
@@ -21,7 +21,7 @@ const urlUtils = require('../../../core/shared/url-utils');
 const settingsCache = require('../../../core/shared/settings-cache');
 const DomainEvents = require('@tryghost/domain-events');
 const logging = require('@tryghost/logging');
-const {stripeMocker} = require('../../utils/e2e-framework-mock-manager');
+const {stripeMocker, mockLabsDisabled} = require('../../utils/e2e-framework-mock-manager');
 
 /**
  * Assert that haystack and needles match, ignoring the order.
@@ -66,6 +66,16 @@ async function getNewsletters() {
     return (await models.Newsletter.findAll({filter: 'status:active'})).models;
 }
 
+async function createMember(data) {
+    const member = await models.Member.add({
+        name: '',
+        email_disabled: false,
+        ...data
+    });
+
+    return member;
+}
+
 const newsletterSnapshot = {
     id: anyObjectId
 };
@@ -184,6 +194,7 @@ describe('Members API without Stripe', function () {
 
     beforeEach(function () {
         mockManager.mockMail();
+        mockLabsDisabled('newEmailAddresses');
     });
 
     afterEach(function () {
@@ -543,7 +554,7 @@ describe('Members API', function () {
             });
     });
 
-    it('Can filter by signup attribution', async function () {
+    it('Can filter by conversion attribution', async function () {
         await agent
             .get('/members/?filter=conversion:' + fixtureManager.get('posts', 0).id)
             .expectStatus(200)
@@ -893,6 +904,7 @@ describe('Members API', function () {
         await agent.delete(`/members/${memberFailVerification.id}`);
 
         await configUtils.restore();
+        settingsCache.set('email_verification_required', false);
     });
 
     it('Can add and send a signup confirmation email', async function () {
@@ -1006,6 +1018,85 @@ describe('Members API', function () {
             .expectStatus(200);
     });
 
+    it('Does not send a signup email when email verification is required', async function () {
+        mockManager.mockSetting('email_verification_required', true);
+
+        const member = {
+            name: 'Do not Send Me Confirmation',
+            email: 'member_not_getting_confirmation@test.com',
+            newsletters: [
+                newsletters[0],
+                newsletters[1]
+            ]
+        };
+
+        const {body} = await agent
+            .post('/members/?send_email=true&email_type=signup')
+            .body({members: [member]})
+            .expectStatus(201)
+            .matchBodySnapshot({
+                members: [
+                    buildMemberWithoutIncludesSnapshot({
+                        newsletters: 2
+                    })
+                ]
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag,
+                location: anyString
+            });
+
+        const newMember = body.members[0];
+
+        emailMockReceiver
+            .assertSentEmailCount(0);
+
+        await assertMemberEvents({
+            eventType: 'MemberStatusEvent',
+            memberId: newMember.id,
+            asserts: [
+                {
+                    from_status: null,
+                    to_status: 'free'
+                }
+            ]
+        });
+
+        await assertMemberEvents({
+            eventType: 'MemberSubscribeEvent',
+            memberId: newMember.id,
+            asserts: [
+                {
+                    subscribed: true,
+                    source: 'admin',
+                    newsletter_id: newsletters[0].id
+                },
+                {
+                    subscribed: true,
+                    source: 'admin',
+                    newsletter_id: newsletters[1].id
+                }
+            ]
+        });
+
+        // @TODO: do we really need to delete this member here?
+        await agent
+            .delete(`members/${body.members[0].id}/`)
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            })
+            .expectStatus(204);
+
+        // There should be no MemberSubscribeEvent remaining.
+        await assertMemberEvents({
+            eventType: 'MemberSubscribeEvent',
+            memberId: newMember.id,
+            asserts: []
+        });
+    });
+
     it('Add should fail when passing incorrect email_type query parameter', async function () {
         const newMember = {
             name: 'test',
@@ -1617,6 +1708,29 @@ describe('Members API', function () {
         should.deepEqual(memberWithPaidSubscription, readMember, 'Editing a member returns a different format than reading a member');
     });
 
+    it('Cannot add unknown tiers to a member', async function () {
+        const memberId = testUtils.DataGenerator.Content.members[0].id;
+        const unknownProductId = 'blahblahid';
+
+        sinon.stub(logging, 'error');
+
+        await agent
+            .put(`/members/${memberId}/`)
+            .body({
+                members: [{
+                    tiers: [{
+                        id: unknownProductId
+                    }]
+                }]
+            })
+            .expectStatus(400)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+    });
+
     it('Cannot add complimentary subscriptions to a member with an active subscription', async function () {
         if (!memberWithPaidSubscription) {
             // Previous test failed
@@ -1948,7 +2062,7 @@ describe('Members API', function () {
 
         // Check activity feed
         const {body: eventsBody} = await agent
-            .get(`/members/events?filter=data.member_id:${newMember.id}`)
+            .get(`/members/events?filter=data.member_id:'${newMember.id}'`)
             .body({members: [memberChanged]})
             .expectStatus(200)
             .matchHeaderSnapshot({
@@ -2097,6 +2211,150 @@ describe('Members API', function () {
             });
     });
 
+    it('can change the email address', async function () {
+        const memberToChange = {
+            name: 'Jon Snow',
+            email: 'jon.snow@test.com',
+            newsletters: []
+        };
+
+        const memberChanged = {
+            email: 'aegon.targaryen@test.com'
+        };
+
+        // Create member
+        const {body} = await agent
+            .post(`/members/`)
+            .body({members: [memberToChange]})
+            .expectStatus(201)
+            .matchBodySnapshot({
+                members: new Array(1).fill(buildMemberMatcherShallowIncludesWithTiers(0, 0))
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag,
+                location: anyLocationFor('members')
+            });
+
+        // Update email address
+        const newMember = body.members[0];
+        await agent
+            .put(`/members/${newMember.id}/`)
+            .body({members: [memberChanged]})
+            .expectStatus(200)
+            .matchBodySnapshot({
+                members: new Array(1).fill(buildMemberMatcherShallowIncludesWithTiers(0, 0))
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+
+        // Check member events
+        await assertMemberEvents({
+            eventType: 'MemberEmailChangeEvent',
+            memberId: newMember.id,
+            asserts: [
+                {
+                    from_email: 'jon.snow@test.com',
+                    to_email: 'aegon.targaryen@test.com'
+                }
+            ]
+        });
+
+        // Check activity feed
+        const {body: eventsBody} = await agent
+            .get(`/members/events?filter=data.member_id:'${newMember.id}'`)
+            .body({members: [memberChanged]})
+            .expectStatus(200)
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+
+        const events = eventsBody.events;
+
+        matchArrayWithoutOrder(events, [
+            {
+                type: 'email_change_event',
+                data: {
+                    from_email: 'jon.snow@test.com',
+                    to_email: 'aegon.targaryen@test.com'
+                }
+            },
+            {
+                type: 'signup_event'
+            }
+        ]);
+    });
+
+    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();
+        });
+    });
+
+    // Log out
+    it('Can log out', async function () {
+        const member = await createMember({
+            name: 'test',
+            email: 'member-log-out-test@test.com'
+        });
+
+        const startTransientId = member.get('transient_id');
+
+        await agent
+            .delete(`/members/${member.id}/sessions/`)
+            .expectStatus(204)
+            .matchBodySnapshot()
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+
+        await member.refresh();
+        assert.notEqual(member.get('transient_id'), startTransientId, 'The transient_id should have changed');
+    });
+
     // Delete a member
 
     it('Can destroy', async function () {
@@ -2960,7 +3218,7 @@ describe('Members API Bulk operations', function () {
         should(model.relations.newsletters.models.length).equal(newsletterCount, 'This test requires a member with 2 or more newsletters');
 
         await agent
-            .put(`/members/bulk/?filter=id:${member.id}`)
+            .put(`/members/bulk/?filter=id:'${member.id}'`)
             .body({bulk: {
                 action: 'unsubscribe'
             }})
@@ -2988,7 +3246,7 @@ describe('Members API Bulk operations', function () {
 
         // When we do it again, we should still receive a count of 1, because we unsubcribed one member (who happens to be already unsubscribed)
         await agent
-            .put(`/members/bulk/?filter=id:${member.id}`)
+            .put(`/members/bulk/?filter=id:'${member.id}'`)
             .body({bulk: {
                 action: 'unsubscribe'
             }})
@@ -3226,7 +3484,7 @@ describe('Members API Bulk operations', function () {
         should(model2.relations.labels.models.map(m => m.id)).match([firstId, secondId]);
 
         await agent
-            .put(`/members/bulk/?filter=id:${member1.id}`)
+            .put(`/members/bulk/?filter=id:'${member1.id}'`)
             .body({bulk: {
                 action: 'removeLabel',
                 meta: {
diff --git a/ghost/core/test/e2e-api/admin/newsletters.test.js b/ghost/core/test/e2e-api/admin/newsletters.test.js
index eca76b78084..fbafff8829b 100644
--- a/ghost/core/test/e2e-api/admin/newsletters.test.js
+++ b/ghost/core/test/e2e-api/admin/newsletters.test.js
@@ -1,10 +1,12 @@
 const assert = require('assert/strict');
 const sinon = require('sinon');
 const {agentProvider, mockManager, fixtureManager, configUtils, dbUtils, matchers, regexes} = require('../../utils/e2e-framework');
-const {anyContentVersion, anyEtag, anyObjectId, anyUuid, anyISODateTime, anyLocationFor, anyNumber} = matchers;
+const {anyContentVersion, anyEtag, anyObjectId, anyUuid, anyErrorId, anyISODateTime, anyLocationFor, anyNumber} = matchers;
 const {queryStringToken} = regexes;
 const models = require('../../../core/server/models');
 const logging = require('@tryghost/logging');
+const {mockLabsDisabled, mockLabsEnabled} = require('../../utils/e2e-framework-mock-manager');
+const settingsHelpers = require('../../../core/server/services/settings-helpers');
 
 const assertMemberRelationCount = async (newsletterId, expectedCount) => {
     const relations = await dbUtils.knex('members_newsletters').where({newsletter_id: newsletterId}).pluck('id');
@@ -12,6 +14,16 @@ const assertMemberRelationCount = async (newsletterId, expectedCount) => {
     assert.equal(relations.length, expectedCount);
 };
 
+// Change directly in database, to test edge cases
+async function editNewsletter(id, changes) {
+    await dbUtils.knex('newsletters').where({id}).update(changes);
+}
+
+// Get directly from the database
+async function getNewsletter(id) {
+    return (await dbUtils.knex('newsletters').where({id}))[0];
+}
+
 const newsletterSnapshot = {
     id: anyObjectId,
     uuid: anyUuid,
@@ -39,6 +51,7 @@ describe('Newsletters API', function () {
 
     beforeEach(function () {
         emailMockReceiver = mockManager.mockMail();
+        mockLabsDisabled('newEmailAddresses');
     });
 
     afterEach(function () {
@@ -358,6 +371,103 @@ describe('Newsletters API', function () {
             }]);
     });
 
+    it('[Legacy] Can only set newsletter reply to to newsletter or support value', async function () {
+        const id = fixtureManager.get('newsletters', 0).id;
+
+        await agent.put(`newsletters/${id}`)
+            .body({
+                newsletters: [{
+                    sender_reply_to: 'support'
+                }]
+            })
+            .expectStatus(200)
+            .matchBodySnapshot({
+                newsletters: [newsletterSnapshot]
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+
+        await agent.put(`newsletters/${id}`)
+            .body({
+                newsletters: [{
+                    sender_reply_to: 'newsletter'
+                }]
+            })
+            .expectStatus(200)
+            .matchBodySnapshot({
+                newsletters: [newsletterSnapshot]
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+    });
+
+    it('[Legacy] Cannot set newsletter clear sender_reply_to', async function () {
+        const id = fixtureManager.get('newsletters', 0).id;
+
+        await agent.put(`newsletters/${id}`)
+            .body({
+                newsletters: [{
+                    sender_reply_to: ''
+                }]
+            })
+            .expectStatus(422)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+    });
+
+    it('[Legacy] Cannot set newsletter reply-to to any email address', async function () {
+        const id = fixtureManager.get('newsletters', 0).id;
+
+        await agent.put(`newsletters/${id}`)
+            .body({
+                newsletters: [{
+                    sender_reply_to: 'hello@acme.com'
+                }]
+            })
+            .expectStatus(422)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+    });
+
+    it('[Legacy] Cannot set newsletter sender_email to invalid email address', async function () {
+        const id = fixtureManager.get('newsletters', 0).id;
+
+        await agent.put(`newsletters/${id}`)
+            .body({
+                newsletters: [{
+                    sender_email: 'notvalid'
+                }]
+            })
+            .expectStatus(422)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            })
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                etag: anyEtag
+            });
+    });
+
     it('Can verify property updates', async function () {
         const cheerio = require('cheerio');
 
@@ -760,4 +870,1009 @@ describe('Newsletters API', function () {
                 etag: anyEtag
             });
     });
+
+    describe('Managed email without custom sending domain', function () {
+        this.beforeEach(function () {
+            configUtils.set('hostSettings:managedEmail:enabled', true);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', null);
+            configUtils.set('mail:from', 'default@email.com');
+        });
+
+        describe('Auto correcting invalid domains', function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            beforeEach(async function () {
+                // Invalid situation in the database)
+                await editNewsletter(id, {
+                    sender_email: 'notvalid@acme.com',
+                    sender_reply_to: 'newsletter'
+                });
+            });
+
+            after(async function () {
+                // Reset
+                await editNewsletter(id, {
+                    sender_email: null,
+                    sender_reply_to: 'newsletter'
+                });
+            });
+
+            it('Read returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter', async function () {
+                const {body} = await agent.get(`newsletters/${id}`)
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(body.newsletters[0].sender_email, null);
+                assert.equal(body.newsletters[0].sender_reply_to, 'notvalid@acme.com');
+            });
+
+            it('Browse returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter', async function () {
+                const {body} = await agent.get(`newsletters`)
+                    .expectStatus(200)
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = body.newsletters.find(n => n.id === id);
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(newsletter.sender_email, null);
+                assert.equal(newsletter.sender_reply_to, 'notvalid@acme.com');
+            });
+
+            it('Resets sender_email when editing the newsletter reply_to address', async function () {
+                await agent.put(`newsletters/${id}`)
+                    .body({
+                        newsletters: [{
+                            sender_reply_to: 'support'
+                        }]
+                    })
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = await getNewsletter(id);
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(newsletter.sender_email, null);
+                assert.equal(newsletter.sender_reply_to, 'support');
+            });
+
+            it('Resets sender_email when editing the newsletter reply_to address in combination with resetting sender email', async function () {
+                await agent.put(`newsletters/${id}`)
+                    .body({
+                        newsletters: [{
+                            sender_email: null,
+                            sender_reply_to: 'something@allowed.com'
+                        }]
+                    })
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = await getNewsletter(id);
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(newsletter.sender_email, null);
+                assert.equal(newsletter.sender_reply_to, 'newsletter'); // required validation
+            });
+
+            it('Resets sender_email when editing the newsletter reply_to address in combination with keeping sender email', async function () {
+                await agent.put(`newsletters/${id}`)
+                    .body({
+                        newsletters: [{
+                            sender_email: 'notvalid@acme.com',
+                            sender_reply_to: 'something@allowed.com'
+                        }]
+                    })
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = await getNewsletter(id);
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(newsletter.sender_email, null);
+                assert.equal(newsletter.sender_reply_to, 'newsletter'); // required validation
+            });
+
+            it('Can switch sender_email to sender_reply_to without validation', async function () {
+                // The frontend will try to do this because it gets the mapped values from the API
+                await agent.put(`newsletters/${id}`)
+                    .body({
+                        newsletters: [{
+                            sender_email: null,
+                            sender_reply_to: 'notvalid@acme.com'
+                        }]
+                    })
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = await getNewsletter(id);
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(newsletter.sender_email, null);
+                assert.equal(newsletter.sender_reply_to, 'notvalid@acme.com'); // did not require validation
+            });
+
+            it('Does not reset sender_email when editing the newsletter (not the reply-to address)', async function () {
+                await agent.put(`newsletters/${id}`)
+                    .body({
+                        newsletters: [{
+                            name: 'My changed newsletter name'
+                        }]
+                    })
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = await getNewsletter(id);
+                assert.equal(newsletter.name, 'My changed newsletter name');
+                assert.equal(newsletter.sender_email, 'notvalid@acme.com');
+                assert.equal(newsletter.sender_reply_to, 'newsletter');
+            });
+        });
+
+        it('Can set newsletter reply-to to newsletter or support', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'support'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'newsletter'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot clear newsletter reply-to', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: ''
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot set newsletter reply-to to invalid email address', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'notvalid'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Can set newsletter reply-to to any email address with required verification', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            const before = await models.Newsletter.findOne({id});
+            const beforeSenderReplyTo = before.get('sender_reply_to');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'hello@acme.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot],
+                    meta: {
+                        sent_email_verification: ['sender_reply_to']
+                    }
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            await before.refresh();
+            assert.equal(before.get('sender_reply_to'), beforeSenderReplyTo, 'sender_reply_to should not have changed because it first requires verification');
+
+            emailMockReceiver
+                .assertSentEmailCount(1)
+                .matchMetadataSnapshot()
+                .matchHTMLSnapshot([{
+                    pattern: queryStringToken('verifyEmail'),
+                    replacement: 'verifyEmail=REPLACED_TOKEN'
+                }])
+                .matchPlaintextSnapshot([{
+                    pattern: queryStringToken('verifyEmail'),
+                    replacement: 'verifyEmail=REPLACED_TOKEN'
+                }]);
+        });
+
+        it('Can set newsletter reply-to to the default address without requiring verification', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            const before = await models.Newsletter.findOne({id});
+            const beforeEmail = before.get('sender_reply_to');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'default@email.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            // No verification
+            emailMockReceiver.assertSentEmailCount(0);
+
+            await before.refresh();
+            assert.equal(before.get('sender_reply_to'), 'default@email.com');
+
+            // Revert back
+            before.set('sender_reply_to', beforeEmail);
+            await before.save();
+        });
+
+        it('Cannot change sender_email', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: 'hello@acme.com'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot set newsletter sender_email to invalid email address', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: 'notvalid'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Can keep sender_email', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            // Invalid situation in the database)
+            await editNewsletter(id, {
+                sender_email: 'existing@acme.com',
+                sender_reply_to: 'newsletter'
+            });
+
+            const before = await models.Newsletter.findOne({id});
+            assert(before.get('sender_email'), 'This test requires a non empty sender_email');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: before.get('sender_email')
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            // No verification
+            emailMockReceiver.assertSentEmailCount(0);
+        });
+
+        it('Can set sender_email to default address', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            const before = await models.Newsletter.findOne({id});
+            assert(before.get('sender_email'), 'This test requires a non empty sender_email');
+            const defaultAddress = settingsHelpers.getDefaultEmail().address;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: defaultAddress
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            // No verification
+            emailMockReceiver.assertSentEmailCount(0);
+        });
+
+        it('Can clear sender_email', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            const before = await models.Newsletter.findOne({id});
+            const beforeEmail = before.get('sender_email');
+            assert(before.get('sender_email'), 'This test requires a non empty sender_email');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: ''
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            // No verification
+            emailMockReceiver.assertSentEmailCount(0);
+
+            // Revert back
+            await before.refresh();
+            before.set('sender_email', beforeEmail);
+            await before.save();
+        });
+    });
+
+    describe('Managed email with custom sending domain', function () {
+        this.beforeEach(function () {
+            configUtils.set('hostSettings:managedEmail:enabled', true);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', 'sendingdomain.com');
+        });
+
+        describe('Auto correcting invalid domains', function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            beforeEach(async function () {
+                // Invalid situation in the database)
+                await editNewsletter(id, {
+                    sender_email: 'notvalid@acme.com',
+                    sender_reply_to: 'newsletter'
+                });
+            });
+
+            after(async function () {
+                // Reset
+                await editNewsletter(id, {
+                    sender_email: null,
+                    sender_reply_to: 'newsletter'
+                });
+            });
+
+            it('Read returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter', async function () {
+                const {body} = await agent.get(`newsletters/${id}`)
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(body.newsletters[0].sender_email, null);
+                assert.equal(body.newsletters[0].sender_reply_to, 'notvalid@acme.com');
+            });
+
+            it('Browse returns sender_email as sender_reply_to in case we cannot send from sender_email and sender_reply_to is set to newsletter', async function () {
+                const {body} = await agent.get(`newsletters`)
+                    .expectStatus(200)
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = body.newsletters.find(n => n.id === id);
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(newsletter.sender_email, null);
+                assert.equal(newsletter.sender_reply_to, 'notvalid@acme.com');
+            });
+
+            it('Resets sender_email when editing the newsletter reply_to address', async function () {
+                await agent.put(`newsletters/${id}`)
+                    .body({
+                        newsletters: [{
+                            sender_reply_to: 'support'
+                        }]
+                    })
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = await getNewsletter(id);
+
+                // Do a manual check to make sure we don't accidentally change snapshots
+                assert.equal(newsletter.sender_email, null);
+                assert.equal(newsletter.sender_reply_to, 'support');
+            });
+
+            it('Does not reset sender_email when editing the newsletter (not the reply-to address)', async function () {
+                await agent.put(`newsletters/${id}`)
+                    .body({
+                        newsletters: [{
+                            name: 'My changed newsletter name'
+                        }]
+                    })
+                    .expectStatus(200)
+                    .matchBodySnapshot({
+                        newsletters: [newsletterSnapshot]
+                    })
+                    .matchHeaderSnapshot({
+                        'content-version': anyContentVersion,
+                        etag: anyEtag
+                    });
+
+                const newsletter = await getNewsletter(id);
+                assert.equal(newsletter.name, 'My changed newsletter name');
+                assert.equal(newsletter.sender_email, 'notvalid@acme.com');
+                assert.equal(newsletter.sender_reply_to, 'newsletter');
+            });
+        });
+
+        it('Can set newsletter reply-to to newsletter or support', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'support'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'newsletter'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot clear newsletter reply-to', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: ''
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot set newsletter reply-to to invalid email address', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'notvalid'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Can set newsletter reply-to to any email address with required verification', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            const before = await models.Newsletter.findOne({id});
+            const beforeSenderReplyTo = before.get('sender_reply_to');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'hello@acme.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot],
+                    meta: {
+                        sent_email_verification: ['sender_reply_to']
+                    }
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            await before.refresh();
+            assert.equal(before.get('sender_reply_to'), beforeSenderReplyTo, 'sender_reply_to should not have changed because it first requires verification');
+
+            emailMockReceiver
+                .assertSentEmailCount(1)
+                .matchMetadataSnapshot()
+                .matchHTMLSnapshot([{
+                    pattern: queryStringToken('verifyEmail'),
+                    replacement: 'verifyEmail=REPLACED_TOKEN'
+                }])
+                .matchPlaintextSnapshot([{
+                    pattern: queryStringToken('verifyEmail'),
+                    replacement: 'verifyEmail=REPLACED_TOKEN'
+                }]);
+        });
+
+        it('Can set newsletter reply-to to matching sending domain without required verification', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'anything@sendingdomain.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            const before = await models.Newsletter.findOne({id});
+            assert.equal(before.get('sender_reply_to'), 'anything@sendingdomain.com');
+
+            emailMockReceiver
+                .assertSentEmailCount(0);
+        });
+
+        it('Cannot change sender_email to non matching domain', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: 'hello@acme.com'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot set newsletter sender_email to invalid email address', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: 'notvalid'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Can keep sender_email', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            // Invalid situation in the database)
+            await editNewsletter(id, {
+                sender_email: 'existing@acme.com',
+                sender_reply_to: 'newsletter'
+            });
+
+            const before = await models.Newsletter.findOne({id});
+            assert(before.get('sender_email'), 'This test requires a non empty sender_email');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: before.get('sender_email')
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Can set sender_email to address matching sending domain, without verification', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: 'anything@sendingdomain.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            const before = await models.Newsletter.findOne({id});
+            assert.equal(before.get('sender_email'), 'anything@sendingdomain.com');
+
+            emailMockReceiver
+                .assertSentEmailCount(0);
+        });
+
+        it('Can clear sender_email', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            const before = await models.Newsletter.findOne({id});
+            const beforeEmail = before.get('sender_email');
+            assert(before.get('sender_email'), 'This test requires a non empty sender_email');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: ''
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            // Revert back
+            await before.refresh();
+            before.set('sender_email', beforeEmail);
+            await before.save();
+        });
+    });
+
+    describe('Self hoster without managed email', function () {
+        this.beforeEach(function () {
+            configUtils.set('hostSettings:managedEmail:enabled', false);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', '');
+            mockLabsEnabled('newEmailAddresses');
+        });
+
+        it('Can set newsletter reply-to to newsletter or support', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'support'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'newsletter'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot clear newsletter reply-to', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: ''
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Cannot set newsletter reply-to to invalid email address', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'notvalid'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Can set newsletter reply-to to any email address without required verification', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_reply_to: 'hello@acme.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            const before = await models.Newsletter.findOne({id});
+            assert.equal(before.get('sender_reply_to'), 'hello@acme.com');
+
+            emailMockReceiver
+                .assertSentEmailCount(0);
+        });
+
+        it('Can change sender_email to any address without verification', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: 'hello@acme.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            const before = await models.Newsletter.findOne({id});
+            assert.equal(before.get('sender_email'), 'hello@acme.com');
+
+            emailMockReceiver
+                .assertSentEmailCount(0);
+        });
+
+        it('Cannot set newsletter sender_email to invalid email address', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: 'notvalid'
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [{
+                        id: anyErrorId
+                    }]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+        });
+
+        it('Can clear sender_email', async function () {
+            const id = fixtureManager.get('newsletters', 0).id;
+
+            const before = await models.Newsletter.findOne({id});
+            const beforeEmail = before.get('sender_email');
+            assert(before.get('sender_email'), 'This test requires a non empty sender_email');
+
+            await agent.put(`newsletters/${id}`)
+                .body({
+                    newsletters: [{
+                        sender_email: ''
+                    }]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    newsletters: [newsletterSnapshot]
+                })
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                });
+
+            // Revert back
+            await before.refresh();
+            before.set('sender_email', beforeEmail);
+            await before.save();
+        });
+    });
 });
diff --git a/ghost/core/test/e2e-api/admin/oembed.test.js b/ghost/core/test/e2e-api/admin/oembed.test.js
index 72dbaa6f75d..39a6184baf9 100644
--- a/ghost/core/test/e2e-api/admin/oembed.test.js
+++ b/ghost/core/test/e2e-api/admin/oembed.test.js
@@ -58,6 +58,31 @@ describe('Oembed API', function () {
         should.exist(res.body.html);
     });
 
+    it('does not use http preferentially to https', async function () {
+        const httpMock = nock('https://odysee.com')
+            .get('/$/oembed')
+            .query({url: 'http://odysee.com/@BarnabasNagy:5/At-Last-(Playa):2', format: 'json'})
+            .reply(200, 'The URL is invalid or is not associated with any claim.');
+
+        const httpsMock = nock('https://odysee.com')
+            .get('/$/oembed')
+            .query({url: 'https://odysee.com/@BarnabasNagy:5/At-Last-(Playa):2', format: 'json'})
+            .reply(200, {
+                html: '<iframe></iframe>',
+                type: 'rich',
+                version: '1.0'
+            });
+
+        const res = await request.get(localUtils.API.getApiQuery('oembed/?url=https%3A%2F%2Fodysee.com%2F%40BarnabasNagy%3A5%2FAt-Last-%28Playa%29%3A2'))
+            .set('Origin', config.get('url'))
+            .expect('Content-Type', /json/)
+            .expect('Cache-Control', testUtils.cacheRules.private);
+
+        httpMock.isDone().should.be.false();
+        httpsMock.isDone().should.be.true();
+        should.exist(res.body.html);
+    });
+
     it('errors with a useful message when embedding is disabled', async function () {
         const requestMock = nock('https://www.youtube.com')
             .get('/oembed')
@@ -82,7 +107,7 @@ describe('Oembed API', function () {
             .set('Origin', config.get('url'))
             .expect('Content-Type', /json/)
             .expect('Cache-Control', testUtils.cacheRules.private)
-            .expect(401);
+            .expect(422);
 
         requestMock.isDone().should.be.true();
         should.exist(res.body.errors);
@@ -196,6 +221,35 @@ describe('Oembed API', function () {
 
             should.exist(res.body.errors);
         });
+
+        it('should replace icon URL when it returns 404', async function () {
+            // Mock the page so it contains a readable icon URL
+            const pageMock = nock('http://example.com')
+                .get('/page-with-icon')
+                .reply(
+                    200,
+                    '<html><head><title>TESTING</title><link rel="icon" href="http://example.com/icon.svg"></head><body></body></html>',
+                    {'content-type': 'text/html'}
+                );
+
+            // Mock the icon URL to return 404
+            nock('http://example.com/')
+                .head('/icon.svg')
+                .reply(404);
+
+            const url = encodeURIComponent(' http://example.com/page-with-icon\t '); // Whitespaces are to make sure urls are trimmed
+            const res = await request.get(localUtils.API.getApiQuery(`oembed/?url=${url}&type=bookmark`))
+                .set('Origin', config.get('url'))
+                .expect('Content-Type', /json/)
+                .expect('Cache-Control', testUtils.cacheRules.private)
+                .expect(200);
+
+            // Check that the icon URL mock was loaded
+            pageMock.isDone().should.be.true();
+
+            // Check that the substitute icon URL is returned in place of the original
+            res.body.metadata.icon.should.eql('https://static.ghost.org/v5.0.0/images/link-icon.svg');
+        });
     });
 
     describe('with unknown provider', function () {
@@ -206,7 +260,7 @@ describe('Oembed API', function () {
 
             const pageMock = nock('http://oembed.test.com')
                 .get('/')
-                .reply(200, '<html><head><link rel="alternate" type="application/json+oembed" href="http://oembed.test.com/my-embed"></head></html>');
+                .reply(200, '<html><head><link rel="alternate" type="application/json+oembed" href="http://oembed.test.com/my-embed"><title>Title</title></head></html>');
 
             const oembedMock = nock('http://oembed.test.com')
                 .get('/my-embed')
@@ -230,7 +284,7 @@ describe('Oembed API', function () {
         it('fetches url and follows <link rel="alternate">', async function () {
             const pageMock = nock('http://test.com')
                 .get('/')
-                .reply(200, '<html><head><link rel="alternate" type="application/json+oembed" href="http://test.com/oembed"></head></html>');
+                .reply(200, '<html><head><link rel="alternate" type="application/json+oembed" href="http://test.com/oembed"><title>Title</title></head></html>');
 
             const oembedMock = nock('http://test.com')
                 .get('/oembed')
@@ -253,7 +307,7 @@ describe('Oembed API', function () {
         it('follows redirects when fetching <link rel="alternate">', async function () {
             const pageMock = nock('http://test.com')
                 .get('/')
-                .reply(200, '<html><head><link rel="alternate" type="application/json+oembed" href="http://test.com/oembed"></head></html>');
+                .reply(200, '<html><head><link rel="alternate" type="application/json+oembed" href="http://test.com/oembed"><title>Title</title></head></html>');
 
             const alternateRedirectMock = nock('http://test.com')
                 .get('/oembed')
diff --git a/ghost/core/test/e2e-api/admin/offers.test.js b/ghost/core/test/e2e-api/admin/offers.test.js
index d191cb5e065..c582300c2cd 100644
--- a/ghost/core/test/e2e-api/admin/offers.test.js
+++ b/ghost/core/test/e2e-api/admin/offers.test.js
@@ -1,5 +1,5 @@
 const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
-const {anyContentVersion, anyEtag, anyObjectId, anyLocationFor, anyErrorId} = matchers;
+const {anyContentVersion, anyEtag, anyObjectId, anyLocationFor, anyErrorId, anyISODateTime} = matchers;
 const should = require('should');
 const models = require('../../../core/server/models');
 const sinon = require('sinon');
@@ -76,7 +76,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 }]
             });
         savedOffer = body.offers[0];
@@ -109,7 +110,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 }]
             });
     });
@@ -141,7 +143,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 }]
             })
             .expect(({body}) => {
@@ -177,7 +180,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 }]
             });
     });
@@ -210,7 +214,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 }]
             });
         trialOffer = body.offers[0];
@@ -322,7 +327,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             });
     });
@@ -340,7 +346,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             });
     });
@@ -360,7 +367,8 @@ describe('Offers API', function () {
                     duration: 'trial',
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             });
     });
@@ -387,7 +395,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             })
             .expect(({body}) => {
@@ -484,7 +493,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             })
             .expect(({body}) => {
@@ -506,7 +516,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             });
     });
@@ -525,7 +536,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             });
     });
@@ -549,7 +561,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             })
             .expect(({body}) => {
@@ -577,7 +590,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             })
             .expect(({body}) => {
@@ -608,7 +622,8 @@ describe('Offers API', function () {
                     id: anyObjectId,
                     tier: {
                         id: anyObjectId
-                    }
+                    },
+                    created_at: anyISODateTime
                 })
             })
             .expect(({body}) => {
diff --git a/ghost/core/test/e2e-api/admin/pages.test.js b/ghost/core/test/e2e-api/admin/pages.test.js
index 1c86990005c..88011bc1654 100644
--- a/ghost/core/test/e2e-api/admin/pages.test.js
+++ b/ghost/core/test/e2e-api/admin/pages.test.js
@@ -285,6 +285,62 @@ describe('Pages API', function () {
                 })
                 .expectStatus(200);
         });
+
+        describe('Access', function () {
+            describe('Visibility is set to tiers', function () {
+                it('Saves only paid tiers', async function () {
+                    const page = {
+                        title: 'Test Page',
+                        status: 'draft'
+                    };
+
+                    // @ts-ignore
+                    const products = await models.Product.findAll();
+
+                    const freeTier = products.models[0];
+                    const paidTier = products.models[1];
+
+                    const {body: pageBody} = await agent
+                        .post('/pages/', {
+                            headers: {
+                                'content-type': 'application/json'
+                            }
+                        })
+                        .body({pages: [page]})
+                        .expectStatus(201);
+
+                    const [pageResponse] = pageBody.pages;
+
+                    await agent
+                        .put(`/pages/${pageResponse.id}`)
+                        .body({
+                            pages: [{
+                                id: pageResponse.id,
+                                updated_at: pageResponse.updated_at,
+                                visibility: 'tiers',
+                                tiers: [
+                                    {id: freeTier.id},
+                                    {id: paidTier.id}
+                                ]
+                            }]
+                        })
+                        .expectStatus(200)
+                        .matchHeaderSnapshot({
+                            'content-version': anyContentVersion,
+                            etag: anyEtag,
+                            'x-cache-invalidate': anyString
+                        })
+                        .matchBodySnapshot({
+                            pages: [Object.assign({}, matchPageShallowIncludes, {
+                                published_at: null,
+                                tiers: [
+                                    {type: paidTier.get('type'), ...tierSnapshot}
+                                ]
+                            })]
+                        });
+                });
+            });
+        });
     });
 
     describe('Copy', function () {
diff --git a/ghost/core/test/e2e-api/admin/posts.test.js b/ghost/core/test/e2e-api/admin/posts.test.js
index 4328260dd01..7b837f9ff11 100644
--- a/ghost/core/test/e2e-api/admin/posts.test.js
+++ b/ghost/core/test/e2e-api/admin/posts.test.js
@@ -671,6 +671,62 @@ describe('Posts API', function () {
             should.exist(emptyPageCount);
             emptyPageCount.should.equal(totalPageCount, 'post-update empty page count');
         });
+
+        describe('Access', function () {
+            describe('Visibility is set to tiers', function () {
+                it('Saves only paid tiers', async function () {
+                    const post = {
+                        title: 'Test Page',
+                        status: 'draft'
+                    };
+
+                    // @ts-ignore
+                    const products = await models.Product.findAll();
+
+                    const freeTier = products.models[0];
+                    const paidTier = products.models[1];
+
+                    const {body: pageBody} = await agent
+                        .post('/posts/', {
+                            headers: {
+                                'content-type': 'application/json'
+                            }
+                        })
+                        .body({posts: [post]})
+                        .expectStatus(201);
+
+                    const [pageResponse] = pageBody.posts;
+
+                    await agent
+                        .put(`/posts/${pageResponse.id}`)
+                        .body({
+                            posts: [{
+                                id: pageResponse.id,
+                                updated_at: pageResponse.updated_at,
+                                visibility: 'tiers',
+                                tiers: [
+                                    {id: freeTier.id},
+                                    {id: paidTier.id}
+                                ]
+                            }]
+                        })
+                        .expectStatus(200)
+                        .matchHeaderSnapshot({
+                            'content-version': anyContentVersion,
+                            etag: anyEtag,
+                            'x-cache-invalidate': anyString
+                        })
+                        .matchBodySnapshot({
+                            posts: [Object.assign({}, matchPostShallowIncludes, {
+                                published_at: null,
+                                tiers: [
+                                    {type: paidTier.get('type'), ...tierSnapshot}
+                                ]
+                            })]
+                        });
+                });
+            });
+        });
     });
 
     describe('Delete', 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..af40c51b314 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,71 @@ 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);
+        });
+
+        it('Returns nullified values if site fails to fetch', async function () {
+            nock('https://dogpictures.com')
+                .get('/')
+                .reply(404);
+
+            const {body} = await agent.post('recommendations/check/')
+                .body({
+                    recommendations: [{
+                        url: 'https://dogpictures.com'
+                    }]
+                })
+                .expectStatus(200)
+                .matchHeaderSnapshot({
+                    'content-version': anyContentVersion,
+                    etag: anyEtag
+                })
+                .matchBodySnapshot({});
+
+            assert.equal(body.recommendations[0].title, null);
+            assert.equal(body.recommendations[0].url, 'https://dogpictures.com/');
+            assert.equal(body.recommendations[0].description, null);
+            assert.equal(body.recommendations[0].excerpt, null);
+            assert.equal(body.recommendations[0].featured_image, null);
+            assert.equal(body.recommendations[0].favicon, null);
+            assert.equal(body.recommendations[0].one_click_subscribe, false);
+        });
+    });
+
     describe('delete', function () {
         it('Can delete recommendation', async function () {
             const id = await addDummyRecommendation();
diff --git a/ghost/core/test/e2e-api/admin/settings.test.js b/ghost/core/test/e2e-api/admin/settings.test.js
index 82cea6b6ffa..21df9cde1c2 100644
--- a/ghost/core/test/e2e-api/admin/settings.test.js
+++ b/ghost/core/test/e2e-api/admin/settings.test.js
@@ -3,20 +3,23 @@ const sinon = require('sinon');
 const logging = require('@tryghost/logging');
 const SingleUseTokenProvider = require('../../../core/server/services/members/SingleUseTokenProvider');
 const settingsCache = require('../../../core/shared/settings-cache');
-const {agentProvider, fixtureManager, mockManager, matchers} = require('../../utils/e2e-framework');
+const {agentProvider, fixtureManager, mockManager, matchers, configUtils} = require('../../utils/e2e-framework');
 const {stringMatching, anyEtag, anyUuid, anyContentLength, anyContentVersion} = matchers;
 const models = require('../../../core/server/models');
+const {mockLabsDisabled, mockLabsEnabled} = require('../../utils/e2e-framework-mock-manager');
 const {anyErrorId} = matchers;
 
-const CURRENT_SETTINGS_COUNT = 84;
+const CURRENT_SETTINGS_COUNT = 87;
 
 const settingsMatcher = {};
 
 const publicHashSettingMatcher = {
+    key: 'public_hash',
     value: stringMatching(/[a-z0-9]{30}/)
 };
 
 const labsSettingMatcher = {
+    key: 'labs',
     value: stringMatching(/\{[^\s]+\}/)
 };
 
@@ -29,10 +32,10 @@ const matchSettingsArray = (length) => {
         settingsArray[26] = publicHashSettingMatcher;
     }
 
-    if (length > 60) {
+    if (length > 61) {
         // Added a setting that is alphabetically before 'labs'? then you need to increment this counter.
         // Item at index x is the lab settings, which changes as we add and remove features
-        settingsArray[60] = labsSettingMatcher;
+        settingsArray[61] = labsSettingMatcher;
     }
 
     return settingsArray;
@@ -49,6 +52,7 @@ describe('Settings API', function () {
 
     beforeEach(function () {
         mockManager.mockMail();
+        mockLabsDisabled('newEmailAddresses');
     });
 
     afterEach(function () {
@@ -102,7 +106,7 @@ describe('Settings API', function () {
             const settingsToChange = [
                 {
                     key: 'title',
-                    value: []
+                    value: ''
                 },
                 {
                     key: 'codeinjection_head',
@@ -253,7 +257,7 @@ describe('Settings API', function () {
             mockManager.assert.sentEmailCount(0);
         });
 
-        it('editing members_support_address triggers email verification flow', async function () {
+        it('[LEGACY] editing members_support_address triggers email verification flow', async function () {
             await agent.put('settings/')
                 .body({
                     settings: [{key: 'members_support_address', value: 'support@example.com'}]
@@ -496,4 +500,197 @@ describe('Settings API', function () {
                 });
         });
     });
+
+    describe('Managed email without custom sending domain', function () {
+        this.beforeEach(function () {
+            configUtils.set('hostSettings:managedEmail:enabled', true);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', null);
+            configUtils.set('mail:from', 'default@email.com');
+        });
+
+        it('editing members_support_address triggers email verification flow', async function () {
+            const currentSetting = settingsCache.get('members_support_address');
+            assert(currentSetting !== 'othersupport@example.com', 'This test requires a changed email address');
+
+            await agent.put('settings/')
+                .body({
+                    settings: [{key: 'members_support_address', value: 'othersupport@example.com'}]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    settings: matchSettingsArray(CURRENT_SETTINGS_COUNT)
+                })
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    // Special rule for this test, as the labs setting changes a lot
+                    'content-length': anyContentLength,
+                    'content-version': anyContentVersion
+                })
+                .expect(({body}) => {
+                    const membersSupportAddress = body.settings.find(setting => setting.key === 'members_support_address');
+                    assert.equal(membersSupportAddress.value, currentSetting);
+
+                    assert.deepEqual(body.meta, {
+                        sent_email_verification: ['members_support_address']
+                    });
+                });
+
+            mockManager.assert.sentEmailCount(1);
+            mockManager.assert.sentEmail({
+                subject: 'Verify email address',
+                to: 'othersupport@example.com'
+            });
+        });
+
+        it('editing members_support_address equaling default does not trigger verification flow', async function () {
+            await agent.put('settings/')
+                .body({
+                    settings: [{key: 'members_support_address', value: 'default@email.com'}]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    settings: matchSettingsArray(CURRENT_SETTINGS_COUNT)
+                })
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    // Special rule for this test, as the labs setting changes a lot
+                    'content-length': anyContentLength,
+                    'content-version': anyContentVersion
+                });
+
+            mockManager.assert.sentEmailCount(0);
+        });
+    });
+
+    describe('Managed email with custom sending domain', function () {
+        this.beforeEach(function () {
+            configUtils.set('hostSettings:managedEmail:enabled', true);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', 'sendingdomain.com');
+            configUtils.set('mail:from', 'default@email.com');
+        });
+
+        it('editing members_support_address without matching domain triggers email verification flow', async function () {
+            const currentSetting = settingsCache.get('members_support_address');
+            assert(currentSetting !== 'othersupport@example.com', 'This test requires a changed email address');
+
+            await agent.put('settings/')
+                .body({
+                    settings: [{key: 'members_support_address', value: 'othersupport@example.com'}]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    settings: matchSettingsArray(CURRENT_SETTINGS_COUNT)
+                })
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    // Special rule for this test, as the labs setting changes a lot
+                    'content-length': anyContentLength,
+                    'content-version': anyContentVersion
+                })
+                .expect(({body}) => {
+                    const membersSupportAddress = body.settings.find(setting => setting.key === 'members_support_address');
+                    assert.equal(membersSupportAddress.value, currentSetting);
+
+                    assert.deepEqual(body.meta, {
+                        sent_email_verification: ['members_support_address']
+                    });
+                });
+
+            mockManager.assert.sentEmailCount(1);
+            mockManager.assert.sentEmail({
+                subject: 'Verify email address',
+                to: 'othersupport@example.com'
+            });
+        });
+
+        it('editing members_support_address with matching domain does not trigger email verification flow', async function () {
+            const currentSetting = settingsCache.get('members_support_address');
+            assert(currentSetting !== 'support@sendingdomain.com', 'This test requires a changed email address');
+
+            await agent.put('settings/')
+                .body({
+                    settings: [{key: 'members_support_address', value: 'support@sendingdomain.com'}]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    settings: matchSettingsArray(CURRENT_SETTINGS_COUNT)
+                })
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    // Special rule for this test, as the labs setting changes a lot
+                    'content-length': anyContentLength,
+                    'content-version': anyContentVersion
+                });
+
+            mockManager.assert.sentEmailCount(0);
+        });
+
+        it('editing members_support_address equaling default does not trigger verification flow', async function () {
+            await agent.put('settings/')
+                .body({
+                    settings: [{key: 'members_support_address', value: 'default@email.com'}]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    settings: matchSettingsArray(CURRENT_SETTINGS_COUNT)
+                })
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    // Special rule for this test, as the labs setting changes a lot
+                    'content-length': anyContentLength,
+                    'content-version': anyContentVersion
+                });
+
+            mockManager.assert.sentEmailCount(0);
+        });
+    });
+
+    describe('Self hoster without managed email', function () {
+        this.beforeEach(function () {
+            configUtils.set('hostSettings:managedEmail:enabled', false);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', '');
+            mockLabsEnabled('newEmailAddresses');
+        });
+
+        it('editing members_support_address does not trigger email verification flow', async function () {
+            const currentSetting = settingsCache.get('members_support_address');
+            assert(currentSetting !== 'support@customdomain.com', 'This test requires a changed email address');
+
+            await agent.put('settings/')
+                .body({
+                    settings: [{key: 'members_support_address', value: 'support@customdomain.com'}]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    settings: matchSettingsArray(CURRENT_SETTINGS_COUNT)
+                })
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    // Special rule for this test, as the labs setting changes a lot
+                    'content-length': anyContentLength,
+                    'content-version': anyContentVersion
+                });
+
+            mockManager.assert.sentEmailCount(0);
+        });
+
+        it('editing members_support_address equaling default does not trigger verification flow', async function () {
+            await agent.put('settings/')
+                .body({
+                    settings: [{key: 'members_support_address', value: 'default@email.com'}]
+                })
+                .expectStatus(200)
+                .matchBodySnapshot({
+                    settings: matchSettingsArray(CURRENT_SETTINGS_COUNT)
+                })
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    // Special rule for this test, as the labs setting changes a lot
+                    'content-length': anyContentLength,
+                    'content-version': anyContentVersion
+                });
+
+            mockManager.assert.sentEmailCount(0);
+        });
+    });
 });
diff --git a/ghost/core/test/e2e-api/admin/slugs.test.js b/ghost/core/test/e2e-api/admin/slugs.test.js
index c939764bc84..8de1f3b9b0a 100644
--- a/ghost/core/test/e2e-api/admin/slugs.test.js
+++ b/ghost/core/test/e2e-api/admin/slugs.test.js
@@ -20,7 +20,7 @@ describe('Slug API', function () {
             .expect('Cache-Control', testUtils.cacheRules.private)
             .expect(200);
 
-        should.exist(res.headers['x-cache-invalidate']);
+        should.not.exist(res.headers['x-cache-invalidate']);
         const jsonResponse = res.body;
         should.exist(jsonResponse);
         should.exist(jsonResponse.slugs);
diff --git a/ghost/core/test/e2e-api/admin/users.test.js b/ghost/core/test/e2e-api/admin/users.test.js
index f4de80a3900..bc12b02a5a7 100644
--- a/ghost/core/test/e2e-api/admin/users.test.js
+++ b/ghost/core/test/e2e-api/admin/users.test.js
@@ -274,6 +274,36 @@ describe('User API', function () {
         jsonResponse.users[0].roles[0].name.should.equal('Administrator');
     });
 
+    it('Does not trigger cache invalidation when a private attribute on a user has been changed', async function () {
+        const res = await request.put(localUtils.API.getApiQuery('users/me/'))
+            .set('Origin', config.get('url'))
+            .send({
+                users: [{
+                    comment_notifications: false
+                }]
+            })
+            .expect('Content-Type', /json/)
+            .expect('Cache-Control', testUtils.cacheRules.private)
+            .expect(200);
+
+        should.equal(res.headers['x-cache-invalidate'], undefined);
+    });
+
+    it('Does not trigger cache invalidation when no attribute on a user has been changed', async function () {
+        const res = await request.put(localUtils.API.getApiQuery('users/me/'))
+            .set('Origin', config.get('url'))
+            .send({
+                users: [{
+                    facebook: null
+                }]
+            })
+            .expect('Content-Type', /json/)
+            .expect('Cache-Control', testUtils.cacheRules.private)
+            .expect(200);
+
+        should.equal(res.headers['x-cache-invalidate'], undefined);
+    });
+
     it('Can destroy an active user and transfer posts to the owner', async function () {
         const userId = testUtils.getExistingData().users[1].id;
         const userSlug = testUtils.getExistingData().users[1].slug;
diff --git a/ghost/core/test/e2e-api/admin/utils.js b/ghost/core/test/e2e-api/admin/utils.js
index d54d54cbe6e..5b59e1d11ca 100644
--- a/ghost/core/test/e2e-api/admin/utils.js
+++ b/ghost/core/test/e2e-api/admin/utils.js
@@ -225,13 +225,14 @@ module.exports = {
         return testUtils.API.doAuth(`${API_URL}session/`, ...args);
     },
 
-    getValidAdminToken(audience, keyid = 0) {
+    getValidAdminToken(audience, keyid = 0, opts = {}) {
         const jwt = require('jsonwebtoken');
         const JWT_OPTIONS = {
             keyid: testUtils.DataGenerator.Content.api_keys[keyid].id,
             algorithm: 'HS256',
             expiresIn: '5m',
-            audience: audience
+            audience: audience,
+            ...opts
         };
 
         return jwt.sign(
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..c2f42af62e8 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
@@ -114,7 +114,7 @@ Object {
       "feature_image_caption": null,
       "featured": false,
       "frontmatter": null,
-      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
+      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt=\\"\\"><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt=\\"\\"></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
       "id": "6194d3ce51e2700162531a75",
       "meta_description": null,
       "meta_title": null,
@@ -323,7 +323,7 @@ Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut
       "feature_image_caption": null,
       "featured": true,
       "frontmatter": null,
-      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav></p><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul><p></p><!--kg-card-end: markdown-->",
+      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul></p><!--kg-card-end: markdown-->",
       "id": "618ba1ffbe2896088840a6e7",
       "meta_description": null,
       "meta_title": null,
@@ -476,7 +476,7 @@ exports[`Posts Content API Can browse filtering by collection 2: [headers] 1`] =
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "public, max-age=0",
-  "content-length": "46629",
+  "content-length": "46632",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -786,100 +786,6 @@ Object {
     },
   },
   "posts": Array [
-    Object {
-      "access": true,
-      "authors": Array [
-        Object {
-          "bio": "bio",
-          "cover_image": null,
-          "facebook": null,
-          "id": "1",
-          "location": "location",
-          "meta_description": null,
-          "meta_title": null,
-          "name": "Joe Bloggs",
-          "profile_image": "https://example.com/super_photo.jpg",
-          "slug": "joe-bloggs",
-          "twitter": null,
-          "url": "http://127.0.0.1:2369/author/joe-bloggs/",
-          "website": null,
-        },
-        Object {
-          "bio": "bio",
-          "cover_image": null,
-          "facebook": null,
-          "id": "6193c685e792de832cd08141",
-          "location": "location",
-          "meta_description": null,
-          "meta_title": null,
-          "name": "Slimer McEctoplasm",
-          "profile_image": null,
-          "slug": "slimer-mcectoplasm",
-          "twitter": null,
-          "url": "http://127.0.0.1:2369/404/",
-          "website": null,
-        },
-      ],
-      "canonical_url": null,
-      "codeinjection_foot": null,
-      "codeinjection_head": null,
-      "comment_id": "618ba1ffbe2896088840a6e7",
-      "comments": false,
-      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
-      "custom_excerpt": null,
-      "custom_template": null,
-      "email_subject": null,
-      "excerpt": " * Lorem
- * Aliquam
- * Tortor
- * Morbi
- * Praesent
- * Pellentesque
-
-Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.
-
-1234abcdefghijkl
-
-Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim venia",
-      "feature_image": null,
-      "feature_image_alt": null,
-      "feature_image_caption": null,
-      "featured": true,
-      "frontmatter": null,
-      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav></p><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul><p></p><!--kg-card-end: markdown-->",
-      "id": "618ba1ffbe2896088840a6e7",
-      "meta_description": null,
-      "meta_title": null,
-      "og_description": null,
-      "og_image": null,
-      "og_title": null,
-      "primary_author": Object {
-        "bio": "bio",
-        "cover_image": null,
-        "facebook": null,
-        "id": "1",
-        "location": "location",
-        "meta_description": null,
-        "meta_title": null,
-        "name": "Joe Bloggs",
-        "profile_image": "https://example.com/super_photo.jpg",
-        "slug": "joe-bloggs",
-        "twitter": null,
-        "url": "http://127.0.0.1:2369/author/joe-bloggs/",
-        "website": null,
-      },
-      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
-      "reading_time": 1,
-      "slug": "not-so-short-bit-complex",
-      "title": "Not so short, bit complex",
-      "twitter_description": null,
-      "twitter_image": null,
-      "twitter_title": null,
-      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
-      "url": "http://127.0.0.1:2369/not-so-short-bit-complex/",
-      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
-      "visibility": "public",
-    },
     Object {
       "access": true,
       "authors": Array [
@@ -1062,7 +968,7 @@ Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut
       "feature_image_caption": null,
       "featured": false,
       "frontmatter": null,
-      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
+      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt=\\"\\"><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt=\\"\\"></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
       "id": "6194d3ce51e2700162531a75",
       "meta_description": null,
       "meta_title": null,
@@ -1386,6 +1292,100 @@ Most successful subscription businesses publish a mix of free and paid posts to
       "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
       "visibility": "public",
     },
+    Object {
+      "access": true,
+      "authors": Array [
+        Object {
+          "bio": "bio",
+          "cover_image": null,
+          "facebook": null,
+          "id": "1",
+          "location": "location",
+          "meta_description": null,
+          "meta_title": null,
+          "name": "Joe Bloggs",
+          "profile_image": "https://example.com/super_photo.jpg",
+          "slug": "joe-bloggs",
+          "twitter": null,
+          "url": "http://127.0.0.1:2369/author/joe-bloggs/",
+          "website": null,
+        },
+        Object {
+          "bio": "bio",
+          "cover_image": null,
+          "facebook": null,
+          "id": "6193c685e792de832cd08141",
+          "location": "location",
+          "meta_description": null,
+          "meta_title": null,
+          "name": "Slimer McEctoplasm",
+          "profile_image": null,
+          "slug": "slimer-mcectoplasm",
+          "twitter": null,
+          "url": "http://127.0.0.1:2369/404/",
+          "website": null,
+        },
+      ],
+      "canonical_url": null,
+      "codeinjection_foot": null,
+      "codeinjection_head": null,
+      "comment_id": "618ba1ffbe2896088840a6e7",
+      "comments": false,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "custom_excerpt": null,
+      "custom_template": null,
+      "email_subject": null,
+      "excerpt": " * Lorem
+ * Aliquam
+ * Tortor
+ * Morbi
+ * Praesent
+ * Pellentesque
+
+Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.
+
+1234abcdefghijkl
+
+Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim venia",
+      "feature_image": null,
+      "feature_image_alt": null,
+      "feature_image_caption": null,
+      "featured": true,
+      "frontmatter": null,
+      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul></p><!--kg-card-end: markdown-->",
+      "id": "618ba1ffbe2896088840a6e7",
+      "meta_description": null,
+      "meta_title": null,
+      "og_description": null,
+      "og_image": null,
+      "og_title": null,
+      "primary_author": Object {
+        "bio": "bio",
+        "cover_image": null,
+        "facebook": null,
+        "id": "1",
+        "location": "location",
+        "meta_description": null,
+        "meta_title": null,
+        "name": "Joe Bloggs",
+        "profile_image": "https://example.com/super_photo.jpg",
+        "slug": "joe-bloggs",
+        "twitter": null,
+        "url": "http://127.0.0.1:2369/author/joe-bloggs/",
+        "website": null,
+      },
+      "published_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "reading_time": 1,
+      "slug": "not-so-short-bit-complex",
+      "title": "Not so short, bit complex",
+      "twitter_description": null,
+      "twitter_image": null,
+      "twitter_title": null,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000\\\\\\+\\\\d\\{2\\}:\\\\d\\{2\\}/,
+      "url": "http://127.0.0.1:2369/not-so-short-bit-complex/",
+      "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "visibility": "public",
+    },
     Object {
       "access": true,
       "authors": Array [
@@ -1616,7 +1616,7 @@ exports[`Posts Content API Can filter posts by authors 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "public, max-age=0",
-  "content-length": "55181",
+  "content-length": "55184",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1666,7 +1666,7 @@ Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut
       "feature_image_caption": null,
       "featured": true,
       "frontmatter": null,
-      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav></p><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul><p></p><!--kg-card-end: markdown-->",
+      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul></p><!--kg-card-end: markdown-->",
       "id": "618ba1ffbe2896088840a6e7",
       "meta_description": null,
       "meta_title": null,
@@ -1995,7 +1995,7 @@ exports[`Posts Content API Can filter posts by tag 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "public, max-age=0",
-  "content-length": "13990",
+  "content-length": "13983",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2195,7 +2195,7 @@ Object {
       "feature_image_caption": null,
       "featured": false,
       "frontmatter": null,
-      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
+      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt=\\"\\"><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt=\\"\\"></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
       "id": "6194d3ce51e2700162531a75",
       "meta_description": null,
       "meta_title": null,
@@ -2594,7 +2594,7 @@ Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut
       "feature_image_caption": null,
       "featured": true,
       "frontmatter": null,
-      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav></p><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul><p></p><!--kg-card-end: markdown-->",
+      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul></p><!--kg-card-end: markdown-->",
       "id": "618ba1ffbe2896088840a6e7",
       "meta_description": null,
       "meta_title": null,
@@ -2878,7 +2878,7 @@ exports[`Posts Content API Can include relations 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "public, max-age=0",
-  "content-length": "65510",
+  "content-length": "65513",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3120,7 +3120,7 @@ Object {
       "feature_image_caption": null,
       "featured": false,
       "frontmatter": null,
-      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
+      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt=\\"\\"><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt=\\"\\"></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
       "id": "6194d3ce51e2700162531a75",
       "meta_description": null,
       "meta_title": null,
@@ -3329,7 +3329,7 @@ Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut
       "feature_image_caption": null,
       "featured": true,
       "frontmatter": null,
-      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav></p><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul><p></p><!--kg-card-end: markdown-->",
+      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul></p><!--kg-card-end: markdown-->",
       "id": "618ba1ffbe2896088840a6e7",
       "meta_description": null,
       "meta_title": null,
@@ -3482,7 +3482,7 @@ exports[`Posts Content API Can request posts 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "public, max-age=0",
-  "content-length": "46629",
+  "content-length": "46632",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3605,7 +3605,7 @@ Object {
       "feature_image_caption": null,
       "featured": false,
       "frontmatter": null,
-      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
+      "html": "<p>Ghost comes with a best-in-class editor which does its very best to get out of the way, and let you focus on your content. Don't let its minimal looks fool you, though, beneath the surface lies a powerful editing toolset designed to accommodate the extensive needs of modern creators.</p><p>For many, the base canvas of the Ghost editor will feel familiar. You can start writing as you would expect, highlight content to access the toolbar you would expect, and generally use all of the keyboard shortcuts you would expect.</p><p>Our main focus in building the Ghost editor is to try and make as many things that you hope/expect might work: actually work. </p><ul><li>You can copy and paste raw content from web pages, and Ghost will do its best to correctly preserve the formatting. </li><li>Pasting an image from your clipboard will upload inline.</li><li>Pasting a social media URL will automatically create an embed.</li><li>Highlight a word in the editor and paste a URL from your clipboard on top: Ghost will turn it into a link.</li><li>You can also paste (or write!) Markdown and Ghost will usually be able to auto-convert it into fully editable, formatted content.</li></ul><figure class=\\"kg-card kg-image-card kg-width-wide kg-card-hascaption\\"><img src=\\"https://static.ghost.org/v4.0.0/images/editor.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3182\\" height=\\"1500\\"><figcaption>The Ghost editor. Also available in dark-mode, for late night writing sessions.</figcaption></figure><p>The goal, as much as possible, is for things to work so that you don't have to <em>think</em> so much about the editor. You won't find any disastrous \\"block builders\\" here, where you have to open 6 submenus and choose from 18 different but identical alignment options. That's not what Ghost is about.</p><p>What you will find though, is dynamic cards which allow you to embed rich media into your posts and create beautifully laid out stories.</p><h2 id=\\"using-cards\\">Using cards</h2><p>You can insert dynamic cards inside post content using the <code>+</code> button, which appears on new lines, or by typing <code>/</code> on a new line to trigger the card menu. Many of the choices are simple and intuitive, like bookmark cards, which allow you to create rich links with embedded structured data:</p><figure class=\\"kg-card kg-bookmark-card\\"><a class=\\"kg-bookmark-container\\" href=\\"https://opensubscriptionplatforms.com/?ref=127.0.0.1\\"><div class=\\"kg-bookmark-content\\"><div class=\\"kg-bookmark-title\\">Open Subscription Platforms</div><div class=\\"kg-bookmark-description\\">A shared movement for independent subscription data.</div><div class=\\"kg-bookmark-metadata\\"><img class=\\"kg-bookmark-icon\\" src=\\"https://opensubscriptionplatforms.com/images/favicon.png\\" alt=\\"\\"><span class=\\"kg-bookmark-author\\">Open Subscription Platforms</span></div></div><div class=\\"kg-bookmark-thumbnail\\"><img src=\\"https://opensubscriptionplatforms.com/images/osp-card.png\\" alt=\\"\\"></div></a></figure><p>or embed cards which make it easy to insert content you want to share with your audience, from external services:</p><figure class=\\"kg-card kg-embed-card\\"><iframe width=\\"200\\" height=\\"113\\" src=\\"https://www.youtube.com/embed/hmH3XMlms8E?feature=oembed\\" frameborder=\\"0\\" allow=\\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\\" allowfullscreen></iframe></figure><p>But, dig a little deeper, and you'll also find more advanced cards, like one that only shows up in email newsletters (great for personalized introductions) and a comprehensive set of specialized cards for different types of images and galleries.</p><blockquote>Once you  start mixing text and image cards creatively, the whole narrative of the story changes. Suddenly, you're working in a new format.</blockquote><figure class=\\"kg-card kg-image-card kg-width-full\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-xSMqGH7gi6o-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"6000\\" height=\\"4000\\"></figure><p>As it turns out, sometimes pictures and a thousand words go together really well. Telling people a great story often has much more impact if they can feel, even for a moment, as though they were right there with you.</p><figure class=\\"kg-card kg-gallery-card kg-width-wide\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/andreas-selter-e4yK8QQlZa0-unsplash.jpg\\" width=\\"4572\\" height=\\"3048\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/steve-carter-Ixp4YhCKZkI-unsplash.jpg\\" width=\\"4032\\" height=\\"2268\\" loading=\\"lazy\\" alt></div></div></div></figure><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/lukasz-szmigiel-jFCViYFYcus-unsplash.jpg\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2560\\" height=\\"1705\\"></figure><figure class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\"><div class=\\"kg-gallery-container\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jd-mason-hPiEFq6-Eto-unsplash.jpg\\" width=\\"5184\\" height=\\"3888\\" loading=\\"lazy\\" alt></div><div class=\\"kg-gallery-image\\"><img src=\\"https://static.ghost.org/v4.0.0/images/jp-valery-OBpOP9GVH9U-unsplash.jpg\\" width=\\"5472\\" height=\\"3648\\" loading=\\"lazy\\" alt></div></div></div><figcaption>Peaceful places</figcaption></figure><p>Galleries and image cards can be combined in so many different ways — the only limit is your imagination.</p><h2 id=\\"build-workflows-with-snippets\\">Build workflows with snippets</h2><p>One of the most powerful features of the Ghost editor is the ability to create and re-use content snippets. If you've ever used an email client with a concept of <em>saved replies</em> then this will be immediately intuitive.</p><p>To create a snippet, select a piece of content in the editor that you'd like to re-use in future, then click on the snippet icon in the toolbar. Give your snippet a name, and you're all done. Now your snippet will be available from within the card menu, or you can search for it directly using the <code>/</code> command.</p><p>This works really well for saving images you might want to use often, like a company logo or team photo, links to resources you find yourself often linking to, or introductions and passages that you want to remember.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/createsnippet.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"2282\\" height=\\"1272\\"></figure><p>You can even build entire post templates or outlines to create a quick, re-usable workflow for publishing over time. Or build custom design elements for your post with an HTML card, and use a snippet to insert it.</p><p>Once you get a few useful snippets set up, it's difficult to go back to the old way of diving through media libraries and trawling for that one thing you know you used somewhere that one time.</p><hr><h2 id=\\"publishing-and-newsletters-the-easy-way\\">Publishing and newsletters the easy way</h2><p>When you're ready to publish, Ghost makes it as simple as possible to deliver your new post to all your existing members. Just hit the <em>Preview</em> link and you'll get a chance to see what your content looks like on Web, Mobile, Email and Social.</p><figure class=\\"kg-card kg-image-card kg-width-wide\\"><img src=\\"https://static.ghost.org/v4.0.0/images/preview.png\\" class=\\"kg-image\\" alt loading=\\"lazy\\" width=\\"3166\\" height=\\"2224\\"></figure><p>You can send yourself a test newsletter to make sure everything looks good in your email client, and then hit the <em>Publish</em> button to decide who to deliver it to.</p><p>Ghost comes with a streamlined, optimized email newsletter template that has settings built-in for you to customize the colors and typography. We've spent countless hours refining the template to make sure it works great across all email clients, and performs well for email deliverability.</p><p>So, you don't need to fight the awful process of building a custom email template from scratch. It's all done already!</p><hr><p>The Ghost editor is powerful enough to do whatever you want it to do. With a little exploration, you'll be up and running in no time.</p>",
       "id": "6194d3ce51e2700162531a75",
       "meta_description": null,
       "meta_title": null,
@@ -3814,7 +3814,7 @@ Definition listConsectetur adipisicing elit, sed do eiusmod tempor incididunt ut
       "feature_image_caption": null,
       "featured": true,
       "frontmatter": null,
-      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav></p><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul><p></p><!--kg-card-end: markdown-->",
+      "html": "<!--kg-card-begin: markdown--><p><nav><ul><li><a href=\\"#nowhere\\" title=\\"Anchor URL\\">Lorem</a></li><li><a href=\\"http://127.0.0.1:2369/about#nowhere\\" title=\\"Relative URL\\">Aliquam</a></li><li><a href=\\"//somewhere.com/link#nowhere\\" title=\\"Protocol Relative URL\\">Tortor</a></li><li><a href=\\"http://somewhere.com/link?ref=127.0.0.1#nowhere\\" title=\\"Absolute URL\\">Morbi</a></li><li><a href=\\"#nowhere\\" title=\\"Praesent dapibus, neque id cursus faucibus\\">Praesent</a></li><li><a href=\\"#nowhere\\" title=\\"Pellentesque fermentum dolor\\">Pellentesque</a></li></ul></nav><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul></p><!--kg-card-end: markdown-->",
       "id": "618ba1ffbe2896088840a6e7",
       "meta_description": null,
       "meta_title": null,
@@ -3967,7 +3967,7 @@ exports[`Posts Content API Can request posts from different origin 2: [headers]
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "public, max-age=0",
-  "content-length": "46629",
+  "content-length": "46632",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -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 {
@@ -4826,3 +4909,21 @@ Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac tu
   ],
 }
 `;
+
+exports[`Posts Content API Errors upon invalid filter value 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": "ER_WRONG_VALUE",
+      "context": "Invalid value select count(distinct posts.id) as aggregate from \`posts\` where (\`posts\`.\`status\` = 'published' and (\`posts\`.\`published_at\` < '1715091791890' and \`posts\`.\`type\` = 'post')) - Incorrect DATETIME value: '1715091791890'",
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Validation error, cannot list posts.",
+      "property": null,
+      "type": "ValidationError",
+    },
+  ],
+}
+`;
diff --git a/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap
index 2a2015f320f..c61c0a5f86f 100644
--- a/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap
@@ -10,7 +10,9 @@ Object {
     "codeinjection_head": null,
     "comments_enabled": "off",
     "cover_image": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    "default_email_address": "noreply@127.0.0.1",
     "description": "Thoughts, stories and ideas",
+    "editor_default_email_recipients": "visibility",
     "facebook": "ghost",
     "firstpromoter_account": null,
     "icon": null,
@@ -53,6 +55,7 @@ Object {
     "portal_button_icon": null,
     "portal_button_signup_text": "Subscribe",
     "portal_button_style": "icon-and-text",
+    "portal_default_plan": "yearly",
     "portal_name": true,
     "portal_plans": Array [
       "free",
@@ -74,6 +77,7 @@ Object {
         "url": "/contribute/",
       },
     ],
+    "support_email_address": "noreply@127.0.0.1",
     "timezone": "Etc/UTC",
     "title": "Ghost",
     "twitter": "@ghost",
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..7eeba91d843 100644
--- a/ghost/core/test/e2e-api/content/posts.test.js
+++ b/ghost/core/test/e2e-api/content/posts.test.js
@@ -5,7 +5,7 @@ const testUtils = require('../../utils');
 const models = require('../../../core/server/models');
 
 const {agentProvider, fixtureManager, matchers, mockManager} = require('../../utils/e2e-framework');
-const {anyArray, anyContentVersion, anyEtag, anyUuid, anyISODateTimeWithTZ} = matchers;
+const {anyArray, anyContentVersion, anyErrorId, anyEtag, anyUuid, anyISODateTimeWithTZ} = matchers;
 
 const postMatcher = {
     published_at: anyISODateTimeWithTZ,
@@ -22,6 +22,28 @@ const postMatcherShallowIncludes = Object.assign(
     }
 );
 
+async function trackDb(fn, skip) {
+    const db = require('../../../core/server/data/db');
+    if (db?.knex?.client?.config?.client !== 'sqlite3') {
+        return skip();
+    }
+    /** @type {import('sqlite3').Database} */
+    const database = db.knex.client;
+
+    const queries = [];
+    function handler(/** @type {{sql: string}} */ query) {
+        queries.push(query);
+    }
+
+    database.on('query', handler);
+
+    await fn();
+
+    database.off('query', handler);
+
+    return queries;
+}
+
 describe('Posts Content API', function () {
     let agent;
 
@@ -84,6 +106,30 @@ 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('Errors upon invalid filter value', async function () {
+        if (process.env.NODE_ENV !== 'testing-mysql') {
+            this.skip();
+        }
+
+        await agent
+            .get(`posts/?filter=published_at%3A%3C%271715091791890%27`)
+            .expectStatus(422)
+            .matchBodySnapshot({
+                errors: [{
+                    id: anyErrorId
+                }]
+            });
+    });
+
     it('Can filter posts by tag', async function () {
         const res = await agent.get('posts/?filter=tag:kitchen-sink,featured:true&include=tags')
             .expectStatus(200)
@@ -135,7 +181,7 @@ describe('Posts Content API', function () {
 
         const jsonResponse = res.body;
 
-        assert.equal(jsonResponse.posts[0].slug, 'not-so-short-bit-complex', 'The API orders by number of matched authors');
+        assert.equal(jsonResponse.posts[0].slug, 'welcome', 'The API orders by number of matched authors, then by published_at desc, then by id desc');
 
         const primaryAuthors = jsonResponse.posts.map((post) => {
             return post.primary_author.slug;
@@ -396,4 +442,24 @@ describe('Posts Content API', function () {
             .expectStatus(200);
         assert(response.body.posts[0].html.includes('<a href="https://example.com">Link</a><a href="invalid">Test</a>'), 'Html not expected: ' + response.body.posts[0].html);
     });
+
+    it('Does not select * by default', async function () {
+        let queries = await trackDb(() => agent.get('posts/?limit=all').expectStatus(200), this.skip.bind(this));
+        let postsRelatedQueries = queries.filter(q => q.sql.includes('`posts`'));
+        for (const query of postsRelatedQueries) {
+            assert(!query.sql.includes('*'), 'Query should not select *');
+        }
+
+        queries = await trackDb(() => agent.get('posts/?limit=3').expectStatus(200), this.skip.bind(this));
+        postsRelatedQueries = queries.filter(q => q.sql.includes('`posts`'));
+        for (const query of postsRelatedQueries) {
+            assert(!query.sql.includes('*'), 'Query should not select *');
+        }
+
+        queries = await trackDb(() => agent.get('posts/?include=tags,authors').expectStatus(200), this.skip.bind(this));
+        postsRelatedQueries = queries.filter(q => q.sql.includes('`posts`'));
+        for (const query of postsRelatedQueries) {
+            assert(!query.sql.includes('*'), 'Query should not select *');
+        }
+    });
 });
diff --git a/ghost/core/test/e2e-api/members-comments/__snapshots__/comments.test.js.snap b/ghost/core/test/e2e-api/members-comments/__snapshots__/comments.test.js.snap
index 0b1ec71bc26..a4c7f211982 100644
--- a/ghost/core/test/e2e-api/members-comments/__snapshots__/comments.test.js.snap
+++ b/ghost/core/test/e2e-api/members-comments/__snapshots__/comments.test.js.snap
@@ -106,6 +106,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/",
   "x-powered-by": "Express",
 }
 `;
@@ -146,6 +147,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -1666,6 +1668,94 @@ Object {
 }
 `;
 
+exports[`Comments API when commenting enabled for all when authenticated Can browse all comments of a post (legacy) 1: [body] 1`] = `
+Object {
+  "comments": Array [
+    Object {
+      "count": Object {
+        "likes": Any<Number>,
+        "replies": Any<Number>,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "edited_at": null,
+      "html": "<p>First.</p>",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "liked": Any<Boolean>,
+      "member": Object {
+        "avatar_image": null,
+        "expertise": null,
+        "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+        "name": "Mr Egg",
+        "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      },
+      "replies": Array [
+        Object {
+          "count": Object {
+            "likes": Any<Number>,
+          },
+          "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "edited_at": null,
+          "html": "<p>Really original</p>",
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "liked": Any<Boolean>,
+          "member": Object {
+            "avatar_image": null,
+            "expertise": null,
+            "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+            "name": null,
+            "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+          },
+          "status": "published",
+        },
+      ],
+      "status": "published",
+    },
+    Object {
+      "count": Object {
+        "likes": Any<Number>,
+        "replies": 0,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "edited_at": null,
+      "html": "<p>This is a message</p><p></p><p>New line</p>",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "liked": Any<Boolean>,
+      "member": Object {
+        "avatar_image": null,
+        "expertise": null,
+        "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+        "name": null,
+        "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      },
+      "replies": Array [],
+      "status": "published",
+    },
+  ],
+  "meta": Object {
+    "pagination": Object {
+      "limit": 15,
+      "next": null,
+      "page": 1,
+      "pages": 1,
+      "prev": null,
+      "total": 2,
+    },
+  },
+}
+`;
+
+exports[`Comments API when commenting enabled for all when authenticated Can browse all comments of a post (legacy) 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": "1118",
+  "content-type": "application/json; charset=utf-8",
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Comments API when commenting enabled for all when authenticated Can browse all comments of a post 1: [body] 1`] = `
 Object {
   "comments": Array [
@@ -1754,6 +1844,94 @@ Object {
 }
 `;
 
+exports[`Comments API when commenting enabled for all when authenticated Can browse all comments of a post with default order 1: [body] 1`] = `
+Object {
+  "comments": Array [
+    Object {
+      "count": Object {
+        "likes": Any<Number>,
+        "replies": 0,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "edited_at": null,
+      "html": "<p>This is a message</p><p></p><p>New line</p>",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "liked": Any<Boolean>,
+      "member": Object {
+        "avatar_image": null,
+        "expertise": null,
+        "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+        "name": null,
+        "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      },
+      "replies": Array [],
+      "status": "published",
+    },
+    Object {
+      "count": Object {
+        "likes": Any<Number>,
+        "replies": Any<Number>,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "edited_at": null,
+      "html": "<p>First.</p>",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "liked": Any<Boolean>,
+      "member": Object {
+        "avatar_image": null,
+        "expertise": null,
+        "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+        "name": "Mr Egg",
+        "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      },
+      "replies": Array [
+        Object {
+          "count": Object {
+            "likes": Any<Number>,
+          },
+          "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "edited_at": null,
+          "html": "<p>Really original</p>",
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "liked": Any<Boolean>,
+          "member": Object {
+            "avatar_image": null,
+            "expertise": null,
+            "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+            "name": null,
+            "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+          },
+          "status": "published",
+        },
+      ],
+      "status": "published",
+    },
+  ],
+  "meta": Object {
+    "pagination": Object {
+      "limit": 15,
+      "next": null,
+      "page": 1,
+      "pages": 1,
+      "prev": null,
+      "total": 2,
+    },
+  },
+}
+`;
+
+exports[`Comments API when commenting enabled for all when authenticated Can browse all comments of a post with default order 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": "1118",
+  "content-type": "application/json; charset=utf-8",
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Comments API when commenting enabled for all when authenticated Can comment on a post 1: [body] 1`] = `
 Object {
   "comments": Array [
@@ -1790,6 +1968,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/",
   "x-powered-by": "Express",
 }
 `;
@@ -1848,6 +2027,7 @@ Object {
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/",
   "x-powered-by": "Express",
 }
 `;
@@ -1935,6 +2115,7 @@ Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/",
   "x-powered-by": "Express",
 }
 `;
@@ -2002,6 +2183,7 @@ Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -2168,6 +2350,7 @@ Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/",
   "x-powered-by": "Express",
 }
 `;
@@ -2266,6 +2449,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -2306,6 +2490,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -2346,6 +2531,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -2386,6 +2572,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": StringMatching /\\\\/api\\\\/members\\\\/comments\\\\/post\\\\/\\[0-9a-f\\]\\{24\\}\\\\/, \\\\/api\\\\/members\\\\/comments\\\\/\\[0-9a-f\\]\\{24\\}\\\\/replies\\\\//,
   "x-powered-by": "Express",
 }
 `;
@@ -2847,6 +3034,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -2887,6 +3075,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -2927,6 +3116,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
@@ -3025,6 +3215,74 @@ Object {
 }
 `;
 
+exports[`Comments API when commenting enabled for all when not authenticated Can browse all comments of a post (legacy) 1: [body] 1`] = `
+Object {
+  "comments": Array [
+    Object {
+      "count": Object {
+        "likes": Any<Number>,
+        "replies": Any<Number>,
+      },
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "edited_at": null,
+      "html": "<p>First.</p>",
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "liked": Any<Boolean>,
+      "member": Object {
+        "avatar_image": null,
+        "expertise": null,
+        "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+        "name": "Mr Egg",
+        "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      },
+      "replies": Array [
+        Object {
+          "count": Object {
+            "likes": Any<Number>,
+          },
+          "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+          "edited_at": null,
+          "html": "<p>Really original</p>",
+          "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+          "liked": Any<Boolean>,
+          "member": Object {
+            "avatar_image": null,
+            "expertise": null,
+            "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+            "name": null,
+            "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+          },
+          "status": "published",
+        },
+      ],
+      "status": "published",
+    },
+  ],
+  "meta": Object {
+    "pagination": Object {
+      "limit": 15,
+      "next": null,
+      "page": 1,
+      "pages": 1,
+      "prev": null,
+      "total": 1,
+    },
+  },
+}
+`;
+
+exports[`Comments API when commenting enabled for all when not authenticated Can browse all comments of a post (legacy) 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": "753",
+  "content-type": "application/json; charset=utf-8",
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "vary": "Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Comments API when commenting enabled for all when not authenticated Can browse all comments of a post 1: [body] 1`] = `
 Object {
   "comments": Array [
@@ -3535,6 +3793,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/",
   "x-powered-by": "Express",
 }
 `;
@@ -3575,6 +3834,7 @@ Object {
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/comments\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
   "vary": "Accept-Encoding",
+  "x-cache-invalidate": "/api/members/comments/post/618ba1ffbe2896088840a6df/, /api/members/comments/6195c6a1e792de832cd08144/replies/",
   "x-powered-by": "Express",
 }
 `;
diff --git a/ghost/core/test/e2e-api/members-comments/comments.test.js b/ghost/core/test/e2e-api/members-comments/comments.test.js
index 4444f6f90ea..7deff815954 100644
--- a/ghost/core/test/e2e-api/members-comments/comments.test.js
+++ b/ghost/core/test/e2e-api/members-comments/comments.test.js
@@ -211,9 +211,21 @@ describe('Comments API', function () {
                 sinon.restore();
             });
 
+            it('Can browse all comments of a post (legacy)', async function () {
+                await membersAgent
+                    .get(`/api/comments/?filter=post_id:'${postId}'`)
+                    .expectStatus(200)
+                    .matchHeaderSnapshot({
+                        etag: anyEtag
+                    })
+                    .matchBodySnapshot({
+                        comments: [commentMatcherWithReplies({replies: 1})]
+                    });
+            });
+
             it('Can browse all comments of a post', async function () {
                 await membersAgent
-                    .get(`/api/comments/?filter=post_id:${postId}`)
+                    .get(`/api/comments/post/${postId}/`)
                     .expectStatus(200)
                     .matchHeaderSnapshot({
                         etag: anyEtag
@@ -306,15 +318,50 @@ describe('Comments API', function () {
                 await testCanCommentOnPost(member);
             });
 
+            it('Can browse all comments of a post (legacy)', async function () {
+                // uses explicit order to match db ordering
+                await membersAgent
+                    .get(`/api/comments/?filter=post_id:'${postId}'&order=id%20ASC`)
+                    .expectStatus(200)
+                    .matchHeaderSnapshot({
+                        etag: anyEtag
+                    })
+                    .matchBodySnapshot({
+                        comments: [
+                            commentMatcherWithReplies({replies: 1}),
+                            commentMatcher
+                        ]
+                    });
+            });
+
             it('Can browse all comments of a post', async function () {
+                // uses explicit order to match db ordering
                 await membersAgent
-                    .get(`/api/comments/?filter=post_id:${postId}`)
+                    .get(`/api/comments/post/${postId}/?order=id%20ASC`)
                     .expectStatus(200)
                     .matchHeaderSnapshot({
                         etag: anyEtag
                     })
                     .matchBodySnapshot({
-                        comments: [commentMatcherWithReplies({replies: 1}), commentMatcher]
+                        comments: [
+                            commentMatcherWithReplies({replies: 1}),
+                            commentMatcher
+                        ]
+                    });
+            });
+
+            it('Can browse all comments of a post with default order', async function () {
+                await membersAgent
+                    .get(`/api/comments/post/${postId}/`)
+                    .expectStatus(200)
+                    .matchHeaderSnapshot({
+                        etag: anyEtag
+                    })
+                    .matchBodySnapshot({
+                        comments: [
+                            commentMatcher,
+                            commentMatcherWithReplies({replies: 1})
+                        ]
                     });
             });
 
@@ -334,7 +381,10 @@ describe('Comments API', function () {
                     .expectStatus(201)
                     .matchHeaderSnapshot({
                         etag: anyEtag,
-                        location: anyLocationFor('comments')
+                        location: anyLocationFor('comments'),
+                        'x-cache-invalidate': matchers.stringMatching(
+                            new RegExp('/api/members/comments/post/[0-9a-f]{24}/, /api/members/comments/[0-9a-f]{24}/replies/')
+                        )
                     })
                     .matchBodySnapshot({
                         comments: [commentMatcher]
@@ -420,7 +470,7 @@ describe('Comments API', function () {
             it('Can reply to a comment with www domain', async function () {
                 // Test that the www. is stripped from the default
                 configUtils.set('url', 'http://www.domain.example/');
-                await testCanReply(member, {from: 'noreply@domain.example'});
+                await testCanReply(member, {from: '"Ghost" <noreply@domain.example>'});
             });
 
             it('Can reply to a comment with custom support email', async function () {
@@ -434,7 +484,7 @@ describe('Comments API', function () {
                     }
                     return getStub.wrappedMethod.call(settingsCache, key, options);
                 });
-                await testCanReply(member, {from: 'support@example.com'});
+                await testCanReply(member, {from: '"Ghost" <support@example.com>'});
             });
 
             it('Can like a comment', async function () {
@@ -616,7 +666,7 @@ describe('Comments API', function () {
                     .expectEmptyBody();
 
                 // Check report
-                const reports = await models.CommentReport.findAll({filter: 'comment_id:' + commentId});
+                const reports = await models.CommentReport.findAll({filter: 'comment_id:\'' + commentId + '\''});
                 reports.models.length.should.eql(1);
 
                 const report = reports.models[0];
@@ -641,7 +691,7 @@ describe('Comments API', function () {
                     .expectEmptyBody();
 
                 // Check report should be the same (no extra created)
-                const reports = await models.CommentReport.findAll({filter: 'comment_id:' + commentId});
+                const reports = await models.CommentReport.findAll({filter: 'comment_id:\'' + commentId + '\''});
                 reports.models.length.should.eql(1);
 
                 const report = reports.models[0];
@@ -651,7 +701,7 @@ describe('Comments API', function () {
             });
 
             it('Can edit a comment on a post', async function () {
-                const {body} = await await membersAgent
+                const {body} = await membersAgent
                     .put(`/api/comments/${commentId}`)
                     .body({comments: [{
                         html: 'Updated comment'
@@ -679,7 +729,7 @@ describe('Comments API', function () {
                     }]});
 
                 const {body} = await membersAgent
-                    .get(`/api/comments/?filter=post_id:${anotherPostId}`);
+                    .get(`/api/comments/?filter=post_id:'${anotherPostId}'`);
 
                 assert(!body.comments.find(comment => comment.id === commentId), 'The comment should not have moved post');
             });
diff --git a/ghost/core/test/e2e-api/members/__snapshots__/donation-checkout-session.test.js.snap b/ghost/core/test/e2e-api/members/__snapshots__/donation-checkout-session.test.js.snap
index 67a223dba80..2882f387c07 100644
--- a/ghost/core/test/e2e-api/members/__snapshots__/donation-checkout-session.test.js.snap
+++ b/ghost/core/test/e2e-api/members/__snapshots__/donation-checkout-session.test.js.snap
@@ -11,3 +11,15 @@ Object {
   "url": "https://checkout.stripe.com/c/pay/fake-data",
 }
 `;
+
+exports[`Create Stripe Checkout Session for Donations can create a checkout session for a site with a long title 1: [body] 1`] = `
+Object {
+  "url": "https://checkout.stripe.com/c/pay/fake-data",
+}
+`;
+
+exports[`Create Stripe Checkout Session for Donations check if donation message is in email 1: [body] 1`] = `
+Object {
+  "url": "https://checkout.stripe.com/c/pay/fake-data",
+}
+`;
diff --git a/ghost/core/test/e2e-api/members/__snapshots__/feedback.test.js.snap b/ghost/core/test/e2e-api/members/__snapshots__/feedback.test.js.snap
index d9487d896b4..997655f492f 100644
--- a/ghost/core/test/e2e-api/members/__snapshots__/feedback.test.js.snap
+++ b/ghost/core/test/e2e-api/members/__snapshots__/feedback.test.js.snap
@@ -26,6 +26,104 @@ Object {
 }
 `;
 
+exports[`Members Feedback Authentication Allows authentication via uuid (+ key) 1: [body] 1`] = `
+Object {
+  "feedback": Array [
+    Object {
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "memberId": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "postId": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "score": 1,
+    },
+  ],
+}
+`;
+
+exports[`Members Feedback Authentication Allows authentication via uuid (+ key) 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": "132",
+  "content-type": "application/json; charset=utf-8",
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/feedback\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
+  "vary": "Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Members Feedback Authentication Thorws for invalid key 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Invalid key.",
+      "property": null,
+      "type": "UnauthorizedError",
+    },
+  ],
+}
+`;
+
+exports[`Members Feedback Authentication Throws for invalid uuid 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Invalid key.",
+      "property": null,
+      "type": "UnauthorizedError",
+    },
+  ],
+}
+`;
+
+exports[`Members Feedback Authentication Throws for missing key 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Invalid key.",
+      "property": null,
+      "type": "UnauthorizedError",
+    },
+  ],
+}
+`;
+
+exports[`Members Feedback Authentication Throws for nonexisting uuid 1: [body] 1`] = `
+Object {
+  "errors": Array [
+    Object {
+      "code": null,
+      "context": null,
+      "details": null,
+      "ghostErrorCode": null,
+      "help": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+      "message": "Invalid key.",
+      "property": null,
+      "type": "UnauthorizedError",
+    },
+  ],
+}
+`;
+
 exports[`Members Feedback Can add feedback 1: [body] 1`] = `
 Object {
   "feedback": Array [
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..252480f8d0f 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",
@@ -345,6 +357,162 @@ Object {
 }
 `;
 
+exports[`Comments API when caching members content is enabled can get member data 1: [body] 1`] = `
+Object {
+  "avatar_image": null,
+  "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+  "email": "member@example.com",
+  "email_suppression": Object {
+    "info": null,
+    "suppressed": false,
+  },
+  "enable_comment_notifications": true,
+  "expertise": null,
+  "firstname": null,
+  "name": null,
+  "newsletters": Array [
+    Object {
+      "description": null,
+      "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,
+  "subscribed": false,
+  "subscriptions": Array [],
+  "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+}
+`;
+
+exports[`Comments API when caching members content is enabled 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": "621",
+  "content-type": "application/json; charset=utf-8",
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "set-cookie": Array [
+    StringMatching /\\^ghost-access=free:/,
+    StringMatching /\\^ghost-access-hmac=/,
+  ],
+  "vary": "Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Comments API when caching members content is enabled sets ghost-access and ghost-access-hmac cookies 1: [body] 1`] = `
+Object {
+  "avatar_image": null,
+  "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+  "email": "member@example.com",
+  "email_suppression": Object {
+    "info": null,
+    "suppressed": false,
+  },
+  "enable_comment_notifications": true,
+  "expertise": null,
+  "firstname": null,
+  "name": null,
+  "newsletters": Array [
+    Object {
+      "description": null,
+      "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,
+  "subscribed": false,
+  "subscriptions": Array [],
+  "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+}
+`;
+
+exports[`Comments API when caching members content is enabled sets ghost-access and ghost-access-hmac cookies 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": "621",
+  "content-type": "application/json; charset=utf-8",
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "set-cookie": Array [
+    StringMatching /\\^ghost-access=\\[0-9a-fA-F\\]\\{24\\}:\\\\d\\{10\\}/,
+    StringMatching /\\^ghost-access-hmac=\\[a-fA-F0-9\\]\\{64\\}/,
+  ],
+  "vary": "Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
+exports[`Comments API when caching members content is enabled sets ghost-access and ghost-access-hmac cookies to null when not authenticated but a cookie is sent 1: [body] 1`] = `
+Object {
+  "avatar_image": null,
+  "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+  "email": "member@example.com",
+  "email_suppression": Object {
+    "info": null,
+    "suppressed": false,
+  },
+  "enable_comment_notifications": true,
+  "expertise": null,
+  "firstname": null,
+  "name": null,
+  "newsletters": Array [
+    Object {
+      "description": null,
+      "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,
+  "subscribed": false,
+  "subscriptions": Array [],
+  "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/,
+}
+`;
+
+exports[`Comments API when caching members content is enabled sets ghost-access and ghost-access-hmac cookies to null when not authenticated but a cookie is sent 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": "621",
+  "content-type": "application/json; charset=utf-8",
+  "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
+  "set-cookie": Array [
+    StringMatching /\\^ghost-access=\\[0-9a-fA-F\\]\\{24\\}:\\\\d\\{10\\}/,
+    StringMatching /\\^ghost-access-hmac=\\[a-fA-F0-9\\]\\{64\\}/,
+  ],
+  "vary": "Accept-Encoding",
+  "x-powered-by": "Express",
+}
+`;
+
 exports[`Comments API when not authenticated but enabled can update comment notifications 1: [body] 1`] = `
 Object {
   "email": "member1@test.com",
@@ -356,6 +524,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 +536,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/__snapshots__/webhooks.test.js.snap b/ghost/core/test/e2e-api/members/__snapshots__/webhooks.test.js.snap
index 44d580bd0e2..dfa7272e0c4 100644
--- a/ghost/core/test/e2e-api/members/__snapshots__/webhooks.test.js.snap
+++ b/ghost/core/test/e2e-api/members/__snapshots__/webhooks.test.js.snap
@@ -429,7 +429,7 @@ exports[`Members API Member attribution Returns subscription created attribution
 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": "8144",
+  "content-length": "5664",
   "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/members/donation-checkout-session.test.js b/ghost/core/test/e2e-api/members/donation-checkout-session.test.js
index 528f0061900..8e6489a5a58 100644
--- a/ghost/core/test/e2e-api/members/donation-checkout-session.test.js
+++ b/ghost/core/test/e2e-api/members/donation-checkout-session.test.js
@@ -58,21 +58,29 @@ describe('Create Stripe Checkout Session for Donations', function () {
             .expectStatus(200)
             .matchBodySnapshot();
 
-        // Send a webhook of a paid invoice for this session
+        // Send a webhook of a completed checkout session for this donation
         await stripeMocker.sendWebhook({
-            type: 'invoice.payment_succeeded',
+            type: 'checkout.session.completed',
             data: {
                 object: {
-                    type: 'invoice',
-                    paid: true,
-                    amount_paid: 1200,
+                    mode: 'payment',
+                    amount_total: 1200,
                     currency: 'usd',
                     customer: (stripeMocker.checkoutSessions[0].customer),
-                    customer_name: 'Paid Test',
-                    customer_email: 'exampledonation@example.com',
+                    customer_details: {
+                        name: 'Paid Test',
+                        email: 'exampledonation@example.com'
+                    },
                     metadata: {
-                        ...(stripeMocker.checkoutSessions[0].invoice_creation?.invoice_data?.metadata ?? {})
-                    }
+                        ...(stripeMocker.checkoutSessions[0].metadata ?? {}),
+                        ghost_donation: true
+                    },
+                    custom_fields: [{
+                        key: 'donation_message',
+                        text: {
+                            value: 'You are the best! Have a lovely day!'
+                        }
+                    }]
                 }
             }
         });
@@ -87,11 +95,13 @@ describe('Create Stripe Checkout Session for Donations', function () {
         const lastDonation = await models.DonationPaymentEvent.findOne({
             email: 'exampledonation@example.com'
         }, {require: true});
+
         assert.equal(lastDonation.get('amount'), 1200);
         assert.equal(lastDonation.get('currency'), 'usd');
         assert.equal(lastDonation.get('email'), 'exampledonation@example.com');
         assert.equal(lastDonation.get('name'), 'Paid Test');
         assert.equal(lastDonation.get('member_id'), null);
+        assert.equal(lastDonation.get('donation_message'), 'You are the best! Have a lovely day!');
 
         // Check referrer
         assert.equal(lastDonation.get('referrer_url'), 'example.com');
@@ -113,7 +123,7 @@ describe('Create Stripe Checkout Session for Donations', function () {
 
         const membersService = require('../../../core/server/services/members');
         const member = await membersService.api.members.create({email, name: 'Member Test'});
-        const token = await membersService.api.getMemberIdentityToken(email);
+        const token = await membersService.api.getMemberIdentityToken(member.get('transient_id'));
 
         await DomainEvents.allSettled();
 
@@ -125,6 +135,7 @@ describe('Create Stripe Checkout Session for Donations', function () {
 
         await membersAgent.post('/api/create-stripe-checkout-session/')
             .body({
+                mode: 'payment',
                 customerEmail: email,
                 identity: token,
                 type: 'donation',
@@ -146,21 +157,29 @@ describe('Create Stripe Checkout Session for Donations', function () {
             .expectStatus(200)
             .matchBodySnapshot();
 
-        // Send a webhook of a paid invoice for this session
+        // Send a webhook of a completed checkout session for this donation
         await stripeMocker.sendWebhook({
-            type: 'invoice.payment_succeeded',
+            type: 'checkout.session.completed',
             data: {
                 object: {
-                    type: 'invoice',
-                    paid: true,
-                    amount_paid: 1220,
+                    mode: 'payment',
+                    amount_total: 1220,
                     currency: 'eur',
                     customer: (stripeMocker.checkoutSessions[0].customer),
-                    customer_name: 'Member Test',
-                    customer_email: email,
+                    customer_details: {
+                        name: 'Member Test',
+                        email: email
+                    },
                     metadata: {
-                        ...(stripeMocker.checkoutSessions[0].invoice_creation?.invoice_data?.metadata ?? {})
-                    }
+                        ...(stripeMocker.checkoutSessions[0].metadata ?? {}),
+                        ghost_donation: true
+                    },
+                    custom_fields: [{
+                        key: 'donation_message',
+                        text: {
+                            value: 'You are the best! Have a lovely day!'
+                        }
+                    }]
                 }
             }
         });
@@ -180,6 +199,7 @@ describe('Create Stripe Checkout Session for Donations', function () {
         assert.equal(lastDonation.get('email'), email);
         assert.equal(lastDonation.get('name'), 'Member Test');
         assert.equal(lastDonation.get('member_id'), member.id);
+        assert.equal(lastDonation.get('donation_message'), 'You are the best! Have a lovely day!');
 
         // Check referrer
         assert.equal(lastDonation.get('referrer_url'), 'example.com');
@@ -191,4 +211,122 @@ describe('Create Stripe Checkout Session for Donations', function () {
         assert.equal(lastDonation.get('attribution_type'), 'post');
         assert.equal(lastDonation.get('attribution_url'), url);
     });
+
+    it('check if donation message is in email', async function () {
+        const post = await getPost(fixtureManager.get('posts', 0).id);
+        const url = urlService.getUrlByResourceId(post.id, {absolute: false});
+
+        await membersAgent.post('/api/create-stripe-checkout-session/')
+            .body({
+                mode: 'payment',
+                type: 'donation',
+                customerEmail: 'paid@test.com',
+                successUrl: 'https://example.com/?type=success',
+                cancelUrl: 'https://example.com/?type=cancel',
+                metadata: {
+                    urlHistory: [
+                        {
+                            path: url,
+                            time: Date.now(),
+                            referrerMedium: null,
+                            referrerSource: 'ghost-explore',
+                            referrerUrl: 'https://example.com/blog/'
+                        }
+                    ],
+                    ghost_donation: true
+                },
+                custom_fields: [{
+                    key: 'donation_message',
+                    label: {
+                        type: 'custom',
+                        custom: 'Add a personal note'
+                    },
+                    type: 'text',
+                    optional: true
+                }]
+            })
+            .expectStatus(200)
+            .matchBodySnapshot();
+
+        // Send a webhook of a completed checkout session for this donation
+        await stripeMocker.sendWebhook({
+            type: 'checkout.session.completed',
+            data: {
+                object: {
+                    mode: 'payment',
+                    amount_total: 1200,
+                    currency: 'usd',
+                    customer: (stripeMocker.checkoutSessions[0].customer),
+                    customer_details: {
+                        name: 'Paid Test',
+                        email: 'exampledonation@example.com'
+                    },
+                    metadata: {
+                        ...(stripeMocker.checkoutSessions[0].metadata ?? {}),
+                        ghost_donation: true
+                    },
+                    custom_fields: [{
+                        key: 'donation_message',
+                        text: {
+                            value: 'You are the best! Have a lovely day!'
+                        }
+                    }]
+                }
+            }
+        });
+
+        // check if donation message is in email
+        mockManager.assert.sentEmail({
+            subject: '💰 One-time payment received: $12.00 from Paid Test',
+            to: 'jbloggs@example.com',
+            text: /You are the best! Have a lovely day!/
+        });
+    });
+
+    // We had a bug where the stripe_prices.nickname column was too short for the site title
+    // Stripe is also limited to 250 chars so we need to truncate the nickname
+    it('can create a checkout session for a site with a long title', async function () {
+        // Ensure site title is longer than 250 characters
+        mockManager.mockSetting('title', 'a'.repeat(251));
+
+        // clear out existing prices to guarantee we're creating a new one
+        await models.StripePrice.where('type', 'donation').destroy().catch((e) => {
+            if (e.message !== 'No Rows Deleted') {
+                throw e;
+            }
+        });
+
+        // Fake a visit to a post
+        const post = await getPost(fixtureManager.get('posts', 0).id);
+        const url = urlService.getUrlByResourceId(post.id, {absolute: false});
+
+        await membersAgent.post('/api/create-stripe-checkout-session/')
+            .body({
+                customerEmail: 'paid@test.com',
+                type: 'donation',
+                successUrl: 'https://example.com/?type=success',
+                cancelUrl: 'https://example.com/?type=cancel',
+                metadata: {
+                    test: 'hello',
+                    urlHistory: [
+                        {
+                            path: url,
+                            time: Date.now(),
+                            referrerMedium: null,
+                            referrerSource: 'ghost-explore',
+                            referrerUrl: 'https://example.com/blog/'
+                        }
+                    ]
+                }
+            })
+            .expectStatus(200)
+            .matchBodySnapshot();
+
+        const latestStripePrice = await models.StripePrice
+            .where('type', 'donation')
+            .orderBy('created_at', 'DESC')
+            .fetch({require: true});
+
+        latestStripePrice.get('nickname').should.have.length(250);
+    });
 });
diff --git a/ghost/core/test/e2e-api/members/feedback.test.js b/ghost/core/test/e2e-api/members/feedback.test.js
index 490db7954ee..f98908325c7 100644
--- a/ghost/core/test/e2e-api/members/feedback.test.js
+++ b/ghost/core/test/e2e-api/members/feedback.test.js
@@ -3,9 +3,13 @@ const {agentProvider, mockManager, fixtureManager, matchers, configUtils} = requ
 const {anyEtag, anyObjectId, anyLocationFor, anyErrorId} = matchers;
 const models = require('../../../core/server/models');
 const sinon = require('sinon');
+const settingsHelpers = require('../../../core/server/services/settings-helpers');
+const crypto = require('crypto');
+
+const membersValidationKeyMock = 'abc123dontstealme';
 
 describe('Members Feedback', function () {
-    let membersAgent, membersAgent2, memberUuid;
+    let membersAgent, membersAgent2, memberUuid, memberHmac;
     let clock;
 
     before(async function () {
@@ -14,9 +18,11 @@ describe('Members Feedback', function () {
 
         await fixtureManager.init('posts', 'members');
         memberUuid = fixtureManager.get('members', 0).uuid;
+        memberHmac = crypto.createHmac('sha256', membersValidationKeyMock).update(memberUuid).digest('hex');
     });
 
     beforeEach(function () {
+        sinon.stub(settingsHelpers, 'getMembersValidationKey').returns(membersValidationKeyMock);
         mockManager.mockMail();
     });
 
@@ -55,21 +61,45 @@ describe('Members Feedback', function () {
                     ]
                 });
         });
-    });
 
-    describe('Validation', function () {
-        const postId = fixtureManager.get('posts', 0).id;
+        it('Allows authentication via uuid (+ key)', async function () {
+            const postId = fixtureManager.get('posts', 0).id;
 
-        it('Throws for invalid score', async function () {
+            await membersAgent
+                .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
+                .body({
+                    feedback: [{
+                        score: 1,
+                        post_id: postId
+                    }]
+                })
+                .expectStatus(201)
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    location: anyLocationFor('feedback')
+                })
+                .matchBodySnapshot({
+                    feedback: [
+                        {
+                            id: anyObjectId,
+                            memberId: anyObjectId,
+                            postId: anyObjectId
+                        }
+                    ]
+                });
+        });
+
+        it('Throws for missing key', async function () {
+            const postId = fixtureManager.get('posts', 0).id;
             await membersAgent
                 .post(`/api/feedback/?uuid=${memberUuid}`)
                 .body({
                     feedback: [{
-                        score: 2,
+                        score: 1,
                         post_id: postId
                     }]
                 })
-                .expectStatus(422)
+                .expectStatus(401)
                 .matchBodySnapshot({
                     errors: [
                         {
@@ -79,16 +109,17 @@ describe('Members Feedback', function () {
                 });
         });
 
-        it('Throws for invalid score type', async function () {
+        it('Thorws for invalid key', async function () {
+            const postId = fixtureManager.get('posts', 0).id;
             await membersAgent
-                .post(`/api/feedback/?uuid=${memberUuid}`)
+                .post(`/api/feedback/?uuid=${memberUuid}&key=1234`)
                 .body({
                     feedback: [{
-                        score: 'text',
+                        score: 1,
                         post_id: postId
                     }]
                 })
-                .expectStatus(422)
+                .expectStatus(401)
                 .matchBodySnapshot({
                     errors: [
                         {
@@ -99,6 +130,7 @@ describe('Members Feedback', function () {
         });
 
         it('Throws for invalid uuid', async function () {
+            const postId = fixtureManager.get('posts', 0).id;
             await membersAgent
                 .post(`/api/feedback/?uuid=1234`)
                 .body({
@@ -118,6 +150,7 @@ describe('Members Feedback', function () {
         });
 
         it('Throws for nonexisting uuid', async function () {
+            const postId = fixtureManager.get('posts', 0).id;
             const uuid = '00000000-0000-0000-0000-000000000000';
             await membersAgent
                 .post(`/api/feedback/?uuid=${uuid}`)
@@ -136,10 +169,52 @@ describe('Members Feedback', function () {
                     ]
                 });
         });
+    });
+
+    describe('Validation', function () {
+        const postId = fixtureManager.get('posts', 0).id;
+
+        it('Throws for invalid score', async function () {
+            await membersAgent
+                .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
+                .body({
+                    feedback: [{
+                        score: 2,
+                        post_id: postId
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [
+                        {
+                            id: anyErrorId
+                        }
+                    ]
+                });
+        });
+
+        it('Throws for invalid score type', async function () {
+            await membersAgent
+                .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
+                .body({
+                    feedback: [{
+                        score: 'text',
+                        post_id: postId
+                    }]
+                })
+                .expectStatus(422)
+                .matchBodySnapshot({
+                    errors: [
+                        {
+                            id: anyErrorId
+                        }
+                    ]
+                });
+        });
 
         it('Throws for nonexisting post', async function () {
             await membersAgent
-                .post(`/api/feedback/?uuid=${memberUuid}`)
+                .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
                 .body({
                     feedback: [{
                         score: 1,
@@ -161,7 +236,7 @@ describe('Members Feedback', function () {
         const postId = fixtureManager.get('posts', 0).id;
 
         await membersAgent
-            .post(`/api/feedback/?uuid=${memberUuid}`)
+            .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
             .body({
                 feedback: [{
                     score: 1,
@@ -189,7 +264,7 @@ describe('Members Feedback', function () {
         const postId = fixtureManager.get('posts', 1).id;
 
         const {body} = await membersAgent
-            .post(`/api/feedback/?uuid=${memberUuid}`)
+            .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
             .body({
                 feedback: [{
                     score: 0,
@@ -220,7 +295,7 @@ describe('Members Feedback', function () {
         clock.tick(10 * 60 * 1000);
 
         const {body: body2} = await membersAgent
-            .post(`/api/feedback/?uuid=${memberUuid}`)
+            .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
             .body({
                 feedback: [{
                     score: 1,
@@ -252,7 +327,7 @@ describe('Members Feedback', function () {
 
         // Do the same change again, and the model shouldn't change
         const {body: body3} = await membersAgent
-            .post(`/api/feedback/?uuid=${memberUuid}`)
+            .post(`/api/feedback/?uuid=${memberUuid}&key=${memberHmac}`)
             .body({
                 feedback: [{
                     score: 1,
diff --git a/ghost/core/test/e2e-api/members/middleware.test.js b/ghost/core/test/e2e-api/members/middleware.test.js
index 8f97b479660..88a03849338 100644
--- a/ghost/core/test/e2e-api/members/middleware.test.js
+++ b/ghost/core/test/e2e-api/members/middleware.test.js
@@ -1,7 +1,10 @@
-const {agentProvider, mockManager, fixtureManager, matchers} = require('../../utils/e2e-framework');
-const {anyEtag, anyObjectId, anyUuid, anyISODateTime} = matchers;
+const crypto = require('crypto');
+const {agentProvider, mockManager, fixtureManager, matchers, configUtils} = require('../../utils/e2e-framework');
+const {anyEtag, anyObjectId, anyUuid, anyISODateTime, stringMatching} = matchers;
 const models = require('../../../core/server/models');
 const should = require('should');
+const sinon = require('sinon');
+const settingsHelpers = require('../../../core/server/services/settings-helpers');
 
 let membersAgent;
 
@@ -12,7 +15,8 @@ const memberMatcher = (newslettersCount) => {
         created_at: anyISODateTime,
         newsletters: new Array(newslettersCount).fill(
             {
-                id: anyObjectId
+                id: anyObjectId,
+                uuid: anyUuid
             }
         )
     };
@@ -23,7 +27,8 @@ const buildMemberMatcher = (newslettersCount) => {
         uuid: anyUuid,
         newsletters: new Array(newslettersCount).fill(
             {
-                id: anyObjectId
+                id: anyObjectId,
+                uuid: anyUuid
             }
         )
     };
@@ -57,8 +62,11 @@ describe('Comments API', function () {
             let member = await models.Member.findOne({id: fixtureManager.get('members', 0).id}, {require: true});
             member.get('enable_comment_notifications').should.eql(true, 'This test requires the initial value to be true');
 
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+            const hmac = crypto.createHmac('sha256', 'test').update(member.get('uuid')).digest('hex');
+
             await membersAgent
-                .put(`/api/member/newsletters/?uuid=${member.get('uuid')}`)
+                .put(`/api/member/newsletters/?uuid=${member.get('uuid')}&key=${hmac}`)
                 .body({
                     enable_comment_notifications: false
                 })
@@ -176,9 +184,12 @@ describe('Comments API', function () {
             member = await models.Member.findOne({id: member.id}, {require: true});
             member.get('enable_comment_notifications').should.eql(false);
 
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+            const hmac = crypto.createHmac('sha256', 'test').update(member.get('uuid')).digest('hex');
+
             // Via updateMemberNewsletters
             await membersAgent
-                .put(`/api/member/newsletters/?uuid=${member.get('uuid')}`)
+                .put(`/api/member/newsletters/?uuid=${member.get('uuid')}&key=${hmac}`)
                 .body({
                     enable_comment_notifications: true
                 })
@@ -222,4 +233,61 @@ describe('Comments API', function () {
             should(member.get('email_disabled')).be.false();
         });
     });
+
+    describe('when caching members content is enabled', function () {
+        it('sets ghost-access and ghost-access-hmac cookies', async function () {
+            configUtils.set('cacheMembersContent:enabled', true);
+            configUtils.set('cacheMembersContent:hmacSecret', crypto.randomBytes(64).toString('base64'));
+            membersAgent = await agentProvider.getMembersAPIAgent();
+            await fixtureManager.init('newsletters', 'members:newsletters');
+            await membersAgent.loginAs('member@example.com');
+            const member = await models.Member.findOne({email: 'member@example.com'}, {require: true});
+            await membersAgent
+                .get(`/api/member/`)
+                .expectStatus(200)
+                .matchHeaderSnapshot({
+                    etag: anyEtag,
+                    'set-cookie': [
+                        stringMatching(/^ghost-access=[0-9a-fA-F]{24}:\d{10}/),
+                        stringMatching(/^ghost-access-hmac=[a-fA-F0-9]{64}/)
+                    ]
+                })
+                .matchBodySnapshot(memberMatcher(2))
+                .expect(({body}) => {
+                    body.email.should.eql(member.get('email'));
+                });
+        });
+
+        it('does not set ghost-access and ghost-access-hmac cookies when not authenticated', async function () {
+            configUtils.set('cacheMembersContent:enabled', true);
+            configUtils.set('cacheMembersContent:hmacSecret', crypto.randomBytes(64).toString('base64'));
+            membersAgent = await agentProvider.getMembersAPIAgent();
+            await fixtureManager.init('newsletters', 'members:newsletters');
+            await membersAgent
+                .get(`/api/member/`)
+                .expectStatus(204)
+                .expectEmptyBody()
+                .expect(({headers}) => {
+                    should.not.exist(headers['set-cookie']);
+                });
+        });
+
+        it('sets ghost-access and ghost-access-hmac cookies to null when not authenticated but a cookie is sent', async function () {
+            // This is to ensure that the cookies are reset when a user logs out
+            configUtils.set('cacheMembersContent:enabled', true);
+            configUtils.set('cacheMembersContent:hmacSecret', crypto.randomBytes(64).toString('base64'));
+            membersAgent = await agentProvider.getMembersAPIAgent();
+            await fixtureManager.init('newsletters', 'members:newsletters');
+            // Send a ghost-access cookie but without a valid member session
+            await membersAgent.jar.setCookie('ghost-access=fake;');
+            await membersAgent
+                .get('/api/member/')
+                .expect(({headers}) => {
+                    should.exist(headers['set-cookie']);
+                    headers['set-cookie'].should.matchAny(/ghost-access=null;/);
+                })
+                .expectStatus(204)
+                .expectEmptyBody();
+        });
+    });
 });
diff --git a/ghost/core/test/e2e-api/members/recommendations.test.js b/ghost/core/test/e2e-api/members/recommendations.test.js
index 1bf16a5cf8b..95c160f1330 100644
--- a/ghost/core/test/e2e-api/members/recommendations.test.js
+++ b/ghost/core/test/e2e-api/members/recommendations.test.js
@@ -6,13 +6,13 @@ const {Recommendation} = require('@tryghost/recommendations');
 
 async function testClicked({recommendationId, memberId}, test) {
     const before = await recommendationsService.clickEventRepository.getAll({
-        filter: 'recommendationId:' + recommendationId
+        filter: `recommendationId:'${recommendationId}'`
     });
 
     await test();
 
     const after = await recommendationsService.clickEventRepository.getAll({
-        filter: 'recommendationId:' + recommendationId
+        filter: `recommendationId:'${recommendationId}'`
     });
 
     assert.equal(after.length, before.length + 1);
@@ -40,11 +40,11 @@ async function testNotSubscribed(test) {
 
 async function testSubscribed({recommendationId, memberId}, test) {
     const before = await recommendationsService.subscribeEventRepository.getAll({
-        filter: 'recommendationId:' + recommendationId
+        filter: `recommendationId:'${recommendationId}'`
     });
     await test();
     const after = await recommendationsService.subscribeEventRepository.getAll({
-        filter: 'recommendationId:' + recommendationId
+        filter: `recommendationId:'${recommendationId}'`
     });
 
     assert.equal(after.length, before.length + 1);
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-api/members/site.test.js b/ghost/core/test/e2e-api/members/site.test.js
index ba94c9653bd..b389e8d3638 100644
--- a/ghost/core/test/e2e-api/members/site.test.js
+++ b/ghost/core/test/e2e-api/members/site.test.js
@@ -12,7 +12,7 @@ describe('Site Public Settings', function () {
     });
 
     afterEach(async function () {
-        await await models.Settings.edit({
+        await models.Settings.edit({
             key: 'members_signup_access',
             value: 'all'
         }, {context: {internal: true}});
@@ -34,7 +34,7 @@ describe('Site Public Settings', function () {
     });
 
     it('Sets allow_external_signup to false when members are invite only', async function () {
-        await await models.Settings.edit({
+        await models.Settings.edit({
             key: 'members_signup_access',
             value: 'invite'
         }, {context: {internal: true}});
@@ -58,12 +58,12 @@ describe('Site Public Settings', function () {
             .get('/api/site');
         assert.equal(initialBody.site.allow_external_signup, true, 'This test requires the initial state to allow external signups');
 
-        await await models.Settings.edit({
+        await models.Settings.edit({
             key: 'portal_signup_checkbox_required',
             value: true
         }, {context: {internal: true}});
 
-        await await models.Settings.edit({
+        await models.Settings.edit({
             key: 'portal_signup_terms_html',
             value: 'I agree to the terms and conditions'
         }, {context: {internal: true}});
diff --git a/ghost/core/test/e2e-api/members/webhooks.test.js b/ghost/core/test/e2e-api/members/webhooks.test.js
index d91b32ba1f7..e3457796ca8 100644
--- a/ghost/core/test/e2e-api/members/webhooks.test.js
+++ b/ghost/core/test/e2e-api/members/webhooks.test.js
@@ -221,7 +221,7 @@ describe('Members API', function () {
 
         let canceledPaidMember;
 
-        it('Handles cancellation of paid subscriptions correctly', async function () {
+        it('Handles cancellation of paid subscriptions at the end of the billing cycle', async function () {
             const customer_id = createStripeID('cust');
             const subscription_id = createStripeID('sub');
 
@@ -256,8 +256,8 @@ describe('Members API', function () {
             // Create a new customer in Stripe
             set(customer, {
                 id: customer_id,
-                name: 'Test Member',
-                email: 'cancel-paid-test@email.com',
+                name: 'Cancel me at the end of the billing cycle',
+                email: 'cancel-me-at-the-end-of-cycle@test.com',
                 subscriptions: {
                     type: 'list',
                     data: [subscription]
@@ -286,10 +286,14 @@ describe('Members API', function () {
                 mrr: 500
             });
 
-            // Cancel the previously created subscription in Stripe
+            // Set the subscription to cancel at the end of the period
             set(subscription, {
                 ...subscription,
-                status: 'canceled'
+                canceled_at: Date.now() / 1000,
+                cancel_at_period_end: true,
+                metadata: {
+                    cancellation_reason: 'I want to break free'
+                }
             });
 
             // Send the webhook call to announce the cancelation
@@ -304,6 +308,152 @@ describe('Members API', function () {
                 secret: process.env.WEBHOOK_SECRET
             });
 
+            await membersAgent.post('/webhooks/stripe/')
+                .body(webhookPayload)
+                .header('content-type', 'application/json')
+                .header('stripe-signature', webhookSignature)
+                .expectStatus(200);
+
+            // Check that the subscription has been set to cancel and has saved the cancellation reason
+            const {body: body2} = await adminAgent.get('/members/' + initialMember.id + '/');
+            assert.equal(body2.members.length, 1, 'The member does not exist');
+            const updatedMember = body2.members[0];
+            should(updatedMember.subscriptions).match([
+                {
+                    status: 'active',
+                    cancel_at_period_end: true,
+                    cancellation_reason: 'I want to break free'
+                }
+            ]);
+
+            // Check whether MRR and cancel_at_period_end has been set
+            await assertSubscription(initialMember.subscriptions[0].id, {
+                subscription_id: subscription.id,
+                status: 'active',
+                cancel_at_period_end: true,
+                plan_amount: 500,
+                plan_interval: 'month',
+                plan_currency: 'usd',
+                mrr: 0
+            });
+
+            // Check that there is a canceled event
+            await assertMemberEvents({
+                eventType: 'MemberPaidSubscriptionEvent',
+                memberId: updatedMember.id,
+                asserts: [
+                    {
+                        type: 'created',
+                        mrr_delta: 500
+                    },
+                    {
+                        type: 'canceled',
+                        mrr_delta: -500
+                    }
+                ]
+            });
+
+            // Check that the staff notifications has been sent
+            await DomainEvents.allSettled();
+
+            mockManager.assert.sentEmail({
+                subject: /Paid subscription started: Cancel me at the end of the billing cycle/,
+                to: 'jbloggs@example.com'
+            });
+
+            mockManager.assert.sentEmail({
+                subject: /Cancellation: Cancel me at the end of the billing cycle/,
+                to: 'jbloggs@example.com'
+            });
+        });
+
+        it('Handles immediate cancellation of paid subscriptions', async function () {
+            const customer_id = createStripeID('cust');
+            const subscription_id = createStripeID('sub');
+
+            // Create a new subscription in Stripe
+            set(subscription, {
+                id: subscription_id,
+                customer: customer_id,
+                status: 'active',
+                items: {
+                    type: 'list',
+                    data: [{
+                        id: 'item_123',
+                        price: {
+                            id: 'price_123',
+                            product: 'product_123',
+                            active: true,
+                            nickname: 'Monthly',
+                            currency: 'usd',
+                            recurring: {
+                                interval: 'month'
+                            },
+                            unit_amount: 500,
+                            type: 'recurring'
+                        }
+                    }]
+                },
+                start_date: Date.now() / 1000,
+                current_period_end: Date.now() / 1000 + (60 * 60 * 24 * 31),
+                cancel_at_period_end: false
+            });
+
+            // Create a new customer in Stripe
+            set(customer, {
+                id: customer_id,
+                name: 'Cancel me now',
+                email: 'cancel-me-immediately@test.com',
+                subscriptions: {
+                    type: 'list',
+                    data: [subscription]
+                }
+            });
+
+            // Make sure this customer has a corresponding member in the database
+            // And all the subscriptions are setup correctly
+            const initialMember = await createMemberFromStripe();
+            assert.equal(initialMember.status, 'paid', 'The member initial status should be paid');
+            assert.equal(initialMember.tiers.length, 1, 'The member should have one tier');
+            should(initialMember.subscriptions).match([
+                {
+                    status: 'active'
+                }
+            ]);
+
+            // Check whether MRR and status has been set
+            await assertSubscription(initialMember.subscriptions[0].id, {
+                subscription_id: subscription.id,
+                status: 'active',
+                cancel_at_period_end: false,
+                plan_amount: 500,
+                plan_interval: 'month',
+                plan_currency: 'usd',
+                mrr: 500
+            });
+
+            // Cancel the previously created subscription in Stripe
+            set(subscription, {
+                ...subscription,
+                status: 'canceled',
+                canceled_at: Date.now() / 1000,
+                cancellation_details: {
+                    reason: 'payment_failed'
+                }
+            });
+
+            // Send the webhook call to announce the cancelation
+            const webhookPayload = JSON.stringify({
+                type: 'customer.subscription.deleted',
+                data: {
+                    object: subscription
+                }
+            });
+            const webhookSignature = stripe.webhooks.generateTestHeaderString({
+                payload: webhookPayload,
+                secret: process.env.WEBHOOK_SECRET
+            });
+
             await membersAgent.post('/webhooks/stripe/')
                 .body(webhookPayload)
                 .header('content-type', 'application/json')
@@ -318,7 +468,8 @@ describe('Members API', function () {
             assert.equal(updatedMember.tiers.length, 0, 'The member should have no products');
             should(updatedMember.subscriptions).match([
                 {
-                    status: 'canceled'
+                    status: 'canceled',
+                    cancellation_reason: 'Payment failed'
                 }
             ]);
 
@@ -368,6 +519,19 @@ describe('Members API', function () {
                 ]
             });
 
+            // Check that the staff notifications has been sent
+            await DomainEvents.allSettled();
+
+            mockManager.assert.sentEmail({
+                subject: /Paid subscription started: Cancel me now/,
+                to: 'jbloggs@example.com'
+            });
+
+            mockManager.assert.sentEmail({
+                subject: /Cancellation: Cancel me now/,
+                to: 'jbloggs@example.com'
+            });
+
             canceledPaidMember = updatedMember;
         });
 
diff --git a/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap b/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap
index c90b85a3d40..d2d688d07a4 100644
--- a/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap
+++ b/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap
@@ -540,6 +540,10 @@ a {
 
 exports[`API Versioning Admin API responds with error and sends email ONCE when requested version is BEHIND and CANNOT respond multiple times 3: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
+  "from": "\\"Ghost\\" <noreply@127.0.0.1>",
+  "generateTextFromHTML": true,
+  "replyTo": null,
   "subject": "Attention required: Your Zapier integration has failed",
   "to": "jbloggs@example.com",
 }
@@ -1040,6 +1044,10 @@ a {
 
 exports[`API Versioning Admin API responds with error when requested version is BEHIND and CANNOT respond 3: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
+  "from": "\\"Ghost\\" <noreply@127.0.0.1>",
+  "generateTextFromHTML": true,
+  "replyTo": null,
   "subject": "Attention required: Your Zapier integration has failed",
   "to": "jbloggs@example.com",
 }
@@ -1354,7 +1362,9 @@ Object {
     "codeinjection_head": null,
     "comments_enabled": "off",
     "cover_image": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    "default_email_address": "noreply@127.0.0.1",
     "description": "Thoughts, stories and ideas",
+    "editor_default_email_recipients": "visibility",
     "facebook": "ghost",
     "firstpromoter_account": null,
     "icon": null,
@@ -1397,6 +1407,7 @@ Object {
     "portal_button_icon": null,
     "portal_button_signup_text": "Subscribe",
     "portal_button_style": "icon-and-text",
+    "portal_default_plan": "yearly",
     "portal_name": true,
     "portal_plans": Array [
       "free",
@@ -1418,6 +1429,7 @@ Object {
         "url": "/contribute/",
       },
     ],
+    "support_email_address": "noreply@127.0.0.1",
     "timezone": "Etc/UTC",
     "title": "Ghost",
     "twitter": "@ghost",
@@ -1453,7 +1465,9 @@ Object {
     "codeinjection_head": null,
     "comments_enabled": "off",
     "cover_image": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
+    "default_email_address": "noreply@127.0.0.1",
     "description": "Thoughts, stories and ideas",
+    "editor_default_email_recipients": "visibility",
     "facebook": "ghost",
     "firstpromoter_account": null,
     "icon": null,
@@ -1496,6 +1510,7 @@ Object {
     "portal_button_icon": null,
     "portal_button_signup_text": "Subscribe",
     "portal_button_style": "icon-and-text",
+    "portal_default_plan": "yearly",
     "portal_name": true,
     "portal_plans": Array [
       "free",
@@ -1517,6 +1532,7 @@ Object {
         "url": "/contribute/",
       },
     ],
+    "support_email_address": "noreply@127.0.0.1",
     "timezone": "Etc/UTC",
     "title": "Ghost",
     "twitter": "@ghost",
diff --git a/ghost/core/test/e2e-browser/admin/portal-settings.spec.js b/ghost/core/test/e2e-browser/admin/portal-settings.spec.js
index d3dfe54a138..461af941996 100644
--- a/ghost/core/test/e2e-browser/admin/portal-settings.spec.js
+++ b/ghost/core/test/e2e-browser/admin/portal-settings.spec.js
@@ -20,7 +20,7 @@ test.describe('Portal Settings', () => {
             const modal = await openPortalLinks(sharedPage);
 
             // fetch portal default url from input
-            const portalUrl = await modal.getByLabel('Default').inputValue();
+            const portalUrl = await modal.getByLabel('Default:').inputValue();
             await sharedPage.goto(portalUrl);
 
             const portalFrame = sharedPage.locator('[data-testid="portal-popup-frame"]');
diff --git a/ghost/core/test/e2e-browser/admin/publishing.spec.js b/ghost/core/test/e2e-browser/admin/publishing.spec.js
index d1393872e44..0b205701439 100644
--- a/ghost/core/test/e2e-browser/admin/publishing.spec.js
+++ b/ghost/core/test/e2e-browser/admin/publishing.spec.js
@@ -11,11 +11,11 @@ const {createTier, createMember, createPostDraft, impersonateMember} = require('
  * @param {string} [hoverStatus] Optional different status when you hover the status
  */
 const checkPostStatus = async (page, status, hoverStatus) => {
-    await expect(page.locator('[data-test-editor-post-status]')).toContainText(status, {timeout: 5000});
+    await expect(page.locator('[data-test-editor-post-status]').first()).toContainText(status, {timeout: 5000});
 
     if (hoverStatus) {
-        await page.locator('[data-test-editor-post-status]').hover();
-        await expect(page.locator('[data-test-editor-post-status]')).toContainText(hoverStatus, {timeout: 5000});
+        await page.locator('[data-test-editor-post-status]').first().hover();
+        await expect(page.locator('[data-test-editor-post-status]').first()).toContainText(hoverStatus, {timeout: 5000});
     }
 };
 
@@ -78,7 +78,7 @@ const createPage = async (page, {title = 'Hello world', body = 'This is my post
     await page.locator('[data-test-editor-title-input]').fill(title);
 
     // wait for editor to be ready
-    await expect(page.locator('[data-lexical-editor="true"]')).toBeVisible();
+    await expect(page.locator('[data-lexical-editor="true"]').first()).toBeVisible();
 
     // Continue to the body by pressing enter
     await page.keyboard.press('Enter');
@@ -91,7 +91,7 @@ const createPage = async (page, {title = 'Hello world', body = 'This is my post
  * @param {import('@playwright/test').Page} page
  */
 const openPublishFlow = async (page) => {
-    await page.locator('[data-test-button="publish-flow"]').click();
+    await page.locator('[data-test-button="publish-flow"]').first().click();
 };
 
 /**
@@ -198,8 +198,6 @@ test.describe('Publishing', () => {
             await createPostDraft(sharedPage, postData);
             await publishPost(sharedPage, {type: 'publish+send'});
             await closePublishFlow(sharedPage);
-
-            await checkPostStatus(sharedPage, 'Published');
             await checkPostPublished(sharedPage, postData);
         });
 
@@ -232,8 +230,6 @@ test.describe('Publishing', () => {
             await createPostDraft(sharedPage, postData);
             await publishPost(sharedPage, {type: 'send'});
             await closePublishFlow(sharedPage);
-            await checkPostStatus(sharedPage, 'Sent to '); // can't test for 1 member for now, because depends on test ordering :( (sometimes 2 members are created)
-
             await checkPostNotPublished(sharedPage, postData);
         });
     });
@@ -284,6 +280,29 @@ test.describe('Publishing', () => {
         });
     });
 
+    test.describe('Lexical Rendering', () => {
+        test.describe.configure({retries: 1});
+
+        test('Renders Lexical editor', async ({sharedPage: adminPage}) => {
+            await adminPage.goto('/ghost');
+
+            await createPostDraft(adminPage, {title: 'Lexical editor test', body: 'This is my post body.'});
+
+            // Check if the lexical editor is present
+            expect(await adminPage.locator('[data-kg="editor"]').first()).toBeVisible();
+        });
+
+        test('Renders secondary hidden lexical editor', async ({sharedPage: adminPage}) => {
+            await adminPage.goto('/ghost');
+            await createPostDraft(adminPage, {title: 'Secondary lexical editor test', body: 'This is my post body.'});
+            const secondaryLexicalEditor = adminPage.locator('[data-secondary-instance="true"]');
+            // Check if the secondary lexical editor exists
+            await expect(secondaryLexicalEditor).toHaveCount(1);
+            // Check if it is hidden
+            await expect(secondaryLexicalEditor).toBeHidden();
+        });
+    });
+
     test.describe('Update post', () => {
         test.describe.configure({retries: 1});
 
@@ -304,8 +323,9 @@ test.describe('Publishing', () => {
             await expect(publishedHeader).toContainText(date.toFormat('LLL d, yyyy'));
 
             // add some extra text to the post
-            await adminPage.locator('[data-kg="editor"]').click();
-            await adminPage.waitForTimeout(200); //
+            await adminPage.locator('li[data-test-post-id]').first().click();
+            await adminPage.locator('[data-kg="editor"]').first().click();
+            await adminPage.waitForTimeout(500);
             await adminPage.keyboard.type(' This is some updated text.');
 
             // change some post settings
@@ -314,10 +334,12 @@ test.describe('Publishing', () => {
             await adminPage.fill('[data-test-field="custom-excerpt"]', 'Short description and meta');
 
             // save
-            await adminPage.locator('[data-test-button="publish-save"]').click();
+            const saveButton = await adminPage.locator('[data-test-button="publish-save"]').first();
+            await expect(saveButton).toHaveText('Update');
+            await saveButton.click();
+            await expect(saveButton).toHaveText('Updated');
 
             // check front-end has new text after reloading
-            await frontendPage.waitForTimeout(300); // let save go through
             await frontendPage.reload();
             await expect(publishedBody).toContainText('This is some updated text.');
             await expect(publishedHeader).toContainText('Jan 7, 2022');
@@ -328,7 +350,7 @@ test.describe('Publishing', () => {
 
     test.describe('Schedule post', () => {
         // Post should be published to web and sent as a newsletter at the scheduled time
-        test('Publish and Email', async ({sharedPage}) => {
+        test('Scheduled Publish and Email', async ({sharedPage}) => {
             const postData = {
                 // This title should be unique
                 title: 'Scheduled post publish+email test',
@@ -362,7 +384,7 @@ test.describe('Publishing', () => {
         });
 
         // Post should be published to web only at the scheduled time
-        test('Publish only', async ({sharedPage}) => {
+        test('Scheduled Publish only', async ({sharedPage}) => {
             const postData = {
                 title: 'Scheduled post test',
                 body: 'This is my scheduled post body.'
@@ -392,7 +414,7 @@ test.describe('Publishing', () => {
         });
 
         // Post should be published to web only at the scheduled time
-        test('Email only', async ({sharedPage}) => {
+        test('Scheduled Email only', async ({sharedPage}) => {
             const postData = {
                 title: 'Scheduled email only test',
                 body: 'This is my scheduled post body.'
@@ -406,7 +428,7 @@ test.describe('Publishing', () => {
             // Schedule the post to publish asap (by setting it to 00:00, it will get auto corrected to the minimum time possible - 5 seconds in the future)
             await publishPost(sharedPage, {type: 'send', time: '00:00'});
             await closePublishFlow(sharedPage);
-            await checkPostStatus(sharedPage, 'Scheduled', 'Scheduled to be sent to');
+            await checkPostStatus(sharedPage, 'Scheduled', 'Scheduled to be sent in a few seconds');
             const editorUrl = await sharedPage.url();
 
             // Check not published yet
@@ -447,7 +469,8 @@ test.describe('Publishing', () => {
             await checkPostNotPublished(testsharedPage, postData);
 
             // Now unschedule this post
-            await sharedPage.locator('[data-test-button="update-flow"]').click();
+            await sharedPage.locator('li[data-test-post-id]').first().click();
+            await sharedPage.locator('[data-test-button="update-flow"]').first().click();
             await sharedPage.locator('[data-test-button="revert-to-draft"]').click();
 
             // Check status
@@ -541,6 +564,7 @@ test.describe('Updating post access', () => {
 
         // publish
         await publishPost(sharedPage);
+        await closePublishFlow(sharedPage);
         const frontendPage = await openPublishedPostBookmark(sharedPage);
 
         // non-member doesn't have access
@@ -571,23 +595,27 @@ test.describe('Updating post access', () => {
         await page.locator('[data-test-date-time-picker-datepicker]').click();
         await page.locator('.ember-power-calendar-nav-control--previous').click();
         await page.locator('.ember-power-calendar-day', {hasText: '15'}).click();
-        await page.locator('[data-test-date-time-picker-time-input]').fill('12:00');
+        const dateTimePickerInput = await page.locator('[data-test-date-time-picker-time-input]');
+        dateTimePickerInput.fill('12:00');
+        await page.keyboard.press('Tab');
+
+        // test will not work if the field is not filled appropriately
+        await expect(dateTimePickerInput).toHaveValue('12:00');
 
         await publishPost(page);
         await closePublishFlow(page);
 
         // go to settings and change the timezone
-        await page.locator('[data-test-link="posts"]').click();
         await page.locator('[data-test-nav="settings"]').click();
         await expect(page.getByTestId('timezone')).toContainText('UTC');
 
         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 +623,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}) => {
@@ -620,7 +648,7 @@ test.describe('Updating post access', () => {
 
         // go to publish a post
         await createPostDraft(page, {title: 'Published in timezones', body: 'Published in timezones'});
-        await page.locator('[data-test-button="publish-flow"]').click();
+        await page.locator('[data-test-button="publish-flow"]').first().click();
 
         await expect(page.locator('[data-test-setting="publish-type"] [data-test-setting-title]')).toContainText('Publish');
 
@@ -639,3 +667,39 @@ test.describe('Updating post access', () => {
         ).toContainText(/\d+\s* subscriber/m);
     });
 });
+
+test.describe('Deleting a post', () => {
+    test('Delete a saved post', async ({page}) => {
+        await page.goto('/ghost');
+
+        await createPostDraft(page, {title: 'Delete a post test', body: 'This is the content'});
+
+        await expect(page.locator('[data-test-editor-post-status]')).toContainText('Draft - Saved');
+
+        await openPostSettingsMenu(page);
+
+        await page.locator('[data-test-button="delete-post"]').click();
+
+        await page.locator('[data-test-button="delete-post-confirm"]').click();
+        
+        await expect(
+            page.locator('[data-test-screen-title]')
+        ).toContainText('Posts');
+    });
+
+    test('Delete a post with unsaved changes', async ({page}) => {
+        await page.goto('/ghost');
+
+        await createPostDraft(page, {title: 'Delete a post test', body: 'This is the content'});
+
+        await openPostSettingsMenu(page);
+
+        await page.locator('[data-test-button="delete-post"]').click();
+
+        await page.locator('[data-test-button="delete-post-confirm"]').click();
+        
+        await expect(
+            page.locator('[data-test-screen-title]')
+        ).toContainText('Posts');
+    });
+});
diff --git a/ghost/core/test/e2e-browser/admin/site-settings.spec.js b/ghost/core/test/e2e-browser/admin/site-settings.spec.js
index 6269576e419..7b512e4bd9a 100644
--- a/ghost/core/test/e2e-browser/admin/site-settings.spec.js
+++ b/ghost/core/test/e2e-browser/admin/site-settings.spec.js
@@ -66,7 +66,8 @@ test.describe('Site Settings', () => {
                 title: 'Test post',
                 body: 'Test post content'
             });
-            await sharedPage.locator('[data-test-button="publish-flow"]').click();
+            await sharedPage.locator('[data-test-button="publish-flow"]').first().click();
+
             await expect(sharedPage.locator('[data-test-setting="publish-type"] > button')).toHaveCount(0);
             await expect(sharedPage.locator('[data-test-setting="email-recipients"]')).toHaveCount(0);
         });
diff --git a/ghost/core/test/e2e-browser/admin/tiers.spec.js b/ghost/core/test/e2e-browser/admin/tiers.spec.js
index 7bce02a0d6d..389e94257c8 100644
--- a/ghost/core/test/e2e-browser/admin/tiers.spec.js
+++ b/ghost/core/test/e2e-browser/admin/tiers.spec.js
@@ -23,19 +23,16 @@ test.describe('Admin', () => {
                 monthlyPrice: 5,
                 yearlyPrice: 50
             });
-            const offerName = await createOffer(sharedPage, {
+            const {offerName} = await createOffer(sharedPage, {
                 name: 'Get 5% Off!',
                 tierName,
-                offerType: 'discount',
-                amount: 5
+                offerType: 'freeTrial',
+                amount: 14
             });
 
-            await test.step('Check that offers and tiers are available on Offers page', async () => {
-                await sharedPage.locator('[data-test-nav="offers"]').click();
-                await sharedPage.waitForSelector('[data-test-offers-list]');
-                await expect(sharedPage.locator('[data-test-offers-list]')).toContainText(tierName);
-                await expect(sharedPage.locator('[data-test-offers-list]')).toContainText(offerName);
-            });
+            await sharedPage.goto('/ghost/');
+            await sharedPage.goto('/ghost/#/settings/offers');
+            await expect(sharedPage.getByTestId('offers')).toContainText(offerName);
         });
 
         test('Can create additional Tier', async ({sharedPage}) => {
@@ -83,7 +80,8 @@ test.describe('Admin', () => {
                 await tierModal.getByLabel('Description').fill(updatedDescription);
                 await tierModal.getByLabel('Monthly price').fill(updatedMonthlyPrice);
                 await tierModal.getByLabel('Yearly price').fill(updatedYearlyPrice);
-                await tierModal.getByRole('button', {name: 'Save & close'}).click();
+                await tierModal.getByRole('button', {name: 'Save'}).click();
+                await tierModal.getByRole('button', {name: 'Close'}).click();
             });
 
             const portalFrame = await test.step('Go to website and open portal', async () => {
@@ -131,7 +129,8 @@ test.describe('Admin', () => {
                 const tierModal = await openTierModal(sharedPage, {slug});
                 await tierModal.getByRole('button', {name: 'Archive tier'}).click();
                 await sharedPage.getByTestId('confirmation-modal').getByRole('button', {name: 'Archive'}).click();
-                await tierModal.getByRole('button', {name: 'Save & close'}).click();
+                await tierModal.getByRole('button', {name: 'Save'}).click();
+                await tierModal.getByRole('button', {name: 'Close'}).click();
             });
 
             await test.step('Archived tier should not be available in active tiers', async () => {
@@ -148,7 +147,7 @@ test.describe('Admin', () => {
 
                 const portalSettings = sharedPage.getByTestId('portal-modal');
 
-                await portalSettings.locator('input[type=checkbox]').first().waitFor();
+                await portalSettings.locator('button[role="checkbox"]').first().waitFor();
 
                 await expect(portalSettings.getByLabel(tierName).first()).toBeHidden();
 
@@ -159,7 +158,8 @@ test.describe('Admin', () => {
                 const tierModal = await openTierModal(sharedPage, {slug});
                 await tierModal.getByRole('button', {name: 'Reactivate tier'}).click();
                 await sharedPage.getByTestId('confirmation-modal').getByRole('button', {name: 'Reactivate'}).click();
-                await tierModal.getByRole('button', {name: 'Save & close'}).click();
+                await tierModal.getByRole('button', {name: 'Save'}).click();
+                await tierModal.getByRole('button', {name: 'Close'}).click();
             });
 
             await test.step('Unarchived tier should be available in active tiers', async () => {
@@ -172,7 +172,7 @@ test.describe('Admin', () => {
 
                 const portalSettings = sharedPage.getByTestId('portal-modal');
 
-                await portalSettings.locator('input[type=checkbox]').first().waitFor();
+                await portalSettings.locator('button[role="checkbox"]').first().waitFor();
 
                 await expect(portalSettings.getByLabel(tierName).first()).toBeVisible();
 
diff --git a/ghost/core/test/e2e-browser/portal/donations.spec.js b/ghost/core/test/e2e-browser/portal/donations.spec.js
index 7db5441f7ba..7b4c674bd56 100644
--- a/ghost/core/test/e2e-browser/portal/donations.spec.js
+++ b/ghost/core/test/e2e-browser/portal/donations.spec.js
@@ -8,16 +8,24 @@ test.describe('Portal', () => {
             // go to website and open portal
             await sharedPage.goto('/#/portal/support');
 
+            const totalAmount = sharedPage.getByTestId('product-summary-total-amount');
+            await expect(totalAmount).toHaveText('$5.00');
+            await sharedPage.getByText('Change amount').click();
             await sharedPage.locator('#customUnitAmount').fill('12.50');
             await sharedPage.locator('#email').fill('member-donation-test-1@ghost.org');
             await completeStripeSubscription(sharedPage);
 
-            // Check success message
+            await sharedPage.pause();
+            // Check success modal
+            await sharedPage.waitForSelector('[data-testid="portal-popup-frame"]', {state: 'visible'});
+            expect(sharedPage.url()).toMatch(/[^\/]\/#\/portal\/support\/success/); // Ensure correct URL and no double-slash
             const portalFrame = sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
-            await expect(portalFrame.getByText('Thank you!')).toBeVisible();
+            await expect(portalFrame.getByText('Thank you for your support')).toBeVisible();
+            // Modal has working subscribe action
+            await portalFrame.getByText('Sign up').click();
+            await expect(portalFrame.locator('.gh-portal-signup')).toBeVisible();
         });
 
-        // This test is broken because the impersonate is not working!
         test('Can donate as a logged in free member', async ({sharedPage}) => {
             // create a new free member
             await createMember(sharedPage, {
@@ -32,18 +40,20 @@ test.describe('Portal', () => {
             await sharedPage.goto('#/portal/support');
 
             // Don't need to fill email as it's already filled
+            await sharedPage.getByText('Change amount').click();
             await sharedPage.locator('#customUnitAmount').fill('12.50');
             await completeStripeSubscription(sharedPage);
 
-            // Check success message
-            const portalFrame = sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
-            await expect(portalFrame.getByText('Thank you!')).toBeVisible();
+            // Check success notification
+            const notificationFrame = sharedPage.frameLocator('[data-testid="portal-notification-frame"]');
+            // todo: replace class locator on data-attr locator
+            await expect(notificationFrame.locator('.gh-portal-notification.success')).toHaveCount(1);
         });
 
         test('Can donate with a fixed amount set and different currency', async ({sharedPage}) => {
             await sharedPage.goto('/ghost/#/settings');
 
-            const section = sharedPage.getByTestId('tips-or-donations');
+            const section = sharedPage.getByTestId('tips-and-donations');
 
             await section.getByRole('button', {name: 'Edit'}).click();
             await section.getByLabel('Suggested amount').fill('98');
@@ -64,8 +74,9 @@ test.describe('Portal', () => {
             await completeStripeSubscription(sharedPage);
 
             // Check success message
+            await sharedPage.waitForSelector('[data-testid="portal-popup-frame"]', {state: 'visible'});
             const portalFrame = sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
-            await expect(portalFrame.getByText('Thank you!')).toBeVisible();
+            await expect(portalFrame.getByText('Thank you for your support')).toBeVisible();
         });
     });
 });
diff --git a/ghost/core/test/e2e-browser/portal/member-actions.spec.js b/ghost/core/test/e2e-browser/portal/member-actions.spec.js
index 1f158e5cad1..217d48916e0 100644
--- a/ghost/core/test/e2e-browser/portal/member-actions.spec.js
+++ b/ghost/core/test/e2e-browser/portal/member-actions.spec.js
@@ -106,8 +106,8 @@ test.describe('Portal', () => {
             await portalTriggerButton.click();
             await portalFrame.locator('[data-test-button="manage-newsletters"]').click();
 
-            // check amount of newsletterss
-            const newsletters = await portalFrame.locator('[data-test-toggle-wrapper="true"]');
+            // check amount of newsletters
+            const newsletters = await portalFrame.locator('.gh-portal-list-toggle-wrapper');
             const count = await newsletters.count();
             await expect(count).toEqual(2);
 
@@ -120,8 +120,8 @@ test.describe('Portal', () => {
             await portalFrame.locator('[data-test-button="unsubscribe-from-all-emails"]').click();
 
             // todo: replace class locator on data-attr locator
-            await expect(await portalFrame.locator('.gh-portal-popupnotification.success')).toBeVisible();
-            await expect(await portalFrame.locator('.gh-portal-popupnotification.success')).toBeHidden();
+            await expect(portalFrame.locator('.gh-portal-popupnotification.success')).toBeVisible();
+            await expect(portalFrame.locator('.gh-portal-popupnotification.success')).toBeHidden();
 
             // all newsletters should be disabled
             for (let i = 0; i < count; i++) {
diff --git a/ghost/core/test/e2e-browser/portal/offers.spec.js b/ghost/core/test/e2e-browser/portal/offers.spec.js
index e63569ed732..2a628b8c70b 100644
--- a/ghost/core/test/e2e-browser/portal/offers.spec.js
+++ b/ghost/core/test/e2e-browser/portal/offers.spec.js
@@ -3,6 +3,7 @@ const test = require('../fixtures/ghost-test');
 const {deleteAllMembers, createTier, createOffer, completeStripeSubscription} = require('../utils');
 
 test.describe('Portal', () => {
+    test.setTimeout(90000); // override the default 60s in the config as these retries can run close to 60s
     test.describe('Offers', () => {
         test('Creates and uses a free-trial Offer', async ({sharedPage}) => {
             // reset members by deleting all existing
@@ -18,7 +19,7 @@ test.describe('Portal', () => {
             });
 
             // add a new offer with free trial
-            const offerName = await createOffer(sharedPage, {
+            const {offerName, offerLink} = await createOffer(sharedPage, {
                 name: 'Black Friday Special',
                 tierName,
                 offerType: 'freeTrial',
@@ -26,31 +27,35 @@ test.describe('Portal', () => {
             });
 
             // check that offer was added in the offer list screen
-            await expect(sharedPage.locator(`[data-test-offer="${offerName}"]`), 'Should have free-trial offer').toBeVisible();
+            await sharedPage.goto('/ghost');
+            await sharedPage.locator('[data-test-nav="settings"]').click();
+            await expect(await sharedPage.getByTestId('offers')).toContainText(offerName);
 
-            // open offer details page
-            await sharedPage.locator(`[data-test-offer="${offerName}"] a`).first().click();
+            await sharedPage.goto(offerLink);
 
-            // fetch offer url from portal settings and open it
-            const portalUrl = await sharedPage.locator('[data-test-input="offer-portal-url"]').inputValue();
-            await sharedPage.goto(portalUrl);
+            // Wait for the load state to ensure the page has loaded completely
+            let portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
+            await expect(portalTriggerButton).toBeVisible();
 
-            const portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
-            const portalFrame = sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            // Wait for the iframe to be attached to the DOM
+            await expect(sharedPage.locator('[data-testid="portal-popup-frame"]')).toBeAttached({timeout: 1000});
 
-            // check offer title is shown on portal
-            await expect(portalFrame.locator('.gh-portal-offer-title'), 'URL should open Portal with free-trial offer').toBeVisible();
-            await expect(portalFrame.getByRole('heading', {name: offerName}), 'URL should open Portal with free-trial offer').toBeVisible();
+            // Use the frameLocator to interact with elements inside the frame
+            const portalFrameLocator = await sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            await portalFrameLocator.locator('.gh-portal-offer-title').waitFor();
+
+            await expect(portalFrameLocator.locator('.gh-portal-offer-title'), 'URL should open Portal with free-trial offer').toBeVisible();
+            await expect(portalFrameLocator.getByRole('heading', {name: offerName}), 'URL should open Portal with free-trial offer').toBeVisible();
 
             // fill member details and click start trial
-            await portalFrame.locator('[data-test-input="input-name"]').fill('Testy McTesterson');
-            await portalFrame.locator('[data-test-input="input-email"]').fill('testy+trial@example.com');
-            await portalFrame.getByRole('button', {name: 'Start 14-day free trial'}).click();
+            await portalFrameLocator.locator('[data-test-input="input-name"]').fill('Testy McTesterson');
+            await portalFrameLocator.locator('[data-test-input="input-email"]').fill('testy+trial@example.com');
+            await portalFrameLocator.getByRole('button', {name: 'Start 14-day free trial'}).click();
 
             // handle newsletter selection page if it opens and click continue
-            const hasContinueBtn = await portalFrame.locator('text="Continue"').isVisible();
+            const hasContinueBtn = await portalFrameLocator.locator('text="Continue"').isVisible();
             if (hasContinueBtn) {
-                await portalFrame.getByRole('button', {name: 'Continue'}).click();
+                await portalFrameLocator.getByRole('button', {name: 'Continue'}).click();
             }
 
             // complete subscription
@@ -60,20 +65,21 @@ test.describe('Portal', () => {
             await portalTriggerButton.click();
 
             // check portal shows free trial info
-            await expect(portalFrame.locator('text=Free Trial – Ends'), 'Portal should show free trial info').toBeVisible();
+            await expect(portalFrameLocator.locator('text=Free Trial – Ends'), 'Portal should show free trial info').toBeVisible();
 
             // go to member list on admin
             await sharedPage.goto('/ghost');
             await sharedPage.locator('.gh-nav a[href="#/members/"]').click();
 
-            // 1 member, should be Testy, on Portal Tier
-            await expect(sharedPage.getByRole('link', {name: 'Testy McTesterson testy+trial@example.com'}), 'Should have 1 paid member').toBeVisible();
-            await expect(sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
+            // // 1 member, should be Testy, on Portal Tier
+            await expect(await sharedPage.getByRole('link', {name: 'Testy McTesterson testy+trial@example.com'}), 'Should have 1 paid member').toBeVisible();
+            await expect(await sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
 
-            // Ensure the offer redemption count was bumped
-            await sharedPage.locator('.gh-nav a[href="#/offers/"]').click();
-            const locator = sharedPage.locator(`[data-test-offer="${offerName}"]`).locator('[data-test-list="redemption-count"]').locator('span');
-            await expect(locator).toContainText('1');
+            // // Ensure the offer redemption count was bumped
+            await sharedPage.goto('/ghost/#/settings/offers');
+            // await sharedPage.locator('.gh-nav a[href="#/offers/"]').click();
+            const locator = await sharedPage.locator(`[data-test-offer="${offerName}"]`);
+            await expect(locator).toContainText('1 redemption');
         });
 
         test('Creates and uses a one-time discount Offer', async ({sharedPage}) => {
@@ -90,7 +96,7 @@ test.describe('Portal', () => {
             });
 
             // Creates a one-time discount offer for 10% off
-            const offerName = await createOffer(sharedPage, {
+            const {offerName, offerLink} = await createOffer(sharedPage, {
                 name: 'Black Friday Special',
                 tierName: tierName,
                 offerType: 'discount',
@@ -98,30 +104,41 @@ test.describe('Portal', () => {
             });
 
             // check that offer was added in the offer list screen
-            await expect(sharedPage.locator(`[data-test-offer="${offerName}"]`), 'Should have free-trial offer').toBeVisible();
-
+            await sharedPage.goto('/ghost');
+            await sharedPage.locator('[data-test-nav="settings"]').click();
+            await expect(sharedPage.getByTestId('offers')).toContainText(offerName);
             // open offer details page
-            await sharedPage.locator(`[data-test-offer="${offerName}"] a`).first().click();
+            // await sharedPage.locator(`[data-test-offer="${offerName}"] a`).first().click();
 
             // fetch offer url from portal settings and open it
-            const portalUrl = await sharedPage.locator('[data-test-input="offer-portal-url"]').inputValue();
-            await sharedPage.goto(portalUrl);
+            await sharedPage.goto(offerLink);
+
+            // Wait for the load state to ensure the page has loaded completely
+            await sharedPage.waitForLoadState('load');
+
+            // Wait for the load state to ensure the page has loaded completely
+            let portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
+            await expect(portalTriggerButton).toBeVisible();
 
-            const portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
-            const portalFrame = sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            // Wait for the iframe to be attached to the DOM
+            await expect(sharedPage.locator('[data-testid="portal-popup-frame"]')).toBeAttached({timeout: 1000});
+
+            // Use the frameLocator to interact with elements inside the frame
+            const portalFrameLocator = await sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            await portalFrameLocator.locator('.gh-portal-offer-title').waitFor();
 
             // check offer title is visible on portal page
-            await expect(portalFrame.locator('.gh-portal-offer-title'), 'URL should open Portal with discount offer').toBeVisible();
+            await expect(portalFrameLocator.locator('.gh-portal-offer-title'), 'URL should open Portal with discount offer').toBeVisible();
 
             // fill member details and continue
-            await portalFrame.locator('#input-name').fill('Testy McTesterson');
-            await portalFrame.locator('#input-email').fill('testy+oneoff@example.com');
-            await portalFrame.getByRole('button', {name: 'Continue'}).click();
+            await portalFrameLocator.locator('#input-name').fill('Testy McTesterson');
+            await portalFrameLocator.locator('#input-email').fill('testy+oneoff@example.com');
+            await portalFrameLocator.getByRole('button', {name: 'Continue'}).click();
 
             // check if newsletter selection screen is shown and continue
-            const hasContinueBtn = await portalFrame.locator('text="Continue"').isVisible();
+            const hasContinueBtn = await portalFrameLocator.locator('text="Continue"').isVisible();
             if (hasContinueBtn) {
-                await portalFrame.getByRole('button', {name: 'Continue'}).click();
+                await portalFrameLocator.getByRole('button', {name: 'Continue'}).click();
             }
 
             // complete stripe subscription
@@ -130,15 +147,15 @@ test.describe('Portal', () => {
             // wait for site to load and open portal
             await portalTriggerButton.click();
             // Discounted price should not be visible for member for one-time offers
-            await expect(portalFrame.locator('text=$5.40/month'), 'Portal should not show discounted price').not.toBeVisible();
+            await expect(portalFrameLocator.locator('text=$5.40/month'), 'Portal should not show discounted price').not.toBeVisible();
 
             // go to members list on admin
             await sharedPage.goto('/ghost');
             await sharedPage.locator('.gh-nav a[href="#/members/"]').click();
 
             // 1 member, should be Testy, on Portal Tier
-            await expect(sharedPage.getByRole('link', {name: 'Testy McTesterson testy+oneoff@example.com'}), 'Should have 1 paid member').toBeVisible();
-            await expect(sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
+            await expect(await sharedPage.getByRole('link', {name: 'Testy McTesterson testy+oneoff@example.com'}), 'Should have 1 paid member').toBeVisible();
+            await expect(await sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
         });
 
         test('Creates and uses a multiple-months discount Offer', async ({sharedPage}) => {
@@ -155,7 +172,7 @@ test.describe('Portal', () => {
             });
 
             // Creates a one-time discount offer for 10% off
-            const offerName = await createOffer(sharedPage, {
+            const {offerName, offerLink} = await createOffer(sharedPage, {
                 name: 'Black Friday Special',
                 tierName: tierName,
                 offerType: 'discount',
@@ -164,33 +181,40 @@ test.describe('Portal', () => {
                 discountDuration: 3
             });
 
-            // check that offer was added in the offer list screen
-            await expect(sharedPage.locator(`[data-test-offer="${offerName}"]`), 'Should have free-trial offer').toBeVisible();
+            await sharedPage.goto('/ghost');
+            await sharedPage.locator('[data-test-nav="settings"]').click();
+            await expect(await sharedPage.getByTestId('offers')).toContainText(offerName);
 
-            // open offer details page
-            await sharedPage.locator(`[data-test-offer="${offerName}"] a`).first().click();
+            await sharedPage.goto(offerLink);
 
-            // fetch offer url from portal settings and open it
-            const portalUrl = await sharedPage.locator('[data-test-input="offer-portal-url"]').inputValue();
-            await sharedPage.goto(portalUrl);
+            // Wait for the load state to ensure the page has loaded completely
+            await sharedPage.waitForLoadState('load');
+
+            // Wait for the load state to ensure the page has loaded completely
+            let portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
+            await expect(portalTriggerButton).toBeVisible();
 
-            const portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
-            const portalFrame = sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            // Wait for the iframe to be attached to the DOM
+            await expect(sharedPage.locator('[data-testid="portal-popup-frame"]')).toBeAttached({timeout: 1000});
+
+            // Use the frameLocator to interact with elements inside the frame
+            const portalFrameLocator = await sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            await portalFrameLocator.locator('.gh-portal-offer-title').waitFor();
 
             // check offer details are shown on portal page
-            await expect(portalFrame.locator('.gh-portal-offer-title'), 'URL should open Portal with discount offer').toBeVisible();
-            await expect(portalFrame.locator('text=10% off for first 3 months.'), 'URL should open Portal with discount offer').toBeVisible();
-            await expect(portalFrame.locator('text=$5.40'), 'URL should open Portal with discount offer').toBeVisible();
+            await expect(portalFrameLocator.locator('.gh-portal-offer-title'), 'URL should open Portal with discount offer').toBeVisible();
+            await expect(portalFrameLocator.locator('text=10% off for first 3 months.'), 'URL should open Portal with discount offer').toBeVisible();
+            await expect(portalFrameLocator.locator('text=$5.40'), 'URL should open Portal with discount offer').toBeVisible();
 
             // fill member details and continue
-            await portalFrame.locator('#input-name').fill('Testy McTesterson');
-            await portalFrame.locator('#input-email').fill('testy+multi@example.com');
-            await portalFrame.getByRole('button', {name: 'Continue'}).click();
+            await portalFrameLocator.locator('#input-name').fill('Testy McTesterson');
+            await portalFrameLocator.locator('#input-email').fill('testy+multi@example.com');
+            await portalFrameLocator.getByRole('button', {name: 'Continue'}).click();
 
             // check newsletter selection if shown and continue
-            const hasContinueBtn = await portalFrame.locator('text="Continue"').isVisible();
+            const hasContinueBtn = await portalFrameLocator.locator('text="Continue"').isVisible();
             if (hasContinueBtn) {
-                await portalFrame.getByRole('button', {name: 'Continue'}).click();
+                await portalFrameLocator.getByRole('button', {name: 'Continue'}).click();
             }
 
             // complete stripe subscription
@@ -200,13 +224,13 @@ test.describe('Portal', () => {
             await portalTriggerButton.click();
 
             // Discounted price should not be visible for member for one-time offers
-            await expect(portalFrame.locator('text=$5.40/month'), 'Portal should show discounted price').toBeVisible();
+            await expect(portalFrameLocator.locator('text=$5.40/month'), 'Portal should show discounted price').toBeVisible();
             await sharedPage.goto('/ghost');
             await sharedPage.locator('.gh-nav a[href="#/members/"]').click();
 
             // 1 member, should be Testy, on Portal Tier
-            await expect(sharedPage.getByRole('link', {name: 'Testy McTesterson testy+multi@example.com'}), 'Should have 1 paid member').toBeVisible();
-            await expect(sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
+            await expect(await sharedPage.getByRole('link', {name: 'Testy McTesterson testy+multi@example.com'}), 'Should have 1 paid member').toBeVisible();
+            await expect(await sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
         });
 
         test('Creates and uses a forever discount Offer', async ({sharedPage}) => {
@@ -223,7 +247,7 @@ test.describe('Portal', () => {
             });
 
             // Creates a one-time discount offer for 10% off
-            const offerName = await createOffer(sharedPage, {
+            const {offerName, offerLink} = await createOffer(sharedPage, {
                 name: 'Black Friday Special',
                 tierName: tierName,
                 offerType: 'discount',
@@ -232,32 +256,40 @@ test.describe('Portal', () => {
             });
 
             // check that offer was added in the offer list screen
-            await expect(sharedPage.locator(`[data-test-offer="${offerName}"]`), 'Should have free-trial offer').toBeVisible();
+            await sharedPage.goto('/ghost');
+            await sharedPage.locator('[data-test-nav="settings"]').click();
+            await expect(sharedPage.getByTestId('offers')).toContainText(offerName);
 
-            // open offer details page
-            await sharedPage.locator(`[data-test-offer="${offerName}"] a`).first().click();
+            await sharedPage.goto(offerLink);
 
-            // fetch offer url from portal settings and open it
-            const portalUrl = await sharedPage.locator('[data-test-input="offer-portal-url"]').inputValue();
-            await sharedPage.goto(portalUrl);
+            // Wait for the load state to ensure the page has loaded completely
+            await sharedPage.waitForLoadState('load');
+
+            // Wait for the load state to ensure the page has loaded completely
+            let portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
+            await expect(portalTriggerButton).toBeVisible();
+
+            // Wait for the iframe to be attached to the DOM
+            await expect(sharedPage.locator('[data-testid="portal-popup-frame"]')).toBeAttached({timeout: 1000});
 
-            const portalTriggerButton = sharedPage.frameLocator('[data-testid="portal-trigger-frame"]').locator('[data-testid="portal-trigger-button"]');
-            const portalFrame = sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            // Use the frameLocator to interact with elements inside the frame
+            const portalFrameLocator = await sharedPage.frameLocator('[data-testid="portal-popup-frame"]');
+            await portalFrameLocator.locator('.gh-portal-offer-title').waitFor();
 
             // check offer details are shown on portal page
-            await expect(portalFrame.locator('.gh-portal-offer-title'), 'URL should open Portal with discount offer').toBeVisible();
-            await expect(portalFrame.locator('text=10% off forever.'), 'URL should open Portal with discount offer').toBeVisible();
-            await expect(portalFrame.locator('text=$5.40'), 'URL should open Portal with discount offer').toBeVisible();
+            await expect(portalFrameLocator.locator('.gh-portal-offer-title'), 'URL should open Portal with discount offer').toBeVisible();
+            await expect(portalFrameLocator.locator('text=10% off forever.'), 'URL should open Portal with discount offer').toBeVisible();
+            await expect(portalFrameLocator.locator('text=$5.40'), 'URL should open Portal with discount offer').toBeVisible();
 
             // fill member details and continue
-            await portalFrame.locator('#input-name').fill('Testy McTesterson');
-            await portalFrame.locator('#input-email').fill('testy+forever@example.com');
-            await portalFrame.getByRole('button', {name: 'Continue'}).click();
+            await portalFrameLocator.locator('#input-name').fill('Testy McTesterson');
+            await portalFrameLocator.locator('#input-email').fill('testy+forever@example.com');
+            await portalFrameLocator.getByRole('button', {name: 'Continue'}).click();
 
             // check if newsletter selection page is shown and continue
-            const hasContinueBtn = await portalFrame.locator('text="Continue"').isVisible();
+            const hasContinueBtn = await portalFrameLocator.locator('text="Continue"').isVisible();
             if (hasContinueBtn) {
-                await portalFrame.getByRole('button', {name: 'Continue'}).click();
+                await portalFrameLocator.getByRole('button', {name: 'Continue'}).click();
             }
             await completeStripeSubscription(sharedPage);
 
@@ -265,13 +297,13 @@ test.describe('Portal', () => {
             await portalTriggerButton.click();
 
             // Discounted price should be visible for member for forever offers
-            await expect(portalFrame.locator('text=$5.40/month'), 'Portal should show discounted price').toBeVisible();
+            await expect(portalFrameLocator.locator('text=$5.40/month'), 'Portal should show discounted price').toBeVisible();
             await sharedPage.goto('/ghost');
             await sharedPage.locator('.gh-nav a[href="#/members/"]').click();
 
             // 1 member, should be Testy, on Portal Tier
-            await expect(sharedPage.getByRole('link', {name: 'Testy McTesterson testy+forever@example.com'}), 'Should have 1 paid member').toBeVisible();
-            await expect(sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
+            await expect(await sharedPage.getByRole('link', {name: 'Testy McTesterson testy+forever@example.com'}), 'Should have 1 paid member').toBeVisible();
+            await expect(await sharedPage.getByRole('link', {name: tierName}), `Paid member should be on ${tierName}`).toBeVisible();
         });
 
         test('Archiving an offer', async ({sharedPage}) => {
@@ -286,7 +318,7 @@ test.describe('Portal', () => {
             });
 
             // Create an offer. This will be archived
-            const offerName = await createOffer(sharedPage, {
+            const {offerLink} = await createOffer(sharedPage, {
                 name: 'To be archived',
                 tierName: tierName,
                 offerType: 'discount',
@@ -300,18 +332,8 @@ test.describe('Portal', () => {
                 offerType: 'discount',
                 amount: 10
             });
-
-            // Check if the offer appears in the archive list
-            await sharedPage.locator('.gh-contentfilter-menu-trigger').click();
-            await sharedPage.getByRole('option', {name: 'Archived offers'}).click();
-            await expect(sharedPage.getByRole('link', {name: offerName}), 'Should have an archived offer').toBeVisible();
-
-            // Go to the offer and grab the offer URL
-            await sharedPage.locator('.gh-offers-list .gh-list-row').filter({hasText: offerName}).click();
-            const portalUrl = await sharedPage.locator('input#url').inputValue();
-
             // Open the offer URL and make sure portal popup doesn't load
-            await sharedPage.goto(portalUrl);
+            await sharedPage.goto(offerLink);
             const portalPopup = await sharedPage.locator('[data-testid="portal-popup-frame"]').isVisible();
             await expect(portalPopup).toBeFalsy();
         });
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..8dd0df4ec9f 100644
--- a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
+++ b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
@@ -60,7 +60,7 @@ const setupGhost = async (page) => {
         await page.getByPlaceholder('At least 10 characters').fill(ownerUser.password);
 
         await page.getByPlaceholder('At least 10 characters').press('Enter');
-        await page.locator('.gh-done-pink').click();
+
         await page.locator('.gh-nav').waitFor(options);
     }
 };
@@ -96,10 +96,10 @@ const setupStripe = async (page, stripConnectIntegrationToken) => {
     await expect(modal.getByRole('button', {name: 'Disconnect'})).toBeVisible();
     await modal.getByRole('button', {name: 'Close'}).click();
 
-    await page.getByRole('button', {name: '← Done'}).click();
+    await page.getByTestId('exit-settings').click();
 };
 
-// Setup Mailgun with fake data, for Ghost Admin to allow bulk sending
+// Setup Mailgun with fake data for Ghost Admin to allow bulk sending
 const setupMailgun = async (page) => {
     await page.locator('.gh-nav a[href="#/settings/"]').click();
     const section = page.getByTestId('mailgun');
@@ -110,7 +110,7 @@ const setupMailgun = async (page) => {
     await section.getByRole('button', {name: 'Save'}).click();
     await section.getByText('Mailgun is set up').waitFor();
 
-    await page.getByRole('button', {name: '← Done'}).click();
+    await page.getByTestId('exit-settings').click();
 };
 
 /**
@@ -125,9 +125,8 @@ const enableLabs = async (page) => {
 
     await section.getByRole('tab', {name: 'Alpha features'}).click();
     await section.getByLabel('Webmentions').click();
-    await section.getByLabel('Tips & donations').click();
 
-    await page.getByRole('button', {name: '← Done'}).click();
+    await page.getByTestId('exit-settings').click();
 };
 
 /**
@@ -154,31 +153,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
@@ -220,7 +194,8 @@ const createTier = async (page, {name, monthlyPrice, yearlyPrice, trialDays}, en
             await page.getByTestId('tier-detail-modal').getByRole('button', {name: 'Archive tier'}).click();
             await page.getByTestId('confirmation-modal').getByRole('button', {name: 'Archive'}).click();
             await page.getByTestId('tier-detail-modal').getByRole('button', {name: 'Reactivate tier'}).waitFor();
-            await page.getByTestId('tier-detail-modal').getByRole('button', {name: 'Save & close'}).click();
+            await page.getByTestId('tier-detail-modal').getByRole('button', {name: 'Save'}).click();
+            await page.getByTestId('tier-detail-modal').getByRole('button', {name: 'Close'}).click();
         }
 
         // Add the tier
@@ -234,7 +209,8 @@ const createTier = async (page, {name, monthlyPrice, yearlyPrice, trialDays}, en
             await modal.getByLabel('Add a free trial').check();
             await modal.getByLabel('Trial days').fill(`${trialDays}`);
         }
-        await modal.getByRole('button', {name: 'Save & close'}).click();
+        await modal.getByRole('button', {name: 'Save'}).click();
+        await modal.getByRole('button', {name: 'Close'}).click();
         await page.locator('[data-testid="tier-card"]:visible').filter({hasText: name}).waitFor();
 
         // Enable the tier in portal
@@ -253,7 +229,6 @@ const createTier = async (page, {name, monthlyPrice, yearlyPrice, trialDays}, en
                 await portalSettings.getByLabel('Yearly').first().check();
             }
             await portalSettings.getByRole('button', {name: 'Save'}).click();
-            await page.waitForLoadState('networkidle');
             await portalSettings.getByRole('button', {name: 'Close'}).click();
         }
 
@@ -272,72 +247,84 @@ const createTier = async (page, {name, monthlyPrice, yearlyPrice, trialDays}, en
  * @param {string} [options.discountType]
  * @param {number} [options.discountDuration]
  * @param {number} options.amount
- * @returns {Promise<string>} Unique offer name
+ * @returns {Promise<object>} Unique offer name
  */
-const createOffer = async (page, {name, tierName, offerType, amount, discountType = null, discountDuration = 3}) => {
-    await page.goto('/ghost');
-    await page.locator('.gh-nav a[href="#/offers/"]').click();
-
-    // Keep offer names unique & <= 40 characters
-    let offerName = `${name} (${new ObjectID().toHexString().slice(0, 40 - name.length - 3)})`;
 
-    // Archive other offers to keep the list tidy
-    // We only need 1 offer to be active at a time
-    // Either the list of active offers loads, or the CTA when no offers exist
-    while (await Promise.race([
-        page.locator('.gh-offers-list .gh-list-header').filter({hasText: 'active'}).waitFor({state: 'visible', timeout: 1000}).then(() => true),
-        page.locator('.gh-offers-list-cta').waitFor({state: 'visible', timeout: 1000}).then(() => false)
-    ]).catch(() => false)) {
-        const listItem = page.locator('.gh-offers-list .gh-list-row:not(.header)').first();
-        await listItem.locator('a[href^="#/offers/"]').last().click();
-        await page.getByRole('button', {name: 'Archive offer'}).click();
-        await page
-            .locator('.modal-content')
-            .filter({hasText: 'Archive offer'})
-            .first()
-            .getByRole('button', {name: 'Archive'})
-            .click();
+const createOffer = async (page, {name, tierName, offerType, amount, discountType = null, discountDuration = 3}) => {
+    let offerName;
+    let offerLink;
+    await test.step('Create an offer', async () => {
+        await page.goto('/ghost');
+        await page.locator('[data-test-nav="settings"]').click();
 
-        // TODO: Use a more resilient selector
-        const statusDropdown = await page.getByRole('button', {name: 'Archived offers'});
-        await statusDropdown.waitFor({
-            state: 'visible',
-            timeout: 1000
-        });
-        await statusDropdown.click();
-        await page.getByRole('option', {name: 'Active offers'}).click();
-    }
+        // Keep offer names unique & <= 40 characters
+        offerName = `${name} (${new ObjectID().toHexString().slice(0, 40 - name.length - 3)})`;
+        // Tiers request can take time, so waiting until there is no connections before interacting with them
+        await page.waitForLoadState('networkidle');
+        // ... and even so, the component updates can take a bit to trickle down, so we should verify that the Tier is fully loaded before proceeding
+        await page.getByTestId('tiers').getByText('No active tiers found').waitFor({state: 'hidden'});
+        await page.getByTestId('offers').getByRole('button', {name: 'Manage tiers'}).waitFor({state: 'hidden'});
+
+        // only one of these buttons is ever available - either 'Add offer' or 'Manage offers'
+        const hasExistingOffers = await page.getByTestId('offers').getByRole('button', {name: 'Manage offers'}).isVisible();
+        const isCTA = await page.getByTestId('offers').getByRole('button', {name: 'Add offer'}).isVisible();
+
+        // Archive other offers to keep the list tidy
+        // We only need 1 offer to be active at a time
+        // Either the list of active offers loads, or the CTA when no offers exist
+        if (hasExistingOffers && !isCTA) {
+            await page.getByTestId('offers').getByRole('button', {name: 'Manage offers'}).click();
+
+            // Selector for the elements with data-testid 'offer-item'
+            // const offerItemsSelector = '[data-testid="offer-item"]';
+            await page.getByTestId('offer-item').nth(0).click();
+            await page.getByRole('button', {name: 'Archive offer'}).click();
+
+            const confirmModal = await page.getByTestId('confirmation-modal');
+            await confirmModal.getByRole('button', {name: 'Archive'}).click();
+        }
 
-    await page.getByRole('link', {name: 'New offer'}).click();
-    await page.locator('input#name').fill(offerName);
-
-    if (offerType === 'freeTrial') {
-        await page.getByRole('button', {name: 'Free trial Give free access for a limited time.'}).click();
-        await page.locator('input#trial-duration').fill(`${amount}`);
-    } else if (offerType === 'discount') {
-        await page.locator('input#amount').fill(`${amount}`);
-        if (discountType === 'multiple-months') {
-            await page.locator('[data-test-select="offer-duration"]').selectOption('repeating');
-            await page.locator('input#duration-months').fill(discountDuration.toString());
+        if (isCTA) {
+            await page.getByTestId('offers').getByRole('button', {name: 'Add offer'}).click();
+        } else {
+            // ensure the modal is open
+            if (!page.getByTestId('offers-modal').isVisible()) {
+                await page.getByTestId('offers').getByRole('button', {name: 'Manage offers'}).click();
+            }
+            await page.getByText('New offer').click();
         }
 
-        if (discountType === 'forever') {
-            await page.locator('[data-test-select="offer-duration"]').selectOption('forever');
+        await page.getByLabel('Offer name').fill(offerName);
+
+        if (offerType === 'freeTrial') {
+            // await page.getByRole('button', {name: 'Free trial Give free access for a limited time.'}).click();
+            await page.getByText('Give free access for a limited time').click();
+            await page.getByLabel('Trial duration').fill(`${amount}`);
+        } else if (offerType === 'discount') {
+            await page.getByLabel('Amount off').fill(`${amount}`);
+            if (discountType === 'multiple-months') {
+                await chooseOptionInSelect(page.getByTestId('duration-select-offers'), `Multiple-months`);
+                await page.getByLabel('Duration in months').fill(discountDuration.toString());
+                // await page.locator('[data-test-select="offer-duration"]').selectOption('repeating');
+                // await page.locator('input#duration-months').fill(discountDuration.toString());
+            }
+
+            if (discountType === 'forever') {
+                await chooseOptionInSelect(page.getByTestId('duration-select-offers'), `Forever`);
+            }
         }
-    }
 
-    const priceId = await page.locator(`.gh-select-product-cadence>select>option`).getByText(`${tierName} - Monthly`).getAttribute('value');
-    await page.locator('.gh-select-product-cadence>select').selectOption(priceId);
+        await chooseOptionInSelect(page.getByTestId('tier-cadence-select-offers'), `${tierName} - Monthly`);
+        await page.getByRole('button', {name: 'Publish'}).click();
+        await page.waitForLoadState('networkidle');
 
-    await page.getByRole('button', {name: 'Save'}).click();
-    // Wait for the "Saved" button, ensures that next clicks don't trigger the unsaved work modal
-    await page.getByRole('button', {name: 'Saved'}).waitFor({
-        state: 'visible',
-        timeout: 10000
+        const offerLinkInput = await page.locator('input[name="offer-url"]');
+        // sometimes offer link is not generated, and if so the rest of the test will fail
+        await expect(offerLinkInput).not.toBeEmpty();
+        offerLink = await offerLinkInput.inputValue();
     });
-    await page.locator('.gh-nav a[href="#/offers/"]').click();
 
-    return offerName;
+    return {offerName, offerLink};
 };
 
 const fillInputIfExists = async (page, selector, value) => {
@@ -346,9 +333,9 @@ const fillInputIfExists = async (page, selector, value) => {
     }
 };
 
-const completeStripeSubscription = async (page) => {
+const completeStripeSubscription = async (page, {awaitNetworkIdle = true} = {}) => {
     await page.locator('#cardNumber').fill('4242 4242 4242 4242');
-    await page.locator('#cardExpiry').fill('04 / 24');
+    await page.locator('#cardExpiry').fill('04 / 26');
     await page.locator('#cardCvc').fill('424');
     await page.locator('#billingName').fill('Testy McTesterson');
     await page.getByRole('combobox', {name: 'Country or region'}).selectOption('US');
@@ -358,12 +345,22 @@ const completeStripeSubscription = async (page) => {
     await fillInputIfExists(page, '#billingAddressLine2', 'Apt 1');
     await fillInputIfExists(page, '#billingLocality', 'Testville');
 
+    // some regions have a stripe pass checkbox that blocks the submit button
+    if (await page.isVisible('#enableStripePass')) {
+        const checkbox = await page.locator('#enableStripePass');
+        if (await checkbox.isChecked()) {
+            await checkbox.uncheck();
+        }
+    }
+
     // Wait for submit button complete
     await page.waitForSelector('[data-testid="hosted-payment-submit-button"].SubmitButton--complete', {state: 'attached'});
 
     await page.getByTestId('hosted-payment-submit-button').click();
 
-    await page.waitForLoadState('networkidle');
+    if (awaitNetworkIdle) {
+        await page.waitForLoadState('networkidle');
+    }
 };
 
 /**
@@ -427,7 +424,7 @@ const createPostDraft = async (page, {title = 'Hello world', body = 'This is my
     await page.locator('[data-test-editor-title-input]').fill(title);
 
     // wait for editor to be ready
-    await expect(page.locator('[data-lexical-editor="true"]')).toBeVisible();
+    await expect(page.locator('[data-lexical-editor="true"]').first()).toBeVisible();
 
     // Continue to the body by pressing enter
     await page.keyboard.press('Enter');
@@ -518,6 +515,11 @@ const generateStripeIntegrationToken = async (accountId) => {
     })).toString('base64');
 };
 
+const chooseOptionInSelect = async (select, optionText) => {
+    await select.click();
+    await select.page().locator('[data-testid="select-option"]', {hasText: optionText}).click();
+};
+
 module.exports = {
     setupGhost,
     setupStripe,
@@ -528,12 +530,12 @@ module.exports = {
     setupMailgun,
     deleteAllMembers,
     createTier,
-    archiveAllTiers,
     createOffer,
     createMember,
     createPostDraft,
     completeStripeSubscription,
     impersonateMember,
     goToMembershipPage,
-    openTierModal
+    openTierModal,
+    chooseOptionInSelect
 };
diff --git a/ghost/core/test/e2e-frontend/default_routes.test.js b/ghost/core/test/e2e-frontend/default_routes.test.js
index d868702f6b2..7fcc50b8ce1 100644
--- a/ghost/core/test/e2e-frontend/default_routes.test.js
+++ b/ghost/core/test/e2e-frontend/default_routes.test.js
@@ -271,7 +271,7 @@ describe('Default Frontend routing', function () {
             await request.get('/rss/')
                 .expect(200)
                 .expect('Cache-Control', testUtils.cacheRules.public)
-                .expect('Content-Type', 'text/xml; charset=utf-8')
+                .expect('Content-Type', 'application/rss+xml; charset=utf-8')
                 .expect(assertCorrectFrontendHeaders)
                 .expect((res) => {
                     res.text.should.match(/<!\[CDATA\[Start here for a quick overview of everything you need to know\]\]>/);
@@ -283,7 +283,7 @@ describe('Default Frontend routing', function () {
             await request.get('/author/ghost/rss/')
                 .expect(200)
                 .expect('Cache-Control', testUtils.cacheRules.public)
-                .expect('Content-Type', 'text/xml; charset=utf-8')
+                .expect('Content-Type', 'application/rss+xml; charset=utf-8')
                 .expect(assertCorrectFrontendHeaders)
                 .expect((res) => {
                     res.text.should.match(/<!\[CDATA\[Start here for a quick overview of everything you need to know\]\]>/);
@@ -295,7 +295,7 @@ describe('Default Frontend routing', function () {
             await request.get('/tag/getting-started/rss/')
                 .expect(200)
                 .expect('Cache-Control', testUtils.cacheRules.public)
-                .expect('Content-Type', 'text/xml; charset=utf-8')
+                .expect('Content-Type', 'application/rss+xml; charset=utf-8')
                 .expect(assertCorrectFrontendHeaders)
                 .expect((res) => {
                     res.text.should.match(/<!\[CDATA\[Start here for a quick overview of everything you need to know\]\]>/);
@@ -319,14 +319,13 @@ describe('Default Frontend routing', function () {
                 .expect(200)
                 .expect(assertCorrectFrontendHeaders);
 
-            // The response here is a publicly documented format users rely on
-            // In case it's changed remember to update the docs at https://ghost.org/help/modifying-robots-txt/
             res.text.should.equal(
                 'User-agent: *\n' +
                 'Sitemap: http://127.0.0.1:2369/sitemap.xml\nDisallow: /ghost/\n' +
-                'Disallow: /p/\n' +
                 'Disallow: /email/\n' +
-                'Disallow: /r/\n'
+                'Disallow: /members/api/comments/counts/\n' +
+                'Disallow: /r/\n' +
+                'Disallow: /webmentions/receive/\n'
             );
         });
 
@@ -462,7 +461,7 @@ describe('Default Frontend routing', function () {
             await request.get(`/${settingsCache.get('public_hash')}/rss/`)
                 .expect(200)
                 .expect('Cache-Control', testUtils.cacheRules.private)
-                .expect('Content-Type', 'text/xml; charset=utf-8')
+                .expect('Content-Type', 'application/rss+xml; charset=utf-8')
                 .expect(assertCorrectFrontendHeaders)
                 .expect((res) => {
                     res.text.should.match(/<!\[CDATA\[Start here for a quick overview of everything you need to know\]\]>/);
@@ -473,7 +472,7 @@ describe('Default Frontend routing', function () {
             await request.get(`/tag/getting-started/${settingsCache.get('public_hash')}/rss/`)
                 .expect(200)
                 .expect('Cache-Control', testUtils.cacheRules.private)
-                .expect('Content-Type', 'text/xml; charset=utf-8')
+                .expect('Content-Type', 'application/rss+xml; charset=utf-8')
                 .expect(assertCorrectFrontendHeaders)
                 .expect((res) => {
                     res.text.should.match(/<!\[CDATA\[Start here for a quick overview of everything you need to know\]\]>/);
diff --git a/ghost/core/test/e2e-frontend/helpers/get.test.js b/ghost/core/test/e2e-frontend/helpers/get.test.js
index b45541746f4..b0dd47679a1 100644
--- a/ghost/core/test/e2e-frontend/helpers/get.test.js
+++ b/ghost/core/test/e2e-frontend/helpers/get.test.js
@@ -1,3 +1,4 @@
+const assert = require('assert/strict');
 const should = require('should');
 const sinon = require('sinon');
 const testUtils = require('../../utils');
@@ -98,6 +99,238 @@ describe('e2e {{#get}} helper', function () {
         locals = {root: {_locals: {}}};
     });
 
+    describe('Filter optimisation', function () {
+        it('Does not do filter optimisation on OR queries', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `tag:-hash-hidden,id:-${publicPost.id}`,
+                    limit: '5'
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.notEqual(fn.firstCall.args[0].meta.cacheabilityOptimisation, true);
+        });
+        it('Does not do filter optimisation on nested id queries', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `tag:-hash-hidden+(id:-${publicPost.id},id:-${membersPost.id})`,
+                    limit: '5'
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.notEqual(fn.firstCall.args[0].meta.cacheabilityOptimisation, true);
+        });
+        it('Does not do filter optimisation on multiple negated id queries', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `id:-${publicPost.id}+id:-${membersPost.id}`,
+                    limit: '5'
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.notEqual(fn.firstCall.args[0].meta.cacheabilityOptimisation, true);
+        });
+        it('Returns the correct posts with limit as a string', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    limit: '5'
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            const firstPostUsually = fn.firstCall.args[0].posts[0];
+            const firstLimit = fn.firstCall.args[0].meta.pagination.limit;
+            assert.equal(firstLimit, 5);
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `id:-${firstPostUsually.id}`,
+                    limit: '5'
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.equal(fn.secondCall.args[0].meta.cacheabilityOptimisation, true);
+            const foundFilteredPost = fn.secondCall.args[0].posts.find(post => post.id === firstPostUsually.id);
+            assert.equal(foundFilteredPost, undefined);
+        });
+        it('Returns the correct posts with default limit', async function () {
+            await get.call({}, 'posts', {
+                hash: {},
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            const firstPostUsually = fn.firstCall.args[0].posts[0];
+            const defaultLimit = fn.firstCall.args[0].meta.pagination.limit;
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `id:-${firstPostUsually.id}`
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.equal(fn.secondCall.args[0].meta.pagination.limit, defaultLimit);
+            assert.equal(fn.secondCall.args[0].meta.cacheabilityOptimisation, true);
+            const foundFilteredPost = fn.secondCall.args[0].posts.find(post => post.id === firstPostUsually.id);
+            assert.equal(foundFilteredPost, undefined);
+        });
+        it('Returns the correct posts with a limit all', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    limit: 'all'
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            const firstPostUsually = fn.firstCall.args[0].posts[0];
+            const initialCount = fn.firstCall.args[0].posts.length;
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `id:-${firstPostUsually.id}`,
+                    limit: 'all'
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.equal(fn.secondCall.args[0].posts.length, initialCount - 1);
+            assert.equal(fn.secondCall.args[0].meta.pagination.limit, 'all');
+            assert.equal(fn.secondCall.args[0].meta.cacheabilityOptimisation, true);
+            const foundFilteredPost = fn.secondCall.args[0].posts.find(post => post.id === firstPostUsually.id);
+            assert.equal(foundFilteredPost, undefined);
+        });
+        it('Returns the correct posts with a solo negative filter', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    limit: 1
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            const firstPostUsually = fn.firstCall.args[0].posts[0];
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `id:-${firstPostUsually.id}`,
+                    limit: 5
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.equal(fn.secondCall.args[0].posts.length, 5);
+            assert.equal(fn.secondCall.args[0].meta.pagination.limit, 5);
+            assert.equal(fn.secondCall.args[0].meta.cacheabilityOptimisation, true);
+            const foundFilteredPost = fn.secondCall.args[0].posts.find(post => post.id === firstPostUsually.id);
+            assert.equal(foundFilteredPost, undefined);
+        });
+        it('Returns the correct posts with a sandwiched negative filter', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `tag:-hash-hidden+visibility:public`,
+                    limit: 1
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            const firstPostUsually = fn.firstCall.args[0].posts[0];
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `visibility:public+id:-${firstPostUsually.id}+tag:-hash-hidden`,
+                    limit: 5
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.equal(fn.secondCall.args[0].posts.length, 5);
+            assert.equal(fn.secondCall.args[0].meta.pagination.limit, 5);
+            assert.equal(fn.secondCall.args[0].meta.cacheabilityOptimisation, true);
+            const foundFilteredPost = fn.secondCall.args[0].posts.find(post => post.id === firstPostUsually.id);
+            assert.equal(foundFilteredPost, undefined);
+        });
+        it('Returns the correct posts with a prefix negative filter', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `tag:-hash-hidden`,
+                    limit: 1
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            const firstPostUsually = fn.firstCall.args[0].posts[0];
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `id:-${firstPostUsually.id}+tag:-hash-hidden`,
+                    limit: 5
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.equal(fn.secondCall.args[0].posts.length, 5);
+            assert.equal(fn.secondCall.args[0].meta.pagination.limit, 5);
+            assert.equal(fn.secondCall.args[0].meta.cacheabilityOptimisation, true);
+            const foundFilteredPost = fn.secondCall.args[0].posts.find(post => post.id === firstPostUsually.id);
+            assert.equal(foundFilteredPost, undefined);
+        });
+        it('Returns the correct posts with a suffix negative filter', async function () {
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `tag:-hash-hidden`,
+                    limit: 1
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            const firstPostUsually = fn.firstCall.args[0].posts[0];
+            await get.call({}, 'posts', {
+                hash: {
+                    filter: `tag:-hash-hidden+id:-${firstPostUsually.id}`,
+                    limit: 5
+                },
+                data: {},
+                locals,
+                fn,
+                inverse
+            });
+            assert.equal(fn.secondCall.args[0].posts.length, 5);
+            assert.equal(fn.secondCall.args[0].meta.pagination.limit, 5);
+            assert.equal(fn.secondCall.args[0].meta.cacheabilityOptimisation, true);
+            const foundFilteredPost = fn.secondCall.args[0].posts.find(post => post.id === firstPostUsually.id);
+            assert.equal(foundFilteredPost, undefined);
+        });
+    });
+
     describe('{{access}} property', function () {
         let member;
 
diff --git a/ghost/core/test/e2e-frontend/members.test.js b/ghost/core/test/e2e-frontend/members.test.js
index 44f014c8ab7..92cdb177160 100644
--- a/ghost/core/test/e2e-frontend/members.test.js
+++ b/ghost/core/test/e2e-frontend/members.test.js
@@ -6,12 +6,14 @@ const moment = require('moment');
 const testUtils = require('../utils');
 const configUtils = require('../utils/configUtils');
 const settingsCache = require('../../core/shared/settings-cache');
+const settingsHelpers = require('../../core/server/services/settings-helpers');
 const DomainEvents = require('@tryghost/domain-events');
 const {MemberPageViewEvent} = require('@tryghost/member-events');
 const models = require('../../core/server/models');
-const {mockManager, fixtureManager} = require('../utils/e2e-framework');
+const {fixtureManager} = require('../utils/e2e-framework');
 const DataGenerator = require('../utils/fixtures/data-generator');
 const members = require('../../core/server/services/members');
+const crypto = require('crypto');
 
 function assertContentIsPresent(res) {
     res.text.should.containEql('<h2 id="markdown">markdown</h2>');
@@ -27,12 +29,18 @@ async function createMember(data) {
     });
 }
 
+async function cycleTransientId(data) {
+    return await members.api.members.cycleTransientId({
+        ...data
+    });
+}
+
 describe('Front-end members behavior', function () {
     let request;
 
     async function loginAsMember(email) {
         // Member should exist, because we are signin in
-        await models.Member.findOne({email}, {require: true});
+        const member = await models.Member.findOne({email}, {require: true});
 
         // membersService needs to be required after Ghost start so that settings
         // are pre-populated with defaults
@@ -51,6 +59,8 @@ describe('Front-end members behavior', function () {
                 should.exist(redirectUrl.searchParams.get('success'));
                 redirectUrl.searchParams.get('success').should.eql('true');
             });
+
+        return member;
     }
 
     before(async function () {
@@ -98,6 +108,7 @@ describe('Front-end members behavior', function () {
 
         it('should return no content when removing member sessions', async function () {
             await request.del('/members/api/session')
+                .expect('set-cookie', /ghost-members-ssr=.*;.*?expires=Thu, 01 Jan 1970 00:00:00 GMT;.*?/)
                 .expect(204);
         });
 
@@ -116,11 +127,10 @@ describe('Front-end members behavior', function () {
                 .expect(400);
         });
 
-        //TODO: Remove 500 expect once tests are wired up with Stripe
-        it('should not throw 400 for using offer id on members create checkout session endpoint', async function () {
+        it('should error for using an invalid offer id on members create checkout session endpoint', async function () {
             await request.post('/members/api/create-stripe-checkout-session')
                 .send({
-                    offerId: '62826b1b6dccb3e3e997ebd4',
+                    offerId: 'invalid',
                     identity: null,
                     metadata: {
                         name: 'Jamie Larsen'
@@ -130,7 +140,7 @@ describe('Front-end members behavior', function () {
                     tierId: null,
                     cadence: null
                 })
-                .expect(500);
+                .expect(400);
         });
 
         it('should error for invalid data on members create update session endpoint', async function () {
@@ -141,8 +151,8 @@ describe('Front-end members behavior', function () {
         it('should error for invalid subscription id on members create update session endpoint', async function () {
             const membersService = require('../../core/server/services/members');
             const email = 'test-member-create-update-session@email.com';
-            await membersService.api.members.create({email});
-            const token = await membersService.api.getMemberIdentityToken(email);
+            const member = await membersService.api.members.create({email});
+            const token = await membersService.api.getMemberIdentityToken(member.get('transient_id'));
             await request.post('/members/api/create-stripe-update-session')
                 .send({
                     identity: token,
@@ -160,86 +170,114 @@ describe('Front-end members behavior', function () {
                 .expect(400);
         });
 
-        it('should error for fetching member newsletters with missing uuid', async function () {
-            await request.get('/members/api/member/newsletters')
-                .expect(400);
-        });
+        describe('Newsletters', function () {
+            afterEach(function () {
+                sinon.restore();
+            });
 
-        it('should error for fetching member newsletters with invalid uuid', async function () {
-            await request.get('/members/api/member/newsletters?uuid=abc')
-                .expect(404);
-        });
+            it('should error for fetching member newsletters with missing uuid', async function () {
+                await request.get('/members/api/member/newsletters')
+                    .expect(401);
+            });
 
-        it('should error for updating member newsletters with missing uuid', async function () {
-            await request.put('/members/api/member/newsletters')
-                .expect(400);
-        });
+            it('should error for fetching member newsletters with invalid uuid', async function () {
+                await request.get('/members/api/member/newsletters?uuid=abc')
+                    .expect(401);
+            });
 
-        it('should error for updating member newsletters with invalid uuid', async function () {
-            await request.put('/members/api/member/newsletters?uuid=abc')
-                .expect(404);
-        });
+            it('should error for updating member newsletters with missing uuid', async function () {
+                await request.put('/members/api/member/newsletters')
+                    .expect(401);
+            });
 
-        it('should fetch and update member newsletters with valid uuid', async function () {
-            const memberUUID = DataGenerator.Content.members[0].uuid;
+            it('should error for updating member newsletters with invalid uuid', async function () {
+                await request.put('/members/api/member/newsletters?uuid=abc')
+                    .expect(401);
+            });
 
-            // Can fetch newsletter subscriptions
-            const getRes = await request.get(`/members/api/member/newsletters?uuid=${memberUUID}`)
-                .expect(200);
-            const getJsonResponse = getRes.body;
-
-            should.exist(getJsonResponse);
-            getJsonResponse.should.have.properties(['email', 'uuid', 'status', 'name', 'newsletters']);
-            getJsonResponse.should.not.have.property('id');
-            getJsonResponse.newsletters.should.have.length(1);
-
-            // NOTE: these should be snapshots not code
-            Object.keys(getJsonResponse.newsletters[0]).should.have.length(4);
-            getJsonResponse.newsletters[0].should.have.properties([
-                'id',
-                'name',
-                'description',
-                'sort_order'
-            ]);
+            it('should error for updating member newsletters with no key', async function () {
+                sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+                await request.get('/members/api/member/newsletters?uuid=abc')
+                    .expect(401);
+            });
 
-            // Can update newsletter subscription
-            const originalNewsletters = getJsonResponse.newsletters;
-            const originalNewsletterName = originalNewsletters[0].name;
-            originalNewsletters[0].name = 'cannot change me';
+            it('should 401 for GET member newsletters with a mismatched hmac key', async function () {
+                sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+                await request.get('/members/api/member/newsletters?uuid=abc&key=blah')
+                    .expect(401);
+            });
 
-            const res = await request.put(`/members/api/member/newsletters?uuid=${memberUUID}`)
-                .send({
-                    newsletters: []
-                })
-                .expect(200);
-            const jsonResponse = res.body;
+            it('should 401 for PUT member newsletters with a mismatched hmac key', async function () {
+                sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+                await request.put('/members/api/member/newsletters?uuid=abc&key=blah')
+                    .expect(401);
+            });
 
-            should.exist(jsonResponse);
-            jsonResponse.should.have.properties(['email', 'uuid', 'status', 'name', 'newsletters']);
-            jsonResponse.should.not.have.property('id');
-            jsonResponse.newsletters.should.have.length(0);
+            it('should fetch and update member newsletters with valid uuid', async function () {
+                const memberUUID = DataGenerator.Content.members[0].uuid;
 
-            const resRestored = await request.put(`/members/api/member/newsletters?uuid=${memberUUID}`)
-                .send({
-                    newsletters: originalNewsletters
-                })
-                .expect(200);
+                // Can fetch newsletter subscriptions
+                sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+                const memberHmac = crypto.createHmac('sha256', 'test').update(memberUUID).digest('hex');
+                const getRes = await request.get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
+                    .expect(200);
+                const getJsonResponse = getRes.body;
 
-            const restoreJsonResponse = resRestored.body;
-            should.exist(restoreJsonResponse);
-            restoreJsonResponse.should.have.properties(['email', 'uuid', 'status', 'name', 'newsletters']);
-            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);
-            restoreJsonResponse.newsletters[0].should.have.properties([
-                'id',
-                'name',
-                'description',
-                'sort_order'
-            ]);
+                should.exist(getJsonResponse);
+                getJsonResponse.should.have.properties(['email', 'uuid', 'status', 'name', 'newsletters']);
+                getJsonResponse.should.not.have.property('id');
+                getJsonResponse.newsletters.should.have.length(1);
+
+                // NOTE: these should be snapshots not code
+                Object.keys(getJsonResponse.newsletters[0]).should.have.length(5);
+                getJsonResponse.newsletters[0].should.have.properties([
+                    'id',
+                    'uuid',
+                    'name',
+                    'description',
+                    'sort_order'
+                ]);
+
+                // Can update newsletter subscription
+                const originalNewsletters = getJsonResponse.newsletters;
+                const originalNewsletterName = originalNewsletters[0].name;
+                originalNewsletters[0].name = 'cannot change me';
+
+                const res = await request.put(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
+                    .send({
+                        newsletters: []
+                    })
+                    .expect(200);
+                const jsonResponse = res.body;
+
+                should.exist(jsonResponse);
+                jsonResponse.should.have.properties(['email', 'uuid', 'status', 'name', 'newsletters']);
+                jsonResponse.should.not.have.property('id');
+                jsonResponse.newsletters.should.have.length(0);
+
+                const resRestored = await request.put(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
+                    .send({
+                        newsletters: originalNewsletters
+                    })
+                    .expect(200);
 
-            should.equal(restoreJsonResponse.newsletters[0].name, originalNewsletterName);
+                const restoreJsonResponse = resRestored.body;
+                should.exist(restoreJsonResponse);
+                restoreJsonResponse.should.have.properties(['email', 'uuid', 'status', 'name', 'newsletters']);
+                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(5);
+                restoreJsonResponse.newsletters[0].should.have.properties([
+                    'id',
+                    'uuid',
+                    'name',
+                    'description',
+                    'sort_order'
+                ]);
+
+                should.equal(restoreJsonResponse.newsletters[0].name, originalNewsletterName);
+            });
         });
 
         it('should serve theme 404 on members endpoint', async function () {
@@ -256,12 +294,8 @@ describe('Front-end members behavior', function () {
     });
 
     describe('Unsubscribe', function () {
-        beforeEach(function () {
-            mockManager.mockLabsEnabled('listUnsubscribeHeader');
-        });
-
         afterEach(function () {
-            mockManager.restore();
+            sinon.restore();
         });
 
         it('should redirect with uuid and action param', async function () {
@@ -276,12 +310,18 @@ describe('Front-end members behavior', function () {
                 .expect('Location', 'http://127.0.0.1:2369/?uuid=XXX&newsletter=YYY&action=unsubscribe');
         });
 
+        it('should pass through an optional key param', async function () {
+            await request.get('/unsubscribe/?uuid=XXX&key=YYY')
+                .expect(302)
+                .expect('Location', 'http://127.0.0.1:2369/?uuid=XXX&key=YYY&action=unsubscribe');
+        });
+
         it('should reject when missing a uuid', async function () {
             await request.get('/unsubscribe/')
                 .expect(400);
         });
 
-        it('should do an actual unsubscribe on POST', async function () {
+        it('should return unauthorized with a bad key', async function () {
             const newsletterId = fixtureManager.get('newsletters', 0).id;
             const member = await createMember({
                 email: 'unsubscribe-member-test@example.com',
@@ -291,19 +331,40 @@ describe('Front-end members behavior', function () {
             });
 
             const memberUUID = member.get('uuid');
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('therealkey');
+            const memberHmac = crypto.createHmac('sha256','thefalsekey').update(memberUUID).digest('hex');
+
+            // auth via uuid+key should fail
+            await request
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
+                .expect(401);
+        });
+
+        it('should do an actual unsubscribe on POST', async function () {
+            const newsletterId = fixtureManager.get('newsletters', 0).id;
+            const member = await createMember({
+                email: 'unsubscribe-member-test-another@example.com',
+                newsletters: [
+                    {id: newsletterId}
+                ]
+            });
+
+            const memberUUID = member.get('uuid');
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+            const memberHmac = crypto.createHmac('sha256','test').update(memberUUID).digest('hex');
 
             // Can fetch newsletter subscriptions
             let getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             let getJsonResponse = getRes.body;
             assert.equal(getJsonResponse.newsletters.length, 1);
 
-            await request.post(`/unsubscribe/?uuid=${memberUUID}`)
+            await request.post(`/unsubscribe/?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(201);
 
             getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             getJsonResponse = getRes.body;
 
@@ -324,19 +385,21 @@ describe('Front-end members behavior', function () {
             });
 
             const memberUUID = member.get('uuid');
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+            const memberHmac = crypto.createHmac('sha256','test').update(memberUUID).digest('hex');
 
             // Can fetch newsletter subscriptions
             let getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             let getJsonResponse = getRes.body;
             assert.equal(getJsonResponse.newsletters.length, 2);
 
-            await request.post(`/unsubscribe/?uuid=${memberUUID}&newsletter=${newsletter2Uuid}`)
+            await request.post(`/unsubscribe/?uuid=${memberUUID}&newsletter=${newsletter2Uuid}&key=${memberHmac}`)
                 .expect(201);
 
             getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             getJsonResponse = getRes.body;
 
@@ -355,15 +418,17 @@ describe('Front-end members behavior', function () {
             });
 
             const memberUUID = member.get('uuid');
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+            const memberHmac = crypto.createHmac('sha256','test').update(memberUUID).digest('hex');
 
             // Can fetch newsletter subscriptions
             let getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             let getJsonResponse = getRes.body;
             assert.equal(getJsonResponse.newsletters.length, 1);
 
-            await request.post(`/unsubscribe/?uuid=${memberUUID}&comments=1`)
+            await request.post(`/unsubscribe/?uuid=${memberUUID}&key=${memberHmac}&comments=1`)
                 .expect(201);
 
             const updatedMember = await members.api.members.get({id: member.id}, {withRelated: ['newsletters']});
@@ -381,21 +446,23 @@ describe('Front-end members behavior', function () {
             });
 
             const memberUUID = member.get('uuid');
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+            const memberHmac = crypto.createHmac('sha256','test').update(memberUUID).digest('hex');
 
             // Can fetch newsletter subscriptions
             let getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             let getJsonResponse = getRes.body;
             assert.equal(getJsonResponse.newsletters.length, 1);
 
-            await request.post(`/unsubscribe/?uuid=${memberUUID}`)
+            await request.post(`/unsubscribe/?uuid=${memberUUID}&key=${memberHmac}`)
                 .type('form')
                 .send({'List-Unsubscribe': 'One-Click'})
                 .expect(201);
 
             getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             getJsonResponse = getRes.body;
 
@@ -412,20 +479,22 @@ describe('Front-end members behavior', function () {
             });
 
             const memberUUID = member.get('uuid');
+            sinon.stub(settingsHelpers, 'getMembersValidationKey').returns('test');
+            const memberHmac = crypto.createHmac('sha256','test').update(memberUUID).digest('hex');
 
             // Can fetch newsletter subscriptions
             let getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             let getJsonResponse = getRes.body;
             assert.equal(getJsonResponse.newsletters.length, 1);
 
-            await request.post(`/unsubscribe/?uuid=${memberUUID}`)
+            await request.post(`/unsubscribe/?uuid=${memberUUID}&key=${memberHmac}`)
                 .field('List-Unsubscribe', 'One-Click')
                 .expect(201);
 
             getRes = await request
-                .get(`/members/api/member/newsletters?uuid=${memberUUID}`)
+                .get(`/members/api/member/newsletters?uuid=${memberUUID}&key=${memberHmac}`)
                 .expect(200);
             getJsonResponse = getRes.body;
 
@@ -539,6 +608,104 @@ describe('Front-end members behavior', function () {
             });
         });
 
+        describe('log out', function () {
+            let member;
+
+            beforeEach(async function () {
+                member = await loginAsMember('member1@test.com');
+            });
+
+            it('an invalid token causes a set-cookie logout when requesting the identity', async function () {
+                // Check logged in
+                await request.get('/members/api/member')
+                    .expect(200);
+
+                // Cycle the transient id manually
+                await cycleTransientId({id: member.id});
+
+                await member.refresh();
+                const transientId = member.get('transient_id');
+
+                await request.get('/members/api/session')
+                    .expect('set-cookie', /ghost-members-ssr=.*;.*?expires=Thu, 01 Jan 1970 00:00:00 GMT;.*?/)
+                    .expect(204);
+
+                // Check logged out
+                await request.get('/members/api/member')
+                    .expect(204);
+
+                // Check transient id has NOT changed
+                await member.refresh();
+                assert.equal(member.get('transient_id'), transientId);
+            });
+
+            it('by default only destroys current session', async function () {
+                const transientId = member.get('transient_id');
+
+                // Check logged in
+                await request.get('/members/api/member')
+                    .expect(200);
+
+                await request.del('/members/api/session')
+                    .expect('set-cookie', /ghost-members-ssr=.*;.*?expires=Thu, 01 Jan 1970 00:00:00 GMT;.*?/)
+                    .expect(204);
+
+                // Check logged out
+                await request.get('/members/api/member')
+                    .expect(204);
+
+                // Check transient id has NOT changed
+                await member.refresh();
+                assert.equal(member.get('transient_id'), transientId);
+            });
+
+            it('can destroy all sessions', async function () {
+                const transientId = member.get('transient_id');
+
+                // Check logged in
+                await request.get('/members/api/member')
+                    .expect(200);
+
+                await request.del('/members/api/session')
+                    .send({
+                        all: true
+                    })
+                    .expect('set-cookie', /ghost-members-ssr=.*;.*?expires=Thu, 01 Jan 1970 00:00:00 GMT;.*?/)
+                    .expect(204);
+
+                // Check logged out
+                await request.get('/members/api/member')
+                    .expect(204);
+
+                // Check transient id has changed
+                await member.refresh();
+                assert.notEqual(member.get('transient_id'), transientId);
+            });
+
+            it('can destroy only current session', async function () {
+                const transientId = member.get('transient_id');
+
+                // Check logged in
+                await request.get('/members/api/member')
+                    .expect(200);
+
+                await request.del('/members/api/session')
+                    .send({
+                        all: false
+                    })
+                    .expect('set-cookie', /ghost-members-ssr=.*;.*?expires=Thu, 01 Jan 1970 00:00:00 GMT;.*?/)
+                    .expect(204);
+
+                // Check logged out
+                await request.get('/members/api/member')
+                    .expect(204);
+
+                // Check transient id has NOT changed
+                await member.refresh();
+                assert.equal(member.get('transient_id'), transientId);
+            });
+        });
+
         describe('as free member', function () {
             before(async function () {
                 await loginAsMember('member1@test.com');
@@ -663,9 +830,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-frontend/middleware.test.js b/ghost/core/test/e2e-frontend/middleware.test.js
new file mode 100644
index 00000000000..e48032c8ae3
--- /dev/null
+++ b/ghost/core/test/e2e-frontend/middleware.test.js
@@ -0,0 +1,94 @@
+const sinon = require('sinon');
+const supertest = require('supertest');
+const testUtils = require('../utils');
+const configUtils = require('../utils/configUtils');
+const membersService = require('../../core/server/services/members');
+
+describe('Middleware Execution', function () {
+    let loadMemberSessionMiddlewareSpy;
+    let request;
+
+    before(async function () {
+        loadMemberSessionMiddlewareSpy = sinon.spy(membersService.middleware, 'loadMemberSession');
+
+        // Ensure we do a forced start so that spy is in place when the server starts
+        await testUtils.startGhost({forceStart: true});
+
+        request = supertest.agent(configUtils.config.get('url'));
+    });
+
+    after(async function () {
+        sinon.restore();
+
+        await testUtils.stopGhost();
+    });
+
+    afterEach(function () {
+        loadMemberSessionMiddlewareSpy.resetHistory();
+    });
+
+    describe('Loading a member session', function () {
+        describe('Page with member content', function () {
+            it('should load member session on home route', async function () {
+                await request.get('/');
+                sinon.assert.calledOnce(loadMemberSessionMiddlewareSpy);
+            });
+
+            it('should load member session on post route', async function () {
+                await request.get('/welcome/');
+                sinon.assert.calledOnce(loadMemberSessionMiddlewareSpy);
+            });
+        });
+
+        describe('Sitemap', function () {
+            it('should not load member session on sitemap route', async function () {
+                await request.get('/sitemap.xml');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+
+            it('should not load member session on sitemap-pages route', async function () {
+                await request.get('/sitemap-pages.xml');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+
+            it('should not load member session on sitemap-posts route', async function () {
+                await request.get('/sitemap-posts.xml');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+
+            it('should not load member session on sitemap-tags route', async function () {
+                await request.get('/sitemap-tags.xml');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+
+            it('should not load member session on sitemap-authors route', async function () {
+                await request.get('/sitemap-authors.xml');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+        });
+
+        describe('Recommendations', function () {
+            it('should not load member session on recommendations route', async function () {
+                await request.get('/.well-known/recommendations.json');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+        });
+
+        describe('Static assets', function () {
+            it('should not load member session on fonts route', async function () {
+                await request.get('/assets/fonts/inter-roman.woff2');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+
+            it('should not load member session on source.js route', async function () {
+                await request.get('/assets/built/source.js');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+
+            it('should not load member session on screen.css route', async function () {
+                await request.get('/assets/built/screen.css');
+                sinon.assert.notCalled(loadMemberSessionMiddlewareSpy);
+            });
+        });
+    });
+});
diff --git a/ghost/core/test/e2e-frontend/preview_routes.test.js b/ghost/core/test/e2e-frontend/preview_routes.test.js
index 9258fe1b968..7333cac3ba4 100644
--- a/ghost/core/test/e2e-frontend/preview_routes.test.js
+++ b/ghost/core/test/e2e-frontend/preview_routes.test.js
@@ -9,6 +9,7 @@ const supertest = require('supertest');
 const cheerio = require('cheerio');
 const testUtils = require('../utils');
 const config = require('../../core/shared/config');
+const {DateTime} = require('luxon');
 let request;
 
 function assertCorrectFrontendHeaders(res) {
@@ -90,6 +91,38 @@ describe('Frontend Routing: Preview Routes', function () {
             .expect(assertCorrectFrontendHeaders);
     });
 
+    it('should render scheduled email-only posts', async function () {
+        const scheduledEmail = await testUtils.fixtures.insertPosts([{
+            title: 'test newsletter',
+            status: 'scheduled',
+            published_at: DateTime.now().plus({days: 1}).toISODate(),
+            posts_meta: {
+                email_only: true
+            }
+        }]);
+
+        await request.get(`/p/${scheduledEmail[0].get('uuid')}/`)
+            .expect('Content-Type', /html/)
+            .expect(200)
+            .expect(assertCorrectFrontendHeaders);
+    });
+
+    it('should redirect sent email-only posts to /email/:uuid from /p/:uuid', async function () {
+        const emailedPost = await testUtils.fixtures.insertPosts([{
+            title: 'test newsletter',
+            status: 'sent',
+            posts_meta: {
+                email_only: true
+            }
+        }]);
+
+        await request.get(`/p/${emailedPost[0].get('uuid')}/`)
+            .expect(301)
+            .expect('Location', `/email/${emailedPost[0].get('uuid')}/`)
+            .expect('Cache-Control', testUtils.cacheRules.year)
+            .expect(assertCorrectFrontendHeaders);
+    });
+
     it('404s unknown uuids', async function () {
         request.get('/p/aac6b4f6-e1f3-406c-9247-c94a0496d39f/')
             .expect(404)
diff --git a/ghost/core/test/e2e-frontend/static-files.test.js b/ghost/core/test/e2e-frontend/static-files.test.js
new file mode 100644
index 00000000000..1072806b9c6
--- /dev/null
+++ b/ghost/core/test/e2e-frontend/static-files.test.js
@@ -0,0 +1,25 @@
+const assert = require('assert/strict');
+const {agentProvider} = require('../utils/e2e-framework');
+
+describe('Static files', function () {
+    let frontendAgent;
+    let ghostServer;
+
+    before(async function () {
+        const agents = await agentProvider.getAgentsWithFrontend();
+        frontendAgent = agents.frontendAgent;
+        ghostServer = agents.ghostServer;
+    });
+
+    after(async function () {
+        await ghostServer.stop();
+    });
+
+    it('serves unstyled 404 for non-existing resized + original files', async function () {
+        const response = await frontendAgent
+            .get('/content/images/size/w2000/1995/12/daniel.jpg')
+            .expect(404);
+
+        assert.ok(response.text.includes('NotFoundError: Image not found'));
+    });
+});
diff --git a/ghost/core/test/e2e-server/__snapshots__/click-tracking.test.js.snap b/ghost/core/test/e2e-server/__snapshots__/click-tracking.test.js.snap
new file mode 100644
index 00000000000..5d53952d5ce
--- /dev/null
+++ b/ghost/core/test/e2e-server/__snapshots__/click-tracking.test.js.snap
@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Click Tracking Full test 1: [headers] 1`] = `
+Object {
+  "accept-encoding": "gzip, deflate, br",
+  "content-length": Any<Number>,
+  "content-type": "application/json",
+  "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
+  "user-agent": StringMatching /Ghost\\\\/\\\\d\\+\\\\\\.\\\\d\\+\\\\\\.\\\\d\\+\\\\s\\\\\\(https:\\\\/\\\\/github\\.com\\\\/TryGhost\\\\/Ghost\\\\\\)/,
+}
+`;
+
+exports[`Click Tracking Full test 2: [body] 1`] = `
+Object {
+  "member": Object {
+    "current": Object {
+      "avatar_image": null,
+      "comped": false,
+      "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "email": "with-product@test.com",
+      "email_count": 0,
+      "email_open_rate": null,
+      "email_opened_count": 0,
+      "geolocation": null,
+      "id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
+      "labels": Array [],
+      "last_seen_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "name": "Dana Barrett",
+      "newsletters": Array [],
+      "note": null,
+      "status": "paid",
+      "subscribed": false,
+      "subscriptions": Array [],
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+      "uuid": "f6f91461-d7d8-4a3f-aa5d-8e582c40b347",
+    },
+    "previous": Object {
+      "last_seen_at": null,
+      "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
+    },
+  },
+}
+`;
diff --git a/ghost/core/test/e2e-server/admin.test.js b/ghost/core/test/e2e-server/admin.test.js
index 09c6fc4bb68..600dcddad59 100644
--- a/ghost/core/test/e2e-server/admin.test.js
+++ b/ghost/core/test/e2e-server/admin.test.js
@@ -44,6 +44,31 @@ describe('Admin Routing', function () {
         });
     });
 
+    describe('Auth Frame', function () {
+        before(function () {
+            // ensure the admin-auth folder exists so serveStatic doesn't fall through
+            adminUtils.stubAuthFrameFiles(configUtils.config.getContentPath('public'));
+        });
+
+        it('Renders 204 with no admin session cookie', async function () {
+            await request
+                .get('/ghost/auth-frame/')
+                .set('Origin', config.get('url'))
+                .expect(204)
+                .expect('Cache-Control', 'public, max-age=0');
+        });
+
+        it('Renders static file with admin session cookie', async function () {
+            await request
+                .get('/ghost/auth-frame/')
+                .set('Origin', config.get('url'))
+                .set('Cookie', [
+                    'ghost-admin-api-session=abc; Path=/; HttpOnly; Secure; SameSite=Strict'
+                ])
+                .expect(200);
+        });
+    });
+
     describe('Admin Redirects', function () {
         it('should redirect /GHOST/ to /ghost/', async function () {
             await request.get('/GHOST/')
diff --git a/ghost/core/test/e2e-server/click-tracking.test.js b/ghost/core/test/e2e-server/click-tracking.test.js
index 5a573f1ddb9..01f1e1bcb80 100644
--- a/ghost/core/test/e2e-server/click-tracking.test.js
+++ b/ghost/core/test/e2e-server/click-tracking.test.js
@@ -1,22 +1,25 @@
 const assert = require('assert/strict');
 const fetch = require('node-fetch').default;
-const {agentProvider, mockManager, fixtureManager} = require('../utils/e2e-framework');
+const {agentProvider, mockManager, fixtureManager, matchers} = require('../utils/e2e-framework');
 const urlUtils = require('../../core/shared/url-utils');
 const jobService = require('../../core/server/services/jobs/job-service');
+const {anyGhostAgent, anyContentVersion, anyNumber, anyISODateTime, anyObjectId} = matchers;
 
 describe('Click Tracking', function () {
     let agent;
+    let webhookMockReceiver;
 
     before(async function () {
         const {adminAgent} = await agentProvider.getAgentsWithFrontend();
         agent = adminAgent;
-        await fixtureManager.init('newsletters', 'members:newsletters');
+        await fixtureManager.init('newsletters', 'members:newsletters', 'integrations');
         await agent.loginAsOwner();
     });
 
     beforeEach(function () {
         mockManager.mockMail();
         mockManager.mockMailgun();
+        webhookMockReceiver = mockManager.mockWebhookRequests();
     });
 
     afterEach(function () {
@@ -24,10 +27,13 @@ describe('Click Tracking', function () {
     });
 
     it('Full test', async function () {
-        const {body: {posts: [draft]}} = await agent.post('/posts/', {
+        const siteUrl = new URL(urlUtils.urlFor('home', true));
+
+        const {body: {posts: [draft]}} = await agent.post('/posts/?source=html', {
             body: {
                 posts: [{
-                    title: 'My Newsletter'
+                    title: 'My Newsletter',
+                    html: `<p>External link <a href="https://example.com/a">https://example.com/a</a>; Internal link <a href=${siteUrl.href}/about">${siteUrl.href}/about</a>;Ghost homepage <a href="https://ghost.org">https://ghost.org</a></p>`
                 }]
             }
         });
@@ -48,17 +54,25 @@ describe('Click Tracking', function () {
         // Wait for the newsletter to be sent
         await jobService.allSettled();
 
+        // Setup a webhook listener for member.edited events
+        const webhookURL = 'https://test-webhook-receiver.com/member-edited/';
+        await webhookMockReceiver.mock(webhookURL);
+        await fixtureManager.insertWebhook({
+            event: 'member.edited',
+            url: webhookURL
+        });
+
         const {body: {links}} = await agent.get(
-            `/links/?filter=post_id:${post.id}`
+            `/links/?filter=${encodeURIComponent(`post_id:'${post.id}'`)}`
         );
 
         /** @type {(url: string) => Promise<import('node-fetch').Response>} */
         const fetchWithoutFollowingRedirect = url => fetch(url, {redirect: 'manual'});
 
-        const siteUrl = new URL(urlUtils.urlFor('home', true));
-
         let internalRedirectHappened = false;
         let externalRedirectHappened = false;
+        let poweredByGhostIgnored = true;
+
         for (const link of links) {
             const res = await fetchWithoutFollowingRedirect(link.link.from);
             const redirectedToUrl = new URL(res.headers.get('location'));
@@ -66,7 +80,6 @@ describe('Click Tracking', function () {
             // startsWith is a little dirty, but we need this because siteUrl
             // can have a path when Ghost is hosted on a subdomain.
             const isInternal = redirectedToUrl.href.startsWith(siteUrl.href);
-
             if (isInternal) {
                 internalRedirectHappened = true;
 
@@ -80,10 +93,16 @@ describe('Click Tracking', function () {
             }
 
             assert(redirectedToUrl.searchParams.get('ref'), 'ref should be present on all redirects');
+
+            // Powered by Ghost link should not be replaced / tracked
+            if (link.link.to.includes('https://ghost.org/?via=pbg-newsletter')) {
+                poweredByGhostIgnored = false;
+            }
         }
 
         assert(internalRedirectHappened);
         assert(externalRedirectHappened);
+        assert(poweredByGhostIgnored);
 
         const {body: {members}} = await agent.get(
             `/members/`
@@ -91,7 +110,7 @@ describe('Click Tracking', function () {
 
         const linkToClick = links[0];
         const memberToClickLink = members[0];
-
+        assert(memberToClickLink.last_seen_at === null);
         const urlOfLinkToClick = new URL(linkToClick.link.from);
 
         urlOfLinkToClick.searchParams.set('m', memberToClickLink.uuid);
@@ -101,13 +120,13 @@ describe('Click Tracking', function () {
         await fetchWithoutFollowingRedirect(urlOfLinkToClick.href);
 
         const {body: {links: [clickedLink]}} = await agent.get(
-            `/links/?filter=post_id:${post.id}`
+            `/links/?filter=${encodeURIComponent(`post_id:'${post.id}'`)}`
         );
 
         const clickCount = clickedLink.count.clicks;
 
         const {body: {events: clickEvents}} = await agent.get(
-            `/members/events/?filter=data.member_id:${memberToClickLink.id}${encodeURIComponent('+')}type:click_event`
+            `/members/events/?filter=${encodeURIComponent(`data.member_id:'${memberToClickLink.id}'+type:click_event`)}`
         );
 
         const clickEvent = clickEvents.find((/** @type any */ event) => {
@@ -116,5 +135,34 @@ describe('Click Tracking', function () {
 
         assert(clickEvent);
         assert(previousClickCount + 1 === clickCount);
+
+        // Ensure we updated the member's last_seen_at
+        const {body: {members: [memberWhoClicked]}} = await agent.get(
+            `/members/${memberToClickLink.id}`
+        );
+        assert(memberWhoClicked.last_seen_at !== null, 'last_seen_at should be set after a click');
+        assert(new Date(memberWhoClicked.last_seen_at).getTime() > 0, 'last_seen_at should be a valid date');
+        // Ensure we sent the webhook with the correct payload, including newsletters and labels
+        await webhookMockReceiver.receivedRequest();
+        webhookMockReceiver
+            .matchHeaderSnapshot({
+                'content-version': anyContentVersion,
+                'content-length': anyNumber,
+                'user-agent': anyGhostAgent
+            })
+            .matchBodySnapshot({
+                member: {
+                    current: {
+                        created_at: anyISODateTime,
+                        id: anyObjectId,
+                        last_seen_at: anyISODateTime,
+                        updated_at: anyISODateTime
+                    },
+                    previous: {
+                        last_seen_at: null,
+                        updated_at: anyISODateTime
+                    }
+                }
+            });
     });
 });
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..a40dc54480f 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
@@ -8,107 +8,102 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
     <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
     <title>👍 New recommendation</title>
     <style>
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important;
-        }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important;
-        }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important;
-        }
-        table[class=body] .content {
-          padding: 0 !important;
-        }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important;
-        }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important;
-        }
-        table[class=body] .btn table {
-          width: 100% !important;
-        }
-        table[class=body] .btn a {
-          width: 100% !important;
-        }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important;
-        }
-        table[class=body] p[class=small],
-        table[class=body] a[class=small] {
-          font-size: 11px !important;
-        }
-        .new-mention-thumbnail {
-          display: none !important;
-        }
-      }
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%;
-        }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%;
-        }
-        /* Reset styles for Gmail (it wraps email address in link with custom styles) */
-        .text-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important;
-        }
-        #MessageViewBody a {
-          color: inherit;
-          text-decoration: none;
-          font-size: inherit;
-          font-family: inherit;
-          font-weight: inherit;
-          line-height: inherit;
-        }
-      }
-      hr {
-        border-width: 0;
-        height: 0;
-        margin-top: 34px;
-        margin-bottom: 34px;
-        border-bottom-width: 1px;
-        border-bottom-color: #EEF5F8;
-      }
-      a {
-        color: #15212A;
-      }
-      blockquote {
-        margin-left: 0;
-        padding-left: 20px;
-        border-left: 3px solid #DDE1E5;
-      }
-    </style>
+@media only screen and (max-width: 620px) {
+  table.body h1 {
+    font-size: 22px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td,
+table.body span,
+table.body a {
+    font-size: 16px !important;
+  }
+
+  table.body .wrapper,
+table.body .article {
+    padding: 10px !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body p.large,
+table.body p.large a {
+    font-size: 18px !important;
+  }
+
+  table.body p.small,
+table.body a.small {
+    font-size: 12px !important;
+  }
+
+  .new-mention-thumbnail {
+    display: none !important;
+  }
+}
+@media all {
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .text-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  .text-link-accent a {
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+}
+</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%;\\">
 
@@ -127,40 +122,36 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
                   <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                     <tr>
                       <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
-
-                          <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;\\">Great news!</p>
-                          <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>
+                          <h1 style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15171A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 24px;\\">A site is now recommending you&nbsp;back</h1>
 
                         <!--[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:#F4F5F6;border-radius:8px;\\">
+                          <a style=\\"display: flex; font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif; background: #F4F5F6; border-radius: 8px; 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:#15171A;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 style=\\"color:#15171A;font-size:15px;line-height:1.3em;font-weight:700\\">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 #F4F5F6; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif; background-color:#F4F5F6;\\" class=\\"recommendation-card--outlook\\">
                             <tr>
-                                <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F9F9FA;\\">
+                                <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F4F5F6;\\">
                                     <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: #15171A; font-size: 15px; line-height: 1.5em; font-weight: 700; 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>
@@ -171,11 +162,13 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
                           <tbody>
                             <tr>
-                              <td align=\\"left\\" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;\\">
+                              <td align=\\"left\\" 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; vertical-align: top; padding-top: 24px; padding-bottom: 12px;\\">
                                 <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
                                   <tbody>
                                     <tr>
-                                            <td 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; vertical-align: top; background-color: #15171a; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/recommendations\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15171a; border: solid 1px #15171a; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15171a;\\">View recommendations</a></td>
+                                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; border-radius: 8px; text-align: center;\\"> 
+                                          <a href=\\"http://127.0.0.1:2369/ghost/#/settings/recommendations\\" target=\\"_blank\\" style=\\"border: solid 1px #FF1A75; border-radius: 8px; box-sizing: border-box; display: inline-block; font-size: 15px; font-weight: normal; margin: 0; padding: 10px 20px; text-decoration: none; background-color: #FF1A75; border-color: #FF1A75; color: #ffffff;\\">View recommendations</a>
+                                      </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -183,21 +176,29 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
                             </tr>
                           </tbody>
                         </table>
-                        <hr/>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
-                        <p class=\\"text-link\\" style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/recommendations</p>
+
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
+                          <tbody>
+                            <tr>
+                              <td align=\\"left\\" style=\\"padding-top: 24px;\\">
+                                <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #7c8b9a; font-weight: normal; margin: 0; line-height: 25px;\\">Or copy and paste this URL into your browser:</p>
+                                <p class=\\"text-link\\" style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin:0; color: #7c8b9a; font-weight: normal;\\">http://127.0.0.1:2369/ghost/#/settings/recommendations</p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <tr>
-                        <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
-                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;\\">This message was sent from <a class=\\"small\\" href=\\"http://127.0.0.1:2369/\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">127.0.0.1</a> to <a class=\\"small\\" href=\\"mailto:jbloggs@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">jbloggs@example.com</a></p>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;\\">
+                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;\\">This message was sent from <a class=\\"small\\" href=\\"http://127.0.0.1:2369/\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">127.0.0.1</a> to <a class=\\"small\\" href=\\"mailto:jbloggs@example.com\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">jbloggs@example.com</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px\\">
-                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;\\">Don’t want to receive these emails? Manage your preferences <a class=\\"small\\" href=\\"http://127.0.0.1:2369/ghost/#/settings/staff/joe-bloggs\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">here</a>.</p>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;\\">
+                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;\\">Don’t want to receive these emails? Manage your preferences <a class=\\"small\\" href=\\"http://127.0.0.1:2369/ghost/#/settings/staff/joe-bloggs\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">here</a>.</p>
                       </td>
                     </tr>
 
@@ -234,6 +235,10 @@ If you would no longer like to receive these notifications you can adjust your s
 
 exports[`Incoming Recommendation Emails Sends a different email if we receive a recommendation back 3: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
+  "from": "\\"Ghost\\" <noreply@127.0.0.1>",
+  "generateTextFromHTML": true,
+  "replyTo": null,
   "subject": "👍 New recommendation: Other Ghost Site",
   "to": "jbloggs@example.com",
 }
@@ -247,107 +252,102 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
     <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
     <title>👍 New recommendation</title>
     <style>
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important;
-        }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important;
-        }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important;
-        }
-        table[class=body] .content {
-          padding: 0 !important;
-        }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important;
-        }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important;
-        }
-        table[class=body] .btn table {
-          width: 100% !important;
-        }
-        table[class=body] .btn a {
-          width: 100% !important;
-        }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important;
-        }
-        table[class=body] p[class=small],
-        table[class=body] a[class=small] {
-          font-size: 11px !important;
-        }
-        .new-mention-thumbnail {
-          display: none !important;
-        }
-      }
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%;
-        }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%;
-        }
-        /* Reset styles for Gmail (it wraps email address in link with custom styles) */
-        .text-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important;
-        }
-        #MessageViewBody a {
-          color: inherit;
-          text-decoration: none;
-          font-size: inherit;
-          font-family: inherit;
-          font-weight: inherit;
-          line-height: inherit;
-        }
-      }
-      hr {
-        border-width: 0;
-        height: 0;
-        margin-top: 34px;
-        margin-bottom: 34px;
-        border-bottom-width: 1px;
-        border-bottom-color: #EEF5F8;
-      }
-      a {
-        color: #15212A;
-      }
-      blockquote {
-        margin-left: 0;
-        padding-left: 20px;
-        border-left: 3px solid #DDE1E5;
-      }
-    </style>
+@media only screen and (max-width: 620px) {
+  table.body h1 {
+    font-size: 22px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td,
+table.body span,
+table.body a {
+    font-size: 16px !important;
+  }
+
+  table.body .wrapper,
+table.body .article {
+    padding: 10px !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body p.large,
+table.body p.large a {
+    font-size: 18px !important;
+  }
+
+  table.body p.small,
+table.body a.small {
+    font-size: 12px !important;
+  }
+
+  .new-mention-thumbnail {
+    display: none !important;
+  }
+}
+@media all {
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .text-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  .text-link-accent a {
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+}
+</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%;\\">
 
@@ -366,40 +366,37 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                   <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                     <tr>
                       <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
-
-                          <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;\\">Good news!</p>
-                          <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>
+                          <h1 style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15171A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 12px;\\">A site is now recommending you to their&nbsp;audience</h1>
+                          <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: 15px; color: #15171A; font-weight: normal; margin: 0; line-height: 1.3em; padding-bottom: 32px;\\">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:#F4F5F6;border-radius:8px;\\">
+                          <a style=\\"display: flex; font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif; background: #F4F5F6; border-radius: 8px; 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:#15171A;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 style=\\"color:#15171A;font-size:15px;line-height:1.3em;font-weight:700\\">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 #F4F5F6; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif; background-color:#F4F5F6;\\" class=\\"recommendation-card--outlook\\">
                             <tr>
-                                <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F9F9FA;\\">
+                                <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F4F5F6;\\">
                                     <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: #15171A; font-size: 15px; line-height: 1.5em; font-weight: 700; 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>
@@ -410,11 +407,13 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
                           <tbody>
                             <tr>
-                              <td align=\\"left\\" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;\\">
+                              <td align=\\"left\\" 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; vertical-align: top; padding-top: 24px; padding-bottom: 12px;\\">
                                 <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
                                   <tbody>
                                     <tr>
-                                            <td 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; vertical-align: top; background-color: #15171a; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/recommendations/add?url=https%3A%2F%2Fwww.otherghostsite.com%2F\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15171a; border: solid 1px #15171a; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15171a;\\">Recommend back</a></td>
+                                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; border-radius: 8px; text-align: center;\\"> 
+                                          <a href=\\"http://127.0.0.1:2369/ghost/#/settings/recommendations/add?url=https%3A%2F%2Fwww.otherghostsite.com%2F\\" target=\\"_blank\\" style=\\"border: solid 1px #FF1A75; border-radius: 8px; box-sizing: border-box; display: inline-block; font-size: 15px; font-weight: normal; margin: 0; padding: 10px 20px; text-decoration: none; background-color: #FF1A75; border-color: #FF1A75; color: #ffffff;\\">Recommend back</a>
+                                      </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -422,21 +421,29 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                             </tr>
                           </tbody>
                         </table>
-                        <hr/>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
-                        <p class=\\"text-link\\" style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/recommendations</p>
+
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
+                          <tbody>
+                            <tr>
+                              <td align=\\"left\\" style=\\"padding-top: 24px;\\">
+                                <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #7c8b9a; font-weight: normal; margin: 0; line-height: 25px;\\">Or copy and paste this URL into your browser:</p>
+                                <p class=\\"text-link\\" style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin:0; color: #7c8b9a; font-weight: normal;\\">http://127.0.0.1:2369/ghost/#/settings/recommendations</p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <tr>
-                        <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
-                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;\\">This message was sent from <a class=\\"small\\" href=\\"http://127.0.0.1:2369/\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">127.0.0.1</a> to <a class=\\"small\\" href=\\"mailto:jbloggs@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">jbloggs@example.com</a></p>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;\\">
+                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;\\">This message was sent from <a class=\\"small\\" href=\\"http://127.0.0.1:2369/\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">127.0.0.1</a> to <a class=\\"small\\" href=\\"mailto:jbloggs@example.com\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">jbloggs@example.com</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px\\">
-                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;\\">Don’t want to receive these emails? Manage your preferences <a class=\\"small\\" href=\\"http://127.0.0.1:2369/ghost/#/settings/staff/joe-bloggs\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">here</a>.</p>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;\\">
+                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;\\">Don’t want to receive these emails? Manage your preferences <a class=\\"small\\" href=\\"http://127.0.0.1:2369/ghost/#/settings/staff/joe-bloggs\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">here</a>.</p>
                       </td>
                     </tr>
 
@@ -468,107 +475,102 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
     <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
     <title>👍 New recommendation</title>
     <style>
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important;
-        }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important;
-        }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important;
-        }
-        table[class=body] .content {
-          padding: 0 !important;
-        }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important;
-        }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important;
-        }
-        table[class=body] .btn table {
-          width: 100% !important;
-        }
-        table[class=body] .btn a {
-          width: 100% !important;
-        }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important;
-        }
-        table[class=body] p[class=small],
-        table[class=body] a[class=small] {
-          font-size: 11px !important;
-        }
-        .new-mention-thumbnail {
-          display: none !important;
-        }
-      }
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%;
-        }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%;
-        }
-        /* Reset styles for Gmail (it wraps email address in link with custom styles) */
-        .text-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important;
-        }
-        #MessageViewBody a {
-          color: inherit;
-          text-decoration: none;
-          font-size: inherit;
-          font-family: inherit;
-          font-weight: inherit;
-          line-height: inherit;
-        }
-      }
-      hr {
-        border-width: 0;
-        height: 0;
-        margin-top: 34px;
-        margin-bottom: 34px;
-        border-bottom-width: 1px;
-        border-bottom-color: #EEF5F8;
-      }
-      a {
-        color: #15212A;
-      }
-      blockquote {
-        margin-left: 0;
-        padding-left: 20px;
-        border-left: 3px solid #DDE1E5;
-      }
-    </style>
+@media only screen and (max-width: 620px) {
+  table.body h1 {
+    font-size: 22px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td,
+table.body span,
+table.body a {
+    font-size: 16px !important;
+  }
+
+  table.body .wrapper,
+table.body .article {
+    padding: 10px !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body p.large,
+table.body p.large a {
+    font-size: 18px !important;
+  }
+
+  table.body p.small,
+table.body a.small {
+    font-size: 12px !important;
+  }
+
+  .new-mention-thumbnail {
+    display: none !important;
+  }
+}
+@media all {
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .text-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  .text-link-accent a {
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+}
+</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%;\\">
 
@@ -587,40 +589,37 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                   <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                     <tr>
                       <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;\\">
-
-                          <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;\\">Good news!</p>
-                          <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>
+                          <h1 style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15171A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 12px;\\">A site is now recommending you to their&nbsp;audience</h1>
+                          <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: 15px; color: #15171A; font-weight: normal; margin: 0; line-height: 1.3em; padding-bottom: 32px;\\">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:#F4F5F6;border-radius:8px;\\">
+                          <a style=\\"display: flex; font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif; background: #F4F5F6; border-radius: 8px; 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:#15171A;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 style=\\"color:#15171A;font-size:15px;line-height:1.3em;font-weight:700\\">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 #F4F5F6; font-family: -apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Roboto, Oxygen, Ubuntu, Cantarell, \\"Open Sans\\", \\"Helvetica Neue\\", sans-serif; background-color:#F4F5F6;\\" class=\\"recommendation-card--outlook\\">
                             <tr>
-                                <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F9F9FA;\\">
+                                <td width=\\"100%\\" style=\\"padding: 20px;background-color:#F4F5F6;\\">
                                     <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: #15171A; font-size: 15px; line-height: 1.5em; font-weight: 700; 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>
@@ -631,11 +630,13 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"btn btn-primary\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;\\">
                           <tbody>
                             <tr>
-                              <td align=\\"left\\" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;\\">
+                              <td align=\\"left\\" 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; vertical-align: top; padding-top: 24px; padding-bottom: 12px;\\">
                                 <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
                                   <tbody>
                                     <tr>
-                                            <td 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; vertical-align: top; background-color: #15171a; border-radius: 5px; text-align: center;\\"> <a href=\\"http://127.0.0.1:2369/ghost/#/settings/recommendations/add?url=https%3A%2F%2Fwww.otherghostsite.com%2F\\" target=\\"_blank\\" style=\\"display: inline-block; color: #ffffff; background-color: #15171a; border: solid 1px #15171a; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15171a;\\">Recommend back</a></td>
+                                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; border-radius: 8px; text-align: center;\\"> 
+                                          <a href=\\"http://127.0.0.1:2369/ghost/#/settings/recommendations/add?url=https%3A%2F%2Fwww.otherghostsite.com%2F\\" target=\\"_blank\\" style=\\"border: solid 1px #FF1A75; border-radius: 8px; box-sizing: border-box; display: inline-block; font-size: 15px; font-weight: normal; margin: 0; padding: 10px 20px; text-decoration: none; background-color: #FF1A75; border-color: #FF1A75; color: #ffffff;\\">Recommend back</a>
+                                      </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -643,21 +644,29 @@ exports[`Incoming Recommendation Emails Sends an email if we receive a recommend
                             </tr>
                           </tbody>
                         </table>
-                        <hr/>
-                        <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;\\">You can also copy & paste this URL into your browser:</p>
-                        <p class=\\"text-link\\" style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;\\">http://127.0.0.1:2369/ghost/#/settings/recommendations</p>
+
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\">
+                          <tbody>
+                            <tr>
+                              <td align=\\"left\\" style=\\"padding-top: 24px;\\">
+                                <p style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #7c8b9a; font-weight: normal; margin: 0; line-height: 25px;\\">Or copy and paste this URL into your browser:</p>
+                                <p class=\\"text-link\\" style=\\"word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin:0; color: #7c8b9a; font-weight: normal;\\">http://127.0.0.1:2369/ghost/#/settings/recommendations</p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <tr>
-                        <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;\\">
-                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;\\">This message was sent from <a class=\\"small\\" href=\\"http://127.0.0.1:2369/\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">127.0.0.1</a> to <a class=\\"small\\" href=\\"mailto:swellingsworth@example.com\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">swellingsworth@example.com</a></p>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;\\">
+                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;\\">This message was sent from <a class=\\"small\\" href=\\"http://127.0.0.1:2369/\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">127.0.0.1</a> to <a class=\\"small\\" href=\\"mailto:swellingsworth@example.com\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">swellingsworth@example.com</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px\\">
-                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;\\">Don’t want to receive these emails? Manage your preferences <a class=\\"small\\" href=\\"http://127.0.0.1:2369/ghost/#/settings/staff/smith-wellingsworth\\" style=\\"text-decoration: underline; color: #738A94; font-size: 11px;\\">here</a>.</p>
+                      <td style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;\\">
+                        <p class=\\"small\\" style=\\"font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;\\">Don’t want to receive these emails? Manage your preferences <a class=\\"small\\" href=\\"http://127.0.0.1:2369/ghost/#/settings/staff/smith-wellingsworth\\" style=\\"text-decoration: underline; color: #7C8B9A; font-size: 12px;\\">here</a>.</p>
                       </td>
                     </tr>
 
@@ -694,6 +703,10 @@ If you would no longer like to receive these notifications you can adjust your s
 
 exports[`Incoming Recommendation Emails Sends an email if we receive a recommendation 4: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
+  "from": "\\"Ghost\\" <noreply@127.0.0.1>",
+  "generateTextFromHTML": true,
+  "replyTo": null,
   "subject": "👍 New recommendation: Other Ghost Site",
   "to": "jbloggs@example.com",
 }
diff --git a/ghost/core/test/e2e-server/services/member-attribution.test.js b/ghost/core/test/e2e-server/services/member-attribution.test.js
index f4e25e8fcbc..4a3e8099956 100644
--- a/ghost/core/test/e2e-server/services/member-attribution.test.js
+++ b/ghost/core/test/e2e-server/services/member-attribution.test.js
@@ -400,5 +400,25 @@ describe('Member Attribution Service', function () {
                 referrerUrl: null
             }));
         });
+
+        it('resolves Portal signup URLs', async function () {
+            // NOTE: We cannot test the actual hash URL here; the attribution below is what is receieved when navigating to /#/portal/signup?ref=ghost
+            // TODO: We don't appear to have tests for parsing URLs for params.
+            const attribution = await memberAttributionService.service.getAttribution([
+                {
+                    path: '/',
+                    time: Date.now(),
+                    referrerSource: 'casper'
+                }
+            ]);
+            attribution.should.match(({
+                id: null,
+                url: '/',
+                type: 'url',
+                referrerSource: 'casper',
+                referrerMedium: null,
+                referrerUrl: null
+            }));
+        });
     });
-});
+});
\ No newline at end of file
diff --git a/ghost/core/test/e2e-server/services/mentions.test.js b/ghost/core/test/e2e-server/services/mentions.test.js
index bcf6f55834f..ce8481e808a 100644
--- a/ghost/core/test/e2e-server/services/mentions.test.js
+++ b/ghost/core/test/e2e-server/services/mentions.test.js
@@ -368,7 +368,7 @@ describe('Mentions Service', function () {
                 assert.equal(endpointMock.isDone(), true);
             });
 
-            it('Unpublished post (post.unpublished)', async function () {
+            it('Unpublished page (page.unpublished)', async function () {
                 const publishedPage = {status: 'published', ...mentionsPost};
                 const res = await agent
                     .post('pages/')
diff --git a/ghost/core/test/e2e-server/services/recommendation-emails.test.js b/ghost/core/test/e2e-server/services/recommendation-emails.test.js
index c0a99108a2a..f5dd9e4a8d8 100644
--- a/ghost/core/test/e2e-server/services/recommendation-emails.test.js
+++ b/ghost/core/test/e2e-server/services/recommendation-emails.test.js
@@ -1,4 +1,4 @@
-const {agentProvider, fixtureManager, mockManager, dbUtils} = require('../../utils/e2e-framework');
+const {agentProvider, fixtureManager, mockManager} = require('../../utils/e2e-framework');
 const assert = require('assert/strict');
 const mentionsService = require('../../../core/server/services/mentions');
 const recommendationsService = require('../../../core/server/services/recommendations');
@@ -66,10 +66,6 @@ describe('Incoming Recommendation Emails', function () {
     });
 
     it('Sends a different email if we receive a recommendation back', async function () {
-        if (dbUtils.isSQLite()) {
-            this.skip();
-        }
-
         // Create a recommendation to otherghostsite.com
         const recommendation = Recommendation.create({
             title: `Recommendation`,
diff --git a/ghost/core/test/e2e-server/services/stats/mrr-stats-service.test.js b/ghost/core/test/e2e-server/services/stats/mrr-stats-service.test.js
index 67b179cbeb5..b387a0d4627 100644
--- a/ghost/core/test/e2e-server/services/stats/mrr-stats-service.test.js
+++ b/ghost/core/test/e2e-server/services/stats/mrr-stats-service.test.js
@@ -53,7 +53,7 @@ describe('MRR Stats Service', function () {
 
     describe('getCurrentMrr', function () {
         it('Always returns at least one currency', async function () {
-            const result = await statsService.mrr.getCurrentMrr();
+            const result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'usd', // need to check capital usage here!
@@ -64,7 +64,7 @@ describe('MRR Stats Service', function () {
 
         it('Can handle multiple currencies', async function () {
             await createMemberWithSubscription('month', 500, 'eur', '2000-01-10');
-            const result = await statsService.mrr.getCurrentMrr();
+            const result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'EUR',
@@ -75,7 +75,7 @@ describe('MRR Stats Service', function () {
 
         it('Increases MRR by 1 / 12 of yearly subscriptions', async function () {
             await createMemberWithSubscription('year', 12, 'usd', '2000-01-10');
-            const result = await statsService.mrr.getCurrentMrr();
+            const result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'EUR',
@@ -90,7 +90,7 @@ describe('MRR Stats Service', function () {
 
         it('Increases MRR with monthly subscriptions', async function () {
             await createMemberWithSubscription('month', 1, 'usd', '2000-01-11');
-            const result = await statsService.mrr.getCurrentMrr();
+            const result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'EUR',
@@ -105,7 +105,7 @@ describe('MRR Stats Service', function () {
 
         it('Floors results', async function () {
             await createMemberWithSubscription('year', 17, 'usd', '2000-01-12');
-            let result = await statsService.mrr.getCurrentMrr();
+            let result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'EUR',
@@ -119,7 +119,7 @@ describe('MRR Stats Service', function () {
 
             // Floor 11/12 to 0 (same as getMRRDelta method)
             await createMemberWithSubscription('year', 11, 'usd', '2000-01-12');
-            result = await statsService.mrr.getCurrentMrr();
+            result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'EUR',
@@ -133,7 +133,7 @@ describe('MRR Stats Service', function () {
 
             // Floor 11/12 to 0, don't combine with previous addition
             await createMemberWithSubscription('year', 11, 'usd', '2000-01-12');
-            result = await statsService.mrr.getCurrentMrr();
+            result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'EUR',
@@ -147,7 +147,7 @@ describe('MRR Stats Service', function () {
 
             // Floor 13/12 to 1
             await createMemberWithSubscription('year', 13, 'usd', '2000-01-12');
-            result = await statsService.mrr.getCurrentMrr();
+            result = await statsService.api.mrr.getCurrentMrr();
             result.should.eql([
                 {
                     currency: 'EUR',
@@ -162,31 +162,59 @@ describe('MRR Stats Service', function () {
     });
 
     describe('fetchAllDeltas', function () {
-        it('Returns deltas in ascending order', async function () {
-            const results = await statsService.mrr.fetchAllDeltas();
-            results.length.should.equal(4);
+        it('Returns deltas for mrr', async function () {
+            const ninetyDaysAgo = moment().subtract(90, 'days').startOf('day').format('YYYY-MM-DD');
+            const ninetyFiveDaysAgo = moment().subtract(95, 'days').startOf('day').format('YYYY-MM-DD');
+            const eightyNineDaysAgo = moment().subtract(89, 'days').startOf('day').format('YYYY-MM-DD');
+            const today = moment().startOf('day').format('YYYY-MM-DD');
+    
+            await createMemberWithSubscription('month', 500, 'eur', moment(ninetyDaysAgo).toISOString());
+            await createMemberWithSubscription('month', 500, 'eur', moment(ninetyFiveDaysAgo).toISOString());
+            await createMemberWithSubscription('month', 1, 'usd', moment(eightyNineDaysAgo).toISOString());
+            await createMemberWithSubscription('month', 2, 'usd', moment(today).toISOString());
+    
+            const results = await statsService.api.mrr.fetchAllDeltas();
+            results.length.should.equal(3);
             results.should.match([
                 {
-                    date: '2000-01-10',
+                    date: ninetyDaysAgo,
                     delta: 500,
                     currency: 'EUR'
                 },
                 {
-                    date: '2000-01-10',
+                    date: eightyNineDaysAgo,
                     delta: 1,
                     currency: 'USD'
                 },
                 {
-                    date: '2000-01-11',
-                    delta: 1,
-                    currency: 'USD'
-                },
-                {
-                    date: '2000-01-12',
+                    date: today,
                     delta: 2,
                     currency: 'USD'
                 }
             ]);
         });
+
+        it('Returns deltas for the last 90 days', async function () {
+            const ninetyDaysAgo = moment().subtract(90, 'days').startOf('day');
+            const ninetyFiveDaysAgo = moment().subtract(95, 'days').startOf('day');
+            const eightyNineDaysAgo = moment().subtract(89, 'days').startOf('day');
+            const today = moment().startOf('day');
+    
+            await createMemberWithSubscription('month', 500, 'eur', ninetyDaysAgo.toISOString());
+            await createMemberWithSubscription('month', 500, 'eur', ninetyFiveDaysAgo.toISOString());
+            await createMemberWithSubscription('month', 1, 'usd', eightyNineDaysAgo.toISOString());
+            await createMemberWithSubscription('month', 2, 'usd', today.toISOString());
+    
+            const results = await statsService.api.mrr.fetchAllDeltas();
+    
+            // Check that results are within the last 90 days
+            const isWithinLast90Days = (date) => {
+                return moment(date).isBetween(ninetyDaysAgo, today, null, '[]');
+            };
+            results.length.should.be.above(0);
+            results.forEach((result) => {
+                isWithinLast90Days(result.date).should.equal(true);
+            });
+        });
     });
 });
diff --git a/ghost/core/test/e2e-webhooks/__snapshots__/pages.test.js.snap b/ghost/core/test/e2e-webhooks/__snapshots__/pages.test.js.snap
index 7da288e7d4d..a52e57c2b0f 100644
--- a/ghost/core/test/e2e-webhooks/__snapshots__/pages.test.js.snap
+++ b/ghost/core/test/e2e-webhooks/__snapshots__/pages.test.js.snap
@@ -33,7 +33,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -86,7 +86,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -190,7 +190,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -270,7 +270,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -338,7 +338,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -492,7 +492,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -560,7 +560,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -714,7 +714,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -782,7 +782,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -935,7 +935,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1003,7 +1003,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1156,7 +1156,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1224,7 +1224,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1378,7 +1378,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1446,7 +1446,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1644,7 +1644,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1712,7 +1712,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1850,7 +1850,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1918,7 +1918,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -2071,7 +2071,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -2139,7 +2139,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
diff --git a/ghost/core/test/e2e-webhooks/__snapshots__/posts.test.js.snap b/ghost/core/test/e2e-webhooks/__snapshots__/posts.test.js.snap
index 0ffa5816c5f..8620e388510 100644
--- a/ghost/core/test/e2e-webhooks/__snapshots__/posts.test.js.snap
+++ b/ghost/core/test/e2e-webhooks/__snapshots__/posts.test.js.snap
@@ -33,7 +33,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -89,7 +89,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -192,7 +192,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -271,7 +271,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -341,7 +341,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -493,7 +493,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -584,7 +584,7 @@ Header Level 3
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -738,7 +738,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -808,7 +808,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -960,7 +960,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1030,7 +1030,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1182,7 +1182,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1252,7 +1252,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1405,7 +1405,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1496,7 +1496,7 @@ Header Level 3
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1694,7 +1694,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -1785,7 +1785,7 @@ Header Level 3
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -1923,7 +1923,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -2014,7 +2014,7 @@ Header Level 3
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
@@ -2167,7 +2167,7 @@ Object {
           "meta_title": null,
           "milestone_notifications": true,
           "name": "Joe Bloggs",
-          "paid_subscription_canceled_notification": false,
+          "paid_subscription_canceled_notification": true,
           "paid_subscription_started_notification": true,
           "profile_image": "https://example.com/super_photo.jpg",
           "recommendation_notifications": true,
@@ -2237,7 +2237,7 @@ Object {
         "meta_title": null,
         "milestone_notifications": true,
         "name": "Joe Bloggs",
-        "paid_subscription_canceled_notification": false,
+        "paid_subscription_canceled_notification": true,
         "paid_subscription_started_notification": true,
         "profile_image": "https://example.com/super_photo.jpg",
         "recommendation_notifications": true,
diff --git a/ghost/core/test/integration/migrations/migration.test.js b/ghost/core/test/integration/migrations/migration.test.js
index 1a5fc87a853..0da8cf8d35b 100644
--- a/ghost/core/test/integration/migrations/migration.test.js
+++ b/ghost/core/test/integration/migrations/migration.test.js
@@ -114,9 +114,9 @@ describe('Migrations', function () {
 
             permissions.should.havePermission('Browse posts', ['Administrator', 'Editor', 'Author', 'Contributor', 'Admin Integration']);
             permissions.should.havePermission('Read posts', ['Administrator', 'Editor', 'Author', 'Contributor', 'Admin Integration']);
-            permissions.should.havePermission('Edit posts', ['Administrator', 'Editor', 'Admin Integration']);
+            permissions.should.havePermission('Edit posts', ['Administrator', 'Editor', 'Author', 'Contributor', 'Admin Integration']);
             permissions.should.havePermission('Add posts', ['Administrator', 'Editor', 'Author', 'Contributor', 'Admin Integration']);
-            permissions.should.havePermission('Delete posts', ['Administrator', 'Editor', 'Admin Integration']);
+            permissions.should.havePermission('Delete posts', ['Administrator', 'Editor', 'Author', 'Contributor', 'Admin Integration']);
             permissions.should.havePermission('Publish posts', ['Administrator', 'Editor', 'Admin Integration', 'Scheduler Integration']);
 
             permissions.should.havePermission('Browse settings', ['Administrator', 'Editor', 'Author', 'Contributor', 'Admin Integration']);
diff --git a/ghost/core/test/integration/services/email-service/README.md b/ghost/core/test/integration/services/email-service/README.md
new file mode 100644
index 00000000000..0af0f20f0c1
--- /dev/null
+++ b/ghost/core/test/integration/services/email-service/README.md
@@ -0,0 +1,12 @@
+# What is a golden post?
+The golden post is a single lexical post that has at least one example of every card that is available in the Koenig editor (with a few exceptions for cards that should never make it into an email). We have run into problems in the past where a small change to a particular card or to the EmailRenderer itself results in seriously mangled email rendering in one or more clients (usually Outlook).
+
+# How do I update the golden post to include a new card?
+If you're seeing a failing test like `The golden post does not contain the ${card} card`, that means that you (or someone else) has added a new node to `@tryghost/kg-default-nodes` that is not currently represented in the golden post. This test is here to trigger a review of the rendered email of the new card, to make sure it doesn't break the formatting in email clients. To update this test properly, please do the following:
+
+1. Create a card in the lexical editor, either at `koenig.ghost.org` or in your local Koenig repo
+2. Use the JSON Output in the bottom right of the demo to copy the lexical payload for the new card
+3. Paste the lexical payload for the card as a top level child of the `root` node in the golden post fixture at `ghost/core/test/utils/fixtures/email-service/golden-post.json`
+4. Re-run your tests with `UPDATE_SNAPSHOT=1` set to update the snapshot to include the new card
+5. Update (or recreate) the Golden Post on `main.ghost.org` using the `golden-post.json` string.
+6. Send a test email to Litmus and examine the rendered output to ensure everything looks right on different clients.
\ No newline at end of file
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..54a586dc307 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
@@ -11,38 +11,24 @@ Object {
         <title>A random test post</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -61,16 +47,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -81,12 +63,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -124,21 +126,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -169,16 +187,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -191,45 +213,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -274,7 +280,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;
   }
@@ -300,30 +307,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -373,9 +416,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">A random test post &#x2013; </span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -384,30 +427,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -415,24 +460,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">A random test post</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -442,13 +487,18 @@ table.body figcaption a {
                                             <tr class=\\"feature-image-row\\">
                                                 <td class=\\"feature-image
                                                         feature-image-with-caption
-                                                \\" 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; width: 100%; padding-bottom: 10px;\\" width=\\"100%\\" valign=\\"top\\"><img src=\\"https://example.com/image.jpg\\" alt=\\"Testing sending\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\"></td>
+                                                \\" align=\\"center\\" 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;; vertical-align: top; color: #15212A; padding-bottom: 30px; text-align: center; width: 100%; padding: 0; font-size: 13px;\\" width=\\"100%\\" valign=\\"top\\"><img src=\\"https://example.com/image.jpg\\" alt=\\"Testing sending\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\"></td>
                                             </tr>
+
                                                 <tr>
-                                                    <td class=\\"feature-image-caption\\" align=\\"center\\" 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;; vertical-align: top; width: 100%; padding-bottom: 30px; text-align: center; font-size: 13px; color: #000000; color: rgba(0, 0, 0, 0.5);\\" width=\\"100%\\" valign=\\"top\\">Testing <b>feature image caption</b></td>
+                                                    <td align=\\"center\\" 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: #15212A;\\" valign=\\"top\\">
+                                                        <div class=\\"feature-image-caption\\" style=\\"width: 100%; padding-top: 5px; padding-bottom: 32px; text-align: center; color: #738a94; line-height: 1.5em; font-size: 13px;\\">
+                                                            Testing <b>feature image caption</b>
+                                                        </div>
+                                                    </td>
                                                 </tr>
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 
                                                 <!-- POST CONTENT END -->
@@ -465,14 +515,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -482,7 +532,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -521,6 +571,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
 
 
 
@@ -574,6 +626,9 @@ View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
 
 
 
+
+
+
 Testing feature image caption
 
 
@@ -599,11 +654,13 @@ Testing feature image caption
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
 
 
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
 
 
 
@@ -635,38 +692,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -685,16 +728,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -705,12 +744,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -748,21 +807,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -793,16 +868,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -815,45 +894,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -898,7 +961,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;
   }
@@ -924,30 +988,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -997,9 +1097,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -1008,30 +1108,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -1039,24 +1141,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/email/post-uuid/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/email/post-uuid/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/email/post-uuid/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/email/post-uuid/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/email/post-uuid/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/email/post-uuid/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -1064,7 +1166,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -1081,14 +1183,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -1098,7 +1200,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -1137,6 +1239,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -1209,11 +1313,11 @@ Hello world
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -1245,38 +1349,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -1295,16 +1385,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -1315,14 +1401,34 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
     font-size: 16px !important;
   }
 
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
   table.body pre {
     white-space: pre-wrap !important;
     word-break: break-word !important;
@@ -1358,21 +1464,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -1403,16 +1525,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -1425,45 +1551,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -1508,7 +1618,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;
   }
@@ -1534,30 +1645,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -1607,9 +1754,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -1618,30 +1765,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -1649,24 +1798,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-6/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-6/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-6/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-6/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-6/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-6/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -1674,7 +1823,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -1691,14 +1840,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -1708,7 +1857,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -1747,6 +1896,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -1819,11 +1970,11 @@ Hello world
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -1855,38 +2006,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -1905,16 +2042,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -1925,12 +2058,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -1968,21 +2121,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -2013,16 +2182,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -2035,45 +2208,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -2118,7 +2275,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;
   }
@@ -2144,48 +2302,84 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
   }
-}
-@media all {
-  .subscription-details p.hidden {
-    display: none !important;
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
   }
 
-  .ExternalClass {
-    width: 100%;
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
   }
 
-  .ExternalClass,
-.ExternalClass p,
-.ExternalClass span,
-.ExternalClass font,
-.ExternalClass td,
-.ExternalClass div {
-    line-height: 100%;
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
+  }
+}
+@media all {
+  .subscription-details p.hidden {
+    display: none !important;
+  }
+
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
   }
 
   .apple-link a {
@@ -2217,9 +2411,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -2228,30 +2422,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -2259,24 +2455,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-7/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-7/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-7/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-7/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-7/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-7/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -2284,7 +2480,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -2301,14 +2497,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -2318,7 +2514,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -2357,6 +2553,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -2429,11 +2627,11 @@ Hello world
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -2465,38 +2663,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -2515,16 +2699,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -2535,12 +2715,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -2578,21 +2778,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -2623,16 +2839,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -2645,45 +2865,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -2728,7 +2932,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;
   }
@@ -2754,30 +2959,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -2827,9 +3068,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -2838,30 +3079,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px;\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -2870,7 +3113,7 @@ table.body figcaption a {
 
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -2887,14 +3130,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -2904,7 +3147,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -2943,6 +3186,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
 
 
 
@@ -2987,11 +3232,11 @@ Hello world
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
 
 
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
 
 
 
@@ -3023,38 +3268,1432 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
+.view-online-link {
+  word-wrap: none;
+  white-space: nowrap;
+  color: #738a94;
+  text-decoration: underline !important;
+}
+.kg-nft-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 14px;
+  line-height: 1.3em;
+  padding-top: 4px;
+  padding-right: 20px;
+  padding-left: 20px;
+  padding-bottom: 4px;
+}
+.kg-twitter-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 15px;
+  padding: 8px;
+  line-height: 1.3em;
+}
+.kg-audio-link {
+  color: #738a94 !important;
+}
+@media only screen and (max-width: 620px) {
+  table.body {
+    width: 100%;
+    min-width: 100%;
+  }
+
+  .hide-mobile {
+    display: none;
+  }
+
+  .mobile-only {
+    display: initial !important;
+  }
+
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
+  table.body pre {
+    white-space: pre-wrap !important;
+    word-break: break-word !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-spacing: 10px 0 !important;
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .btn table {
+    width: 100% !important;
+  }
+
+  table.body .btn a {
+    width: 100% !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
+  table.body .site-icon img {
+    width: 36px !important;
+    height: 36px !important;
+  }
+
+  table.body .site-url a {
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body .post-meta,
+table.body .post-meta-date {
+    white-space: normal !important;
+    font-size: 13px !important;
+    line-height: 1.2em;
+  }
+
+  table.body .post-meta,
+table.body .view-online {
+    width: 100% !important;
+  }
+
+  table.body .post-meta-left,
+table.body .post-meta-left.view-online {
+    width: 100% !important;
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online-mobile {
+    display: table-row !important;
+  }
+
+  table.body .post-meta-left.view-online-mobile,
+table.body .post-meta-left.view-online-mobile .view-online {
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online.desktop {
+    display: none !important;
+  }
+
+  table.body .view-online {
+    text-decoration: underline;
+  }
+
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
+  table.body .view-online-link,
+table.body .footer,
+table.body .footer a {
+    font-size: 13px !important;
+  }
+
+  table.body .post-title a {
+    font-size: 26px !important;
+    line-height: 1.1em !important;
+  }
+
+  table.feedback-buttons {
+    display: none !important;
+  }
+
+  table.feedback-buttons-mobile {
+    display: table !important;
+    width: 100% !important;
+    max-width: 390px;
+  }
+
+  table.body .feedback-button-mobile-text {
+    font-size: 13px !important;
+  }
+
+  table.body .latest-posts-header {
+    font-size: 12px !important;
+  }
+
+  table.body .latest-post-title {
+    padding-right: 8px !important;
+  }
+
+  table.body .latest-post h4,
+table.body .latest-post h4 span {
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
+  }
+
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
+    font-size: 13px !important;
+    line-height: 1.2 !important;
+  }
+
+  table.body .subscription-box h3 {
+    font-size: 14px !important;
+  }
+
+  table.body .subscription-box p,
+table.body .subscription-box p span {
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details,
+table.body .manage-subscription {
+    display: inline-block;
+    width: 100%;
+    text-align: left !important;
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details {
+    padding-bottom: 12px;
+  }
+
+  table.body .kg-bookmark-card {
+    width: 90vw;
+  }
+
+  table.body .kg-bookmark-thumbnail {
+    display: none !important;
+  }
+
+  table.body .kg-bookmark-metadata span {
+    font-size: 13px !important;
+  }
+
+  table.body .kg-embed-card {
+    max-width: 90vw !important;
+  }
+
+  table.body h1 {
+    font-size: 32px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h2,
+table.body h2 span {
+    font-size: 26px !important;
+    line-height: 1.22em !important;
+  }
+
+  table.body h3 {
+    font-size: 21px !important;
+    line-height: 1.25em !important;
+  }
+
+  table.body h4 {
+    font-size: 19px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h5 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body h6 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote {
+    font-size: 16px !important;
+    line-height: 1.6em;
+    margin-bottom: 0;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt {
+    border-left: 0 none !important;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
+  }
+
+  table.body hr {
+    margin: 2em 0 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 span {
+    font-size: inherit !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
+  }
+}
+@media all {
+  .subscription-details p.hidden {
+    display: none !important;
+  }
+
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .apple-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+
+  .btn-primary table td:hover {
+    background-color: #34495e !important;
+  }
+
+  .btn-primary a:hover {
+    background-color: #34495e !important;
+    border-color: #34495e !important;
+  }
+}
+</style>
+    </head>
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
+        <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
+            <!-- Outlook doesn't respect max-width so we need an extra centered table -->
+            <!--[if mso]>
+            <tr>
+                <td>
+                    <center>
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
+            <![endif]-->
+            <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
+                    <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
+                        <!-- START CENTERED WHITE CONTAINER -->
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
+
+                            <!-- START MAIN CONTENT AREA -->
+                            <tr>
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                            <tr class=\\"header-image-row\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
+                                                </td>
+                                            </tr>
+
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                            </tr>
+
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
+                                                </td>
+                                            </tr>
+                                            <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
+                                                        <tr>
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                                By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
+                                                            </td>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                        <tr class=\\"post-content-row\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
+                                                <!-- POST CONTENT START -->
+                                                <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
+                                                <!-- POST CONTENT END -->
+
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                            <!-- END MAIN CONTENT AREA -->
+
+
+
+
+                            <tr>
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
+                                        <tr>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                        </tr>
+
+                                            <tr>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                            </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                        </table>
+                        <!-- END CENTERED WHITE CONTAINER -->
+                    </div>
+                </td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+            </tr>
+
+            <!--[if mso]>
+                            </table>
+                        </center>
+                    </td>
+                </tr>
+            <![endif]-->
+        </table>
+    </body>
+</html>
+",
+  "plaintext": "
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+This is a test post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • date
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
+
+
+
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts with feedback enabled 1 1`] = `
+Object {
+  "html": "<!doctype html>
+<html>
+    <head>
+        <meta name=\\"viewport\\" content=\\"width=device-width\\">
+        <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
+        <!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
+        <title>This is a test post title</title>
+        <style>
+.post-title-link {
+  color: #15212A;
+  display: block;
+  text-align: center;
+  margin-top: 32px;
+}
+.post-title-link-left {
+  text-align: left;
+}
+.view-online-link {
+  word-wrap: none;
+  white-space: nowrap;
+  color: #738a94;
+  text-decoration: underline !important;
+}
+.kg-nft-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 14px;
+  line-height: 1.3em;
+  padding-top: 4px;
+  padding-right: 20px;
+  padding-left: 20px;
+  padding-bottom: 4px;
+}
+.kg-twitter-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 15px;
+  padding: 8px;
+  line-height: 1.3em;
+}
+.kg-audio-link {
+  color: #738a94 !important;
+}
+@media only screen and (max-width: 620px) {
+  table.body {
+    width: 100%;
+    min-width: 100%;
+  }
+
+  .hide-mobile {
+    display: none;
+  }
+
+  .mobile-only {
+    display: initial !important;
+  }
+
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
+  table.body pre {
+    white-space: pre-wrap !important;
+    word-break: break-word !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-spacing: 10px 0 !important;
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .btn table {
+    width: 100% !important;
+  }
+
+  table.body .btn a {
+    width: 100% !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
+  table.body .site-icon img {
+    width: 36px !important;
+    height: 36px !important;
+  }
+
+  table.body .site-url a {
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body .post-meta,
+table.body .post-meta-date {
+    white-space: normal !important;
+    font-size: 13px !important;
+    line-height: 1.2em;
+  }
+
+  table.body .post-meta,
+table.body .view-online {
+    width: 100% !important;
+  }
+
+  table.body .post-meta-left,
+table.body .post-meta-left.view-online {
+    width: 100% !important;
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online-mobile {
+    display: table-row !important;
+  }
+
+  table.body .post-meta-left.view-online-mobile,
+table.body .post-meta-left.view-online-mobile .view-online {
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online.desktop {
+    display: none !important;
+  }
+
+  table.body .view-online {
+    text-decoration: underline;
+  }
+
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
+  table.body .view-online-link,
+table.body .footer,
+table.body .footer a {
+    font-size: 13px !important;
+  }
+
+  table.body .post-title a {
+    font-size: 26px !important;
+    line-height: 1.1em !important;
+  }
+
+  table.feedback-buttons {
+    display: none !important;
+  }
+
+  table.feedback-buttons-mobile {
+    display: table !important;
+    width: 100% !important;
+    max-width: 390px;
+  }
+
+  table.body .feedback-button-mobile-text {
+    font-size: 13px !important;
+  }
+
+  table.body .latest-posts-header {
+    font-size: 12px !important;
+  }
+
+  table.body .latest-post-title {
+    padding-right: 8px !important;
+  }
+
+  table.body .latest-post h4,
+table.body .latest-post h4 span {
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
+  }
+
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
+    font-size: 13px !important;
+    line-height: 1.2 !important;
+  }
+
+  table.body .subscription-box h3 {
+    font-size: 14px !important;
+  }
+
+  table.body .subscription-box p,
+table.body .subscription-box p span {
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details,
+table.body .manage-subscription {
+    display: inline-block;
+    width: 100%;
+    text-align: left !important;
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details {
+    padding-bottom: 12px;
+  }
+
+  table.body .kg-bookmark-card {
+    width: 90vw;
+  }
+
+  table.body .kg-bookmark-thumbnail {
+    display: none !important;
+  }
+
+  table.body .kg-bookmark-metadata span {
+    font-size: 13px !important;
+  }
+
+  table.body .kg-embed-card {
+    max-width: 90vw !important;
+  }
+
+  table.body h1 {
+    font-size: 32px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h2,
+table.body h2 span {
+    font-size: 26px !important;
+    line-height: 1.22em !important;
+  }
+
+  table.body h3 {
+    font-size: 21px !important;
+    line-height: 1.25em !important;
+  }
+
+  table.body h4 {
+    font-size: 19px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h5 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body h6 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote {
+    font-size: 16px !important;
+    line-height: 1.6em;
+    margin-bottom: 0;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt {
+    border-left: 0 none !important;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
+  }
+
+  table.body hr {
+    margin: 2em 0 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 span {
+    font-size: inherit !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
+  }
+}
+@media all {
+  .subscription-details p.hidden {
+    display: none !important;
+  }
+
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .apple-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+
+  .btn-primary table td:hover {
+    background-color: #34495e !important;
+  }
+
+  .btn-primary a:hover {
+    background-color: #34495e !important;
+    border-color: #34495e !important;
+  }
+}
+</style>
+    </head>
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
+        <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
+            <!-- Outlook doesn't respect max-width so we need an extra centered table -->
+            <!--[if mso]>
+            <tr>
+                <td>
+                    <center>
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
+            <![endif]-->
+            <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
+                    <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
+                        <!-- START CENTERED WHITE CONTAINER -->
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
+
+                            <!-- START MAIN CONTENT AREA -->
+                            <tr>
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                            <tr class=\\"header-image-row\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
+                                                </td>
+                                            </tr>
+
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                            </tr>
+
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
+                                                </td>
+                                            </tr>
+                                            <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
+                                                        <tr>
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                                By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
+                                                            </td>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                        <tr class=\\"post-content-row\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
+                                                <!-- POST CONTENT START -->
+                                                <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
+                                                <!-- POST CONTENT END -->
+
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                            <!-- END MAIN CONTENT AREA -->
+
+                                <tr>
+                                    <td dir=\\"ltr\\" width=\\"100%\\" 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: #15212A; background-color: #ffffff; text-align: center; padding: 32px 0 24px; border-bottom: 1px solid #e5eff5;\\" align=\\"center\\" bgcolor=\\"#ffffff\\" valign=\\"top\\">
+                                        <table class=\\"feedback-buttons\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; margin: auto; width: auto;\\" width=\\"auto\\">
+                                            <tr>
+                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; display: inline-block; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer;\\" nowrap>
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid&amp;key=xxxxxx\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/more-like-this.png\\" border=\\"0\\" width=\\"145\\" height=\\"36\\" alt=\\"More like this\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                        </a>
+                                                    </td>                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; display: inline-block; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer;\\" nowrap>
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid&amp;key=xxxxxx\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/less-like-this.png\\" border=\\"0\\" width=\\"142\\" height=\\"36\\" alt=\\"Less like this\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                        </a>
+                                                    </td>                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; display: inline-block; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer;\\" nowrap>
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/comment.png\\" border=\\"0\\" width=\\"122\\" height=\\"36\\" alt=\\"Comment\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                        </a>
+                                                    </td>                                            </tr>
+                                        </table>
+                                        <table class=\\"feedback-buttons-mobile\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; display: none; mso-hide: all;\\" width=\\"100%\\">
+                                            <tr>
+                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer; width: 33%;\\" nowrap width=\\"33%\\">
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid&amp;key=xxxxxx\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/more-like-this-mobile.png\\" border=\\"0\\" width=\\"42\\" height=\\"42\\" alt=\\"More like this\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                            <p class=\\"feedback-button-mobile-text\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; color: #15212A; font-weight: 500; margin-bottom: 0; font-size: 13px;\\">More like this</p>
+                                                        </a>
+                                                    </td>                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer; width: 33%;\\" nowrap width=\\"33%\\">
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid&amp;key=xxxxxx\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/less-like-this-mobile.png\\" border=\\"0\\" width=\\"42\\" height=\\"42\\" alt=\\"Less like this\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                            <p class=\\"feedback-button-mobile-text\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; color: #15212A; font-weight: 500; margin-bottom: 0; font-size: 13px;\\">Less like this</p>
+                                                        </a>
+                                                    </td>                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer; width: 33%;\\" nowrap width=\\"33%\\">
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/comment-mobile.png\\" border=\\"0\\" width=\\"42\\" height=\\"42\\" alt=\\"Comment\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                            <p class=\\"feedback-button-mobile-text\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; color: #15212A; font-weight: 500; margin-bottom: 0; font-size: 13px;\\">Comment</p>
+                                                        </a>
+                                                    </td>                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+
+
+
+                            <tr>
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
+                                        <tr>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                        </tr>
+
+                                            <tr>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                            </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                        </table>
+                        <!-- END CENTERED WHITE CONTAINER -->
+                    </div>
+                </td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+            </tr>
+
+            <!--[if mso]>
+                            </table>
+                        </center>
+                    </td>
+                </tr>
+            <![endif]-->
+        </table>
+    </body>
+</html>
+",
+  "plaintext": "
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/]
+
+
+Daily newsletter [http://127.0.0.1:2369/]
+
+
+
+
+
+
+
+
+
+
+This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-4/]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • date
+
+
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-4/]
+
+
+
+
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-4/]
+
+
+
+
+
+
+
+
+
+
+
+Hello world
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid&key=xxxxxx
+
+
+
+http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid&key=xxxxxx
+
+
+
+http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments
+
+
+
+
+
+
+
+
+
+
+
+More like this
+
+
+[http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid&key=xxxxxx]
+
+
+
+
+
+Less like this
+
+
+[http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid&key=xxxxxx]
+
+
+
+
+
+Comment
+
+
+[http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments]
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
+
+
+
+https://ghost.org/?via=pbg-newsletter
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+",
+}
+`;
+
+exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts without feedback enabled 1 1`] = `
+Object {
+  "html": "<!doctype html>
+<html>
+    <head>
+        <meta name=\\"viewport\\" content=\\"width=device-width\\">
+        <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
+        <!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
+        <title>This is a test post title</title>
+        <style>
+.post-title-link {
+  color: #15212A;
+  display: block;
+  text-align: center;
+  margin-top: 32px;
 }
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
+.post-title-link-left {
+  text-align: left;
 }
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -3073,16 +4712,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -3093,14 +4728,34 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
     font-size: 16px !important;
   }
 
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
   table.body pre {
     white-space: pre-wrap !important;
     word-break: break-word !important;
@@ -3136,21 +4791,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -3181,16 +4852,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -3203,45 +4878,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -3286,7 +4945,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;
   }
@@ -3312,30 +4972,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -3385,9 +5081,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -3396,30 +5092,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -3427,24 +5125,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-3/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-3/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-3/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -3452,7 +5150,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -3465,18 +5163,39 @@ table.body figcaption a {
 
                             <!-- END MAIN CONTENT AREA -->
 
+                                <tr>
+                                    <td dir=\\"ltr\\" width=\\"100%\\" 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: #15212A; background-color: #ffffff; text-align: center; padding: 32px 0 24px; border-bottom: 1px solid #e5eff5;\\" align=\\"center\\" bgcolor=\\"#ffffff\\" valign=\\"top\\">
+                                        <table class=\\"feedback-buttons\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; margin: auto; width: auto;\\" width=\\"auto\\">
+                                            <tr>
+                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; display: inline-block; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer;\\" nowrap>
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/comment.png\\" border=\\"0\\" width=\\"122\\" height=\\"36\\" alt=\\"Comment\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                        </a>
+                                                    </td>                                            </tr>
+                                        </table>
+                                        <table class=\\"feedback-buttons-mobile\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; display: none; mso-hide: all;\\" width=\\"100%\\">
+                                            <tr>
+                                                    <td dir=\\"ltr\\" valign=\\"top\\" align=\\"center\\" style=\\"color: #15212A; vertical-align: top; font-family: inherit; font-size: 14px; text-align: center; padding: 0 4px 4px; cursor: pointer; width: 33%;\\" nowrap width=\\"33%\\">
+                                                        <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments\\" target=\\"_blank\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\">
+                                                            <img src=\\"https://static.ghost.org/v5.0.0/images/comment-mobile.png\\" border=\\"0\\" width=\\"42\\" height=\\"42\\" alt=\\"Comment\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                            <p class=\\"feedback-button-mobile-text\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em; color: #15212A; font-weight: 500; margin-bottom: 0; font-size: 13px;\\">Comment</p>
+                                                        </a>
+                                                    </td>                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
 
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -3486,7 +5205,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -3525,6 +5244,7 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
 
 
 
@@ -3533,11 +5253,11 @@ table.body figcaption a {
 
 
 
-Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
 
+Ghost [http://127.0.0.1:2369/]
 
-Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
 
+Daily newsletter [http://127.0.0.1:2369/]
 
 
 
@@ -3547,7 +5267,8 @@ Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
 
 
 
-This is a test post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-3/]
 
 
 
@@ -3560,12 +5281,12 @@ This is a test post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
 By Joe Bloggs • date
 
 
-View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-3/]
 
 
 
 
-View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-3/]
 
 
 
@@ -3597,11 +5318,40 @@ Hello world
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments
 
 
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+Comment
+
+
+[http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments]
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
+
+
+
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -3706,8 +5456,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 +5572,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 +5640,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 +5687,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 {
@@ -4018,7 +5758,9 @@ table.body figcaption a {
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
                                                 <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
@@ -4124,7 +5866,7 @@ table.body figcaption a {
                                 <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
@@ -4177,6 +5919,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -4307,7 +6051,7 @@ Comment
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
 
 
 
@@ -4416,8 +6160,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 +6276,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 +6344,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 +6391,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 {
@@ -4728,7 +6462,9 @@ table.body figcaption a {
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
                                                 <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
@@ -4816,7 +6552,7 @@ table.body figcaption a {
                                 <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
@@ -4869,6 +6605,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -4973,7 +6711,7 @@ Comment
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
@@ -5009,38 +6747,24 @@ Object {
         <title>This is the main post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -5059,16 +6783,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -5079,12 +6799,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -5122,21 +6862,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -5167,16 +6923,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -5189,45 +6949,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -5272,7 +7016,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;
   }
@@ -5298,30 +7043,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -5371,9 +7152,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -5382,30 +7163,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -5413,24 +7196,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is the main post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is the main post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -5438,7 +7221,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -5453,19 +7236,19 @@ 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>
+                                    <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: #15212A; padding: 24px 0; border-bottom: 1px solid #e5eff5;\\" 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 8px; color: #15212A; 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\\">
+                                                    <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: #15212A; padding: 16px 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;\\">
-                                                                        <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>
+                                                                <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: #15212A; 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; 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: #15212A;\\" 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;\\">
-                                                                            <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 class=\\"latest-post-excerpt\\" style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #738a94; 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: #738a94;\\" target=\\"_blank\\">Hello world</a>
                                                                         </p>
                                                                 </td>
                                                             </tr>
@@ -5475,15 +7258,15 @@ table.body figcaption a {
                                             </table>
                                             <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\\">
+                                                    <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: #15212A; padding: 16px 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;\\">
-                                                                        <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>
+                                                                <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: #15212A; 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; 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: #15212A;\\" 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;\\">
-                                                                            <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 class=\\"latest-post-excerpt\\" style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #738a94; 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: #738a94;\\" target=\\"_blank\\">Hello world</a>
                                                                         </p>
                                                                 </td>
                                                             </tr>
@@ -5493,15 +7276,15 @@ table.body figcaption a {
                                             </table>
                                             <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\\">
+                                                    <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: #15212A; padding: 16px 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;\\">
-                                                                        <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>
+                                                                <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: #15212A; 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; 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: #15212A;\\" 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;\\">
-                                                                            <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 class=\\"latest-post-excerpt\\" style=\\"line-height: 1.6em; margin: 0; padding: 0; color: #738a94; 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: #738a94;\\" target=\\"_blank\\">Hello world</a>
                                                                         </p>
                                                                 </td>
                                                             </tr>
@@ -5514,14 +7297,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -5531,7 +7314,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -5570,6 +7353,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
 
 
 
@@ -5728,11 +7513,11 @@ Hello world [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
 
 
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
 
 
 
@@ -5764,38 +7549,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -5814,16 +7585,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -5834,12 +7601,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -5877,21 +7664,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -5922,16 +7725,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -5944,45 +7751,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -6027,7 +7818,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;
   }
@@ -6053,30 +7845,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -6126,9 +7954,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -6137,30 +7965,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -6168,24 +7998,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-12/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-12/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-12/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-12/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-12/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-12/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -6193,7 +8023,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -6209,17 +8039,17 @@ table.body figcaption a {
 
 
                                 <tr>
-                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); color: #000000; max-width: 600px;\\" valign=\\"top\\">
-                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px; color: #000000;\\">Subscription details</h3>
-                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #000000;\\">
+                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; color: #15212A;\\" valign=\\"top\\">
+                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px;\\">Subscription details</h3>
+                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #15212A;\\">
                                             <span>You are receiving this because you are a <strong style=\\"font-weight: 700;\\">paid subscriber</strong> to Ghost.</span> Your subscription has been canceled and will expire on date. You can resume your subscription via your account settings.
                                         </p>
                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr>
-                                                <td class=\\"subscription-details\\" 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;\\" valign=\\"top\\">
-                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Name: not provided</p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">canceled-paid@example.com</a></p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Member since: date</p>
+                                                <td class=\\"subscription-details\\" 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: #15212A;\\" valign=\\"top\\">
+                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Name: not provided</p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">canceled-paid@example.com</a></p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Member since: date</p>
                                                 </td>
                                                 <td align=\\"right\\" valign=\\"bottom\\" class=\\"manage-subscription\\" 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;; white-space: nowrap; font-size: 15px; font-weight: 600; text-align: right; line-height: 1.45em; vertical-align: bottom; color: #FF1A75;\\">
                                                     <a href=\\"http://127.0.0.1:2369/#/portal/account\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"> Manage subscription &#x2192;</a>
@@ -6230,14 +8060,14 @@ table.body figcaption a {
                                 </tr>
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -6247,7 +8077,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -6286,6 +8116,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -6393,11 +8225,11 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account]
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -6429,38 +8261,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -6479,16 +8297,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -6499,12 +8313,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -6542,21 +8376,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -6587,16 +8437,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -6609,45 +8463,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -6692,7 +8530,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;
   }
@@ -6718,30 +8557,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -6791,9 +8666,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -6802,30 +8677,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -6833,24 +8710,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-9/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-9/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-9/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-9/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-9/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-9/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -6858,7 +8735,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -6874,17 +8751,17 @@ table.body figcaption a {
 
 
                                 <tr>
-                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); color: #000000; max-width: 600px;\\" valign=\\"top\\">
-                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px; color: #000000;\\">Subscription details</h3>
-                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #000000;\\">
+                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; color: #15212A;\\" valign=\\"top\\">
+                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px;\\">Subscription details</h3>
+                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #15212A;\\">
                                             <span>You are receiving this because you are a <strong style=\\"font-weight: 700;\\">complimentary subscriber</strong> to Ghost.</span> 
                                         </p>
                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr>
-                                                <td class=\\"subscription-details\\" 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;\\" valign=\\"top\\">
-                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Name: not provided</p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">subscription-box-comped@example.com</a></p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Member since: date</p>
+                                                <td class=\\"subscription-details\\" 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: #15212A;\\" valign=\\"top\\">
+                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Name: not provided</p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">subscription-box-comped@example.com</a></p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Member since: date</p>
                                                 </td>
                                                 <td align=\\"right\\" valign=\\"bottom\\" class=\\"manage-subscription\\" 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;; white-space: nowrap; font-size: 15px; font-weight: 600; text-align: right; line-height: 1.45em; vertical-align: bottom; color: #FF1A75;\\">
                                                     <a href=\\"http://127.0.0.1:2369/#/portal/account\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"> Manage subscription &#x2192;</a>
@@ -6895,14 +8772,14 @@ table.body figcaption a {
                                 </tr>
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -6912,7 +8789,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -6951,6 +8828,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -7058,11 +8937,11 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account]
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -7094,38 +8973,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -7144,16 +9009,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -7164,14 +9025,34 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
     font-size: 16px !important;
   }
 
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
   table.body pre {
     white-space: pre-wrap !important;
     word-break: break-word !important;
@@ -7207,21 +9088,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -7252,16 +9149,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -7274,45 +9175,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -7357,7 +9242,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;
   }
@@ -7383,30 +9269,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -7456,9 +9378,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -7467,30 +9389,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -7498,24 +9422,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-8/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-8/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-8/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-8/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-8/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-8/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -7523,7 +9447,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -7539,17 +9463,17 @@ table.body figcaption a {
 
 
                                 <tr>
-                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); color: #000000; max-width: 600px;\\" valign=\\"top\\">
-                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px; color: #000000;\\">Subscription details</h3>
-                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #000000;\\">
+                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; color: #15212A;\\" valign=\\"top\\">
+                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px;\\">Subscription details</h3>
+                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #15212A;\\">
                                             <span>You are receiving this because you are a <strong style=\\"font-weight: 700;\\">free subscriber</strong> to Ghost.</span> 
                                         </p>
                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr>
-                                                <td class=\\"subscription-details\\" 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;\\" valign=\\"top\\">
-                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Name: not provided</p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">subscription-box-1@example.com</a></p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Member since: date</p>
+                                                <td class=\\"subscription-details\\" 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: #15212A;\\" valign=\\"top\\">
+                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Name: not provided</p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">subscription-box-1@example.com</a></p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Member since: date</p>
                                                 </td>
                                                 <td align=\\"right\\" valign=\\"bottom\\" class=\\"manage-subscription\\" 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;; white-space: nowrap; font-size: 15px; font-weight: 600; text-align: right; line-height: 1.45em; vertical-align: bottom; color: #FF1A75;\\">
                                                     <a href=\\"http://127.0.0.1:2369/#/portal/account\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"> Manage subscription &#x2192;</a>
@@ -7560,14 +9484,14 @@ table.body figcaption a {
                                 </tr>
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -7577,7 +9501,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -7616,6 +9540,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -7723,11 +9649,11 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account]
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -7759,38 +9685,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -7809,32 +9721,48 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
     display: none;
   }
 
-  .mobile-only {
+  .mobile-only {
+    display: initial !important;
+  }
+
+  .hide-desktop {
     display: initial !important;
   }
 
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -7872,21 +9800,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -7917,16 +9861,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -7939,45 +9887,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -8022,7 +9954,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;
   }
@@ -8048,30 +9981,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -8121,9 +10090,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -8132,30 +10101,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -8163,24 +10134,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-11/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-11/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-11/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-11/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-11/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-11/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -8188,7 +10159,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -8204,17 +10175,17 @@ table.body figcaption a {
 
 
                                 <tr>
-                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); color: #000000; max-width: 600px;\\" valign=\\"top\\">
-                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px; color: #000000;\\">Subscription details</h3>
-                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #000000;\\">
+                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; color: #15212A;\\" valign=\\"top\\">
+                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px;\\">Subscription details</h3>
+                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #15212A;\\">
                                             <span>You are receiving this because you are a <strong style=\\"font-weight: 700;\\">paid subscriber</strong> to Ghost.</span> Your subscription will renew on date.
                                         </p>
                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr>
-                                                <td class=\\"subscription-details\\" 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;\\" valign=\\"top\\">
-                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Name: not provided</p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">paid@example.com</a></p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Member since: date</p>
+                                                <td class=\\"subscription-details\\" 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: #15212A;\\" valign=\\"top\\">
+                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Name: not provided</p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">paid@example.com</a></p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Member since: date</p>
                                                 </td>
                                                 <td align=\\"right\\" valign=\\"bottom\\" class=\\"manage-subscription\\" 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;; white-space: nowrap; font-size: 15px; font-weight: 600; text-align: right; line-height: 1.45em; vertical-align: bottom; color: #FF1A75;\\">
                                                     <a href=\\"http://127.0.0.1:2369/#/portal/account\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"> Manage subscription &#x2192;</a>
@@ -8225,14 +10196,14 @@ table.body figcaption a {
                                 </tr>
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -8242,7 +10213,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -8281,6 +10252,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -8388,11 +10361,11 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account]
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -8424,38 +10397,24 @@ Object {
         <title>This is a test post title</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -8474,16 +10433,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -8494,12 +10449,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -8537,21 +10512,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -8582,16 +10573,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -8604,45 +10599,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -8687,7 +10666,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;
   }
@@ -8713,30 +10693,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -8786,9 +10802,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello world</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -8797,30 +10813,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -8828,24 +10846,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-10/\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">This is a test post title</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-10/\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">This is a test post title</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-10/\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-10/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-10/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/this-is-a-test-post-title-10/\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -8853,7 +10871,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello world</p>
                                                 <!-- POST CONTENT END -->
@@ -8869,17 +10887,17 @@ table.body figcaption a {
 
 
                                 <tr>
-                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); color: #000000; max-width: 600px;\\" valign=\\"top\\">
-                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px; color: #000000;\\">Subscription details</h3>
-                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #000000;\\">
+                                    <td class=\\"subscription-box\\" 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; padding: 32px 0; border-bottom: 1px solid #e5eff5; color: #15212A;\\" valign=\\"top\\">
+                                        <h3 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; font-size: 14px; font-weight: 700; text-transform: uppercase; margin: 0 0 18px;\\">Subscription details</h3>
+                                        <p style=\\"margin: 0 0 1.5em 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; margin-bottom: 16px; color: #15212A;\\">
                                             <span>You are receiving this because you are a <strong style=\\"font-weight: 700;\\">trialing subscriber</strong> to Ghost.</span> Your free trial ends on date, at which time you will be charged the regular price. You can always cancel before then.
                                         </p>
                                         <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr>
-                                                <td class=\\"subscription-details\\" 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;\\" valign=\\"top\\">
-                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Name: not provided</p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #000000;\\" target=\\"_blank\\">trialing-paid@example.com</a></p>
-                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #000000;\\">Member since: date</p>
+                                                <td class=\\"subscription-details\\" 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: #15212A;\\" valign=\\"top\\">
+                                                    <p class=\\"hidden\\" style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Name: not provided</p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Email: <a href=\\"#\\" style=\\"overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">trialing-paid@example.com</a></p>
+                                                    <p style=\\"margin: 0 0 1.5em 0; margin-bottom: 0; font-size: 15px; font-weight: 400; line-height: 1.45em; text-decoration: none; color: #15212A;\\">Member since: date</p>
                                                 </td>
                                                 <td align=\\"right\\" valign=\\"bottom\\" class=\\"manage-subscription\\" 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;; white-space: nowrap; font-size: 15px; font-weight: 600; text-align: right; line-height: 1.45em; vertical-align: bottom; color: #FF1A75;\\">
                                                     <a href=\\"http://127.0.0.1:2369/#/portal/account\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"> Manage subscription &#x2192;</a>
@@ -8890,14 +10908,14 @@ table.body figcaption a {
                                 </tr>
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"unsubscribe_url\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -8907,7 +10925,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -8946,6 +10964,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/
+
 
 
 
@@ -9053,11 +11073,11 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account]
 
 
 
-Ghost © 2023 – Unsubscribe [unsubscribe_url]
+Ghost © 2024 – Unsubscribe [unsubscribe_url]
 
 
 
-https://ghost.org/
+https://ghost.org/?via=pbg-newsletter
 
 
 
@@ -9088,39 +11108,25 @@ Object {
         <!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
         <title>A random test post</title>
         <style>
-.post-title-link {
-  display: block;
-  text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
-}
-.post-title-link-left {
-  text-align: left;
-}
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
+.post-title-link {
+  color: #15212A;
+  display: block;
+  text-align: center;
+  margin-top: 32px;
 }
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
+.post-title-link-left {
+  text-align: left;
 }
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -9139,16 +11145,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -9159,12 +11161,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -9202,21 +11224,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -9247,16 +11285,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -9269,45 +11311,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -9352,7 +11378,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;
   }
@@ -9378,30 +11405,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -9451,9 +11514,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello {first_name},</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -9462,30 +11525,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -9493,24 +11558,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">A random test post</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -9518,7 +11583,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello {first_name},</p><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hey Simon, Hey Simon,</p>
                                                 <!-- POST CONTENT END -->
@@ -9535,14 +11600,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -9552,7 +11617,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -9591,6 +11656,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
 
 
 
@@ -9665,11 +11732,11 @@ Hey Simon, Hey Simon,
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
 
 
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
 
 
 
@@ -9701,38 +11768,24 @@ Object {
         <title>A random test post</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -9751,16 +11804,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -9771,12 +11820,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -9814,21 +11883,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -9859,16 +11944,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -9881,45 +11970,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -9964,7 +12037,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;
   }
@@ -9990,30 +12064,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -10063,9 +12173,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">Hello {first_name},</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -10074,30 +12184,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -10105,24 +12217,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">A random test post</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -10130,7 +12242,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hello {first_name},</p><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Hey there, Hey ,</p>
                                                 <!-- POST CONTENT END -->
@@ -10147,14 +12259,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -10164,7 +12276,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -10203,6 +12315,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
 
 
 
@@ -10277,11 +12391,11 @@ Hey there, Hey ,
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
 
 
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
 
 
 
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..852e90de8ac 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
@@ -11,38 +11,24 @@ Object {
         <title>A random test post</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -61,16 +47,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -81,12 +63,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -124,21 +126,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -169,16 +187,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -191,45 +213,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -274,7 +280,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;
   }
@@ -300,30 +307,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -373,9 +416,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">This is a paragraph test.</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -384,30 +427,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -415,24 +460,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">A random test post</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -440,7 +485,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">This is a paragraph test.</p>
                                                 <!-- POST CONTENT END -->
@@ -457,14 +502,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -474,7 +519,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -513,6 +558,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
 
 
 
@@ -585,11 +632,11 @@ This is a paragraph test.
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
 
 
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
 
 
 
@@ -621,38 +668,24 @@ Object {
         <title>A random test post</title>
         <style>
 .post-title-link {
+  color: #15212A;
   display: block;
   text-align: center;
-  margin-top: 50px;
-  text-decoration: none !important;
-  color: #000000;
+  margin-top: 32px;
 }
 .post-title-link-left {
   text-align: left;
 }
-.comment-link {
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 13px;
-  letter-spacing: 0.1px;
-  text-decoration: none;
-}
-.comment-link img {
-  width: 16px;
-  height: 16px;
-  margin-bottom: 1px;
-  vertical-align: middle;
-}
 .view-online-link {
   word-wrap: none;
   white-space: nowrap;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94;
+  text-decoration: underline !important;
 }
 .kg-nft-link {
   display: block;
   text-decoration: none !important;
-  color: #000000 !important;
+  color: #15212A !important;
   font-family: inherit !important;
   font-size: 14px;
   line-height: 1.3em;
@@ -671,16 +704,12 @@ Object {
   line-height: 1.3em;
 }
 .kg-audio-link {
-  text-decoration: none !important;
-  color: #000000;
-  color: rgba(0, 0, 0, 0.5);
+  color: #738a94 !important;
 }
 @media only screen and (max-width: 620px) {
   table.body {
     width: 100%;
     min-width: 100%;
-    padding: 8px 4px;
-    background-color: #ffffff;
   }
 
   .hide-mobile {
@@ -691,12 +720,32 @@ Object {
     display: initial !important;
   }
 
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
   table.body p,
 table.body ul,
 table.body ol,
-table.body td,
-table.body span {
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
     font-size: 16px !important;
+    line-height: 1.5em !important;
   }
 
   table.body pre {
@@ -734,21 +783,37 @@ table.body span {
     width: auto !important;
   }
 
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
   table.body .site-icon img {
-    width: 40px !important;
-    height: 40px !important;
+    width: 36px !important;
+    height: 36px !important;
   }
 
   table.body .site-url a {
-    font-size: 14px !important;
-    padding-bottom: 15px !important;
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
   }
 
   table.body .post-meta,
 table.body .post-meta-date {
     white-space: normal !important;
-    font-size: 12px !important;
-    line-height: 1.5em;
+    font-size: 13px !important;
+    line-height: 1.2em;
   }
 
   table.body .post-meta,
@@ -779,16 +844,20 @@ table.body .post-meta-left.view-online-mobile .view-online {
     text-decoration: underline;
   }
 
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
   table.body .view-online-link,
-table.body .comment-link,
 table.body .footer,
 table.body .footer a {
-    font-size: 12px !important;
+    font-size: 13px !important;
   }
 
   table.body .post-title a {
-    font-size: 32px !important;
-    line-height: 1.15em !important;
+    font-size: 26px !important;
+    line-height: 1.1em !important;
   }
 
   table.feedback-buttons {
@@ -801,45 +870,29 @@ table.body .footer a {
     max-width: 390px;
   }
 
-  table.feedback-buttons-mobile a,
-table.body .feedback-button-mobile-text {
-    text-decoration: none !important;
-  }
-
   table.body .feedback-button-mobile-text {
     font-size: 13px !important;
   }
 
   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 .subscription-box h3 {
@@ -884,7 +937,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;
   }
@@ -910,30 +964,66 @@ table.body .manage-subscription {
   }
 
   table.body blockquote {
-    font-size: 17px;
+    font-size: 16px !important;
     line-height: 1.6em;
     margin-bottom: 0;
-    padding-left: 15px;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
   }
 
   table.body blockquote.kg-blockquote-alt {
     border-left: 0 none !important;
-    margin: 0 0 2.5em 0 !important;
-    padding: 0 50px 0 50px !important;
-    font-size: 1.2em;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
   }
 
-  table.body blockquote + * {
-    margin-top: 1.5em !important;
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
   }
 
   table.body hr {
     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;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
   }
 }
 @media all {
@@ -983,9 +1073,9 @@ table.body figcaption a {
 }
 </style>
     </head>
-    <body 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #000000;\\">
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
         <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">This is a paragraph</span>
-        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
             <!-- Outlook doesn't respect max-width so we need an extra centered table -->
             <!--[if mso]>
             <tr>
@@ -994,30 +1084,32 @@ table.body figcaption a {
                         <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
             <![endif]-->
             <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;\\" valign=\\"top\\">&#xA0;</td>
-                <td class=\\"container\\" 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; display: block; padding: 12px; max-width: 600px; background-color: #ffffff; color: #000000; margin: 0 auto;\\" valign=\\"top\\" bgcolor=\\"#ffffff\\">
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
                     <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"20\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px; border-spacing: 20px 0; width: 100%; background: #ffffff;\\">
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
-                                <td class=\\"wrapper\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
                                             <tr class=\\"header-image-row\\">
-                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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-top: 24px;\\" valign=\\"top\\">
-                                                    <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
                                                 </td>
                                             </tr>
 
-                                            <tr>
-                                                <td class=\\"site-info-bordered\\" width=\\"100%\\" align=\\"center\\" 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-top: 50px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12);\\" valign=\\"top\\">
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                                <td class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
                                                             </tr>
                                                             <tr>
-                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #000000; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 50px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 14px; font-weight: 400; text-transform: none; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
                                                             </tr>
 
                                                     </table>
@@ -1025,24 +1117,24 @@ table.body figcaption a {
                                             </tr>
 
                                             <tr>
-                                                <td class=\\"post-title post-title-serif\\" style=\\"vertical-align: top; color: #000000; padding-bottom: 16px; font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
-                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"display: block; text-align: center; margin-top: 50px; color: #000000; overflow-wrap: anywhere; text-decoration: none;\\" target=\\"_blank\\">A random test post</a>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
                                                 </td>
                                             </tr>
                                             <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; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
-                                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 48px;\\">
+                                                <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
                                                         <tr>
-                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
                                                                 By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
                                                             </td>
-                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"text-decoration: none; word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere;\\" target=\\"_blank\\">View in browser</a>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
-                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center;\\" align=\\"center\\">
-                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); font-size: 13px; letter-spacing: 0.1px; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
-                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #000000; color: rgba(0, 0, 0, 0.5); overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
                                                             </td>
                                                         </tr>
                                                     </table>
@@ -1050,7 +1142,7 @@ table.body figcaption a {
                                             </tr>
 
                                         <tr class=\\"post-content-row\\">
-                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #000000; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid rgba(0, 0, 0, 0.12); max-width: 600px;\\" valign=\\"top\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
                                                 <!-- POST CONTENT START -->
                                                 <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">This is a paragraph</p><div></div>
                                                 <!-- POST CONTENT END -->
@@ -1067,14 +1159,14 @@ table.body figcaption a {
 
 
                             <tr>
-                                <td class=\\"wrapper\\" align=\\"center\\" 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; box-sizing: border-box;\\" valign=\\"top\\">
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
                                     <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
                                         <tr>
-                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #000000; color: rgba(0, 0, 0, 0.5); margin-top: 20px; text-align: center; font-size: 13px; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2023 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #000000; color: rgba(0, 0, 0, 0.5); text-decoration: underline;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
                                         </tr>
 
                                             <tr>
-                                                <td class=\\"footer-powered\\" 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; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
                                             </tr>
                                     </table>
                                 </td>
@@ -1084,7 +1176,7 @@ table.body figcaption a {
                         <!-- END CENTERED WHITE CONTAINER -->
                     </div>
                 </td>
-                <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;\\" valign=\\"top\\">&#xA0;</td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
             </tr>
 
             <!--[if mso]>
@@ -1123,6 +1215,8 @@ table.body figcaption a {
 
 
 
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
 
 
 
@@ -1195,11 +1289,3587 @@ This is a paragraph
 
 
 
-Ghost © 2023 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
 
 
 
-http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+",
+}
+`;
+
+exports[`Can send cards via email renders the golden post correctly (labs flag: contentVisibility) 1 1`] = `
+Object {
+  "html": "<!doctype html>
+<html>
+    <head>
+        <meta name=\\"viewport\\" content=\\"width=device-width\\">
+        <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
+        <!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
+        <title>A random test post</title>
+        <style>
+.post-title-link {
+  color: #15212A;
+  display: block;
+  text-align: center;
+  margin-top: 32px;
+}
+.post-title-link-left {
+  text-align: left;
+}
+.view-online-link {
+  word-wrap: none;
+  white-space: nowrap;
+  color: #738a94;
+  text-decoration: underline !important;
+}
+.kg-nft-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 14px;
+  line-height: 1.3em;
+  padding-top: 4px;
+  padding-right: 20px;
+  padding-left: 20px;
+  padding-bottom: 4px;
+}
+.kg-twitter-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 15px;
+  padding: 8px;
+  line-height: 1.3em;
+}
+.kg-audio-link {
+  color: #738a94 !important;
+}
+@media only screen and (max-width: 620px) {
+  table.body {
+    width: 100%;
+    min-width: 100%;
+  }
+
+  .hide-mobile {
+    display: none;
+  }
+
+  .mobile-only {
+    display: initial !important;
+  }
+
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
+  table.body pre {
+    white-space: pre-wrap !important;
+    word-break: break-word !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-spacing: 10px 0 !important;
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .btn table {
+    width: 100% !important;
+  }
+
+  table.body .btn a {
+    width: 100% !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
+  table.body .site-icon img {
+    width: 36px !important;
+    height: 36px !important;
+  }
+
+  table.body .site-url a {
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body .post-meta,
+table.body .post-meta-date {
+    white-space: normal !important;
+    font-size: 13px !important;
+    line-height: 1.2em;
+  }
+
+  table.body .post-meta,
+table.body .view-online {
+    width: 100% !important;
+  }
+
+  table.body .post-meta-left,
+table.body .post-meta-left.view-online {
+    width: 100% !important;
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online-mobile {
+    display: table-row !important;
+  }
+
+  table.body .post-meta-left.view-online-mobile,
+table.body .post-meta-left.view-online-mobile .view-online {
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online.desktop {
+    display: none !important;
+  }
+
+  table.body .view-online {
+    text-decoration: underline;
+  }
+
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
+  table.body .view-online-link,
+table.body .footer,
+table.body .footer a {
+    font-size: 13px !important;
+  }
+
+  table.body .post-title a {
+    font-size: 26px !important;
+    line-height: 1.1em !important;
+  }
+
+  table.feedback-buttons {
+    display: none !important;
+  }
+
+  table.feedback-buttons-mobile {
+    display: table !important;
+    width: 100% !important;
+    max-width: 390px;
+  }
+
+  table.body .feedback-button-mobile-text {
+    font-size: 13px !important;
+  }
+
+  table.body .latest-posts-header {
+    font-size: 12px !important;
+  }
+
+  table.body .latest-post-title {
+    padding-right: 8px !important;
+  }
+
+  table.body .latest-post h4,
+table.body .latest-post h4 span {
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
+  }
+
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
+    font-size: 13px !important;
+    line-height: 1.2 !important;
+  }
+
+  table.body .subscription-box h3 {
+    font-size: 14px !important;
+  }
+
+  table.body .subscription-box p,
+table.body .subscription-box p span {
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details,
+table.body .manage-subscription {
+    display: inline-block;
+    width: 100%;
+    text-align: left !important;
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details {
+    padding-bottom: 12px;
+  }
+
+  table.body .kg-bookmark-card {
+    width: 90vw;
+  }
+
+  table.body .kg-bookmark-thumbnail {
+    display: none !important;
+  }
+
+  table.body .kg-bookmark-metadata span {
+    font-size: 13px !important;
+  }
+
+  table.body .kg-embed-card {
+    max-width: 90vw !important;
+  }
+
+  table.body h1 {
+    font-size: 32px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h2,
+table.body h2 span {
+    font-size: 26px !important;
+    line-height: 1.22em !important;
+  }
+
+  table.body h3 {
+    font-size: 21px !important;
+    line-height: 1.25em !important;
+  }
+
+  table.body h4 {
+    font-size: 19px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h5 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body h6 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote {
+    font-size: 16px !important;
+    line-height: 1.6em;
+    margin-bottom: 0;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt {
+    border-left: 0 none !important;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
+  }
+
+  table.body hr {
+    margin: 2em 0 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 span {
+    font-size: inherit !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
+  }
+}
+@media all {
+  .subscription-details p.hidden {
+    display: none !important;
+  }
+
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .apple-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+
+  .btn-primary table td:hover {
+    background-color: #34495e !important;
+  }
+
+  .btn-primary a:hover {
+    background-color: #34495e !important;
+    border-color: #34495e !important;
+  }
+}
+</style>
+    </head>
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
+        <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">This is just a simple paragraph, no frills.
+
+This is block quote
+
+This is a...different block quote
+
+
+This is a heading!
+
+
+Here&#39;s a smaller heading.
+
+
+A heading
+
+
+and a paragraph (in markdown!)
+
+
+
+
+A paragraph inside an HTML card.
+
+
+And another one, with some bold text.
+
+
+
+Ghost: Independent technology for modern publishingBeautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.Ghost - The Profes</span>
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
+            <!-- Outlook doesn't respect max-width so we need an extra centered table -->
+            <!--[if mso]>
+            <tr>
+                <td>
+                    <center>
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
+            <![endif]-->
+            <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
+                    <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
+                        <!-- START CENTERED WHITE CONTAINER -->
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
+
+                            <!-- START MAIN CONTENT AREA -->
+                            <tr>
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                            <tr class=\\"header-image-row\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
+                                                </td>
+                                            </tr>
+
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                            </tr>
+
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
+                                                </td>
+                                            </tr>
+                                            <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
+                                                        <tr>
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                                By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
+                                                            </td>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                        <tr class=\\"post-content-row\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
+                                                <!-- POST CONTENT START -->
+                                                <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">This is just a simple paragraph, no frills.</p><blockquote style=\\"margin: 0; padding: 0; border-left: #FF1A75 2px solid; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; padding: 0;\\">This is block quote</p></blockquote><blockquote class=\\"kg-blockquote-alt\\" style=\\"margin: 0; padding: 0; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px; border-left: 0 none; text-align: center; font-size: 1.2em; font-style: italic; color: #738a94;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; margin-right: 50px; margin-left: 50px; padding: 0;\\">This is a...different block quote</p></blockquote><h2 id=\\"this-is-a-heading\\" 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 32px;\\">This is a heading!</h2><h3 id=\\"heres-a-smaller-heading\\" 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 26px;\\">Here&#39;s a smaller heading.</h3><div class=\\"kg-card kg-image-card kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><img src=\\"https://upload.wikimedia.org/wikipedia/commons/thumb/8/8c/Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg/1920px-Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg\\" class=\\"kg-image\\" alt=\\"Cows eat grass.\\" loading=\\"lazy\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; margin: 0 auto; height: auto; width: auto;\\" width=\\"auto\\" height=\\"auto\\"><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><span style=\\"text-align: center; white-space: pre-wrap;\\">A lovely cow</span></div></div><h1 id=\\"a-heading\\" 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: 1.5em 0 0.5em 0; font-size: 42px; font-weight: 700;\\">A heading</h1>
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">and a paragraph (in markdown!)</p>
+<div>
+<!--kg-card-begin: html-->
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">A paragraph inside an HTML card.</p>
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">And another one, with some <b>bold</b> text.</p>
+<!--kg-card-end: html-->
+</div><hr style=\\"position: relative; display: block; width: 100%; margin: 3em 0; padding: 0; height: 1px; border: 0; border-top: 1px solid #e5eff5;\\"><div class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><div class=\\"kg-gallery-container\\" style=\\"margin-top: -20px;\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://plus.unsplash.com/premium_photo-1700558685152-81f821a40724?q=80&amp;w=2070&amp;auto=format&amp;fit=crop&amp;ixlib=rb-4.0.3&amp;ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D\\" width=\\"600\\" height=\\"400\\" loading=\\"lazy\\" alt style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; padding-top: 20px; width: 100%; height: auto;\\"></div></div></div><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A gallery.</span></p></div></div><div>
+        <!--[if !mso !vml]-->
+            <div class=\\"kg-card kg-bookmark-card kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0; width: 100%; background: #ffffff;\\">
+                <a class=\\"kg-bookmark-container\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"display: flex; min-height: 148px; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Oxygen, Ubuntu, Cantarell, &#39;Open Sans&#39;, &#39;Helvetica Neue&#39;, sans-serif; border-radius: 3px; border: 1px solid #e5eff5; overflow-wrap: anywhere; color: #FF1A75; text-decoration: none;\\" target=\\"_blank\\">
+                    <div class=\\"kg-bookmark-content\\" style=\\"display: inline-block; width: 100%; padding: 20px;\\">
+                        <div class=\\"kg-bookmark-title\\" style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600;\\">Ghost: Independent technology for modern publishing</div>
+                        <div class=\\"kg-bookmark-description\\" style=\\"display: -webkit-box; overflow-y: hidden; margin-top: 12px; max-height: 40px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400; -webkit-line-clamp: 2; -webkit-box-orient: vertical;\\">Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.</div>
+                        <div class=\\"kg-bookmark-metadata\\" style=\\"display: flex; flex-wrap: wrap; align-items: center; margin-top: 14px; color: #15212A; font-size: 13px; font-weight: 400;\\">
+                            <img class=\\"kg-bookmark-icon\\" src=\\"https://ghost.org/favicon.ico\\" alt style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; margin-right: 8px; width: 22px; height: 22px;\\" width=\\"22\\" height=\\"22\\">
+                            <span class=\\"kg-bookmark-author\\" src=\\"Ghost - The Professional Publishing Platform\\" style=\\"line-height: 1.5em;\\">Ghost - The Professional Publishing Platform</span>
+                            
+                        </div>
+                    </div>
+                    <div class=\\"kg-bookmark-thumbnail\\" 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(&#39;https://ghost.org/images/meta/ghost.png&#39;);\\">
+                        <img src=\\"https://ghost.org/images/meta/ghost.png\\" alt onerror=\\"this.style.display=&#39;none&#39;\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: none;\\"></div>
+                </a>
+                <div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">My favorite website.</span></p></div>
+            </div>
+        <!--[endif]-->
+        <!--[if vml]>
+            <table class=\\"kg-card kg-bookmark-card--outlook\\" style=\\"margin: 0; padding: 0; width: 100%; border: 1px solid #e5eff5; background: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; border-collapse: collapse; border-spacing: 0;\\" width=\\"100%\\">
+                <tr>
+                    <td width=\\"100%\\" style=\\"padding: 20px;\\">
+                        <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
+                            <tr>
+                                <td class=\\"kg-bookmark-title--outlook\\">
+                                    <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600;\\">
+                                        Ghost: Independent technology for modern publishing
+                                    </a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <div class=\\"kg-bookmark-description--outlook\\">
+                                        <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; margin-top: 12px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;\\">
+                                            Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.
+                                        </a>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class=\\"kg-bookmark-metadata--outlook\\" style=\\"padding-top: 14px; color: #15212A; font-size: 13px; font-weight: 400; line-height: 1.5em;\\">
+                                    <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
+                                        <tr>
+                                            
+                                                <td valign=\\"middle\\" class=\\"kg-bookmark-icon--outlook\\" style=\\"padding-right: 8px; font-size: 0; line-height: 1.5em;\\">
+                                                    <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A;\\">
+                                                        <img src=\\"https://ghost.org/favicon.ico\\" width=\\"22\\" height=\\"22\\" alt=\\" \\">
+                                                    </a>
+                                                </td>
+                                            
+                                            <td valign=\\"middle\\" class=\\"kg-bookmark-byline--outlook\\">
+                                                <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A;\\">
+                                                    Ghost - The Professional Publishing Platform
+                                                    
+                                                    
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+            <div class=\\"kg-bookmark-spacer--outlook\\" style=\\"height: 1.5em;\\">&nbsp;</div>
+        <![endif]--></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">Hey </span><span>Vinz</span><span style=\\"white-space: pre-wrap;\\">,</span></p><!--members-only--><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"></p><div class=\\"btn btn-accent\\" style=\\"box-sizing: border-box; width: 100%; display: table;\\"><table border=\\"0\\" cellspacing=\\"0\\" cellpadding=\\"0\\" align=\\"center\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\" width=\\"auto\\"><tr><td align=\\"center\\" style=\\"font-size: 18px; vertical-align: top; color: #15212A; border-radius: 5px; text-align: center; 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;; background-color: #FF1A75;\\" valign=\\"top\\" bgcolor=\\"#FF1A75\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-decoration: none; background-color: #FF1A75; border-color: #FF1A75; color: #FFFFFF;\\" target=\\"_blank\\">Click me, I&#39;m a button!</a></td></tr></table></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"></p><div class=\\"kg-card kg-callout-card kg-callout-card-blue\\" style=\\"display: flex; margin: 0 0 1.5em 0; padding: 20px 28px; border-radius: 3px; background: #E9F6FB;\\"><div class=\\"kg-callout-emoji\\" style=\\"padding-right: 12px; font-size: 20px;\\">&#x1F4A1;</div><div class=\\"kg-callout-text\\">I had an idea...</div></div><div style=\\"background: transparent;
+        border: 1px solid rgba(124, 139, 154, 0.25); border-radius: 4px; padding: 20px; margin-bottom: 1.5em;\\">
+            <h4 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;; text-rendering: optimizeLegibility; margin: 1.8em 0 0.5em 0; line-height: 1.2em; font-size: 1.375rem; font-weight: 600; margin-bottom: 8px; margin-top: 0px;\\"><span style=\\"white-space: pre-wrap;\\">Spoiler alert!</span></h4>
+            <div style=\\"font-size: 1rem; line-height: 1.5; margin-bottom: -1.5em;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">Just kidding</span></p></div>
+        </div><table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" class=\\"kg-audio-card\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto; width: 100%; margin: 0 auto 1.5em; border-radius: 3px; border: 1px solid #e5eff5;\\" width=\\"100%\\">
+                <tbody><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: #15212A;\\" valign=\\"top\\">
+                        <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                            <tbody><tr>
+                                <td width=\\"60\\" 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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; display: block; width: 60px; height: 60px; padding-top: 4px; padding-right: 16px; padding-bottom: 4px; padding-left: 4px; border-radius: 2px;\\" target=\\"_blank\\">
+                                        
+                                        <img src=\\"https://static.ghost.org/v4.0.0/images/audio-file-icon.png\\" class=\\"kg-audio-thumbnail placeholder\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 24px; height: 24px; padding: 18px; border-radius: 2px; background-color: #FF1A75;\\" width=\\"24\\" height=\\"24\\">
+                                        
+                                    </a>
+                                </td>
+                                <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; color: #15212A; position: relative; vertical-align: center;\\" valign=\\"center\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; position: absolute; display: block; top: 0; right: 0; bottom: 0; left: 0;\\" target=\\"_blank\\"></a>
+                                    <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                        <tbody><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: #15212A;\\" valign=\\"top\\">
+                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-title\\" style=\\"display: block; padding-right: 20px; padding-bottom: 4px; padding-top: 4px; font-size: 16px; font-weight: 600; line-height: 18px; overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">Sample</a>
+                                            </td>
+                                        </tr>
+                                        <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: #15212A;\\" valign=\\"top\\">
+                                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                                    <tbody><tr>
+                                                        <td width=\\"24\\" 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; color: #15212A; vertical-align: middle;\\" valign=\\"middle\\">
+                                                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-play-button\\" style=\\"display: block; box-sizing: border-box; width: 16px; height: 16px; border-style: solid; border-width: 8px 0px 8px 16px; border-color: transparent transparent transparent currentColor; overflow-wrap: anywhere; text-decoration: underline; color: #15212A;\\" target=\\"_blank\\"></a>
+                                                        </td>
+                                                        <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; color: #15212A; vertical-align: middle;\\" valign=\\"middle\\">
+                                                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-duration\\" style=\\"display: block; font-size: 13px; overflow-wrap: anywhere; text-decoration: none; color: #15171A;\\" target=\\"_blank\\">1:45<span class=\\"kg-audio-link\\" style=\\"color: #738a94;\\"> &#x2022; Click to play audio</span></a>
+                                                        </td>
+                                                    </tr>
+                                                </tbody></table>
+                                            </td>
+                                        </tr>
+                                    </tbody></table>
+                                </td>
+                            </tr>
+                        </tbody></table>
+                    </td>
+                </tr>
+            </tbody></table><div class=\\"kg-card kg-video-card kg-width-regular kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\">
+            <!--[if !mso !vml]-->
+            <a class=\\"kg-video-preview\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" aria-label=\\"Play video\\" style=\\"background-color: #1d1f21; background-image: radial-gradient(circle at center, #5b5f66, #1d1f21); display: block; overflow-wrap: anywhere; color: #FF1A75; mso-hide: all; text-decoration: none;\\" target=\\"_blank\\">
+                <table cellpadding=\\"0\\" cellspacing=\\"0\\" border=\\"0\\" width=\\"100%\\" background=\\"https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg\\" role=\\"presentation\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-size: cover; min-height: 200px; background: url(&#39;https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg&#39;) left top / cover; mso-hide: all;\\">
+                    <tbody><tr style=\\"mso-hide: all\\">
+                        <td width=\\"25%\\" 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: #15212A; visibility: hidden; mso-hide: all;\\" valign=\\"top\\">
+                            <img src=\\"https://img.spacergif.org/v1/150x338/0a/spacer.png\\" alt width=\\"100%\\" border=\\"0\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; height: auto; opacity: 0; visibility: hidden; mso-hide: all;\\" height=\\"auto\\">
+                        </td>
+                        <td width=\\"50%\\" align=\\"center\\" valign=\\"middle\\" 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; color: #15212A; vertical-align: middle; mso-hide: all;\\">
+                            <div class=\\"kg-video-play-button\\" style=\\"height: 2em; width: 3em; margin: 0 auto; border-radius: 10px; padding: 1em 0.8em 0.6em 1em; font-size: 1em; background-color: rgba(0,0,0,0.85); mso-hide: all;\\"><div style=\\"display: block; width: 0; height: 0; margin: 0 auto; line-height: 0px; border-color: transparent transparent transparent white; border-style: solid; border-width: 0.8em 0 0.8em 1.5em; mso-hide: all;\\"></div></div>
+                        </td>
+                        <td width=\\"25%\\" 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: #15212A; mso-hide: all;\\" valign=\\"top\\">&#xA0;</td>
+                    </tr>
+                </tbody></table>
+            </a>
+            <!--[endif]-->
+
+            <!--[if vml]>
+            <v:group xmlns:v=\\"urn:schemas-microsoft-com:vml\\" xmlns:w=\\"urn:schemas-microsoft-com:office:word\\" coordsize=\\"600,338\\" coordorigin=\\"0,0\\" href=\\"http://127.0.0.1:2369/404/\\" style=\\"width:600px;height:338px;\\">
+                <v:rect fill=\\"t\\" stroked=\\"f\\" style=\\"position:absolute;width:600;height:338;\\"><v:fill src=\\"https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg\\" type=\\"frame\\"/></v:rect>
+                <v:oval fill=\\"t\\" strokecolor=\\"white\\" strokeweight=\\"4px\\" style=\\"position:absolute;left:261;top:130;width:78;height:78\\"><v:fill color=\\"black\\" opacity=\\"30%\\" /></v:oval>
+                <v:shape coordsize=\\"24,32\\" path=\\"m,l,32,24,16,xe\\" fillcolor=\\"white\\" stroked=\\"f\\" style=\\"position:absolute;left:289;top:152;width:30;height:34;\\" />
+            </v:group>
+            <![endif]-->
+
+            <div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A lovely video of a woman on the beach doing nothing.</span></p></div>
+        </div><table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding: 20px; border: 1px solid #E9E9E9; border-radius: 5px; margin: 0 0 1.5em; width: 100%;\\" width=\\"100%\\">
+            
+                <tbody><tr>
+                    <td align=\\"center\\" 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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                        <img src=\\"https://main.ghost.org/content/images/2023/12/ghost-logo.png\\" width=\\"560\\" height=\\"180\\" style=\\"-ms-interpolation-mode: bicubic; display: block; width: 100%; height: auto; max-width: 100%; border: none; padding-bottom: 16px;\\" border=\\"0\\">
+                    </td>
+                </tr>
+            
+            <tr>
+                <td valign=\\"top\\" 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: #15212A;\\">
+                    <h4 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;; text-rendering: optimizeLegibility; margin: 1.8em 0 0.5em 0; line-height: 1.2em; font-weight: 700; font-size: 22px; margin-top: 0; margin-bottom: 0;\\"><span style=\\"white-space: pre-wrap;\\">Make a blog!</span></h4>
+                </td>
+            </tr>
+            
+                <tr style=\\"padding-top:0; padding-bottom:0; margin-bottom:0; padding-bottom:0;\\">
+                    <td valign=\\"top\\" 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: #15212A;\\">
+                        <img src=\\"https://static.ghost.org/v4.0.0/images/star-rating-5.png\\" style=\\"-ms-interpolation-mode: bicubic; max-width: 100%; border: none; width: 96px;\\" border=\\"0\\" width=\\"96\\">
+                    </td>
+                </tr>
+            
+            <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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                    <div style=\\"padding-top: 8px; opacity: 0.7; font-size: 17px; line-height: 1.4; margin-bottom: -24px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">with Ghost</span></p></div>
+                </td>
+            </tr>
+            
+                <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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                        <div class=\\"btn btn-accent\\" style=\\"box-sizing: border-box; display: table; width: 100%; padding-top: 16px;\\">
+                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"background-color: #FF1A75; border-color: #FF1A75; overflow-wrap: anywhere; border: solid 1px; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 0; text-decoration: none; color: #FFFFFF; width: 100%; text-align: center;\\" target=\\"_blank\\"><span style=\\"display: block;padding: 12px 25px;\\">Click here</span></a>
+                        </div>
+                    </td>
+                </tr>
+            
+        </tbody></table><div class=\\"kg-header-card kg-v2\\" style=\\"margin: 0 0 1.5em 0; padding: 0; color: #FFFFFF; text-align: center; background-color: #000000;\\">
+            
+            <div class=\\"kg-header-card-content\\" style=\\"padding: 80px 48px;\\">
+                <h2 class=\\"kg-header-card-heading\\" 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; font-size: 3em; font-weight: 700; margin: 0; line-height: 1em; color: #FFFFFF;\\"><span style=\\"white-space: pre-wrap;\\">Good news everyone!</span></h2>
+                <p class=\\"kg-header-card-subheading\\" style=\\"line-height: 1.6em; margin: 0.75em 0 0; color: #FFFFFF;\\"><span style=\\"white-space: pre-wrap;\\">This header renders properly in </span><i><em class=\\"italic\\" style=\\"white-space: pre-wrap;\\">all</em></i><span style=\\"white-space: pre-wrap;\\"> email clients!</span></p>
+                
+            </div>
+        </div><div class=\\"kg-card kg-embed-card\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><!--[if !mso !vml]-->
+            <a class=\\"kg-video-preview\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" aria-label=\\"Play video\\" style=\\"background-color: #1d1f21; background-image: radial-gradient(circle at center, #5b5f66, #1d1f21); display: block; overflow-wrap: anywhere; color: #FF1A75; mso-hide: all; text-decoration: none;\\" target=\\"_blank\\">
+                <table cellpadding=\\"0\\" cellspacing=\\"0\\" border=\\"0\\" width=\\"100%\\" background=\\"https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg\\" role=\\"presentation\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-size: cover; min-height: 200px; background: url(&#39;https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg&#39;) left top / cover; mso-hide: all;\\">
+                    <tbody><tr style=\\"mso-hide: all\\">
+                        <td width=\\"25%\\" 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: #15212A; visibility: hidden; mso-hide: all;\\" valign=\\"top\\">
+                            <img src=\\"https://img.spacergif.org/v1/150x450/0a/spacer.png\\" alt width=\\"100%\\" border=\\"0\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; height: auto; opacity: 0; visibility: hidden; mso-hide: all;\\" height=\\"auto\\">
+                        </td>
+                        <td width=\\"50%\\" align=\\"center\\" valign=\\"middle\\" 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; color: #15212A; vertical-align: middle; mso-hide: all;\\">
+                            <div class=\\"kg-video-play-button\\" style=\\"height: 2em; width: 3em; margin: 0 auto; border-radius: 10px; padding: 1em 0.8em 0.6em 1em; font-size: 1em; background-color: rgba(0,0,0,0.85); mso-hide: all;\\"><div style=\\"display: block; width: 0; height: 0; margin: 0 auto; line-height: 0px; border-color: transparent transparent transparent white; border-style: solid; border-width: 0.8em 0 0.8em 1.5em; mso-hide: all;\\"></div></div>
+                        </td>
+                        <td width=\\"25%\\" 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: #15212A; mso-hide: all;\\" valign=\\"top\\">&#xA0;</td>
+                    </tr>
+                </tbody></table>
+            </a>
+            <!--[endif]-->
+
+            <!--[if vml]>
+            <v:group xmlns:v=\\"urn:schemas-microsoft-com:vml\\" xmlns:w=\\"urn:schemas-microsoft-com:office:word\\" coordsize=\\"600,450\\" coordorigin=\\"0,0\\" href=\\"https://www.youtube.com/watch?v=jfKfPfyJRdk\\" style=\\"width:600px;height:450px;\\">
+                <v:rect fill=\\"t\\" stroked=\\"f\\" style=\\"position:absolute;width:600;height:450;\\"><v:fill src=\\"https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg\\" type=\\"frame\\"/></v:rect>
+                <v:oval fill=\\"t\\" strokecolor=\\"white\\" strokeweight=\\"4px\\" style=\\"position:absolute;left:261;top:186;width:78;height:78\\"><v:fill color=\\"black\\" opacity=\\"30%\\" /></v:oval>
+                <v:shape coordsize=\\"24,32\\" path=\\"m,l,32,24,16,xe\\" fillcolor=\\"white\\" stroked=\\"f\\" style=\\"position:absolute;left:289;top:208;width:30;height:34;\\" />
+            </v:group>
+            <![endif]--></div><div></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Some text.</p><blockquote style=\\"margin: 0; padding: 0; border-left: #FF1A75 2px solid; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; padding: 0;\\">A blockquote</p></blockquote><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Some more text.</p><div class=\\"kg-card kg-code-card\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><pre style=\\"white-space: pre-wrap; overflow: auto; background: #15212A; padding: 15px; border-radius: 3px; line-height: 1.2em; color: #ffffff;\\"><code class=\\"language-javascript\\" style=\\"font-size: 0.9em;\\">console.log(&#39;Hello world!&#39;);</code></pre><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A tiny little script.</span></p></div></div><table cellspacing=\\"0\\" cellpadding=\\"4\\" border=\\"0\\" class=\\"kg-file-card\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto; width: 100%; margin: 0 0 1.5em 0; border-radius: 3px; border: 1px solid #e5eff5;\\">
+            <tbody><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: #15212A;\\" valign=\\"top\\">
+                    <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                        <tbody><tr>
+                            <td valign=\\"middle\\" 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; color: #15212A; vertical-align: middle;\\">
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-title\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 8px; font-size: 17px; font-weight: bold; line-height: 1.3em; overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">test</a>
+                                </td></tr></tbody></table>
+                                
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-description\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 2px; font-size: 15px; line-height: 1.4em; overflow-wrap: anywhere; text-decoration: none; color: #738a94;\\" target=\\"_blank\\">A tiny text file.</a>
+                                </td></tr></tbody></table>
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-meta\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 4px; padding-bottom: 8px; font-size: 13px; line-height: 1.4em; overflow-wrap: anywhere; text-decoration: none; color: #738a94;\\" target=\\"_blank\\"><span class=\\"kg-file-name\\" style=\\"font-weight: 500; color: #15212A;\\">test.txt</span> &#x2022; 16 Bytes</a>
+                                </td></tr></tbody></table>
+                            </td>
+                            <td width=\\"80\\" valign=\\"middle\\" class=\\"kg-file-thumbnail\\" 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; color: #15212A; position: relative; vertical-align: middle; text-align: center; border-radius: 2px; background-color: #FF1A75;\\" align=\\"center\\" bgcolor=\\"#FF1A75\\">
+                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; display: block; top: 0; right: 0; bottom: 0; left: 0;\\" target=\\"_blank\\">
+                                    <img src=\\"https://static.ghost.org/v4.0.0/images/download-icon-darkmode.png\\" style=\\"border: none; -ms-interpolation-mode: bicubic; margin-top: 6px; height: 24px; width: 24px; max-width: 24px;\\" width=\\"24\\" height=\\"24\\">
+                                </a>
+                            </td>
+                        </tr>
+                    </tbody></table>
+                </td>
+            </tr>
+        </tbody></table>
+                                                <!-- POST CONTENT END -->
+
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                            <!-- END MAIN CONTENT AREA -->
+
+
+
+
+                            <tr>
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
+                                        <tr>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                        </tr>
+
+                                            <tr>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                            </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                        </table>
+                        <!-- END CENTERED WHITE CONTAINER -->
+                    </div>
+                </td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+            </tr>
+
+            <!--[if mso]>
+                            </table>
+                        </center>
+                    </td>
+                </tr>
+            <![endif]-->
+        </table>
+    </body>
+</html>
+",
+  "plaintext": "
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • date
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+
+This is just a simple paragraph, no frills.
+
+> This is block quote
+
+> This is a...different block quote
+
+
+This is a heading!
+
+
+Here's a smaller heading.
+
+A lovely cow
+
+
+A heading
+
+
+and a paragraph (in markdown!)
+
+
+
+
+A paragraph inside an HTML card.
+
+
+And another one, with some bold text.
+
+
+
+----------------------------------------
+
+A gallery.
+
+
+
+
+
+
+Ghost: Independent technology for modern publishing
+Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.
+
+
+Ghost - The Professional Publishing Platform
+
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+My favorite website.
+
+
+
+
+Hey Vinz,
+
+
+
+Click me, I'm a button! [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+💡I had an idea...
+
+
+Spoiler alert!
+
+
+Just kidding
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+Sample [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+1:45 • Click to play audio [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+A lovely video of a woman on the beach doing nothing.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Make a blog!
+
+
+
+
+
+
+
+
+
+
+
+
+
+with Ghost
+
+
+
+
+
+
+
+
+Click here [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+Good news everyone!
+
+
+This header renders properly in all email clients!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+Some text.
+
+> A blockquote
+
+Some more text.
+
+console.log('Hello world!');
+
+A tiny little script.
+
+
+
+
+
+
+
+
+
+
+
+
+
+test [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+A tiny text file. [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+test.txt • 16 Bytes [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
+
+
+
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+",
+}
+`;
+
+exports[`Can send cards via email renders the golden post correctly (no labs flags) 1 1`] = `
+Object {
+  "html": "<!doctype html>
+<html>
+    <head>
+        <meta name=\\"viewport\\" content=\\"width=device-width\\">
+        <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
+        <!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
+        <title>A random test post</title>
+        <style>
+.post-title-link {
+  color: #15212A;
+  display: block;
+  text-align: center;
+  margin-top: 32px;
+}
+.post-title-link-left {
+  text-align: left;
+}
+.view-online-link {
+  word-wrap: none;
+  white-space: nowrap;
+  color: #738a94;
+  text-decoration: underline !important;
+}
+.kg-nft-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 14px;
+  line-height: 1.3em;
+  padding-top: 4px;
+  padding-right: 20px;
+  padding-left: 20px;
+  padding-bottom: 4px;
+}
+.kg-twitter-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 15px;
+  padding: 8px;
+  line-height: 1.3em;
+}
+.kg-audio-link {
+  color: #738a94 !important;
+}
+@media only screen and (max-width: 620px) {
+  table.body {
+    width: 100%;
+    min-width: 100%;
+  }
+
+  .hide-mobile {
+    display: none;
+  }
+
+  .mobile-only {
+    display: initial !important;
+  }
+
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
+  table.body pre {
+    white-space: pre-wrap !important;
+    word-break: break-word !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-spacing: 10px 0 !important;
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .btn table {
+    width: 100% !important;
+  }
+
+  table.body .btn a {
+    width: 100% !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
+  table.body .site-icon img {
+    width: 36px !important;
+    height: 36px !important;
+  }
+
+  table.body .site-url a {
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body .post-meta,
+table.body .post-meta-date {
+    white-space: normal !important;
+    font-size: 13px !important;
+    line-height: 1.2em;
+  }
+
+  table.body .post-meta,
+table.body .view-online {
+    width: 100% !important;
+  }
+
+  table.body .post-meta-left,
+table.body .post-meta-left.view-online {
+    width: 100% !important;
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online-mobile {
+    display: table-row !important;
+  }
+
+  table.body .post-meta-left.view-online-mobile,
+table.body .post-meta-left.view-online-mobile .view-online {
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online.desktop {
+    display: none !important;
+  }
+
+  table.body .view-online {
+    text-decoration: underline;
+  }
+
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
+  table.body .view-online-link,
+table.body .footer,
+table.body .footer a {
+    font-size: 13px !important;
+  }
+
+  table.body .post-title a {
+    font-size: 26px !important;
+    line-height: 1.1em !important;
+  }
+
+  table.feedback-buttons {
+    display: none !important;
+  }
+
+  table.feedback-buttons-mobile {
+    display: table !important;
+    width: 100% !important;
+    max-width: 390px;
+  }
+
+  table.body .feedback-button-mobile-text {
+    font-size: 13px !important;
+  }
+
+  table.body .latest-posts-header {
+    font-size: 12px !important;
+  }
+
+  table.body .latest-post-title {
+    padding-right: 8px !important;
+  }
+
+  table.body .latest-post h4,
+table.body .latest-post h4 span {
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
+  }
+
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
+    font-size: 13px !important;
+    line-height: 1.2 !important;
+  }
+
+  table.body .subscription-box h3 {
+    font-size: 14px !important;
+  }
+
+  table.body .subscription-box p,
+table.body .subscription-box p span {
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details,
+table.body .manage-subscription {
+    display: inline-block;
+    width: 100%;
+    text-align: left !important;
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details {
+    padding-bottom: 12px;
+  }
+
+  table.body .kg-bookmark-card {
+    width: 90vw;
+  }
+
+  table.body .kg-bookmark-thumbnail {
+    display: none !important;
+  }
+
+  table.body .kg-bookmark-metadata span {
+    font-size: 13px !important;
+  }
+
+  table.body .kg-embed-card {
+    max-width: 90vw !important;
+  }
+
+  table.body h1 {
+    font-size: 32px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h2,
+table.body h2 span {
+    font-size: 26px !important;
+    line-height: 1.22em !important;
+  }
+
+  table.body h3 {
+    font-size: 21px !important;
+    line-height: 1.25em !important;
+  }
+
+  table.body h4 {
+    font-size: 19px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h5 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body h6 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote {
+    font-size: 16px !important;
+    line-height: 1.6em;
+    margin-bottom: 0;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt {
+    border-left: 0 none !important;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
+  }
+
+  table.body hr {
+    margin: 2em 0 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 span {
+    font-size: inherit !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
+  }
+}
+@media all {
+  .subscription-details p.hidden {
+    display: none !important;
+  }
+
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .apple-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+
+  .btn-primary table td:hover {
+    background-color: #34495e !important;
+  }
+
+  .btn-primary a:hover {
+    background-color: #34495e !important;
+    border-color: #34495e !important;
+  }
+}
+</style>
+    </head>
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
+        <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">This is just a simple paragraph, no frills.
+
+This is block quote
+
+This is a...different block quote
+
+
+This is a heading!
+
+
+Here&#39;s a smaller heading.
+
+
+A heading
+
+
+and a paragraph (in markdown!)
+
+
+
+
+A paragraph inside an HTML card.
+
+
+And another one, with some bold text.
+
+
+
+Ghost: Independent technology for modern publishingBeautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.Ghost - The Profes</span>
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
+            <!-- Outlook doesn't respect max-width so we need an extra centered table -->
+            <!--[if mso]>
+            <tr>
+                <td>
+                    <center>
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
+            <![endif]-->
+            <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
+                    <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
+                        <!-- START CENTERED WHITE CONTAINER -->
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
+
+                            <!-- START MAIN CONTENT AREA -->
+                            <tr>
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                            <tr class=\\"header-image-row\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
+                                                </td>
+                                            </tr>
+
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                            </tr>
+
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
+                                                </td>
+                                            </tr>
+                                            <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
+                                                        <tr>
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                                By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
+                                                            </td>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                        <tr class=\\"post-content-row\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
+                                                <!-- POST CONTENT START -->
+                                                <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">This is just a simple paragraph, no frills.</p><blockquote style=\\"margin: 0; padding: 0; border-left: #FF1A75 2px solid; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; padding: 0;\\">This is block quote</p></blockquote><blockquote class=\\"kg-blockquote-alt\\" style=\\"margin: 0; padding: 0; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px; border-left: 0 none; text-align: center; font-size: 1.2em; font-style: italic; color: #738a94;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; margin-right: 50px; margin-left: 50px; padding: 0;\\">This is a...different block quote</p></blockquote><h2 id=\\"this-is-a-heading\\" 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 32px;\\">This is a heading!</h2><h3 id=\\"heres-a-smaller-heading\\" 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 26px;\\">Here&#39;s a smaller heading.</h3><div class=\\"kg-card kg-image-card kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><img src=\\"https://upload.wikimedia.org/wikipedia/commons/thumb/8/8c/Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg/1920px-Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg\\" class=\\"kg-image\\" alt=\\"Cows eat grass.\\" loading=\\"lazy\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; margin: 0 auto; height: auto; width: auto;\\" width=\\"auto\\" height=\\"auto\\"><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><span style=\\"text-align: center; white-space: pre-wrap;\\">A lovely cow</span></div></div><h1 id=\\"a-heading\\" 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: 1.5em 0 0.5em 0; font-size: 42px; font-weight: 700;\\">A heading</h1>
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">and a paragraph (in markdown!)</p>
+
+<!--kg-card-begin: html-->
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">A paragraph inside an HTML card.</p>
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">And another one, with some <b>bold</b> text.</p>
+<!--kg-card-end: html-->
+<hr style=\\"position: relative; display: block; width: 100%; margin: 3em 0; padding: 0; height: 1px; border: 0; border-top: 1px solid #e5eff5;\\"><div class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><div class=\\"kg-gallery-container\\" style=\\"margin-top: -20px;\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://plus.unsplash.com/premium_photo-1700558685152-81f821a40724?q=80&amp;w=2070&amp;auto=format&amp;fit=crop&amp;ixlib=rb-4.0.3&amp;ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D\\" width=\\"600\\" height=\\"400\\" loading=\\"lazy\\" alt style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; padding-top: 20px; width: 100%; height: auto;\\"></div></div></div><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A gallery.</span></p></div></div><div>
+        <!--[if !mso !vml]-->
+            <div class=\\"kg-card kg-bookmark-card kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0; width: 100%; background: #ffffff;\\">
+                <a class=\\"kg-bookmark-container\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"display: flex; min-height: 148px; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Oxygen, Ubuntu, Cantarell, &#39;Open Sans&#39;, &#39;Helvetica Neue&#39;, sans-serif; border-radius: 3px; border: 1px solid #e5eff5; overflow-wrap: anywhere; color: #FF1A75; text-decoration: none;\\" target=\\"_blank\\">
+                    <div class=\\"kg-bookmark-content\\" style=\\"display: inline-block; width: 100%; padding: 20px;\\">
+                        <div class=\\"kg-bookmark-title\\" style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600;\\">Ghost: Independent technology for modern publishing</div>
+                        <div class=\\"kg-bookmark-description\\" style=\\"display: -webkit-box; overflow-y: hidden; margin-top: 12px; max-height: 40px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400; -webkit-line-clamp: 2; -webkit-box-orient: vertical;\\">Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.</div>
+                        <div class=\\"kg-bookmark-metadata\\" style=\\"display: flex; flex-wrap: wrap; align-items: center; margin-top: 14px; color: #15212A; font-size: 13px; font-weight: 400;\\">
+                            <img class=\\"kg-bookmark-icon\\" src=\\"https://ghost.org/favicon.ico\\" alt style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; margin-right: 8px; width: 22px; height: 22px;\\" width=\\"22\\" height=\\"22\\">
+                            <span class=\\"kg-bookmark-author\\" src=\\"Ghost - The Professional Publishing Platform\\" style=\\"line-height: 1.5em;\\">Ghost - The Professional Publishing Platform</span>
+                            
+                        </div>
+                    </div>
+                    <div class=\\"kg-bookmark-thumbnail\\" 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(&#39;https://ghost.org/images/meta/ghost.png&#39;);\\">
+                        <img src=\\"https://ghost.org/images/meta/ghost.png\\" alt onerror=\\"this.style.display=&#39;none&#39;\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: none;\\"></div>
+                </a>
+                <div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">My favorite website.</span></p></div>
+            </div>
+        <!--[endif]-->
+        <!--[if vml]>
+            <table class=\\"kg-card kg-bookmark-card--outlook\\" style=\\"margin: 0; padding: 0; width: 100%; border: 1px solid #e5eff5; background: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; border-collapse: collapse; border-spacing: 0;\\" width=\\"100%\\">
+                <tr>
+                    <td width=\\"100%\\" style=\\"padding: 20px;\\">
+                        <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
+                            <tr>
+                                <td class=\\"kg-bookmark-title--outlook\\">
+                                    <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600;\\">
+                                        Ghost: Independent technology for modern publishing
+                                    </a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <div class=\\"kg-bookmark-description--outlook\\">
+                                        <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; margin-top: 12px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;\\">
+                                            Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.
+                                        </a>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class=\\"kg-bookmark-metadata--outlook\\" style=\\"padding-top: 14px; color: #15212A; font-size: 13px; font-weight: 400; line-height: 1.5em;\\">
+                                    <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
+                                        <tr>
+                                            
+                                                <td valign=\\"middle\\" class=\\"kg-bookmark-icon--outlook\\" style=\\"padding-right: 8px; font-size: 0; line-height: 1.5em;\\">
+                                                    <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A;\\">
+                                                        <img src=\\"https://ghost.org/favicon.ico\\" width=\\"22\\" height=\\"22\\" alt=\\" \\">
+                                                    </a>
+                                                </td>
+                                            
+                                            <td valign=\\"middle\\" class=\\"kg-bookmark-byline--outlook\\">
+                                                <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A;\\">
+                                                    Ghost - The Professional Publishing Platform
+                                                    
+                                                    
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+            <div class=\\"kg-bookmark-spacer--outlook\\" style=\\"height: 1.5em;\\">&nbsp;</div>
+        <![endif]--></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">Hey </span><span>Vinz</span><span style=\\"white-space: pre-wrap;\\">,</span></p><!--members-only--><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"></p><div class=\\"btn btn-accent\\" style=\\"box-sizing: border-box; width: 100%; display: table;\\"><table border=\\"0\\" cellspacing=\\"0\\" cellpadding=\\"0\\" align=\\"center\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\" width=\\"auto\\"><tr><td align=\\"center\\" style=\\"font-size: 18px; vertical-align: top; color: #15212A; border-radius: 5px; text-align: center; 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;; background-color: #FF1A75;\\" valign=\\"top\\" bgcolor=\\"#FF1A75\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-decoration: none; background-color: #FF1A75; border-color: #FF1A75; color: #FFFFFF;\\" target=\\"_blank\\">Click me, I&#39;m a button!</a></td></tr></table></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"></p><div class=\\"kg-card kg-callout-card kg-callout-card-blue\\" style=\\"display: flex; margin: 0 0 1.5em 0; padding: 20px 28px; border-radius: 3px; background: #E9F6FB;\\"><div class=\\"kg-callout-emoji\\" style=\\"padding-right: 12px; font-size: 20px;\\">&#x1F4A1;</div><div class=\\"kg-callout-text\\">I had an idea...</div></div><div style=\\"background: transparent;
+        border: 1px solid rgba(124, 139, 154, 0.25); border-radius: 4px; padding: 20px; margin-bottom: 1.5em;\\">
+            <h4 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;; text-rendering: optimizeLegibility; margin: 1.8em 0 0.5em 0; line-height: 1.2em; font-size: 1.375rem; font-weight: 600; margin-bottom: 8px; margin-top: 0px;\\"><span style=\\"white-space: pre-wrap;\\">Spoiler alert!</span></h4>
+            <div style=\\"font-size: 1rem; line-height: 1.5; margin-bottom: -1.5em;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">Just kidding</span></p></div>
+        </div><table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" class=\\"kg-audio-card\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto; width: 100%; margin: 0 auto 1.5em; border-radius: 3px; border: 1px solid #e5eff5;\\" width=\\"100%\\">
+                <tbody><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: #15212A;\\" valign=\\"top\\">
+                        <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                            <tbody><tr>
+                                <td width=\\"60\\" 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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; display: block; width: 60px; height: 60px; padding-top: 4px; padding-right: 16px; padding-bottom: 4px; padding-left: 4px; border-radius: 2px;\\" target=\\"_blank\\">
+                                        
+                                        <img src=\\"https://static.ghost.org/v4.0.0/images/audio-file-icon.png\\" class=\\"kg-audio-thumbnail placeholder\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 24px; height: 24px; padding: 18px; border-radius: 2px; background-color: #FF1A75;\\" width=\\"24\\" height=\\"24\\">
+                                        
+                                    </a>
+                                </td>
+                                <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; color: #15212A; position: relative; vertical-align: center;\\" valign=\\"center\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; position: absolute; display: block; top: 0; right: 0; bottom: 0; left: 0;\\" target=\\"_blank\\"></a>
+                                    <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                        <tbody><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: #15212A;\\" valign=\\"top\\">
+                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-title\\" style=\\"display: block; padding-right: 20px; padding-bottom: 4px; padding-top: 4px; font-size: 16px; font-weight: 600; line-height: 18px; overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">Sample</a>
+                                            </td>
+                                        </tr>
+                                        <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: #15212A;\\" valign=\\"top\\">
+                                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                                    <tbody><tr>
+                                                        <td width=\\"24\\" 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; color: #15212A; vertical-align: middle;\\" valign=\\"middle\\">
+                                                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-play-button\\" style=\\"display: block; box-sizing: border-box; width: 16px; height: 16px; border-style: solid; border-width: 8px 0px 8px 16px; border-color: transparent transparent transparent currentColor; overflow-wrap: anywhere; text-decoration: underline; color: #15212A;\\" target=\\"_blank\\"></a>
+                                                        </td>
+                                                        <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; color: #15212A; vertical-align: middle;\\" valign=\\"middle\\">
+                                                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-duration\\" style=\\"display: block; font-size: 13px; overflow-wrap: anywhere; text-decoration: none; color: #15171A;\\" target=\\"_blank\\">1:45<span class=\\"kg-audio-link\\" style=\\"color: #738a94;\\"> &#x2022; Click to play audio</span></a>
+                                                        </td>
+                                                    </tr>
+                                                </tbody></table>
+                                            </td>
+                                        </tr>
+                                    </tbody></table>
+                                </td>
+                            </tr>
+                        </tbody></table>
+                    </td>
+                </tr>
+            </tbody></table><div class=\\"kg-card kg-video-card kg-width-regular kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\">
+            <!--[if !mso !vml]-->
+            <a class=\\"kg-video-preview\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" aria-label=\\"Play video\\" style=\\"background-color: #1d1f21; background-image: radial-gradient(circle at center, #5b5f66, #1d1f21); display: block; overflow-wrap: anywhere; color: #FF1A75; mso-hide: all; text-decoration: none;\\" target=\\"_blank\\">
+                <table cellpadding=\\"0\\" cellspacing=\\"0\\" border=\\"0\\" width=\\"100%\\" background=\\"https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg\\" role=\\"presentation\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-size: cover; min-height: 200px; background: url(&#39;https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg&#39;) left top / cover; mso-hide: all;\\">
+                    <tbody><tr style=\\"mso-hide: all\\">
+                        <td width=\\"25%\\" 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: #15212A; visibility: hidden; mso-hide: all;\\" valign=\\"top\\">
+                            <img src=\\"https://img.spacergif.org/v1/150x338/0a/spacer.png\\" alt width=\\"100%\\" border=\\"0\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; height: auto; opacity: 0; visibility: hidden; mso-hide: all;\\" height=\\"auto\\">
+                        </td>
+                        <td width=\\"50%\\" align=\\"center\\" valign=\\"middle\\" 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; color: #15212A; vertical-align: middle; mso-hide: all;\\">
+                            <div class=\\"kg-video-play-button\\" style=\\"height: 2em; width: 3em; margin: 0 auto; border-radius: 10px; padding: 1em 0.8em 0.6em 1em; font-size: 1em; background-color: rgba(0,0,0,0.85); mso-hide: all;\\"><div style=\\"display: block; width: 0; height: 0; margin: 0 auto; line-height: 0px; border-color: transparent transparent transparent white; border-style: solid; border-width: 0.8em 0 0.8em 1.5em; mso-hide: all;\\"></div></div>
+                        </td>
+                        <td width=\\"25%\\" 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: #15212A; mso-hide: all;\\" valign=\\"top\\">&#xA0;</td>
+                    </tr>
+                </tbody></table>
+            </a>
+            <!--[endif]-->
+
+            <!--[if vml]>
+            <v:group xmlns:v=\\"urn:schemas-microsoft-com:vml\\" xmlns:w=\\"urn:schemas-microsoft-com:office:word\\" coordsize=\\"600,338\\" coordorigin=\\"0,0\\" href=\\"http://127.0.0.1:2369/404/\\" style=\\"width:600px;height:338px;\\">
+                <v:rect fill=\\"t\\" stroked=\\"f\\" style=\\"position:absolute;width:600;height:338;\\"><v:fill src=\\"https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg\\" type=\\"frame\\"/></v:rect>
+                <v:oval fill=\\"t\\" strokecolor=\\"white\\" strokeweight=\\"4px\\" style=\\"position:absolute;left:261;top:130;width:78;height:78\\"><v:fill color=\\"black\\" opacity=\\"30%\\" /></v:oval>
+                <v:shape coordsize=\\"24,32\\" path=\\"m,l,32,24,16,xe\\" fillcolor=\\"white\\" stroked=\\"f\\" style=\\"position:absolute;left:289;top:152;width:30;height:34;\\" />
+            </v:group>
+            <![endif]-->
+
+            <div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A lovely video of a woman on the beach doing nothing.</span></p></div>
+        </div><table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding: 20px; border: 1px solid #E9E9E9; border-radius: 5px; margin: 0 0 1.5em; width: 100%;\\" width=\\"100%\\">
+            
+                <tbody><tr>
+                    <td align=\\"center\\" 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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                        <img src=\\"https://main.ghost.org/content/images/2023/12/ghost-logo.png\\" width=\\"560\\" height=\\"180\\" style=\\"-ms-interpolation-mode: bicubic; display: block; width: 100%; height: auto; max-width: 100%; border: none; padding-bottom: 16px;\\" border=\\"0\\">
+                    </td>
+                </tr>
+            
+            <tr>
+                <td valign=\\"top\\" 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: #15212A;\\">
+                    <h4 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;; text-rendering: optimizeLegibility; margin: 1.8em 0 0.5em 0; line-height: 1.2em; font-weight: 700; font-size: 22px; margin-top: 0; margin-bottom: 0;\\"><span style=\\"white-space: pre-wrap;\\">Make a blog!</span></h4>
+                </td>
+            </tr>
+            
+                <tr style=\\"padding-top:0; padding-bottom:0; margin-bottom:0; padding-bottom:0;\\">
+                    <td valign=\\"top\\" 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: #15212A;\\">
+                        <img src=\\"https://static.ghost.org/v4.0.0/images/star-rating-5.png\\" style=\\"-ms-interpolation-mode: bicubic; max-width: 100%; border: none; width: 96px;\\" border=\\"0\\" width=\\"96\\">
+                    </td>
+                </tr>
+            
+            <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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                    <div style=\\"padding-top: 8px; opacity: 0.7; font-size: 17px; line-height: 1.4; margin-bottom: -24px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">with Ghost</span></p></div>
+                </td>
+            </tr>
+            
+                <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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                        <div class=\\"btn btn-accent\\" style=\\"box-sizing: border-box; display: table; width: 100%; padding-top: 16px;\\">
+                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"background-color: #FF1A75; border-color: #FF1A75; overflow-wrap: anywhere; border: solid 1px; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 0; text-decoration: none; color: #FFFFFF; width: 100%; text-align: center;\\" target=\\"_blank\\"><span style=\\"display: block;padding: 12px 25px;\\">Click here</span></a>
+                        </div>
+                    </td>
+                </tr>
+            
+        </tbody></table><div class=\\"kg-header-card kg-v2\\" style=\\"margin: 0 0 1.5em 0; padding: 0; color: #FFFFFF; text-align: center; background-color: #000000;\\">
+            
+            <div class=\\"kg-header-card-content\\" style=\\"padding: 80px 48px;\\">
+                <h2 class=\\"kg-header-card-heading\\" 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; font-size: 3em; font-weight: 700; margin: 0; line-height: 1em; color: #FFFFFF;\\"><span style=\\"white-space: pre-wrap;\\">Good news everyone!</span></h2>
+                <p class=\\"kg-header-card-subheading\\" style=\\"line-height: 1.6em; margin: 0.75em 0 0; color: #FFFFFF;\\"><span style=\\"white-space: pre-wrap;\\">This header renders properly in </span><i><em class=\\"italic\\" style=\\"white-space: pre-wrap;\\">all</em></i><span style=\\"white-space: pre-wrap;\\"> email clients!</span></p>
+                
+            </div>
+        </div><div class=\\"kg-card kg-embed-card\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><!--[if !mso !vml]-->
+            <a class=\\"kg-video-preview\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" aria-label=\\"Play video\\" style=\\"background-color: #1d1f21; background-image: radial-gradient(circle at center, #5b5f66, #1d1f21); display: block; overflow-wrap: anywhere; color: #FF1A75; mso-hide: all; text-decoration: none;\\" target=\\"_blank\\">
+                <table cellpadding=\\"0\\" cellspacing=\\"0\\" border=\\"0\\" width=\\"100%\\" background=\\"https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg\\" role=\\"presentation\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-size: cover; min-height: 200px; background: url(&#39;https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg&#39;) left top / cover; mso-hide: all;\\">
+                    <tbody><tr style=\\"mso-hide: all\\">
+                        <td width=\\"25%\\" 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: #15212A; visibility: hidden; mso-hide: all;\\" valign=\\"top\\">
+                            <img src=\\"https://img.spacergif.org/v1/150x450/0a/spacer.png\\" alt width=\\"100%\\" border=\\"0\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; height: auto; opacity: 0; visibility: hidden; mso-hide: all;\\" height=\\"auto\\">
+                        </td>
+                        <td width=\\"50%\\" align=\\"center\\" valign=\\"middle\\" 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; color: #15212A; vertical-align: middle; mso-hide: all;\\">
+                            <div class=\\"kg-video-play-button\\" style=\\"height: 2em; width: 3em; margin: 0 auto; border-radius: 10px; padding: 1em 0.8em 0.6em 1em; font-size: 1em; background-color: rgba(0,0,0,0.85); mso-hide: all;\\"><div style=\\"display: block; width: 0; height: 0; margin: 0 auto; line-height: 0px; border-color: transparent transparent transparent white; border-style: solid; border-width: 0.8em 0 0.8em 1.5em; mso-hide: all;\\"></div></div>
+                        </td>
+                        <td width=\\"25%\\" 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: #15212A; mso-hide: all;\\" valign=\\"top\\">&#xA0;</td>
+                    </tr>
+                </tbody></table>
+            </a>
+            <!--[endif]-->
+
+            <!--[if vml]>
+            <v:group xmlns:v=\\"urn:schemas-microsoft-com:vml\\" xmlns:w=\\"urn:schemas-microsoft-com:office:word\\" coordsize=\\"600,450\\" coordorigin=\\"0,0\\" href=\\"https://www.youtube.com/watch?v=jfKfPfyJRdk\\" style=\\"width:600px;height:450px;\\">
+                <v:rect fill=\\"t\\" stroked=\\"f\\" style=\\"position:absolute;width:600;height:450;\\"><v:fill src=\\"https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg\\" type=\\"frame\\"/></v:rect>
+                <v:oval fill=\\"t\\" strokecolor=\\"white\\" strokeweight=\\"4px\\" style=\\"position:absolute;left:261;top:186;width:78;height:78\\"><v:fill color=\\"black\\" opacity=\\"30%\\" /></v:oval>
+                <v:shape coordsize=\\"24,32\\" path=\\"m,l,32,24,16,xe\\" fillcolor=\\"white\\" stroked=\\"f\\" style=\\"position:absolute;left:289;top:208;width:30;height:34;\\" />
+            </v:group>
+            <![endif]--></div><div></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Some text.</p><blockquote style=\\"margin: 0; padding: 0; border-left: #FF1A75 2px solid; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; padding: 0;\\">A blockquote</p></blockquote><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Some more text.</p><div class=\\"kg-card kg-code-card\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><pre style=\\"white-space: pre-wrap; overflow: auto; background: #15212A; padding: 15px; border-radius: 3px; line-height: 1.2em; color: #ffffff;\\"><code class=\\"language-javascript\\" style=\\"font-size: 0.9em;\\">console.log(&#39;Hello world!&#39;);</code></pre><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A tiny little script.</span></p></div></div><table cellspacing=\\"0\\" cellpadding=\\"4\\" border=\\"0\\" class=\\"kg-file-card\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto; width: 100%; margin: 0 0 1.5em 0; border-radius: 3px; border: 1px solid #e5eff5;\\">
+            <tbody><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: #15212A;\\" valign=\\"top\\">
+                    <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                        <tbody><tr>
+                            <td valign=\\"middle\\" 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; color: #15212A; vertical-align: middle;\\">
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-title\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 8px; font-size: 17px; font-weight: bold; line-height: 1.3em; overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">test</a>
+                                </td></tr></tbody></table>
+                                
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-description\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 2px; font-size: 15px; line-height: 1.4em; overflow-wrap: anywhere; text-decoration: none; color: #738a94;\\" target=\\"_blank\\">A tiny text file.</a>
+                                </td></tr></tbody></table>
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-meta\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 4px; padding-bottom: 8px; font-size: 13px; line-height: 1.4em; overflow-wrap: anywhere; text-decoration: none; color: #738a94;\\" target=\\"_blank\\"><span class=\\"kg-file-name\\" style=\\"font-weight: 500; color: #15212A;\\">test.txt</span> &#x2022; 16 Bytes</a>
+                                </td></tr></tbody></table>
+                            </td>
+                            <td width=\\"80\\" valign=\\"middle\\" class=\\"kg-file-thumbnail\\" 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; color: #15212A; position: relative; vertical-align: middle; text-align: center; border-radius: 2px; background-color: #FF1A75;\\" align=\\"center\\" bgcolor=\\"#FF1A75\\">
+                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; display: block; top: 0; right: 0; bottom: 0; left: 0;\\" target=\\"_blank\\">
+                                    <img src=\\"https://static.ghost.org/v4.0.0/images/download-icon-darkmode.png\\" style=\\"border: none; -ms-interpolation-mode: bicubic; margin-top: 6px; height: 24px; width: 24px; max-width: 24px;\\" width=\\"24\\" height=\\"24\\">
+                                </a>
+                            </td>
+                        </tr>
+                    </tbody></table>
+                </td>
+            </tr>
+        </tbody></table>
+                                                <!-- POST CONTENT END -->
+
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                            <!-- END MAIN CONTENT AREA -->
+
+
+
+
+                            <tr>
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
+                                        <tr>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                        </tr>
+
+                                            <tr>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                            </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                        </table>
+                        <!-- END CENTERED WHITE CONTAINER -->
+                    </div>
+                </td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+            </tr>
+
+            <!--[if mso]>
+                            </table>
+                        </center>
+                    </td>
+                </tr>
+            <![endif]-->
+        </table>
+    </body>
+</html>
+",
+  "plaintext": "
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • date
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+
+This is just a simple paragraph, no frills.
+
+> This is block quote
+
+> This is a...different block quote
+
+
+This is a heading!
+
+
+Here's a smaller heading.
+
+A lovely cow
+
+
+A heading
+
+
+and a paragraph (in markdown!)
+
+
+
+
+A paragraph inside an HTML card.
+
+
+And another one, with some bold text.
+
+
+
+----------------------------------------
+
+A gallery.
+
+
+
+
+
+
+Ghost: Independent technology for modern publishing
+Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.
+
+
+Ghost - The Professional Publishing Platform
+
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+My favorite website.
+
+
+
+
+Hey Vinz,
+
+
+
+Click me, I'm a button! [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+💡I had an idea...
+
+
+Spoiler alert!
+
+
+Just kidding
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+Sample [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+1:45 • Click to play audio [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+A lovely video of a woman on the beach doing nothing.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Make a blog!
+
+
+
+
+
+
+
+
+
+
+
+
+
+with Ghost
+
+
+
+
+
+
+
+
+Click here [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+Good news everyone!
+
+
+This header renders properly in all email clients!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+Some text.
+
+> A blockquote
+
+Some more text.
+
+console.log('Hello world!');
+
+A tiny little script.
+
+
+
+
+
+
+
+
+
+
+
+
+
+test [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+A tiny text file. [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+test.txt • 16 Bytes [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid]
+
+
+
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+",
+}
+`;
+
+exports[`Can send cards via email renders the golden post correctly 1 1`] = `
+Object {
+  "html": "<!doctype html>
+<html>
+    <head>
+        <meta name=\\"viewport\\" content=\\"width=device-width\\">
+        <meta http-equiv=\\"Content-Type\\" content=\\"text/html; charset=UTF-8\\">
+        <!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
+        <title>A random test post</title>
+        <style>
+.post-title-link {
+  color: #15212A;
+  display: block;
+  text-align: center;
+  margin-top: 32px;
+}
+.post-title-link-left {
+  text-align: left;
+}
+.view-online-link {
+  word-wrap: none;
+  white-space: nowrap;
+  color: #738a94;
+  text-decoration: underline !important;
+}
+.kg-nft-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 14px;
+  line-height: 1.3em;
+  padding-top: 4px;
+  padding-right: 20px;
+  padding-left: 20px;
+  padding-bottom: 4px;
+}
+.kg-twitter-link {
+  display: block;
+  text-decoration: none !important;
+  color: #15212A !important;
+  font-family: inherit !important;
+  font-size: 15px;
+  padding: 8px;
+  line-height: 1.3em;
+}
+.kg-audio-link {
+  color: #738a94 !important;
+}
+@media only screen and (max-width: 620px) {
+  table.body {
+    width: 100%;
+    min-width: 100%;
+  }
+
+  .hide-mobile {
+    display: none;
+  }
+
+  .mobile-only {
+    display: initial !important;
+  }
+
+  .hide-desktop {
+    display: initial !important;
+  }
+
+  .desktop-only {
+    display: none !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td {
+    font-size: 16px;
+  }
+
+  table.body .post-excerpt {
+    font-size: 16px !important;
+  }
+
+  table.body .kg-callout-card {
+    padding: 16px 24px !important;
+  }
+
+  table.body .kg-callout-text {
+    font-size: 16px !important;
+    line-height: 1.5em !important;
+  }
+
+  table.body pre {
+    white-space: pre-wrap !important;
+    word-break: break-word !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-spacing: 10px 0 !important;
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .btn table {
+    width: 100% !important;
+  }
+
+  table.body .btn a {
+    width: 100% !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+
+  table.body .site-icon {
+    padding-top: 0 !important;
+  }
+
+  table.body .site-info {
+    padding-top: 24px !important;
+  }
+
+  table.body .post-title-link {
+    margin-top: 24px !important;
+  }
+
+  table.body .post-meta-wrapper {
+    padding-bottom: 24px !important;
+  }
+
+  table.body .site-icon img {
+    width: 36px !important;
+    height: 36px !important;
+  }
+
+  table.body .site-url a {
+    font-size: 13px !important;
+    padding-bottom: 16px !important;
+  }
+
+  table.body .post-meta,
+table.body .post-meta-date {
+    white-space: normal !important;
+    font-size: 13px !important;
+    line-height: 1.2em;
+  }
+
+  table.body .post-meta,
+table.body .view-online {
+    width: 100% !important;
+  }
+
+  table.body .post-meta-left,
+table.body .post-meta-left.view-online {
+    width: 100% !important;
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online-mobile {
+    display: table-row !important;
+  }
+
+  table.body .post-meta-left.view-online-mobile,
+table.body .post-meta-left.view-online-mobile .view-online {
+    text-align: left !important;
+  }
+
+  table.body .post-meta.view-online.desktop {
+    display: none !important;
+  }
+
+  table.body .view-online {
+    text-decoration: underline;
+  }
+
+  table.body .footer p,
+table.body .footer p span {
+    font-size: 13px !important;
+  }
+
+  table.body .view-online-link,
+table.body .footer,
+table.body .footer a {
+    font-size: 13px !important;
+  }
+
+  table.body .post-title a {
+    font-size: 26px !important;
+    line-height: 1.1em !important;
+  }
+
+  table.feedback-buttons {
+    display: none !important;
+  }
+
+  table.feedback-buttons-mobile {
+    display: table !important;
+    width: 100% !important;
+    max-width: 390px;
+  }
+
+  table.body .feedback-button-mobile-text {
+    font-size: 13px !important;
+  }
+
+  table.body .latest-posts-header {
+    font-size: 12px !important;
+  }
+
+  table.body .latest-post-title {
+    padding-right: 8px !important;
+  }
+
+  table.body .latest-post h4,
+table.body .latest-post h4 span {
+    padding: 4px 0 6px !important;
+    font-size: 15px !important;
+  }
+
+  table.body .latest-post-excerpt,
+table.body .latest-post-excerpt a,
+table.body .latest-post-excerpt span {
+    font-size: 13px !important;
+    line-height: 1.2 !important;
+  }
+
+  table.body .subscription-box h3 {
+    font-size: 14px !important;
+  }
+
+  table.body .subscription-box p,
+table.body .subscription-box p span {
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details,
+table.body .manage-subscription {
+    display: inline-block;
+    width: 100%;
+    text-align: left !important;
+    font-size: 13px !important;
+  }
+
+  table.body .subscription-details {
+    padding-bottom: 12px;
+  }
+
+  table.body .kg-bookmark-card {
+    width: 90vw;
+  }
+
+  table.body .kg-bookmark-thumbnail {
+    display: none !important;
+  }
+
+  table.body .kg-bookmark-metadata span {
+    font-size: 13px !important;
+  }
+
+  table.body .kg-embed-card {
+    max-width: 90vw !important;
+  }
+
+  table.body h1 {
+    font-size: 32px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h2,
+table.body h2 span {
+    font-size: 26px !important;
+    line-height: 1.22em !important;
+  }
+
+  table.body h3 {
+    font-size: 21px !important;
+    line-height: 1.25em !important;
+  }
+
+  table.body h4 {
+    font-size: 19px !important;
+    line-height: 1.3em !important;
+  }
+
+  table.body h5 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body h6 {
+    font-size: 16px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote {
+    font-size: 16px !important;
+    line-height: 1.6em;
+    margin-bottom: 0;
+  }
+
+  table.body blockquote p {
+    margin-right: 15px !important;
+    margin-left: 15px !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt {
+    border-left: 0 none !important;
+    margin: 0 !important;
+    font-size: 18px !important;
+    line-height: 1.4em !important;
+  }
+
+  table.body blockquote.kg-blockquote-alt p {
+    margin-right: 20px !important;
+    margin-left: 20px !important;
+  }
+
+  table.body hr {
+    margin: 2em 0 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 span {
+    font-size: inherit !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-content {
+    padding-top: 64px !important;
+    padding-bottom: 64px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 52px !important;
+    padding-bottom: 52px !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+    font-size: 2.2em !important;
+    line-height: 1.1 !important;
+  }
+
+  table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+    line-height: 1.3em !important;
+  }
+
+  .feature-image-caption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption {
+    font-size: 13px!important;
+  }
+
+  .kg-card-figcaption p,
+.kg-card-figcaption p span {
+    font-size: 13px!important;
+  }
+}
+@media all {
+  .subscription-details p.hidden {
+    display: none !important;
+  }
+
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .apple-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+
+  .btn-primary table td:hover {
+    background-color: #34495e !important;
+  }
+
+  .btn-primary a:hover {
+    background-color: #34495e !important;
+    border-color: #34495e !important;
+  }
+}
+</style>
+    </head>
+    <body style=\\"background-color: #fff; 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;; -webkit-font-smoothing: antialiased; font-size: 18px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; color: #15212A;\\">
+        <span class=\\"preheader\\" style=\\"color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;\\">This is just a simple paragraph, no frills.
+
+This is block quote
+
+This is a...different block quote
+
+
+This is a heading!
+
+
+Here&#39;s a smaller heading.
+
+
+A heading
+
+
+and a paragraph (in markdown!)
+
+
+
+
+A paragraph inside an HTML card.
+
+
+And another one, with some bold text.
+
+
+
+Ghost: Independent technology for modern publishingBeautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.Ghost - The Profes</span>
+        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"body\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #fff; width: 100%;\\" bgcolor=\\"#fff\\">
+            <!-- Outlook doesn't respect max-width so we need an extra centered table -->
+            <!--[if mso]>
+            <tr>
+                <td>
+                    <center>
+                        <table border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"600\\">
+            <![endif]-->
+            <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+                <td class=\\"container\\" 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: #15212A; display: block; max-width: 600px; margin: 0 auto;\\" valign=\\"top\\">
+                    <div class=\\"content\\" style=\\"box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px;\\">
+                        <!-- START CENTERED WHITE CONTAINER -->
+                        <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" class=\\"main\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; border-spacing: 20px 0; width: 100%;\\">
+
+                            <!-- START MAIN CONTENT AREA -->
+                            <tr>
+                                <td class=\\"wrapper\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                            <tr class=\\"header-image-row\\">
+                                                <td class=\\"header-image\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 24px; padding-bottom: 16px;\\" valign=\\"top\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">
+                                                        <img src=\\"http://127.0.0.1:2369/content/images/2022/05/test.jpg\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%;\\">
+                                                    </a>
+                                                </td>
+                                            </tr>
+
+                                            <tr class=\\"site-info-row\\">
+                                                <td class=\\"site-info\\" width=\\"100%\\" align=\\"center\\" 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: #15212A; padding-top: 32px;\\" 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 class=\\"site-url \\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-title\\" style=\\"text-decoration: none; color: #15212A; overflow-wrap: anywhere;\\" target=\\"_blank\\">Ghost</a></div></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class=\\"site-url site-url-bottom-padding\\" 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;; vertical-align: top; color: #15212A; font-size: 16px; letter-spacing: -0.1px; font-weight: 700; text-transform: uppercase; text-align: center; padding-bottom: 12px;\\" valign=\\"top\\" align=\\"center\\"><div style=\\"width: 100% !important;\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"site-subtitle\\" style=\\"text-decoration: none; color: #738a94; font-size: 13px; font-weight: 400; text-transform: none; overflow-wrap: anywhere;\\" target=\\"_blank\\">Daily newsletter</a></div></td>
+                                                            </tr>
+
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td class=\\"post-title post-title-no-excerpt post-title-serif\\" style=\\"vertical-align: top; color: #15212A; font-size: 36px; line-height: 1.1em; font-weight: 700; text-align: center; padding-bottom: 16px; font-family: Georgia, serif; letter-spacing: -0.01em;\\" valign=\\"top\\" align=\\"center\\">
+                                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"post-title-link\\" style=\\"text-decoration: none; color: #15212A; display: block; text-align: center; margin-top: 32px; overflow-wrap: anywhere;\\" target=\\"_blank\\">A random test post</a>
+                                                </td>
+                                            </tr>
+                                            <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: #15212A; width: 100%;\\" width=\\"100%\\" valign=\\"top\\">
+                                                    <table class=\\"post-meta-wrapper\\" role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-bottom: 32px;\\">
+                                                        <tr>
+                                                            <td height=\\"20\\" class=\\"post-meta post-meta-center\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; padding: 0;\\" valign=\\"top\\" align=\\"center\\">
+                                                                By Joe Bloggs &#x2022; <span class=\\"post-meta-date\\" style=\\"white-space: nowrap;\\">date </span>
+                                                            </td>
+                                                            <td class=\\"post-meta post-meta-center view-online desktop\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; display: none;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                        <tr class=\\"post-meta post-meta-center view-online-mobile\\" style=\\"color: #738a94; font-size: 13px; font-weight: 400; text-align: center;\\" align=\\"center\\">
+                                                            <td height=\\"20\\" class=\\"view-online\\" 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;; vertical-align: top; color: #738a94; font-size: 13px; font-weight: 400; text-align: center; text-decoration: underline;\\" valign=\\"top\\" align=\\"center\\">
+                                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"view-online-link\\" style=\\"word-wrap: none; white-space: nowrap; color: #738a94; overflow-wrap: anywhere; text-decoration: underline;\\" target=\\"_blank\\">View in browser</a>
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+
+                                        <tr class=\\"post-content-row\\">
+                                            <td class=\\"post-content\\" style=\\"vertical-align: top; font-family: Georgia, serif; font-size: 18px; line-height: 1.5em; color: #15212A; padding-bottom: 20px; border-bottom: 1px solid #e5eff5; max-width: 600px;\\" valign=\\"top\\">
+                                                <!-- POST CONTENT START -->
+                                                <p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">This is just a simple paragraph, no frills.</p><blockquote style=\\"margin: 0; padding: 0; border-left: #FF1A75 2px solid; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; padding: 0;\\">This is block quote</p></blockquote><blockquote class=\\"kg-blockquote-alt\\" style=\\"margin: 0; padding: 0; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px; border-left: 0 none; text-align: center; font-size: 1.2em; font-style: italic; color: #738a94;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; margin-right: 50px; margin-left: 50px; padding: 0;\\">This is a...different block quote</p></blockquote><h2 id=\\"this-is-a-heading\\" 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 32px;\\">This is a heading!</h2><h3 id=\\"heres-a-smaller-heading\\" 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; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 26px;\\">Here&#39;s a smaller heading.</h3><div class=\\"kg-card kg-image-card kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><img src=\\"https://upload.wikimedia.org/wikipedia/commons/thumb/8/8c/Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg/1920px-Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg\\" class=\\"kg-image\\" alt=\\"Cows eat grass.\\" loading=\\"lazy\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; margin: 0 auto; height: auto; width: auto;\\" width=\\"auto\\" height=\\"auto\\"><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><span style=\\"text-align: center; white-space: pre-wrap;\\">A lovely cow</span></div></div><h1 id=\\"a-heading\\" 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: 1.5em 0 0.5em 0; font-size: 42px; font-weight: 700;\\">A heading</h1>
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">and a paragraph (in markdown!)</p>
+
+<!--kg-card-begin: html-->
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">A paragraph inside an HTML card.</p>
+<p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">And another one, with some <b>bold</b> text.</p>
+<!--kg-card-end: html-->
+<hr style=\\"position: relative; display: block; width: 100%; margin: 3em 0; padding: 0; height: 1px; border: 0; border-top: 1px solid #e5eff5;\\"><div class=\\"kg-card kg-gallery-card kg-width-wide kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><div class=\\"kg-gallery-container\\" style=\\"margin-top: -20px;\\"><div class=\\"kg-gallery-row\\"><div class=\\"kg-gallery-image\\"><img src=\\"https://plus.unsplash.com/premium_photo-1700558685152-81f821a40724?q=80&amp;w=2070&amp;auto=format&amp;fit=crop&amp;ixlib=rb-4.0.3&amp;ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D\\" width=\\"600\\" height=\\"400\\" loading=\\"lazy\\" alt style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; padding-top: 20px; width: 100%; height: auto;\\"></div></div></div><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A gallery.</span></p></div></div><div>
+        <!--[if !mso !vml]-->
+            <div class=\\"kg-card kg-bookmark-card kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0; width: 100%; background: #ffffff;\\">
+                <a class=\\"kg-bookmark-container\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"display: flex; min-height: 148px; font-family: -apple-system, BlinkMacSystemFont, &#39;Segoe UI&#39;, Roboto, Oxygen, Ubuntu, Cantarell, &#39;Open Sans&#39;, &#39;Helvetica Neue&#39;, sans-serif; border-radius: 3px; border: 1px solid #e5eff5; overflow-wrap: anywhere; color: #FF1A75; text-decoration: none;\\" target=\\"_blank\\">
+                    <div class=\\"kg-bookmark-content\\" style=\\"display: inline-block; width: 100%; padding: 20px;\\">
+                        <div class=\\"kg-bookmark-title\\" style=\\"color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600;\\">Ghost: Independent technology for modern publishing</div>
+                        <div class=\\"kg-bookmark-description\\" style=\\"display: -webkit-box; overflow-y: hidden; margin-top: 12px; max-height: 40px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400; -webkit-line-clamp: 2; -webkit-box-orient: vertical;\\">Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.</div>
+                        <div class=\\"kg-bookmark-metadata\\" style=\\"display: flex; flex-wrap: wrap; align-items: center; margin-top: 14px; color: #15212A; font-size: 13px; font-weight: 400;\\">
+                            <img class=\\"kg-bookmark-icon\\" src=\\"https://ghost.org/favicon.ico\\" alt style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; margin-right: 8px; width: 22px; height: 22px;\\" width=\\"22\\" height=\\"22\\">
+                            <span class=\\"kg-bookmark-author\\" src=\\"Ghost - The Professional Publishing Platform\\" style=\\"line-height: 1.5em;\\">Ghost - The Professional Publishing Platform</span>
+                            
+                        </div>
+                    </div>
+                    <div class=\\"kg-bookmark-thumbnail\\" 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(&#39;https://ghost.org/images/meta/ghost.png&#39;);\\">
+                        <img src=\\"https://ghost.org/images/meta/ghost.png\\" alt onerror=\\"this.style.display=&#39;none&#39;\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: none;\\"></div>
+                </a>
+                <div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">My favorite website.</span></p></div>
+            </div>
+        <!--[endif]-->
+        <!--[if vml]>
+            <table class=\\"kg-card kg-bookmark-card--outlook\\" style=\\"margin: 0; padding: 0; width: 100%; border: 1px solid #e5eff5; background: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; border-collapse: collapse; border-spacing: 0;\\" width=\\"100%\\">
+                <tr>
+                    <td width=\\"100%\\" style=\\"padding: 20px;\\">
+                        <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
+                            <tr>
+                                <td class=\\"kg-bookmark-title--outlook\\">
+                                    <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A; font-size: 15px; line-height: 1.5em; font-weight: 600;\\">
+                                        Ghost: Independent technology for modern publishing
+                                    </a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <div class=\\"kg-bookmark-description--outlook\\">
+                                        <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; margin-top: 12px; color: #738a94; font-size: 13px; line-height: 1.5em; font-weight: 400;\\">
+                                            Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.
+                                        </a>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class=\\"kg-bookmark-metadata--outlook\\" style=\\"padding-top: 14px; color: #15212A; font-size: 13px; font-weight: 400; line-height: 1.5em;\\">
+                                    <table style=\\"margin: 0; padding: 0; border-collapse: collapse; border-spacing: 0;\\">
+                                        <tr>
+                                            
+                                                <td valign=\\"middle\\" class=\\"kg-bookmark-icon--outlook\\" style=\\"padding-right: 8px; font-size: 0; line-height: 1.5em;\\">
+                                                    <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A;\\">
+                                                        <img src=\\"https://ghost.org/favicon.ico\\" width=\\"22\\" height=\\"22\\" alt=\\" \\">
+                                                    </a>
+                                                </td>
+                                            
+                                            <td valign=\\"middle\\" class=\\"kg-bookmark-byline--outlook\\">
+                                                <a href=\\"https://ghost.org\\" style=\\"text-decoration: none; color: #15212A;\\">
+                                                    Ghost - The Professional Publishing Platform
+                                                    
+                                                    
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+            <div class=\\"kg-bookmark-spacer--outlook\\" style=\\"height: 1.5em;\\">&nbsp;</div>
+        <![endif]--></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">Hey </span><span>Vinz</span><span style=\\"white-space: pre-wrap;\\">,</span></p><!--members-only--><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"></p><div class=\\"btn btn-accent\\" style=\\"box-sizing: border-box; width: 100%; display: table;\\"><table border=\\"0\\" cellspacing=\\"0\\" cellpadding=\\"0\\" align=\\"center\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;\\" width=\\"auto\\"><tr><td align=\\"center\\" style=\\"font-size: 18px; vertical-align: top; color: #15212A; border-radius: 5px; text-align: center; 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;; background-color: #FF1A75;\\" valign=\\"top\\" bgcolor=\\"#FF1A75\\"><a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-decoration: none; background-color: #FF1A75; border-color: #FF1A75; color: #FFFFFF;\\" target=\\"_blank\\">Click me, I&#39;m a button!</a></td></tr></table></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"></p><div class=\\"kg-card kg-callout-card kg-callout-card-blue\\" style=\\"display: flex; margin: 0 0 1.5em 0; padding: 20px 28px; border-radius: 3px; background: #E9F6FB;\\"><div class=\\"kg-callout-emoji\\" style=\\"padding-right: 12px; font-size: 20px;\\">&#x1F4A1;</div><div class=\\"kg-callout-text\\">I had an idea...</div></div><div style=\\"background: transparent;
+        border: 1px solid rgba(124, 139, 154, 0.25); border-radius: 4px; padding: 20px; margin-bottom: 1.5em;\\">
+            <h4 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;; text-rendering: optimizeLegibility; margin: 1.8em 0 0.5em 0; line-height: 1.2em; font-size: 1.375rem; font-weight: 600; margin-bottom: 8px; margin-top: 0px;\\"><span style=\\"white-space: pre-wrap;\\">Spoiler alert!</span></h4>
+            <div style=\\"font-size: 1rem; line-height: 1.5; margin-bottom: -1.5em;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">Just kidding</span></p></div>
+        </div><table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" class=\\"kg-audio-card\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto; width: 100%; margin: 0 auto 1.5em; border-radius: 3px; border: 1px solid #e5eff5;\\" width=\\"100%\\">
+                <tbody><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: #15212A;\\" valign=\\"top\\">
+                        <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                            <tbody><tr>
+                                <td width=\\"60\\" 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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; display: block; width: 60px; height: 60px; padding-top: 4px; padding-right: 16px; padding-bottom: 4px; padding-left: 4px; border-radius: 2px;\\" target=\\"_blank\\">
+                                        
+                                        <img src=\\"https://static.ghost.org/v4.0.0/images/audio-file-icon.png\\" class=\\"kg-audio-thumbnail placeholder\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 24px; height: 24px; padding: 18px; border-radius: 2px; background-color: #FF1A75;\\" width=\\"24\\" height=\\"24\\">
+                                        
+                                    </a>
+                                </td>
+                                <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; color: #15212A; position: relative; vertical-align: center;\\" valign=\\"center\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; position: absolute; display: block; top: 0; right: 0; bottom: 0; left: 0;\\" target=\\"_blank\\"></a>
+                                    <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                        <tbody><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: #15212A;\\" valign=\\"top\\">
+                                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-title\\" style=\\"display: block; padding-right: 20px; padding-bottom: 4px; padding-top: 4px; font-size: 16px; font-weight: 600; line-height: 18px; overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">Sample</a>
+                                            </td>
+                                        </tr>
+                                        <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: #15212A;\\" valign=\\"top\\">
+                                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                                                    <tbody><tr>
+                                                        <td width=\\"24\\" 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; color: #15212A; vertical-align: middle;\\" valign=\\"middle\\">
+                                                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-play-button\\" style=\\"display: block; box-sizing: border-box; width: 16px; height: 16px; border-style: solid; border-width: 8px 0px 8px 16px; border-color: transparent transparent transparent currentColor; overflow-wrap: anywhere; text-decoration: underline; color: #15212A;\\" target=\\"_blank\\"></a>
+                                                        </td>
+                                                        <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; color: #15212A; vertical-align: middle;\\" valign=\\"middle\\">
+                                                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-audio-duration\\" style=\\"display: block; font-size: 13px; overflow-wrap: anywhere; text-decoration: none; color: #15171A;\\" target=\\"_blank\\">1:45<span class=\\"kg-audio-link\\" style=\\"color: #738a94;\\"> &#x2022; Click to play audio</span></a>
+                                                        </td>
+                                                    </tr>
+                                                </tbody></table>
+                                            </td>
+                                        </tr>
+                                    </tbody></table>
+                                </td>
+                            </tr>
+                        </tbody></table>
+                    </td>
+                </tr>
+            </tbody></table><div class=\\"kg-card kg-video-card kg-width-regular kg-card-hascaption\\" style=\\"margin: 0 0 1.5em; padding: 0;\\">
+            <!--[if !mso !vml]-->
+            <a class=\\"kg-video-preview\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" aria-label=\\"Play video\\" style=\\"background-color: #1d1f21; background-image: radial-gradient(circle at center, #5b5f66, #1d1f21); display: block; overflow-wrap: anywhere; color: #FF1A75; mso-hide: all; text-decoration: none;\\" target=\\"_blank\\">
+                <table cellpadding=\\"0\\" cellspacing=\\"0\\" border=\\"0\\" width=\\"100%\\" background=\\"https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg\\" role=\\"presentation\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-size: cover; min-height: 200px; background: url(&#39;https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg&#39;) left top / cover; mso-hide: all;\\">
+                    <tbody><tr style=\\"mso-hide: all\\">
+                        <td width=\\"25%\\" 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: #15212A; visibility: hidden; mso-hide: all;\\" valign=\\"top\\">
+                            <img src=\\"https://img.spacergif.org/v1/150x338/0a/spacer.png\\" alt width=\\"100%\\" border=\\"0\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; height: auto; opacity: 0; visibility: hidden; mso-hide: all;\\" height=\\"auto\\">
+                        </td>
+                        <td width=\\"50%\\" align=\\"center\\" valign=\\"middle\\" 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; color: #15212A; vertical-align: middle; mso-hide: all;\\">
+                            <div class=\\"kg-video-play-button\\" style=\\"height: 2em; width: 3em; margin: 0 auto; border-radius: 10px; padding: 1em 0.8em 0.6em 1em; font-size: 1em; background-color: rgba(0,0,0,0.85); mso-hide: all;\\"><div style=\\"display: block; width: 0; height: 0; margin: 0 auto; line-height: 0px; border-color: transparent transparent transparent white; border-style: solid; border-width: 0.8em 0 0.8em 1.5em; mso-hide: all;\\"></div></div>
+                        </td>
+                        <td width=\\"25%\\" 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: #15212A; mso-hide: all;\\" valign=\\"top\\">&#xA0;</td>
+                    </tr>
+                </tbody></table>
+            </a>
+            <!--[endif]-->
+
+            <!--[if vml]>
+            <v:group xmlns:v=\\"urn:schemas-microsoft-com:vml\\" xmlns:w=\\"urn:schemas-microsoft-com:office:word\\" coordsize=\\"600,338\\" coordorigin=\\"0,0\\" href=\\"http://127.0.0.1:2369/404/\\" style=\\"width:600px;height:338px;\\">
+                <v:rect fill=\\"t\\" stroked=\\"f\\" style=\\"position:absolute;width:600;height:338;\\"><v:fill src=\\"https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg\\" type=\\"frame\\"/></v:rect>
+                <v:oval fill=\\"t\\" strokecolor=\\"white\\" strokeweight=\\"4px\\" style=\\"position:absolute;left:261;top:130;width:78;height:78\\"><v:fill color=\\"black\\" opacity=\\"30%\\" /></v:oval>
+                <v:shape coordsize=\\"24,32\\" path=\\"m,l,32,24,16,xe\\" fillcolor=\\"white\\" stroked=\\"f\\" style=\\"position:absolute;left:289;top:152;width:30;height:34;\\" />
+            </v:group>
+            <![endif]-->
+
+            <div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A lovely video of a woman on the beach doing nothing.</span></p></div>
+        </div><table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding: 20px; border: 1px solid #E9E9E9; border-radius: 5px; margin: 0 0 1.5em; width: 100%;\\" width=\\"100%\\">
+            
+                <tbody><tr>
+                    <td align=\\"center\\" 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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                        <img src=\\"https://main.ghost.org/content/images/2023/12/ghost-logo.png\\" width=\\"560\\" height=\\"180\\" style=\\"-ms-interpolation-mode: bicubic; display: block; width: 100%; height: auto; max-width: 100%; border: none; padding-bottom: 16px;\\" border=\\"0\\">
+                    </td>
+                </tr>
+            
+            <tr>
+                <td valign=\\"top\\" 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: #15212A;\\">
+                    <h4 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;; text-rendering: optimizeLegibility; margin: 1.8em 0 0.5em 0; line-height: 1.2em; font-weight: 700; font-size: 22px; margin-top: 0; margin-bottom: 0;\\"><span style=\\"white-space: pre-wrap;\\">Make a blog!</span></h4>
+                </td>
+            </tr>
+            
+                <tr style=\\"padding-top:0; padding-bottom:0; margin-bottom:0; padding-bottom:0;\\">
+                    <td valign=\\"top\\" 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: #15212A;\\">
+                        <img src=\\"https://static.ghost.org/v4.0.0/images/star-rating-5.png\\" style=\\"-ms-interpolation-mode: bicubic; max-width: 100%; border: none; width: 96px;\\" border=\\"0\\" width=\\"96\\">
+                    </td>
+                </tr>
+            
+            <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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                    <div style=\\"padding-top: 8px; opacity: 0.7; font-size: 17px; line-height: 1.4; margin-bottom: -24px;\\"><p dir=\\"ltr\\" style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">with Ghost</span></p></div>
+                </td>
+            </tr>
+            
+                <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: #15212A; padding-top: 0; padding-bottom: 0; margin-bottom: 0; padding-bottom: 0;\\" valign=\\"top\\">
+                        <div class=\\"btn btn-accent\\" style=\\"box-sizing: border-box; display: table; width: 100%; padding-top: 16px;\\">
+                            <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"background-color: #FF1A75; border-color: #FF1A75; overflow-wrap: anywhere; border: solid 1px; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 0; text-decoration: none; color: #FFFFFF; width: 100%; text-align: center;\\" target=\\"_blank\\"><span style=\\"display: block;padding: 12px 25px;\\">Click here</span></a>
+                        </div>
+                    </td>
+                </tr>
+            
+        </tbody></table><div class=\\"kg-header-card kg-v2\\" style=\\"margin: 0 0 1.5em 0; padding: 0; color: #FFFFFF; text-align: center; background-color: #000000;\\">
+            
+            <div class=\\"kg-header-card-content\\" style=\\"padding: 80px 48px;\\">
+                <h2 class=\\"kg-header-card-heading\\" 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; font-size: 3em; font-weight: 700; margin: 0; line-height: 1em; color: #FFFFFF;\\"><span style=\\"white-space: pre-wrap;\\">Good news everyone!</span></h2>
+                <p class=\\"kg-header-card-subheading\\" style=\\"line-height: 1.6em; margin: 0.75em 0 0; color: #FFFFFF;\\"><span style=\\"white-space: pre-wrap;\\">This header renders properly in </span><i><em class=\\"italic\\" style=\\"white-space: pre-wrap;\\">all</em></i><span style=\\"white-space: pre-wrap;\\"> email clients!</span></p>
+                
+            </div>
+        </div><div class=\\"kg-card kg-embed-card\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><!--[if !mso !vml]-->
+            <a class=\\"kg-video-preview\\" href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" aria-label=\\"Play video\\" style=\\"background-color: #1d1f21; background-image: radial-gradient(circle at center, #5b5f66, #1d1f21); display: block; overflow-wrap: anywhere; color: #FF1A75; mso-hide: all; text-decoration: none;\\" target=\\"_blank\\">
+                <table cellpadding=\\"0\\" cellspacing=\\"0\\" border=\\"0\\" width=\\"100%\\" background=\\"https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg\\" role=\\"presentation\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-size: cover; min-height: 200px; background: url(&#39;https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg&#39;) left top / cover; mso-hide: all;\\">
+                    <tbody><tr style=\\"mso-hide: all\\">
+                        <td width=\\"25%\\" 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: #15212A; visibility: hidden; mso-hide: all;\\" valign=\\"top\\">
+                            <img src=\\"https://img.spacergif.org/v1/150x450/0a/spacer.png\\" alt width=\\"100%\\" border=\\"0\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: block; height: auto; opacity: 0; visibility: hidden; mso-hide: all;\\" height=\\"auto\\">
+                        </td>
+                        <td width=\\"50%\\" align=\\"center\\" valign=\\"middle\\" 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; color: #15212A; vertical-align: middle; mso-hide: all;\\">
+                            <div class=\\"kg-video-play-button\\" style=\\"height: 2em; width: 3em; margin: 0 auto; border-radius: 10px; padding: 1em 0.8em 0.6em 1em; font-size: 1em; background-color: rgba(0,0,0,0.85); mso-hide: all;\\"><div style=\\"display: block; width: 0; height: 0; margin: 0 auto; line-height: 0px; border-color: transparent transparent transparent white; border-style: solid; border-width: 0.8em 0 0.8em 1.5em; mso-hide: all;\\"></div></div>
+                        </td>
+                        <td width=\\"25%\\" 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: #15212A; mso-hide: all;\\" valign=\\"top\\">&#xA0;</td>
+                    </tr>
+                </tbody></table>
+            </a>
+            <!--[endif]-->
+
+            <!--[if vml]>
+            <v:group xmlns:v=\\"urn:schemas-microsoft-com:vml\\" xmlns:w=\\"urn:schemas-microsoft-com:office:word\\" coordsize=\\"600,450\\" coordorigin=\\"0,0\\" href=\\"https://www.youtube.com/watch?v=jfKfPfyJRdk\\" style=\\"width:600px;height:450px;\\">
+                <v:rect fill=\\"t\\" stroked=\\"f\\" style=\\"position:absolute;width:600;height:450;\\"><v:fill src=\\"https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg\\" type=\\"frame\\"/></v:rect>
+                <v:oval fill=\\"t\\" strokecolor=\\"white\\" strokeweight=\\"4px\\" style=\\"position:absolute;left:261;top:186;width:78;height:78\\"><v:fill color=\\"black\\" opacity=\\"30%\\" /></v:oval>
+                <v:shape coordsize=\\"24,32\\" path=\\"m,l,32,24,16,xe\\" fillcolor=\\"white\\" stroked=\\"f\\" style=\\"position:absolute;left:289;top:208;width:30;height:34;\\" />
+            </v:group>
+            <![endif]--></div><div></div><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Some text.</p><blockquote style=\\"margin: 0; padding: 0; border-left: #FF1A75 2px solid; font-size: 17px; font-weight: 500; line-height: 1.6em; letter-spacing: -0.2px;\\"><p style=\\"line-height: 1.6em; margin: 2em 25px; font-size: 1em; padding: 0;\\">A blockquote</p></blockquote><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\">Some more text.</p><div class=\\"kg-card kg-code-card\\" style=\\"margin: 0 0 1.5em; padding: 0;\\"><pre style=\\"white-space: pre-wrap; overflow: auto; background: #15212A; padding: 15px; border-radius: 3px; line-height: 1.2em; color: #ffffff;\\"><code class=\\"language-javascript\\" style=\\"font-size: 0.9em;\\">console.log(&#39;Hello world!&#39;);</code></pre><div class=\\"kg-card-figcaption\\" style=\\"text-align: center; 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;; padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; color: #738a94; font-size: 13px;\\"><p style=\\"margin: 0 0 1.5em 0; line-height: 1.6em;\\"><span style=\\"white-space: pre-wrap;\\">A tiny little script.</span></p></div></div><table cellspacing=\\"0\\" cellpadding=\\"4\\" border=\\"0\\" class=\\"kg-file-card\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto; width: 100%; margin: 0 0 1.5em 0; border-radius: 3px; border: 1px solid #e5eff5;\\">
+            <tbody><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: #15212A;\\" valign=\\"top\\">
+                    <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\">
+                        <tbody><tr>
+                            <td valign=\\"middle\\" 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; color: #15212A; vertical-align: middle;\\">
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-title\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 8px; font-size: 17px; font-weight: bold; line-height: 1.3em; overflow-wrap: anywhere; text-decoration: none; color: #15212A;\\" target=\\"_blank\\">test</a>
+                                </td></tr></tbody></table>
+                                
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-description\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 2px; font-size: 15px; line-height: 1.4em; overflow-wrap: anywhere; text-decoration: none; color: #738a94;\\" target=\\"_blank\\">A tiny text file.</a>
+                                </td></tr></tbody></table>
+                                
+                                <table cellspacing=\\"0\\" cellpadding=\\"0\\" border=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\\"><tbody><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: #15212A;\\" valign=\\"top\\">
+                                    <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" class=\\"kg-file-meta\\" style=\\"display: block; width: 100%; padding-left: 12px; padding-top: 4px; padding-bottom: 8px; font-size: 13px; line-height: 1.4em; overflow-wrap: anywhere; text-decoration: none; color: #738a94;\\" target=\\"_blank\\"><span class=\\"kg-file-name\\" style=\\"font-weight: 500; color: #15212A;\\">test.txt</span> &#x2022; 16 Bytes</a>
+                                </td></tr></tbody></table>
+                            </td>
+                            <td width=\\"80\\" valign=\\"middle\\" class=\\"kg-file-thumbnail\\" 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; color: #15212A; position: relative; vertical-align: middle; text-align: center; border-radius: 2px; background-color: #FF1A75;\\" align=\\"center\\" bgcolor=\\"#FF1A75\\">
+                                <a href=\\"http://127.0.0.1:2369/r/xxxxxx?m=member-uuid\\" style=\\"overflow-wrap: anywhere; color: #FF1A75; text-decoration: underline; display: block; top: 0; right: 0; bottom: 0; left: 0;\\" target=\\"_blank\\">
+                                    <img src=\\"https://static.ghost.org/v4.0.0/images/download-icon-darkmode.png\\" style=\\"border: none; -ms-interpolation-mode: bicubic; margin-top: 6px; height: 24px; width: 24px; max-width: 24px;\\" width=\\"24\\" height=\\"24\\">
+                                </a>
+                            </td>
+                        </tr>
+                    </tbody></table>
+                </td>
+            </tr>
+        </tbody></table>
+                                                <!-- POST CONTENT END -->
+
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                            <!-- END MAIN CONTENT AREA -->
+
+
+
+
+                            <tr>
+                                <td class=\\"wrapper\\" align=\\"center\\" 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: #15212A; box-sizing: border-box;\\" valign=\\"top\\">
+                                    <table role=\\"presentation\\" border=\\"0\\" cellpadding=\\"0\\" cellspacing=\\"0\\" width=\\"100%\\" style=\\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 40px; padding-bottom: 30px;\\">
+                                        <tr>
+                                            <td class=\\"footer\\" 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;; vertical-align: top; color: #738a94; margin-top: 20px; text-align: center; padding-bottom: 10px; padding-top: 10px; padding-left: 30px; padding-right: 30px; line-height: 1.5em; font-size: 13px;\\" valign=\\"top\\" align=\\"center\\">Ghost &#xA9; 2024 &#x2013; <a href=\\"http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid\\" style=\\"overflow-wrap: anywhere; color: #738a94; text-decoration: underline; font-size: 13px;\\" target=\\"_blank\\">Unsubscribe</a></td>
+                                        </tr>
+
+                                            <tr>
+                                                <td class=\\"footer-powered\\" 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: #15212A; text-align: center; padding-top: 70px; padding-bottom: 40px;\\" valign=\\"top\\" align=\\"center\\"><a href=\\"https://ghost.org/?via=pbg-newsletter&amp;ref=127.0.0.1\\" style=\\"color: #FF1A75; text-decoration: none; overflow-wrap: anywhere;\\" target=\\"_blank\\"><img src=\\"https://static.ghost.org/v4.0.0/images/powered.png\\" border=\\"0\\" width=\\"142\\" height=\\"30\\" class=\\"gh-powered\\" alt=\\"Powered by Ghost\\" style=\\"border: none; -ms-interpolation-mode: bicubic; max-width: 100%; width: 142px; height: 30px;\\"></a></td>
+                                            </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                        </table>
+                        <!-- END CENTERED WHITE CONTAINER -->
+                    </div>
+                </td>
+                <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: #15212A;\\" valign=\\"top\\">&#xA0;</td>
+            </tr>
+
+            <!--[if mso]>
+                            </table>
+                        </center>
+                    </td>
+                </tr>
+            <![endif]-->
+        </table>
+    </body>
+</html>
+",
+  "plaintext": "
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+
+Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+By Joe Bloggs • date
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+
+This is just a simple paragraph, no frills.
+
+> This is block quote
+
+> This is a...different block quote
+
+
+This is a heading!
+
+
+Here's a smaller heading.
+
+A lovely cow
+
+
+A heading
+
+
+and a paragraph (in markdown!)
+
+
+
+
+A paragraph inside an HTML card.
+
+
+And another one, with some bold text.
+
+
+
+----------------------------------------
+
+A gallery.
+
+
+
+
+
+
+Ghost: Independent technology for modern publishing
+Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.
+
+
+Ghost - The Professional Publishing Platform
+
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+My favorite website.
+
+
+
+
+Hey Vinz,
+
+
+
+Click me, I'm a button! [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+💡I had an idea...
+
+
+Spoiler alert!
+
+
+Just kidding
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+Sample [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+1:45 • Click to play audio [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+A lovely video of a woman on the beach doing nothing.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Make a blog!
+
+
+
+
+
+
+
+
+
+
+
+
+
+with Ghost
+
+
+
+
+
+
+
+
+Click here [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+
+
+
+Good news everyone!
+
+
+This header renders properly in all email clients!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+Some text.
+
+> A blockquote
+
+Some more text.
+
+console.log('Hello world!');
+
+A tiny little script.
+
+
+
+
+
+
+
+
+
+
+
+
+
+test [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+A tiny text file. [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+test.txt • 16 Bytes [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid]
+
+
+
+
+
+
+
+http://127.0.0.1:2369/r/xxxxxx?m=member-uuid
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid]
+
+
+
+https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1
 
 
 
diff --git a/ghost/core/test/integration/services/email-service/batch-sending.test.js b/ghost/core/test/integration/services/email-service/batch-sending.test.js
index cee09088e72..3345ab21d98 100644
--- a/ghost/core/test/integration/services/email-service/batch-sending.test.js
+++ b/ghost/core/test/integration/services/email-service/batch-sending.test.js
@@ -54,7 +54,7 @@ async function testEmailBatches(settings, email_recipient_filter, expectedBatche
     assert.equal(emailModel.get('email_count'), expectedTotal, 'This email should have an email_count of ' + expectedTotal + ' recipients');
 
     // Did we create batches?
-    const batches = await models.EmailBatch.findAll({filter: `email_id:${emailModel.id}`});
+    const batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
     assert.equal(batches.models.length, expectedBatches.length);
     const remainingBatches = batches.models.slice();
     const emailRecipients = [];
@@ -74,7 +74,7 @@ async function testEmailBatches(settings, email_recipient_filter, expectedBatche
         assert.equal(firstBatch.get('error_data'), null);
 
         // Did we create recipients?
-        const emailRecipientsFirstBatch = await models.EmailRecipient.findAll({filter: `email_id:${emailModel.id}+batch_id:${firstBatch.id}`});
+        const emailRecipientsFirstBatch = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel.id}'+batch_id:'${firstBatch.id}'`});
         assert.equal(emailRecipientsFirstBatch.models.length, expectedBatch.recipients);
 
         emailRecipients.push(...emailRecipientsFirstBatch.models);
@@ -142,7 +142,7 @@ describe('Batch sending tests', function () {
         assert.equal(emailModel.get('email_count'), 4);
 
         // Did we create batches?
-        const batches = await models.EmailBatch.findAll({filter: `email_id:${emailModel.id}`});
+        const batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
         assert.equal(batches.models.length, 1);
 
         // Check all batches are in send state
@@ -157,7 +157,7 @@ describe('Batch sending tests', function () {
         }
 
         // Did we create recipients?
-        const emailRecipients = await models.EmailRecipient.findAll({filter: `email_id:${emailModel.id}`});
+        const emailRecipients = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel.id}'`});
         assert.equal(emailRecipients.models.length, 4);
 
         for (const recipient of emailRecipients.models) {
@@ -189,7 +189,7 @@ describe('Batch sending tests', function () {
         assert.equal(emailModel.get('email_count'), 4);
 
         // Did we create batches?
-        const batches = await models.EmailBatch.findAll({filter: `email_id:${emailModel.id}`});
+        const batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
         assert.equal(batches.models.length, 1);
     });
 
@@ -223,11 +223,11 @@ describe('Batch sending tests', function () {
         assert.equal(emailModel.get('email_count'), 4);
 
         // Did we create batches?
-        const batches = await models.EmailBatch.findAll({filter: `email_id:${emailModel.id}`});
+        const batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
         assert.equal(batches.models.length, 1);
 
         // Did we create recipients?
-        const emailRecipients = await models.EmailRecipient.findAll({filter: `email_id:${emailModel.id}`});
+        const emailRecipients = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel.id}'`});
         assert.equal(emailRecipients.models.length, 4);
 
         for (const recipient of emailRecipients.models) {
@@ -238,7 +238,7 @@ describe('Batch sending tests', function () {
         // Create a new email and see if it is included now
         const {emailModel: emailModel2} = await sendEmail(agent);
         assert.equal(emailModel2.get('email_count'), 5);
-        const emailRecipients2 = await models.EmailRecipient.findAll({filter: `email_id:${emailModel2.id}`});
+        const emailRecipients2 = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel2.id}'`});
         assert.equal(emailRecipients2.models.length, emailRecipients.models.length + 1);
     });
 
@@ -272,7 +272,7 @@ describe('Batch sending tests', function () {
         ]);
     });
 
-    it('Splits recipients in free and paid batch when including paid member only content', async function () {
+    it('Splits recipients in free and paid batch when including different paid and free member content', async function () {
         await testEmailBatches({
             mobiledoc: mobileDocWithPaidAndFreeMemberOnly // = different content for paid and free members
         }, null, [
@@ -411,7 +411,7 @@ describe('Batch sending tests', function () {
         assert.equal(emailModel.get('email_count'), 5);
 
         // Did we create batches?
-        let batches = await models.EmailBatch.findAll({filter: `email_id:${emailModel.id}`});
+        let batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
         assert.equal(batches.models.length, 5);
 
         // sort batches by id because findAll doesn't have order option
@@ -449,7 +449,7 @@ describe('Batch sending tests', function () {
             assert.equal(batch.get('member_segment'), null);
 
             // Did we create recipients?
-            const batchRecipients = await models.EmailRecipient.findAll({filter: `email_id:${emailModel.id}+batch_id:${batch.id}`});
+            const batchRecipients = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel.id}'+batch_id:'${batch.id}'`});
             assert.equal(batchRecipients.models.length, 1);
 
             emailRecipients.push(...batchRecipients.models);
@@ -463,7 +463,7 @@ describe('Batch sending tests', function () {
         await jobManager.allSettled();
 
         await emailModel.refresh();
-        batches = await models.EmailBatch.findAll({filter: `email_id:${emailModel.id}`});
+        batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
 
         // sort batches by provider_id (nullable) because findAll doesn't have order option
         batches.models.sort(sortBatches);
@@ -472,7 +472,7 @@ describe('Batch sending tests', function () {
         assert.equal(emailModel.get('email_count'), 5);
 
         // Did we keep the batches?
-        batches = await models.EmailBatch.findAll({filter: `email_id:${emailModel.id}`});
+        batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
 
         // sort batches by provider_id (nullable) because findAll doesn't have order option
         batches.models.sort(sortBatches);
@@ -491,7 +491,7 @@ describe('Batch sending tests', function () {
             assert.equal(batch.get('error_data'), null);
 
             // Did we create recipients?
-            const batchRecipients = await models.EmailRecipient.findAll({filter: `email_id:${emailModel.id}+batch_id:${batch.id}`});
+            const batchRecipients = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel.id}'+batch_id:'${batch.id}'`});
             assert.equal(batchRecipients.models.length, 1);
 
             emailRecipients.push(...batchRecipients.models);
@@ -567,7 +567,7 @@ describe('Batch sending tests', function () {
             // Test if all links are replaced and contain the member id
             const cheerio = require('cheerio');
             const $ = cheerio.load(html);
-            const links = await linkRedirectRepository.getAll({filter: 'post_id:' + emailModel.get('post_id')});
+            const links = await linkRedirectRepository.getAll({filter: 'post_id:\'' + emailModel.get('post_id') + '\''});
 
             for (const el of $('a').toArray()) {
                 const href = $(el).attr('href');
@@ -577,6 +577,11 @@ describe('Batch sending tests', function () {
                     continue;
                 }
 
+                if (href.includes('https://ghost.org/?via=pbg-newsletter')) {
+                    assert(!href.includes('?m=' + memberUuid), 'Powererd by Ghost link should not be tracked');
+                    continue;
+                }
+
                 // Check if the link is a tracked link
                 assert(href.includes('?m=' + memberUuid), href + ' is not tracked');
 
@@ -612,7 +617,7 @@ describe('Batch sending tests', function () {
 
             const {emailModel, html} = await sendEmail(agent);
             assert.match(html, /\m=/);
-            const links = await linkRedirectRepository.getAll({filter: 'post_id:' + emailModel.get('post_id')});
+            const links = await linkRedirectRepository.getAll({filter: 'post_id:\'' + emailModel.get('post_id') + '\''});
 
             for (const link of links) {
                 // Check ref not added to all replaced links
@@ -627,7 +632,7 @@ describe('Batch sending tests', function () {
 
             const {emailModel, html} = await sendEmail(agent);
             assert.match(html, /\m=/);
-            const links = await linkRedirectRepository.getAll({filter: 'post_id:' + emailModel.get('post_id')});
+            const links = await linkRedirectRepository.getAll({filter: 'post_id:\'' + emailModel.get('post_id') + '\''});
 
             for (const link of links) {
                 // Check ref not added to all replaced links
@@ -640,7 +645,7 @@ describe('Batch sending tests', function () {
 
             const {emailModel, html} = await sendEmail(agent);
             assert.doesNotMatch(html, /\m=/);
-            const links = await linkRedirectRepository.getAll({filter: 'post_id:' + emailModel.get('post_id')});
+            const links = await linkRedirectRepository.getAll({filter: 'post_id:\'' + emailModel.get('post_id') + '\''});
             assert.equal(links.length, 0);
         });
     });
@@ -668,12 +673,12 @@ describe('Batch sending tests', function () {
             assert.match(html, /Hey there, Hey ,/);
 
             // The unsubscribe link is replaced
-            assert.match(html, /<a href="http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&newsletter=[a-z0-9-]+"/, 'Unsubscribe link not found in html');
+            assert.match(html, /<a href="http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&key=[a-z0-9]+&newsletter=[a-z0-9-]+"/, 'Unsubscribe link not found in html');
 
             // Same for plaintext:
             assert.match(plaintext, /Hello {first_name},/);
             assert.match(plaintext, /Hey there, Hey ,/);
-            assert.match(plaintext, /\[http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&newsletter=[a-z0-9-]+\]/, 'Unsubscribe link not found in plaintext');
+            assert.match(plaintext, /\[http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&key=[a-z0-9]+&newsletter=[a-z0-9-]+\]/, 'Unsubscribe link not found in plaintext');
 
             await matchEmailSnapshot();
         });
@@ -702,12 +707,12 @@ describe('Batch sending tests', function () {
             assert.match(html, /Hey Simon, Hey Simon,/);
 
             // The unsubscribe link is replaced
-            assert.match(html, /<a href="http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&newsletter=[a-z0-9-]+"/, 'Unsubscribe link not found in html');
+            assert.match(html, /<a href="http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&key=[a-z0-9]+&newsletter=[a-z0-9-]+"/, 'Unsubscribe link not found in html');
 
             // Same for plaintext:
             assert.match(plaintext, /Hello {first_name},/);
             assert.match(plaintext, /Hey Simon, Hey Simon,/);
-            assert.match(plaintext, /\[http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&newsletter=[a-z0-9-]+\]/, 'Unsubscribe link not found in plaintext');
+            assert.match(plaintext, /\[http:\/\/127.0.0.1:2369\/unsubscribe\/\?uuid=[a-z0-9-]+&key=[a-z0-9]+&newsletter=[a-z0-9-]+\]/, 'Unsubscribe link not found in plaintext');
 
             await matchEmailSnapshot();
         });
@@ -760,7 +765,7 @@ describe('Batch sending tests', function () {
             await matchEmailSnapshot();
         });
 
-        it('Shows 3 comment buttons for published posts without feedback enabled', async function () {
+        it('Shows 2 comment buttons for published posts without feedback enabled', async function () {
             mockSetting('comments_enabled', 'all');
             mockSetting('email_track_clicks', false); // Disable link replacement for this test
 
@@ -774,11 +779,11 @@ describe('Batch sending tests', function () {
             });
 
             // Currently the link is not present in plaintext version (because no text)
-            assert.equal(html.match(/#ghost-comments/g).length, 3, 'Every email should have 3 buttons to comments');
+            assert.equal(html.match(/#ghost-comments/g).length, 2, 'Every email should have 2 buttons to comments');
             await matchEmailSnapshot();
         });
 
-        it('Shows 3 comment buttons for published posts with feedback enabled', async function () {
+        it('Shows 2 comment buttons for published posts with feedback enabled', async function () {
             mockSetting('comments_enabled', 'all');
             mockSetting('email_track_clicks', false); // Disable link replacement for this test
 
@@ -793,7 +798,7 @@ describe('Batch sending tests', function () {
                 });
 
                 // Currently the link is not present in plaintext version (because no text)
-                assert.equal(html.match(/#ghost-comments/g).length, 3, 'Every email should have 3 buttons to comments');
+                assert.equal(html.match(/#ghost-comments/g).length, 2, 'Every email should have 2 buttons to comments');
                 await matchEmailSnapshot();
             } finally {
                 // undo
diff --git a/ghost/core/test/integration/services/email-service/cards.test.js b/ghost/core/test/integration/services/email-service/cards.test.js
index 5f915d2b5f0..1ccf953cb0f 100644
--- a/ghost/core/test/integration/services/email-service/cards.test.js
+++ b/ghost/core/test/integration/services/email-service/cards.test.js
@@ -1,9 +1,15 @@
+const sinon = require('sinon');
 const {agentProvider, fixtureManager, mockManager} = require('../../../utils/e2e-framework');
 const models = require('../../../../core/server/models');
+const labs = require('../../../../core/shared/labs');
 const assert = require('assert/strict');
 const configUtils = require('../../../utils/configUtils');
 const {sendEmail, matchEmailSnapshot} = require('../../../utils/batch-email-utils');
 const cheerio = require('cheerio');
+const fs = require('fs-extra');
+const {DEFAULT_NODES} = require('@tryghost/kg-default-nodes');
+
+const goldenPost = fs.readJsonSync('./test/utils/fixtures/email-service/golden-post.json');
 
 /**
  * Remove the preheader span from the email html and put it in a separate field called preheader
@@ -72,6 +78,7 @@ describe('Can send cards via email', function () {
             value: false
         }], {context: {internal: true}});
         mockManager.restore();
+        sinon.restore();
     });
 
     before(async function () {
@@ -138,4 +145,72 @@ describe('Can send cards via email', function () {
 
         await matchEmailSnapshot();
     });
+
+    it('renders the golden post correctly (no labs flags)', async function () {
+        sinon.stub(labs, 'isSet').returns(false);
+
+        const data = await sendEmail(agent, {
+            lexical: JSON.stringify(goldenPost)
+        });
+
+        splitPreheader(data);
+
+        await matchEmailSnapshot();
+    });
+
+    it('renders the golden post correctly (labs flag: contentVisibility)', async function () {
+        sinon.stub(labs, 'isSet').callsFake((key) => {
+            if (key === 'contentVisibility') {
+                return true;
+            }
+            return false;
+        });
+
+        const data = await sendEmail(agent, {
+            lexical: JSON.stringify(goldenPost)
+        });
+
+        splitPreheader(data);
+
+        await matchEmailSnapshot();
+    });
+
+    it('renders all of the default nodes in the golden post', async function () {
+        // This test checks that all of the default nodes from @tryghost/kg-default-nodes are present in the golden post
+        // This is to ensure that if we add new cards to Koenig, they will be included in the golden post
+        // This is important because the golden post is used to test the email rendering of the cards after
+        // they have gone through the Email Renderer, which can change the HTML/CSS of the cards
+        // See the README.md in this same directory for more information.
+
+        const cardsInGoldenPost = goldenPost.root.children.map((child) => {
+            return child.type;
+        });
+
+        const excludedCards = [
+            'collection', // only used in pages, will never be emailed
+            'extended-text', // not a card
+            'extended-quote', // not a card
+            'extended-heading', // not a card
+            // not a card and shouldn't be present in published posts / emails
+            'tk',
+            'at-link',
+            'at-link-search',
+            'zwnj'
+        ];
+
+        const cardsInDefaultNodes = DEFAULT_NODES.map((node) => {
+            try {
+                return node.getType();
+            } catch (error) {
+                return null;
+            }
+        }).filter((card) => {
+            return card !== null && !excludedCards.includes(card); // don't include extended versions of regular text type nodes, we only want the cards (decorator nodes)
+        });
+
+        // Check that every card in DEFAULT_NODES are present in the golden post (with the exception of the excludedCards above)
+        for (const card of cardsInDefaultNodes) {
+            assert.ok(cardsInGoldenPost.includes(card), `The golden post does not contain the ${card} card`);
+        }
+    });
 });
diff --git a/ghost/core/test/integration/services/email-service/email-event-storage.test.js b/ghost/core/test/integration/services/email-service/email-event-storage.test.js
index 186baa24d92..e712f68a83c 100644
--- a/ghost/core/test/integration/services/email-service/email-event-storage.test.js
+++ b/ghost/core/test/integration/services/email-service/email-event-storage.test.js
@@ -268,7 +268,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored permanent failure
         const permanentFailures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(permanentFailures.length, 1);
 
@@ -364,7 +364,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored permanent failure
         const permanentFailures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(permanentFailures.length, 1);
 
@@ -455,7 +455,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored permanent failure
         const permanentFailures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(permanentFailures.length, 1);
 
@@ -544,7 +544,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored permanent failure
         const permanentFailures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(permanentFailures.length, 1);
 
@@ -661,7 +661,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored temporary failure
         const failures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(failures.length, 1);
 
@@ -763,7 +763,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored temporary failure
         const failures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(failures.length, 1);
 
@@ -865,7 +865,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored temporary failure
         const failures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(failures.length, 1);
 
@@ -967,7 +967,7 @@ describe('EmailEventStorage', function () {
 
         // Check we have a stored temporary failure
         const failures = await models.EmailRecipientFailure.findAll({
-            filter: `email_recipient_id:${emailRecipient.id}`
+            filter: `email_recipient_id:'${emailRecipient.id}'`
         });
         assert.equal(failures.length, 1);
 
@@ -991,7 +991,7 @@ describe('EmailEventStorage', function () {
         const providerId = emailBatch.provider_id;
         const timestamp = new Date(2000, 0, 1);
         const eventsURI = '/members/events/?' + encodeURIComponent(
-            `filter=type:-[comment_event,aggregated_click_event]+data.member_id:${memberId}`
+            `filter=type:-[comment_event,aggregated_click_event]+data.member_id:'${memberId}'`
         );
 
         // Check not unsubscribed
@@ -1028,31 +1028,41 @@ describe('EmailEventStorage', function () {
     });
 
     it('Can handle unsubscribe events', async function () {
+        const newsletterToRemove = fixtureManager.get('newsletters', 0).id;
+        const newsletterToKeep = fixtureManager.get('newsletters', 1).id;
+
+        const email = fixtureManager.get('emails', 0);
+        await models.Email.edit({newsletter_id: newsletterToRemove}, {id: email.id});
+
         const emailBatch = fixtureManager.get('email_batches', 0);
-        const emailId = emailBatch.email_id;
+        assert(emailBatch.email_id === email.id);
 
         const emailRecipient = fixtureManager.get('email_recipients', 0);
         assert(emailRecipient.batch_id === emailBatch.id);
+
         const memberId = emailRecipient.member_id;
         const providerId = emailBatch.provider_id;
         const timestamp = new Date(2000, 0, 1);
 
-        // Reset
+        // Initialise member with 2 newsletters
         await membersService.api.members.update({newsletters: [
             {
-                id: fixtureManager.get('newsletters', 0).id
+                id: newsletterToRemove
+            },
+            {
+                id: newsletterToKeep
             }
         ]}, {id: memberId});
 
-        // Check not unsubscribed
+        // Check that the member is subscribed to 2 newsletters
         const memberInitial = await membersService.api.members.get({id: memberId}, {withRelated: ['newsletters']});
-        assert.notEqual(memberInitial.related('newsletters').length, 0, 'This test requires a member that is subscribed to at least one newsletter');
+        assert.equal(memberInitial.related('newsletters').length, 2, 'This test requires a member that is subscribed to at least one newsletter');
 
         events = [{
             event: 'unsubscribed',
             recipient: emailRecipient.member_email,
             'user-variables': {
-                'email-id': emailId
+                'email-id': email.id
             },
             message: {
                 headers: {
@@ -1070,9 +1080,17 @@ describe('EmailEventStorage', function () {
         // Since this is all event based we should wait for all dispatched events to be completed.
         await DomainEvents.allSettled();
 
-        // Check if unsubscribed
+        // The member should be unsubscribed from the specific newsletter
         const member = await membersService.api.members.get({id: memberId}, {withRelated: ['newsletters']});
-        assert.equal(member.related('newsletters').length, 0);
+
+        // The member is now subscribed to 1 newsletter
+        assert.equal(member.related('newsletters').length, 1);
+
+        // The member is now unsubscribed from newsletter 0
+        assert(!member.related('newsletters').models.some(newsletter => newsletter.id === newsletterToRemove));
+
+        // But the member is still subscribed to newsletter 1
+        assert(member.related('newsletters').models.some(newsletter => newsletter.id === newsletterToKeep));
     });
 
     it('Can handle unknown events', async function () {
diff --git a/ghost/core/test/integration/services/q-email-addresses.test.js b/ghost/core/test/integration/services/q-email-addresses.test.js
new file mode 100644
index 00000000000..01ef8446a76
--- /dev/null
+++ b/ghost/core/test/integration/services/q-email-addresses.test.js
@@ -0,0 +1,489 @@
+const DomainEvents = require('@tryghost/domain-events');
+const {Mention} = require('@tryghost/webmentions');
+const mentionsService = require('../../../core/server/services/mentions');
+const assert = require('assert/strict');
+const {agentProvider, fixtureManager, mockManager} = require('../../utils/e2e-framework');
+const configUtils = require('../../utils/configUtils');
+const {mockLabsDisabled, mockLabsEnabled, mockSetting} = require('../../utils/e2e-framework-mock-manager');
+const ObjectId = require('bson-objectid').default;
+const {sendEmail, getDefaultNewsletter, getLastEmail} = require('../../utils/batch-email-utils');
+const urlUtils = require('../../utils/urlUtils');
+
+let emailMockReceiver, agent, membersAgent;
+
+async function sendNewsletter() {
+    // Prepare a post and email model
+    await sendEmail(agent);
+}
+
+async function sendRecommendationNotification() {
+    // incoming recommendation in this case
+    const webmention = await Mention.create({
+        source: 'https://www.otherghostsite.com/.well-known/recommendations.json',
+        target: 'https://www.mysite.com/',
+        timestamp: new Date(),
+        payload: null,
+        resourceId: null,
+        resourceType: null,
+        sourceTitle: 'Other Ghost Site',
+        sourceSiteTitle: 'Other Ghost Site',
+        sourceAuthor: null,
+        sourceExcerpt: null,
+        sourceFavicon: null,
+        sourceFeaturedImage: null
+    });
+
+    // Mark it as verified
+    webmention.verify('{"url": "https://www.mysite.com/"}', 'application/json');
+    assert.ok(webmention.verified);
+
+    // Save to repository
+    await mentionsService.repository.save(webmention);
+    await DomainEvents.allSettled();
+}
+
+async function sendFreeMemberSignupNotification() {
+    const email = ObjectId().toHexString() + '@email.com';
+    const membersService = require('../../../core/server/services/members');
+    await membersService.api.members.create({email, name: 'Member Test'});
+    await DomainEvents.allSettled();
+}
+
+async function sendCommentNotification() {
+    const postId = fixtureManager.get('posts', 0).id;
+    await membersAgent
+        .post(`/api/comments/`)
+        .body({comments: [{
+            post_id: postId,
+            parent_id: fixtureManager.get('comments', 0).id,
+            html: 'This is a reply'
+        }]})
+        .expectStatus(201);
+}
+
+function configureSite({siteUrl}) {
+    configUtils.set('url', new URL(siteUrl).href);
+}
+
+async function configureNewsletter({sender_email, sender_reply_to, sender_name}) {
+    const defaultNewsletter = await getDefaultNewsletter();
+    defaultNewsletter.set('sender_email', sender_email || null);
+    defaultNewsletter.set('sender_reply_to', sender_reply_to || 'newsletter');
+    defaultNewsletter.set('sender_name', sender_name || null);
+    await defaultNewsletter.save();
+}
+
+function assertFromAddress(from, replyTo) {
+    let i = 0;
+    while (emailMockReceiver.getSentEmail(i)) {
+        const email = emailMockReceiver.getSentEmail(i);
+        assert.equal(email.from, from, `From address (${email.from}) of ${i + 1}th email (${email.subject}) does not match ${from}`);
+
+        if (!replyTo) {
+            assert(email.replyTo === null || email.replyTo === undefined, `Unexpected reply-to address (${email.replyTo}) of ${i + 1}th email (${email.subject}), expected none`);
+        } else {
+            assert.equal(email.replyTo, replyTo, `ReplyTo address (${email.replyTo}) of ${i + 1}th email (${email.subject}) does not match ${replyTo}`);
+        }
+
+        i += 1;
+    }
+
+    assert(i > 0, 'No emails were sent');
+}
+
+async function assertFromAddressNewsletter(aFrom, aReplyTo) {
+    const email = (await getLastEmail());
+    const {from} = email;
+    const replyTo = email['h:Reply-To'];
+
+    assert.equal(from, aFrom, `From address (${from}) does not match ${aFrom}`);
+
+    if (!aReplyTo) {
+        assert(replyTo === null || replyTo === undefined, `Unexpected reply-to address (${replyTo}), expected none`);
+    } else {
+        assert.equal(replyTo, aReplyTo, `ReplyTo address (${replyTo}) does not match ${aReplyTo}`);
+    }
+}
+
+// Tests the from and replyTo addresses for most emails send from within Ghost.
+describe('Email addresses', function () {
+    before(async function () {
+        // Can only set site URL once because otherwise agents are messed up
+        configureSite({
+            siteUrl: 'http://blog.acme.com'
+        });
+
+        const agents = await agentProvider.getAgentsForMembers();
+        agent = agents.adminAgent;
+        membersAgent = agents.membersAgent;
+
+        await fixtureManager.init('newsletters', 'members:newsletters', 'users', 'posts', 'comments');
+        await agent.loginAsAdmin();
+        await membersAgent.loginAs('member@example.com');
+    });
+
+    beforeEach(async function () {
+        emailMockReceiver = mockManager.mockMail();
+        mockManager.mockMailgun();
+        mockLabsDisabled('newEmailAddresses');
+
+        configureSite({
+            siteUrl: 'http://blog.acme.com'
+        });
+        mockSetting('title', 'Example Site');
+        mockSetting('members_support_address', 'support@address.com');
+        mockSetting('comments_enabled', 'all');
+        configUtils.set('mail:from', '"Postmaster" <postmaster@examplesite.com>');
+    });
+
+    afterEach(async function () {
+        await configUtils.restore();
+        urlUtils.restore();
+        mockManager.restore();
+    });
+
+    describe('Legacy setup', function () {
+        it('[STAFF] sends recommendation notification emails from mail.from', async function () {
+            await sendRecommendationNotification();
+            assertFromAddress('"Postmaster" <postmaster@examplesite.com>');
+        });
+
+        it('[STAFF] sends new member notification emails from ghost@domain', async function () {
+            await sendFreeMemberSignupNotification();
+            assertFromAddress('"Example Site" <ghost@blog.acme.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from the generated noreply email address if support address is set to noreply', async function () {
+            mockSetting('members_support_address', 'noreply');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <noreply@blog.acme.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from the generated noreply email address if no support address is set', async function () {
+            mockSetting('members_support_address', '');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <noreply@blog.acme.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from the support address', async function () {
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <support@address.com>');
+        });
+
+        it('[NEWSLETTER] Allows to send a newsletter from any configured email address', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@possible.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <anything@possible.com>', '"Anything Possible" <anything@possible.com>');
+        });
+
+        it('[NEWSLETTER] Sends from a generated noreply by default', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <noreply@blog.acme.com>', '"Anything Possible" <noreply@blog.acme.com>');
+        });
+
+        it('[NEWSLETTER] Can set the reply to to the support address', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'support'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <noreply@blog.acme.com>', 'support@address.com');
+        });
+
+        it('[NEWSLETTER] Uses site title as default sender name', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: null,
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Example Site" <noreply@blog.acme.com>', '"Example Site" <noreply@blog.acme.com>');
+        });
+    });
+
+    describe('Custom sending domain', function () {
+        beforeEach(async function () {
+            configUtils.set('hostSettings:managedEmail:enabled', true);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', 'sendingdomain.com');
+            configUtils.set('mail:from', '"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] sends recommendation emails from mail.from config variable', async function () {
+            await sendRecommendationNotification();
+            assertFromAddress('"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] sends new member notification emails from mail.from config variable', async function () {
+            await sendFreeMemberSignupNotification();
+            assertFromAddress('"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] Uses site title as email address name if no name set in mail:from', async function () {
+            configUtils.set('mail:from', 'default@sendingdomain.com');
+            await sendFreeMemberSignupNotification();
+            assertFromAddress('"Example Site" <default@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from the configured sending domain if support address is set to noreply', async function () {
+            mockSetting('members_support_address', 'noreply');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <noreply@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from the default email address if no support address is set', async function () {
+            mockSetting('members_support_address', '');
+
+            await sendCommentNotification();
+            assertFromAddress('"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from the support address only if it matches the sending domain', async function () {
+            mockSetting('members_support_address', 'support@sendingdomain.com');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <support@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification with replyTo set to the support address if it doesn\'t match the sending domain', async function () {
+            await sendCommentNotification();
+            assertFromAddress('"Default Address" <default@sendingdomain.com>', 'support@address.com');
+        });
+
+        it('[NEWSLETTER] Does not allow to send a newsletter from any email address (instead uses mail.from), but allows reply-to to be set', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@possible.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <default@sendingdomain.com>', '"Anything Possible" <anything@possible.com>');
+        });
+
+        it('[NEWSLETTER] Does allow to send a newsletter from a custom sending domain', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@sendingdomain.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <anything@sendingdomain.com>');
+        });
+
+        it('[NEWSLETTER] Does allow to set the replyTo address to any address', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@sendingdomain.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'anything@possible.com'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <anything@sendingdomain.com>', 'anything@possible.com');
+        });
+
+        it('[NEWSLETTER] Can set the reply to to the support address', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'support'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <default@sendingdomain.com>', 'support@address.com');
+        });
+
+        it('[NEWSLETTER] Uses site title as default sender name', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: null,
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Example Site" <default@sendingdomain.com>');
+        });
+    });
+
+    describe('Managed email without custom sending domain', function () {
+        beforeEach(async function () {
+            configUtils.set('hostSettings:managedEmail:enabled', true);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', undefined);
+            configUtils.set('mail:from', 'default@sendingdomain.com');
+        });
+
+        it('[STAFF] sends recommendation emails from mail.from config variable', async function () {
+            await sendRecommendationNotification();
+            assertFromAddress('"Example Site" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] sends new member notification emails from mail.from config variable', async function () {
+            await sendFreeMemberSignupNotification();
+            assertFromAddress('"Example Site" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] Prefers to use the mail:from sending name if set above the site name', async function () {
+            configUtils.set('mail:from', '"Default Address" <default@sendingdomain.com>');
+
+            await sendFreeMemberSignupNotification();
+            assertFromAddress('"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from mail.from if support address is set to noreply', async function () {
+            mockSetting('members_support_address', 'noreply');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <default@sendingdomain.com>', 'noreply@blog.acme.com');
+        });
+
+        it('[MEMBERS] send a comment reply notification from mail.from if no support address is set, without a replyTo', async function () {
+            mockSetting('members_support_address', '');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <default@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from mail.from with member support address set as replyTo', async function () {
+            mockSetting('members_support_address', 'hello@acme.com');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <default@sendingdomain.com>', 'hello@acme.com');
+        });
+
+        it('[NEWSLETTER] Does not allow to send a newsletter from any email address (instead uses mail.from), but allow reply-to to be set', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@possible.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <default@sendingdomain.com>', '"Anything Possible" <anything@possible.com>');
+        });
+
+        it('[NEWSLETTER] Does allow to set the replyTo address to any address', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@possible.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'anything@possible.com'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <default@sendingdomain.com>', 'anything@possible.com');
+        });
+
+        it('[NEWSLETTER] Can set the reply to to the support address', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'support'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <default@sendingdomain.com>', 'support@address.com');
+        });
+
+        it('[NEWSLETTER] Uses site title as default sender name', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: null,
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Example Site" <default@sendingdomain.com>');
+        });
+    });
+
+    describe('Self-hosted', function () {
+        beforeEach(async function () {
+            mockLabsEnabled('newEmailAddresses');
+            configUtils.set('hostSettings:managedEmail:enabled', false);
+            configUtils.set('hostSettings:managedEmail:sendingDomain', undefined);
+            configUtils.set('mail:from', '"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] sends recommendation emails from mail.from config variable', async function () {
+            await sendRecommendationNotification();
+            assertFromAddress('"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] sends new member notification emails from mail.from config variable', async function () {
+            await sendFreeMemberSignupNotification();
+            assertFromAddress('"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[STAFF] Uses site title as email address name if no name set in mail:from', async function () {
+            configUtils.set('mail:from', 'default@sendingdomain.com');
+            await sendFreeMemberSignupNotification();
+            assertFromAddress('"Example Site" <default@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification with noreply support address', async function () {
+            mockSetting('members_support_address', 'noreply');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <noreply@blog.acme.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification without support address', async function () {
+            mockSetting('members_support_address', '');
+
+            await sendCommentNotification();
+
+            // Use default
+            assertFromAddress('"Default Address" <default@sendingdomain.com>');
+        });
+
+        it('[MEMBERS] send a comment reply notification from chosen support address', async function () {
+            mockSetting('members_support_address', 'hello@acme.com');
+
+            await sendCommentNotification();
+            assertFromAddress('"Example Site" <hello@acme.com>');
+        });
+
+        it('[NEWSLETTER] Does allow to send a newsletter from any configured email address', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@possible.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <anything@possible.com>', '"Anything Possible" <anything@possible.com>');
+        });
+
+        it('[NEWSLETTER] Does allow to set the replyTo address to any address', async function () {
+            await configureNewsletter({
+                sender_email: 'anything@possible.com',
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'anything@noreply.com'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <anything@possible.com>', 'anything@noreply.com');
+        });
+
+        it('[NEWSLETTER] Can set the reply to to the support address', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: 'Anything Possible',
+                sender_reply_to: 'support'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Anything Possible" <default@sendingdomain.com>', 'support@address.com');
+        });
+
+        it('[NEWSLETTER] Uses site title as default sender name', async function () {
+            await configureNewsletter({
+                sender_email: null,
+                sender_name: null,
+                sender_reply_to: 'newsletter'
+            });
+            await sendNewsletter();
+            await assertFromAddressNewsletter('"Example Site" <default@sendingdomain.com>', '"Example Site" <default@sendingdomain.com>');
+        });
+    });
+});
diff --git a/ghost/core/test/regression/api/admin/__snapshots__/authentication.test.js.snap b/ghost/core/test/regression/api/admin/__snapshots__/authentication.test.js.snap
index e7dfc2ce93b..3c8192c98b9 100644
--- a/ghost/core/test/regression/api/admin/__snapshots__/authentication.test.js.snap
+++ b/ghost/core/test/regression/api/admin/__snapshots__/authentication.test.js.snap
@@ -239,6 +239,10 @@ test@example.com [test@example.com]"
 
 exports[`Authentication API Blog setup complete setup 5: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
+  "from": "\\"a test blog\\" <noreply@127.0.0.1>",
+  "generateTextFromHTML": true,
+  "replyTo": null,
   "subject": "Your New Ghost Site",
   "to": "test@example.com",
 }
@@ -514,6 +518,10 @@ test@example.com [test@example.com]"
 
 exports[`Authentication API Blog setup complete setup with default theme 5: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
+  "from": "\\"a test blog\\" <noreply@127.0.0.1>",
+  "generateTextFromHTML": true,
+  "replyTo": null,
   "subject": "Your New Ghost Site",
   "to": "test@example.com",
 }
@@ -586,7 +594,7 @@ Object {
       "meta_title": null,
       "milestone_notifications": true,
       "name": "test user edit",
-      "paid_subscription_canceled_notification": false,
+      "paid_subscription_canceled_notification": true,
       "paid_subscription_started_notification": true,
       "profile_image": "https://example.com/super_photo.jpg",
       "recommendation_notifications": true,
@@ -606,7 +614,7 @@ exports[`Authentication API Blog setup update setup 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": "794",
+  "content-length": "793",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -746,7 +754,7 @@ exports[`Authentication API Password reset reset password 1: [body] 1`] = `
 Object {
   "password_reset": Array [
     Object {
-      "message": "Password changed successfully.",
+      "message": "Password updated",
     },
   ],
 }
@@ -756,7 +764,7 @@ exports[`Authentication API Password reset reset password 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": "65",
+  "content-length": "51",
   "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/regression/api/admin/identities.test.js b/ghost/core/test/regression/api/admin/identities.test.js
index c338fb1ea68..6fc5429203e 100644
--- a/ghost/core/test/regression/api/admin/identities.test.js
+++ b/ghost/core/test/regression/api/admin/identities.test.js
@@ -60,6 +60,7 @@ describe('Identities API', function () {
                 })
                 .then((decoded) => {
                     decoded.sub.should.equal('jbloggs@example.com');
+                    decoded.role.should.equal('Owner');
                 });
         });
     });
diff --git a/ghost/core/test/regression/api/admin/members-importer.test.js b/ghost/core/test/regression/api/admin/members-importer.test.js
index bd5ec8e5939..b4e40bd2e45 100644
--- a/ghost/core/test/regression/api/admin/members-importer.test.js
+++ b/ghost/core/test/regression/api/admin/members-importer.test.js
@@ -341,6 +341,10 @@ describe('Members Importer API', function () {
 
         assert(!!settingsCache.get('email_verification_required'), 'Email verification should now be required');
 
+        mockManager.assert.sentEmail({
+            subject: 'Your member import is complete'
+        });
+
         mockManager.assert.sentEmail({
             subject: 'Email needs verification'
         });
diff --git a/ghost/core/test/regression/api/admin/users.test.js b/ghost/core/test/regression/api/admin/users.test.js
index 8d349df4267..4d7f11251aa 100644
--- a/ghost/core/test/regression/api/admin/users.test.js
+++ b/ghost/core/test/regression/api/admin/users.test.js
@@ -145,10 +145,10 @@ describe('User API', function () {
                     .expect(200);
 
                 const tags = await otherAuthorPost.related('tags').fetch();
-
                 should.equal(tags.length, 3);
-                should.equal(tags.models[2].get('slug'), `hash-${otherAuthor.slug}`);
-                should.equal(tags.models[2].get('name'), `#${otherAuthor.slug}`);
+                // user deletion results in a second tag being added with sort_order of 0, putting it at index 1 instead of at the end (index 2)
+                should.equal(tags.models[1].get('slug'), `hash-${otherAuthor.slug}`);
+                should.equal(tags.models[1].get('name'), `#${otherAuthor.slug}`);
             });
         });
     });
diff --git a/ghost/core/test/regression/mock-express-style/api-vs-frontend.test.js b/ghost/core/test/regression/mock-express-style/api-vs-frontend.test.js
index c6685ed1cb7..3090aee06a0 100644
--- a/ghost/core/test/regression/mock-express-style/api-vs-frontend.test.js
+++ b/ghost/core/test/regression/mock-express-style/api-vs-frontend.test.js
@@ -33,8 +33,8 @@ describe('Frontend behavior tests', function () {
 
         beforeEach(function () {
             sinon.stub(themeEngine.getActive(), 'config').withArgs('posts_per_page').returns(2);
-            const postsAPI = require('../../../core/server/api/endpoints/posts-public');
-            postSpy = sinon.spy(postsAPI.browse, 'query');
+            const postsAPI = require('../../../core/server/api/endpoints').postsPublic;
+            postSpy = sinon.spy(postsAPI, 'browse');
         });
 
         afterEach(function () {
@@ -143,22 +143,20 @@ describe('Frontend behavior tests', function () {
                     });
             });
 
-            it('serve tag', function () {
+            it('serve tag', async function () {
                 const req = {
                     method: 'GET',
                     url: '/tag/bacon/',
                     host: 'example.com'
                 };
 
-                return localUtils.mockExpress.invoke(app, req)
-                    .then(function (response) {
-                        response.statusCode.should.eql(200);
-                        response.template.should.eql('tag');
+                const response = await localUtils.mockExpress.invoke(app, req);
+                response.statusCode.should.eql(200);
+                response.template.should.eql('tag');
 
-                        postSpy.args[0][0].options.filter.should.eql('(tags:\'bacon\'+tags.visibility:public)+type:post');
-                        postSpy.args[0][0].options.page.should.eql(1);
-                        postSpy.args[0][0].options.limit.should.eql(2);
-                    });
+                postSpy.args[0][0].filter.should.eql('tags:\'bacon\'+tags.visibility:public');
+                postSpy.args[0][0].page.should.eql(1);
+                postSpy.args[0][0].limit.should.eql(2);
             });
 
             it('serve tag rss', function () {
@@ -329,7 +327,7 @@ describe('Frontend behavior tests', function () {
         });
 
         describe('assets', function () {
-            it('blog is https, request is http', function () {
+            it('blog is https, request is http (png)', function () {
                 const req = {
                     secure: false,
                     method: 'GET',
@@ -344,7 +342,7 @@ describe('Frontend behavior tests', function () {
                     });
             });
 
-            it('blog is https, request is http', function () {
+            it('blog is https, request is http (css)', function () {
                 const req = {
                     secure: false,
                     method: 'GET',
@@ -564,7 +562,7 @@ describe('Frontend behavior tests', function () {
                 sinon.restore();
             });
 
-            it('serve post', function () {
+            it('serve 404 when there is post with given slug', function () {
                 const req = {
 
                     method: 'GET',
@@ -746,7 +744,7 @@ describe('Frontend behavior tests', function () {
                     });
             });
 
-            it('post without tag', function () {
+            it('post without tag on something collection', function () {
                 const req = {
                     method: 'GET',
                     url: '/something/html-ipsum/',
@@ -1296,7 +1294,7 @@ describe('Frontend behavior tests', function () {
                 return localUtils.mockExpress.invoke(app, req)
                     .then(function (response) {
                         response.statusCode.should.eql(200);
-                        response.headers['content-type'].should.eql('text/xml; charset=UTF-8');
+                        response.headers['content-type'].should.eql('application/rss+xml; charset=UTF-8');
                     });
             });
 
@@ -1450,7 +1448,7 @@ describe('Frontend behavior tests', function () {
                 routes: {
                     '/podcast/rss/': {
                         templates: ['podcast/rss'],
-                        content_type: 'text/xml'
+                        content_type: 'application/rss+xml'
                     },
                     '/cooking/': {
                         controller: 'channel',
@@ -1562,7 +1560,7 @@ describe('Frontend behavior tests', function () {
                 .then(function (response) {
                     response.statusCode.should.eql(200);
                     response.template.should.eql('podcast/rss');
-                    response.headers['content-type'].should.eql('text/xml; charset=utf-8');
+                    response.headers['content-type'].should.eql('application/rss+xml');
                     response.body.match(/<link>/g).length.should.eql(2);
                 });
         });
diff --git a/ghost/core/test/regression/models/model_posts.test.js b/ghost/core/test/regression/models/model_posts.test.js
index fc714837d0f..999fe130238 100644
--- a/ghost/core/test/regression/models/model_posts.test.js
+++ b/ghost/core/test/regression/models/model_posts.test.js
@@ -1501,7 +1501,7 @@ describe('Post Model', function () {
 
                     return models.MobiledocRevision
                         .findAll({
-                            filter: `post_id:${updatedPost.id}`
+                            filter: `post_id:'${updatedPost.id}'`
                         });
                 })
                 .then((mobiledocRevisions) => {
@@ -1536,7 +1536,7 @@ describe('Post Model', function () {
                 })
                 .then(() => models.MobiledocRevision
                     .findAll({
-                        filter: `post_id:${revisionedPost.id}`
+                        filter: `post_id:'${revisionedPost.id}'`
                     })
                 )
                 .then((mobiledocRevisions) => {
@@ -1566,7 +1566,7 @@ describe('Post Model', function () {
 
                     return models.MobiledocRevision
                         .findAll({
-                            filter: `post_id:${createdPost.id}`
+                            filter: `post_id:'${createdPost.id}'`
                         });
                 })
                 .then((mobiledocRevisions) => {
@@ -1582,7 +1582,7 @@ describe('Post Model', function () {
 
                     return models.MobiledocRevision
                         .findAll({
-                            filter: `post_id:${editedPost.id}`
+                            filter: `post_id:'${editedPost.id}'`
                         });
                 })
                 .then((mobiledocRevisions) => {
diff --git a/ghost/core/test/regression/models/model_settings.test.js b/ghost/core/test/regression/models/model_settings.test.js
index 737f3d5d31b..e69b1d98914 100644
--- a/ghost/core/test/regression/models/model_settings.test.js
+++ b/ghost/core/test/regression/models/model_settings.test.js
@@ -5,7 +5,7 @@ const db = require('../../../core/server/data/db');
 // Stuff we are testing
 const models = require('../../../core/server/models');
 
-const SETTINGS_LENGTH = 93;
+const SETTINGS_LENGTH = 94;
 
 describe('Settings Model', function () {
     before(models.init);
diff --git a/ghost/core/test/regression/site/default-theme.test.js b/ghost/core/test/regression/site/default-theme.test.js
new file mode 100644
index 00000000000..67a3b6cdfd0
--- /dev/null
+++ b/ghost/core/test/regression/site/default-theme.test.js
@@ -0,0 +1,14 @@
+const assert = require('assert/strict');
+const {mockSetting} = require('../../utils/e2e-framework-mock-manager');
+
+// This test checks if the default theme passes the current gscan version
+// If this test fails, check the used gscan version in Ghost
+it('Default theme passes linked gscan version', async function () {
+    const themeService = require('../../../core/server/services/themes');
+
+    // Set active theme name
+    mockSetting('active_theme', 'source');
+    await themeService.init();
+    const theme = await themeService.api.getThemeErrors('source');
+    assert.deepEqual(theme.errors, [], 'Default theme should have no errors');
+});
diff --git a/ghost/core/test/unit/api/canary/utils/serializers/input/pages.test.js b/ghost/core/test/unit/api/canary/utils/serializers/input/pages.test.js
index aab4fabf8ef..ed8ed3cf787 100644
--- a/ghost/core/test/unit/api/canary/utils/serializers/input/pages.test.js
+++ b/ghost/core/test/unit/api/canary/utils/serializers/input/pages.test.js
@@ -1,7 +1,15 @@
 const should = require('should');
+const sinon = require('sinon');
 const serializers = require('../../../../../../../core/server/api/endpoints/utils/serializers');
+const postsSchema = require('../../../../../../../core/server/data/schema').tables.posts;
+
+const mobiledocLib = require('@tryghost/html-to-mobiledoc');
 
 describe('Unit: endpoints/utils/serializers/input/pages', function () {
+    afterEach(function () {
+        sinon.restore();
+    });
+
     describe('browse', function () {
         it('default', function () {
             const apiConfig = {};
@@ -16,7 +24,7 @@ describe('Unit: endpoints/utils/serializers/input/pages', function () {
             frame.options.filter.should.eql('type:page');
         });
 
-        it('combine filters', function () {
+        it('combine status+tag filters', function () {
             const apiConfig = {};
             const frame = {
                 apiType: 'content',
@@ -30,7 +38,7 @@ describe('Unit: endpoints/utils/serializers/input/pages', function () {
             frame.options.filter.should.eql('(status:published+tag:eins)+type:page');
         });
 
-        it('combine filters', function () {
+        it('only tag filters', function () {
             const apiConfig = {};
             const frame = {
                 apiType: 'content',
@@ -60,6 +68,65 @@ describe('Unit: endpoints/utils/serializers/input/pages', function () {
             frame.options.formats.should.containEql('html');
             frame.options.formats.should.containEql('plaintext');
         });
+
+        describe('Content API', function () {
+            it('selects all columns from the posts schema but mobiledoc and lexical when no columns are specified', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {}
+                    }
+                };
+
+                serializers.input.pages.browse(apiConfig, frame);
+                const columns = Object.keys(postsSchema);
+                const parsedSelectRaw = frame.options.selectRaw.split(',').map(column => column.trim());
+                parsedSelectRaw.should.eql(columns.filter(column => !['mobiledoc', 'lexical','@@UNIQUE_CONSTRAINTS@@','@@INDEXES@@'].includes(column)));
+            });
+
+            it('strips mobiledoc and lexical columns from a specified columns option', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {},
+                        columns: ['id', 'mobiledoc', 'lexical', 'visibility']
+                    }
+                };
+
+                serializers.input.pages.browse(apiConfig, frame);
+                frame.options.columns.should.eql(['id', 'visibility']);
+            });
+
+            it('forces visibility column if columns are specified', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {},
+                        columns: ['id']
+                    }
+                };
+                
+                serializers.input.pages.browse(apiConfig, frame);
+                frame.options.columns.should.eql(['id', 'visibility']);
+            });
+                
+            it('strips mobiledoc and lexical columns from a specified selectRaw option', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {},
+                        selectRaw: 'id, mobiledoc, lexical'
+                    }
+                };
+
+                serializers.input.posts.browse(apiConfig, frame);
+                frame.options.selectRaw.should.eql('id');
+            });
+        });
     });
 
     describe('read', function () {
@@ -77,7 +144,7 @@ describe('Unit: endpoints/utils/serializers/input/pages', function () {
             frame.options.filter.should.eql('type:page');
         });
 
-        it('content api default', function () {
+        it('content api default (with context)', function () {
             const apiConfig = {};
             const frame = {
                 apiType: 'content',
@@ -179,6 +246,34 @@ describe('Unit: endpoints/utils/serializers/input/pages', function () {
         frame.data.pages[0].tags.should.eql([{slug: 'slug1', name: 'hey'}, {slug: 'slug2'}]);
     });
 
+    it('throws error if HTML conversion fails', function () {
+        // JSDOM require is sometimes very slow on CI causing random timeouts
+        this.timeout(4000);
+
+        const frame = {
+            options: {
+                source: 'html'
+            },
+            data: {
+                posts: [
+                    {
+                        id: 'id1',
+                        html: '<bananarama>'
+                    }
+                ]
+            }
+        };
+
+        sinon.stub(mobiledocLib, 'toMobiledoc').throws(new Error('Some error'));
+
+        try {
+            serializers.input.posts.edit({}, frame);
+            should.fail('Error expected');
+        } catch (err) {
+            err.message.should.eql('Failed to convert HTML to Mobiledoc');
+        }
+    });
+
     describe('Ensure relations format', function () {
         it('relations is array of objects', function () {
             const apiConfig = {};
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..961f1591f79 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
@@ -1,7 +1,15 @@
 const should = require('should');
+const sinon = require('sinon');
 const serializers = require('../../../../../../../core/server/api/endpoints/utils/serializers');
+const postsSchema = require('../../../../../../../core/server/data/schema').tables.posts;
+
+const mobiledocLib = require('@tryghost/html-to-mobiledoc');
 
 describe('Unit: endpoints/utils/serializers/input/posts', function () {
+    afterEach(function () {
+        sinon.restore();
+    });
+
     describe('browse', function () {
         it('default', function () {
             const apiConfig = {};
@@ -37,7 +45,7 @@ describe('Unit: endpoints/utils/serializers/input/posts', function () {
             should.equal(frame.options.filter, '(type:post)+status:[draft,published,scheduled,sent]');
         });
 
-        it('combine filters', function () {
+        it('combine status+tag filters', function () {
             const apiConfig = {};
             const frame = {
                 apiType: 'content',
@@ -57,7 +65,7 @@ describe('Unit: endpoints/utils/serializers/input/posts', function () {
             frame.options.filter.should.eql('(status:published+tag:eins)+type:post');
         });
 
-        it('combine filters', function () {
+        it('only tag filters', function () {
             const apiConfig = {};
             const frame = {
                 apiType: 'content',
@@ -93,6 +101,65 @@ describe('Unit: endpoints/utils/serializers/input/posts', function () {
             frame.options.formats.should.containEql('html');
             frame.options.formats.should.containEql('plaintext');
         });
+
+        describe('Content API', function () {
+            it('selects all columns from the posts schema but mobiledoc and lexical when no columns are specified', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {}
+                    }
+                };
+
+                serializers.input.posts.browse(apiConfig, frame);
+                const columns = Object.keys(postsSchema);
+                const parsedSelectRaw = frame.options.selectRaw.split(',').map(column => column.trim());
+                parsedSelectRaw.should.eql(columns.filter(column => !['mobiledoc', 'lexical','@@UNIQUE_CONSTRAINTS@@','@@INDEXES@@'].includes(column)));
+            });
+
+            it('strips mobiledoc and lexical columns from a specified columns option', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {},
+                        columns: ['id', 'mobiledoc', 'lexical', 'visibility']
+                    }
+                };
+
+                serializers.input.posts.browse(apiConfig, frame);
+                frame.options.columns.should.eql(['id', 'visibility']);
+            });
+
+            it('forces visibility column if columns are specified', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {},
+                        columns: ['id']
+                    }
+                };
+
+                serializers.input.posts.browse(apiConfig, frame);
+                frame.options.columns.should.eql(['id', 'visibility']);
+            });
+
+            it('strips mobiledoc and lexical columns from a specified selectRaw option', function () {
+                const apiConfig = {};
+                const frame = {
+                    apiType: 'content',
+                    options: {
+                        context: {},
+                        selectRaw: 'id, mobiledoc, lexical'
+                    }
+                };
+
+                serializers.input.posts.browse(apiConfig, frame);
+                frame.options.selectRaw.should.eql('id');
+            });
+        });
     });
 
     describe('read', function () {
@@ -233,6 +300,9 @@ describe('Unit: endpoints/utils/serializers/input/posts', function () {
             });
 
             it('transforms html when html is present in data and source options', function () {
+                // JSDOM require is sometimes very slow on CI causing random timeouts
+                this.timeout(4000);
+
                 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 = {
@@ -262,6 +332,9 @@ describe('Unit: endpoints/utils/serializers/input/posts', function () {
             });
 
             it('preserves html cards in transformed html', function () {
+                // JSDOM require is sometimes very slow on CI causing random timeouts
+                this.timeout(4000);
+
                 const apiConfig = {};
                 const frame = {
                     options: {
@@ -280,7 +353,35 @@ describe('Unit: endpoints/utils/serializers/input/posts', function () {
                 serializers.input.posts.edit(apiConfig, frame);
 
                 let postData = frame.data.posts[0];
-                postData.lexical.should.equal('{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"this is great feature","type":"extended-text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1},{"type":"html","version":1,"html":"<div class=\\"custom\\">My Custom HTML</div>"},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"custom html preserved!","type":"extended-text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}');
+                postData.lexical.should.equal('{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"this is great feature","type":"extended-text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1},{"type":"html","version":1,"html":"<div class=\\"custom\\">My Custom HTML</div>","visibility":{"showOnEmail":true,"showOnWeb":true,"segment":""}},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"custom html preserved!","type":"extended-text","version":1}],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}');
+            });
+
+            it('throws error when HTML conversion fails', function () {
+                // JSDOM require is sometimes very slow on CI causing random timeouts
+                this.timeout(4000);
+
+                const frame = {
+                    options: {
+                        source: 'html'
+                    },
+                    data: {
+                        posts: [
+                            {
+                                id: 'id1',
+                                html: '<bananarama>'
+                            }
+                        ]
+                    }
+                };
+
+                sinon.stub(mobiledocLib, 'toMobiledoc').throws(new Error('Some error'));
+
+                try {
+                    serializers.input.posts.edit({}, frame);
+                    should.fail('Error expected');
+                } catch (err) {
+                    err.message.should.eql('Failed to convert HTML to Mobiledoc');
+                }
             });
         });
 
diff --git a/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js b/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js
index eac6f40718f..547de671487 100644
--- a/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js
+++ b/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js
@@ -219,7 +219,9 @@ describe('Unit: utils/serializers/output/mappers', function () {
 
             const newsletter = createJsonModel(testUtils.DataGenerator.forKnex.createNewsletter({
                 name: 'Full newsletter',
-                slug: 'full-newsletter'
+                slug: 'full-newsletter',
+                sender_email: null,
+                sender_reply_to: 'newsletter'
             }));
 
             const mapped = mappers.newsletters(newsletter, frame);
diff --git a/ghost/core/test/unit/frontend/helpers/__snapshots__/ghost_head.test.js.snap b/ghost/core/test/unit/frontend/helpers/__snapshots__/ghost_head.test.js.snap
index 2fc30edbb0a..b9bd03697e3 100644
--- a/ghost/core/test/unit/frontend/helpers/__snapshots__/ghost_head.test.js.snap
+++ b/ghost/core/test/unit/frontend/helpers/__snapshots__/ghost_head.test.js.snap
@@ -281,6 +281,19 @@ Object {
 }
 `;
 
+exports[`{{ghost_head}} helper accent_color does not override code injection 1 1`] = `
+Object {
+  "rendered": "<meta name=\\"generator\\" content=\\"Ghost 0.3\\">
+    <link rel=\\"alternate\\" type=\\"application/rss+xml\\" title=\\"Ghost\\" href=\\"http://localhost:65530/rss/\\">
+    
+    <script defer src=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/sodo-search.min.js\\" data-key=\\"xyz\\" data-styles=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/main.css\\" data-sodo-search=\\"http://127.0.0.1:2369/\\" crossorigin=\\"anonymous\\"></script><style>:root {--ghost-accent-color: #site-setting;}</style>
+    
+    <link href=\\"http://127.0.0.1:2369/webmentions/receive/\\" rel=\\"webmention\\">
+    <style>:root {--ghost-accent-color: #site-code-injection}</style>
+    <style>:root {--ghost-accent-color: #post-code-injection}</style>",
+}
+`;
+
 exports[`{{ghost_head}} helper accent_color includes style tag on templates with no context 1 1`] = `
 Object {
   "rendered": "<meta name=\\"generator\\" content=\\"Ghost 0.3\\">
@@ -444,7 +457,7 @@ Object {
   "string": "<meta name=\\"description\\" content=\\"site description\\" />
     <link rel=\\"canonical\\" href=\\"http://127.0.0.1:2369/\\" />
     <meta name=\\"referrer\\" content=\\"no-referrer-when-downgrade\\" />
-    
+
     <meta property=\\"og:site_name\\" content=\\"Ghost\\" />
     <meta property=\\"og:type\\" content=\\"website\\" />
     <meta property=\\"og:title\\" content=\\"Ghost\\" />
@@ -456,7 +469,7 @@ Object {
     <meta name=\\"twitter:description\\" content=\\"site description\\" />
     <meta name=\\"twitter:url\\" content=\\"http://127.0.0.1:2369/\\" />
     <meta name=\\"twitter:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\" />
-    
+
     <script type=\\"application/ld+json\\">
 {
     \\"@context\\": \\"https://schema.org\\",
@@ -559,7 +572,7 @@ Object {
   "string": "<meta name=\\"description\\" content=\\"site description\\" />
     <link rel=\\"canonical\\" href=\\"http://127.0.0.1:2369/\\" />
     <meta name=\\"referrer\\" content=\\"no-referrer-when-downgrade\\" />
-    
+
     <meta property=\\"og:site_name\\" content=\\"Ghost\\" />
     <meta property=\\"og:type\\" content=\\"website\\" />
     <meta property=\\"og:title\\" content=\\"Ghost\\" />
@@ -571,7 +584,7 @@ Object {
     <meta name=\\"twitter:description\\" content=\\"site description\\" />
     <meta name=\\"twitter:url\\" content=\\"http://127.0.0.1:2369/\\" />
     <meta name=\\"twitter:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\" />
-    
+
     <script type=\\"application/ld+json\\">
 {
     \\"@context\\": \\"https://schema.org\\",
@@ -673,7 +686,7 @@ Object {
   "string": "<meta name=\\"description\\" content=\\"site description\\" />
     <link rel=\\"canonical\\" href=\\"http://127.0.0.1:2369/\\" />
     <meta name=\\"referrer\\" content=\\"no-referrer-when-downgrade\\" />
-    
+
     <meta property=\\"og:site_name\\" content=\\"Ghost\\" />
     <meta property=\\"og:type\\" content=\\"website\\" />
     <meta property=\\"og:title\\" content=\\"Ghost\\" />
@@ -685,7 +698,7 @@ Object {
     <meta name=\\"twitter:description\\" content=\\"site description\\" />
     <meta name=\\"twitter:url\\" content=\\"http://127.0.0.1:2369/\\" />
     <meta name=\\"twitter:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\" />
-    
+
     <script type=\\"application/ld+json\\">
 {
     \\"@context\\": \\"https://schema.org\\",
@@ -714,7 +727,7 @@ Object {
 
     <meta name=\\"generator\\" content=\\"Ghost 4.3\\" />
     <link rel=\\"alternate\\" type=\\"application/rss+xml\\" title=\\"Ghost\\" href=\\"http://localhost:65530/rss/\\" />
-    
+
     <script defer src=\\"https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~1.0/umd/sodo-search.min.js\\" data-key=\\"xyz\\" data-styles=\\"https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~1.0/umd/main.css\\" data-sodo-search=\\"http://127.0.0.1:2369/\\" crossorigin=\\"anonymous\\"></script>",
 }
 `;
@@ -946,6 +959,248 @@ Object {
 }
 `;
 
+exports[`{{ghost_head}} helper includes tinybird tracker script when config is set Sets tb_post_uuid on post page 1 1`] = `
+Object {
+  "rendered": "<link rel=\\"canonical\\" href=\\"http://127.0.0.1:2369/post/\\">
+    <meta name=\\"referrer\\" content=\\"no-referrer-when-downgrade\\">
+    <link rel=\\"amphtml\\" href=\\"http://127.0.0.1:2369/post/amp/\\">
+    
+    <meta property=\\"og:site_name\\" content=\\"Ghost\\">
+    <meta property=\\"og:type\\" content=\\"article\\">
+    <meta property=\\"og:title\\" content=\\"Testing stats\\">
+    <meta property=\\"og:description\\" content=\\"Creating stats for the site\\">
+    <meta property=\\"og:url\\" content=\\"http://127.0.0.1:2369/post/\\">
+    <meta property=\\"og:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    <meta property=\\"article:published_time\\" content=\\"1970-01-01T00:00:00.000Z\\">
+    <meta property=\\"article:modified_time\\" content=\\"1970-01-01T00:00:00.000Z\\">
+    <meta property=\\"article:author\\" content=\\"https://www.facebook.com/testuser\\">
+    <meta name=\\"twitter:card\\" content=\\"summary_large_image\\">
+    <meta name=\\"twitter:title\\" content=\\"Testing stats\\">
+    <meta name=\\"twitter:description\\" content=\\"Creating stats for the site\\">
+    <meta name=\\"twitter:url\\" content=\\"http://127.0.0.1:2369/post/\\">
+    <meta name=\\"twitter:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    <meta name=\\"twitter:label1\\" content=\\"Written by\\">
+    <meta name=\\"twitter:data1\\" content=\\"Author name\\">
+    <meta name=\\"twitter:creator\\" content=\\"@testuser\\">
+    
+    <script type=\\"application/ld+json\\">
+{
+    \\"@context\\": \\"https://schema.org\\",
+    \\"@type\\": \\"Article\\",
+    \\"publisher\\": {
+        \\"@type\\": \\"Organization\\",
+        \\"name\\": \\"Ghost\\",
+        \\"url\\": \\"http://127.0.0.1:2369/\\",
+        \\"logo\\": {
+            \\"@type\\": \\"ImageObject\\",
+            \\"url\\": \\"http://127.0.0.1:2369/favicon.ico\\"
+        }
+    },
+    \\"author\\": {
+        \\"@type\\": \\"Person\\",
+        \\"name\\": \\"Author name\\",
+        \\"image\\": {
+            \\"@type\\": \\"ImageObject\\",
+            \\"url\\": \\"http://127.0.0.1:2369/content/images/test-author-image.png\\"
+        },
+        \\"url\\": \\"https://mysite.com/fakeauthor/\\",
+        \\"sameAs\\": [
+            \\"http://authorwebsite.com\\",
+            \\"https://www.facebook.com/testuser\\",
+            \\"https://twitter.com/testuser\\"
+        ]
+    },
+    \\"headline\\": \\"Testing stats\\",
+    \\"url\\": \\"http://127.0.0.1:2369/post/\\",
+    \\"datePublished\\": \\"1970-01-01T00:00:00.000Z\\",
+    \\"dateModified\\": \\"1970-01-01T00:00:00.000Z\\",
+    \\"description\\": \\"Creating stats for the site\\",
+    \\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/post/\\"
+}
+    </script>
+
+    <meta name=\\"generator\\" content=\\"Ghost 0.3\\">
+    <link rel=\\"alternate\\" type=\\"application/rss+xml\\" title=\\"Ghost\\" href=\\"http://localhost:65530/rss/\\">
+    
+    <script defer src=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/sodo-search.min.js\\" data-key=\\"xyz\\" data-styles=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/main.css\\" data-sodo-search=\\"http://127.0.0.1:2369/\\" crossorigin=\\"anonymous\\"></script>
+    
+    <link href=\\"http://127.0.0.1:2369/webmentions/receive/\\" rel=\\"webmention\\">
+    <script defer src=\\"https://unpkg.com/@tinybirdco/flock.js\\" data-host=\\"https://api.tinybird.co\\" data-token=\\"tinybird_token\\" tb_site_uuid=\\"tb_test_site_uuid\\" tb_post_uuid=\\"post_uuid\\" tb_member_uuid=\\"undefined\\" tb_member_status=\\"undefined\\"></script>",
+}
+`;
+
+exports[`{{ghost_head}} helper includes tinybird tracker script when config is set sets both tb_member_x variables and tb_post_uuid on logged in post page 1 1`] = `
+Object {
+  "rendered": "<link rel=\\"canonical\\" href=\\"http://127.0.0.1:2369/post/\\">
+    <meta name=\\"referrer\\" content=\\"no-referrer-when-downgrade\\">
+    <link rel=\\"amphtml\\" href=\\"http://127.0.0.1:2369/post/amp/\\">
+    
+    <meta property=\\"og:site_name\\" content=\\"Ghost\\">
+    <meta property=\\"og:type\\" content=\\"article\\">
+    <meta property=\\"og:title\\" content=\\"Testing stats\\">
+    <meta property=\\"og:description\\" content=\\"Creating stats for the site\\">
+    <meta property=\\"og:url\\" content=\\"http://127.0.0.1:2369/post/\\">
+    <meta property=\\"og:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    <meta property=\\"article:published_time\\" content=\\"1970-01-01T00:00:00.000Z\\">
+    <meta property=\\"article:modified_time\\" content=\\"1970-01-01T00:00:00.000Z\\">
+    <meta property=\\"article:author\\" content=\\"https://www.facebook.com/testuser\\">
+    <meta name=\\"twitter:card\\" content=\\"summary_large_image\\">
+    <meta name=\\"twitter:title\\" content=\\"Testing stats\\">
+    <meta name=\\"twitter:description\\" content=\\"Creating stats for the site\\">
+    <meta name=\\"twitter:url\\" content=\\"http://127.0.0.1:2369/post/\\">
+    <meta name=\\"twitter:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    <meta name=\\"twitter:label1\\" content=\\"Written by\\">
+    <meta name=\\"twitter:data1\\" content=\\"Author name\\">
+    <meta name=\\"twitter:creator\\" content=\\"@testuser\\">
+    
+    <script type=\\"application/ld+json\\">
+{
+    \\"@context\\": \\"https://schema.org\\",
+    \\"@type\\": \\"Article\\",
+    \\"publisher\\": {
+        \\"@type\\": \\"Organization\\",
+        \\"name\\": \\"Ghost\\",
+        \\"url\\": \\"http://127.0.0.1:2369/\\",
+        \\"logo\\": {
+            \\"@type\\": \\"ImageObject\\",
+            \\"url\\": \\"http://127.0.0.1:2369/favicon.ico\\"
+        }
+    },
+    \\"author\\": {
+        \\"@type\\": \\"Person\\",
+        \\"name\\": \\"Author name\\",
+        \\"image\\": {
+            \\"@type\\": \\"ImageObject\\",
+            \\"url\\": \\"http://127.0.0.1:2369/content/images/test-author-image.png\\"
+        },
+        \\"url\\": \\"https://mysite.com/fakeauthor/\\",
+        \\"sameAs\\": [
+            \\"http://authorwebsite.com\\",
+            \\"https://www.facebook.com/testuser\\",
+            \\"https://twitter.com/testuser\\"
+        ]
+    },
+    \\"headline\\": \\"Testing stats\\",
+    \\"url\\": \\"http://127.0.0.1:2369/post/\\",
+    \\"datePublished\\": \\"1970-01-01T00:00:00.000Z\\",
+    \\"dateModified\\": \\"1970-01-01T00:00:00.000Z\\",
+    \\"description\\": \\"Creating stats for the site\\",
+    \\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/post/\\"
+}
+    </script>
+
+    <meta name=\\"generator\\" content=\\"Ghost 4.3\\">
+    <link rel=\\"alternate\\" type=\\"application/rss+xml\\" title=\\"Ghost\\" href=\\"http://localhost:65530/rss/\\">
+    
+    <script defer src=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/sodo-search.min.js\\" data-key=\\"xyz\\" data-styles=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/main.css\\" data-sodo-search=\\"http://127.0.0.1:2369/\\" crossorigin=\\"anonymous\\"></script>
+    
+    <link href=\\"http://127.0.0.1:2369/webmentions/receive/\\" rel=\\"webmention\\">
+    <script defer src=\\"https://unpkg.com/@tinybirdco/flock.js\\" data-host=\\"https://api.tinybird.co\\" data-token=\\"tinybird_token\\" tb_site_uuid=\\"tb_test_site_uuid\\" tb_post_uuid=\\"post_uuid\\" tb_member_uuid=\\"member_uuid\\" tb_member_status=\\"free\\"></script>",
+}
+`;
+
+exports[`{{ghost_head}} helper includes tinybird tracker script when config is set sets tb_member_x variables on logged in home page 1 1`] = `
+Object {
+  "rendered": "<meta name=\\"description\\" content=\\"site description\\">
+    <link rel=\\"canonical\\" href=\\"http://127.0.0.1:2369/\\">
+    <meta name=\\"referrer\\" content=\\"no-referrer-when-downgrade\\">
+    
+    <meta property=\\"og:site_name\\" content=\\"Ghost\\">
+    <meta property=\\"og:type\\" content=\\"website\\">
+    <meta property=\\"og:title\\" content=\\"Ghost\\">
+    <meta property=\\"og:description\\" content=\\"site description\\">
+    <meta property=\\"og:url\\" content=\\"http://127.0.0.1:2369/\\">
+    <meta property=\\"og:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    <meta name=\\"twitter:card\\" content=\\"summary_large_image\\">
+    <meta name=\\"twitter:title\\" content=\\"Ghost\\">
+    <meta name=\\"twitter:description\\" content=\\"site description\\">
+    <meta name=\\"twitter:url\\" content=\\"http://127.0.0.1:2369/\\">
+    <meta name=\\"twitter:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    
+    <script type=\\"application/ld+json\\">
+{
+    \\"@context\\": \\"https://schema.org\\",
+    \\"@type\\": \\"WebSite\\",
+    \\"publisher\\": {
+        \\"@type\\": \\"Organization\\",
+        \\"name\\": \\"Ghost\\",
+        \\"url\\": \\"http://127.0.0.1:2369/\\",
+        \\"logo\\": {
+            \\"@type\\": \\"ImageObject\\",
+            \\"url\\": \\"http://127.0.0.1:2369/favicon.ico\\"
+        }
+    },
+    \\"url\\": \\"http://127.0.0.1:2369/\\",
+    \\"image\\": {
+        \\"@type\\": \\"ImageObject\\",
+        \\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
+    },
+    \\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
+    \\"description\\": \\"site description\\"
+}
+    </script>
+
+    <meta name=\\"generator\\" content=\\"Ghost 4.3\\">
+    <link rel=\\"alternate\\" type=\\"application/rss+xml\\" title=\\"Ghost\\" href=\\"http://localhost:65530/rss/\\">
+    
+    <script defer src=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/sodo-search.min.js\\" data-key=\\"xyz\\" data-styles=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/main.css\\" data-sodo-search=\\"http://127.0.0.1:2369/\\" crossorigin=\\"anonymous\\"></script>
+    
+    <link href=\\"http://127.0.0.1:2369/webmentions/receive/\\" rel=\\"webmention\\">
+    <script defer src=\\"https://unpkg.com/@tinybirdco/flock.js\\" data-host=\\"https://api.tinybird.co\\" data-token=\\"tinybird_token\\" tb_site_uuid=\\"tb_test_site_uuid\\" tb_post_uuid=\\"undefined\\" tb_member_uuid=\\"member_uuid\\" tb_member_status=\\"paid\\"></script>",
+}
+`;
+
+exports[`{{ghost_head}} helper includes tinybird tracker script when config is set with all tb_variables set to undefined on logged out home page 1 1`] = `
+Object {
+  "rendered": "<meta name=\\"description\\" content=\\"site description\\">
+    <link rel=\\"canonical\\" href=\\"http://127.0.0.1:2369/\\">
+    <meta name=\\"referrer\\" content=\\"no-referrer-when-downgrade\\">
+    
+    <meta property=\\"og:site_name\\" content=\\"Ghost\\">
+    <meta property=\\"og:type\\" content=\\"website\\">
+    <meta property=\\"og:title\\" content=\\"Ghost\\">
+    <meta property=\\"og:description\\" content=\\"site description\\">
+    <meta property=\\"og:url\\" content=\\"http://127.0.0.1:2369/\\">
+    <meta property=\\"og:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    <meta name=\\"twitter:card\\" content=\\"summary_large_image\\">
+    <meta name=\\"twitter:title\\" content=\\"Ghost\\">
+    <meta name=\\"twitter:description\\" content=\\"site description\\">
+    <meta name=\\"twitter:url\\" content=\\"http://127.0.0.1:2369/\\">
+    <meta name=\\"twitter:image\\" content=\\"http://127.0.0.1:2369/content/images/site-cover.png\\">
+    
+    <script type=\\"application/ld+json\\">
+{
+    \\"@context\\": \\"https://schema.org\\",
+    \\"@type\\": \\"WebSite\\",
+    \\"publisher\\": {
+        \\"@type\\": \\"Organization\\",
+        \\"name\\": \\"Ghost\\",
+        \\"url\\": \\"http://127.0.0.1:2369/\\",
+        \\"logo\\": {
+            \\"@type\\": \\"ImageObject\\",
+            \\"url\\": \\"http://127.0.0.1:2369/favicon.ico\\"
+        }
+    },
+    \\"url\\": \\"http://127.0.0.1:2369/\\",
+    \\"image\\": {
+        \\"@type\\": \\"ImageObject\\",
+        \\"url\\": \\"http://127.0.0.1:2369/content/images/site-cover.png\\"
+    },
+    \\"mainEntityOfPage\\": \\"http://127.0.0.1:2369/\\",
+    \\"description\\": \\"site description\\"
+}
+    </script>
+
+    <meta name=\\"generator\\" content=\\"Ghost 4.3\\">
+    <link rel=\\"alternate\\" type=\\"application/rss+xml\\" title=\\"Ghost\\" href=\\"http://localhost:65530/rss/\\">
+    
+    <script defer src=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/sodo-search.min.js\\" data-key=\\"xyz\\" data-styles=\\"https://cdn.jsdelivr.net/ghost/sodo-search@~[[VERSION]]/umd/main.css\\" data-sodo-search=\\"http://127.0.0.1:2369/\\" crossorigin=\\"anonymous\\"></script>
+    
+    <link href=\\"http://127.0.0.1:2369/webmentions/receive/\\" rel=\\"webmention\\">
+    <script defer src=\\"https://unpkg.com/@tinybirdco/flock.js\\" data-host=\\"https://api.tinybird.co\\" data-token=\\"tinybird_token\\" tb_site_uuid=\\"tb_test_site_uuid\\" tb_post_uuid=\\"undefined\\" tb_member_uuid=\\"undefined\\" tb_member_status=\\"undefined\\"></script>",
+}
+`;
+
 exports[`{{ghost_head}} helper members scripts includes portal when members enabled 1 1`] = `
 Object {
   "rendered": "<meta name=\\"description\\" content=\\"site description\\">
diff --git a/ghost/core/test/unit/frontend/helpers/foreach.test.js b/ghost/core/test/unit/frontend/helpers/foreach.test.js
index 2e23503948f..642a6716665 100644
--- a/ghost/core/test/unit/frontend/helpers/foreach.test.js
+++ b/ghost/core/test/unit/frontend/helpers/foreach.test.js
@@ -193,7 +193,7 @@ describe('{{#foreach}} helper', function () {
             resultData[_.size(context) - 1].data.should.eql(options.fn.lastCall.args[1].data);
         });
 
-        it('should handle rowStart and rowEnd for multiple columns (array)', function () {
+        it('should handle rowStart and rowEnd for multiple columns (object)', function () {
             const expected = [
                 {first: true, last: false, even: false, odd: true, rowStart: true, rowEnd: false},
                 {first: false, last: false, even: true, odd: false, rowStart: false, rowEnd: true},
diff --git a/ghost/core/test/unit/frontend/helpers/get.test.js b/ghost/core/test/unit/frontend/helpers/get.test.js
index 1a2d2ad6874..3ed0a61428c 100644
--- a/ghost/core/test/unit/frontend/helpers/get.test.js
+++ b/ghost/core/test/unit/frontend/helpers/get.test.js
@@ -1,3 +1,4 @@
+const assert = require('assert').strict;
 const should = require('should');
 const sinon = require('sinon');
 const {SafeString} = require('../../../../core/frontend/services/handlebars');
@@ -38,6 +39,45 @@ describe('{{#get}} helper', function () {
         sinon.restore();
     });
 
+    describe('cacheability optimisation', function () {
+        it('Ignores non posts', function () {
+            const apiOptions = {
+                filter: 'id:-abcdef1234567890abcdef12'
+            };
+            const {
+                options,
+                parseResult
+            } = get.optimiseFilterCacheability('not-posts', apiOptions);
+            assert.equal(options.filter, 'id:-abcdef1234567890abcdef12');
+            assert.deepEqual(parseResult({not: 'modified'}), {not: 'modified'});
+        });
+        it('Changes the filter for simple id negations', function () {
+            const apiOptions = {
+                filter: 'id:-abcdef1234567890abcdef12',
+                limit: 1
+            };
+            const {
+                options,
+                parseResult
+            } = get.optimiseFilterCacheability('posts', apiOptions);
+            assert.equal(options.filter, 'id:-null');
+            assert.deepEqual(parseResult({
+                posts: [{
+                    id: 'abcdef1234567890abcdef12'
+                }, {
+                    id: '1234567890abcdef12345678'
+                }]
+            }), {
+                posts: [{
+                    id: '1234567890abcdef12345678'
+                }],
+                meta: {
+                    cacheabilityOptimisation: true
+                }
+            });
+        });
+    });
+
     describe('context preparation', function () {
         const meta = {pagination: {}};
 
@@ -394,12 +434,13 @@ describe('{{#get}} helper', function () {
         it('should log an error and return safely if it hits the timeout threshold', async function () {
             configUtils.set('optimization:getHelper:timeout:threshold', 1);
 
-            await get.call(
+            const result = await get.call(
                 {},
                 'posts',
                 {hash: {}, data: locals, fn: fn, inverse: inverse}
             );
 
+            assert(result.toString().includes('data-aborted-get-helper'));
             // A log message will be output
             logging.error.calledOnce.should.be.true();
             // The get helper gets called with an empty array of results
diff --git a/ghost/core/test/unit/frontend/helpers/ghost_head.test.js b/ghost/core/test/unit/frontend/helpers/ghost_head.test.js
index a8305e56361..2241abb0a91 100644
--- a/ghost/core/test/unit/frontend/helpers/ghost_head.test.js
+++ b/ghost/core/test/unit/frontend/helpers/ghost_head.test.js
@@ -340,6 +340,19 @@ describe('{{ghost_head}} helper', function () {
             published_at: new Date(0),
             updated_at: new Date(0)
         }));
+
+        posts.push(createPost({ // Post 10
+            title: 'Testing stats',
+            uuid: 'post_uuid',
+            excerpt: 'Creating stats for the site',
+            mobiledoc: testUtils.DataGenerator.markdownToMobiledoc('Creating stats for the site'),
+            authors: [
+                authors[3]
+            ],
+            primary_author: authors[3],
+            published_at: new Date(0),
+            updated_at: new Date(0)
+        }));
     };
 
     before(function () {
@@ -1065,6 +1078,30 @@ describe('{{ghost_head}} helper', function () {
                 }
             }));
         });
+
+        it('does not override code injection', async function () {
+            settingsCache.get.withArgs('codeinjection_head').returns('<style>:root {--ghost-accent-color: #site-code-injection}</style>');
+
+            const renderObject = {
+                post: Object.assign({}, posts[1], {codeinjection_head: '<style>:root {--ghost-accent-color: #post-code-injection}</style>'})
+            };
+
+            const templateOptions = {
+                site: {
+                    accent_color: '#site-setting'
+                }
+            };
+
+            await testGhostHead(testUtils.createHbsResponse({
+                templateOptions,
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/post/amp/',
+                    context: null,
+                    safeVersion: '0.3'
+                }
+            }));
+        });
     });
 
     describe('members scripts', function () {
@@ -1161,4 +1198,80 @@ describe('{{ghost_head}} helper', function () {
             }));
         });
     });
+
+    describe('includes tinybird tracker script when config is set', function () {
+        beforeEach(function () {
+            configUtils.set({
+                tinybird: {
+                    tracker: {
+                        scriptUrl: 'https://unpkg.com/@tinybirdco/flock.js',
+                        endpoint: 'https://api.tinybird.co',
+                        token: 'tinybird_token',
+                        id: 'tb_test_site_uuid'
+                    }
+                }
+            });
+        });
+        it('with all tb_variables set to undefined on logged out home page', async function () {
+            await testGhostHead(testUtils.createHbsResponse({
+                locals: {
+                    relativeUrl: '/',
+                    context: ['home', 'index'],
+                    safeVersion: '4.3'
+                }
+            }));
+        });
+
+        it('Sets tb_post_uuid on post page', async function () {
+            const renderObject = {
+                post: posts[10]
+            };
+
+            await testGhostHead(testUtils.createHbsResponse({
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/post/',
+                    context: ['post'],
+                    safeVersion: '0.3'
+                }
+            }));
+        });
+
+        it('sets tb_member_x variables on logged in home page', async function () {
+            const renderObject = {
+                member: {
+                    uuid: 'member_uuid',
+                    status: 'paid'
+                }
+            };
+
+            await testGhostHead(testUtils.createHbsResponse({
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/',
+                    context: ['home', 'index'],
+                    safeVersion: '4.3'
+                }
+            }));
+        });
+
+        it('sets both tb_member_x variables and tb_post_uuid on logged in post page', async function () {
+            const renderObject = {
+                member: {
+                    uuid: 'member_uuid',
+                    status: 'free'
+                },
+                post: posts[10]
+            };
+
+            await testGhostHead(testUtils.createHbsResponse({
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/post/',
+                    context: ['post'],
+                    safeVersion: '4.3'
+                }
+            }));
+        });
+    });
 });
diff --git a/ghost/core/test/unit/frontend/helpers/has.test.js b/ghost/core/test/unit/frontend/helpers/has.test.js
index 55da2159dda..8debadfa984 100644
--- a/ghost/core/test/unit/frontend/helpers/has.test.js
+++ b/ghost/core/test/unit/frontend/helpers/has.test.js
@@ -202,7 +202,7 @@ describe('{{#has}} helper', function () {
             inverse.called.should.be.false();
         });
 
-        it('should handle tags and authors like an OR query (pass)', function () {
+        it('should handle tags and authors like an OR query when match both author and tag (pass)', function () {
             thisCtx = {authors: [{name: 'sam'}], tags: [{name: 'much'}, {name: 'bar'}, {name: 'baz'}]};
 
             callHasHelper(thisCtx, {author: 'joe, sam, pat', tag: 'much, such, wow'});
@@ -238,7 +238,7 @@ describe('{{#has}} helper', function () {
             inverse.called.should.be.false();
         });
 
-        it('count:>1', function () {
+        it('count:>1 (fail)', function () {
             thisCtx = {authors: [{name: 'fred'}]};
 
             callHasHelper(thisCtx, {author: 'count:>1'});
@@ -247,7 +247,7 @@ describe('{{#has}} helper', function () {
             inverse.called.should.be.true();
         });
 
-        it('count:>1', function () {
+        it('count:>1 (pass)', function () {
             thisCtx = {authors: [{name: 'fred'}, {name: 'sam'}]};
 
             callHasHelper(thisCtx, {author: 'count:>1'});
diff --git a/ghost/core/test/unit/frontend/helpers/recommendations.test.js b/ghost/core/test/unit/frontend/helpers/recommendations.test.js
index df7c3e9b876..df97808ab44 100644
--- a/ghost/core/test/unit/frontend/helpers/recommendations.test.js
+++ b/ghost/core/test/unit/frontend/helpers/recommendations.test.js
@@ -67,11 +67,13 @@ describe('{{#recommendations}} helper', function () {
 
         response.should.be.an.Object().with.property('string');
 
-        const expected = trimSpaces(html`
+        const expected = html`
         <ul class="recommendations">
             <li class="recommendation">
                 <a href="https://recommendations1.com" data-recommendation="1" target="_blank" rel="noopener">
-                    <img class="recommendation-favicon" src="https://recommendations1.com/favicon.ico" alt="Recommendation 1" loading="lazy">
+                    <div class="recommendation-favicon">
+                        <img src="https://recommendations1.com/favicon.ico" alt="Recommendation 1" loading="lazy" onerror="this.style.display='none';">
+                    </div>
                     <h5 class="recommendation-title">Recommendation 1</h5>
                     <span class="recommendation-url">recommendations1.com</span>
                     <p class="recommendation-description">Description 1</p>
@@ -79,17 +81,25 @@ describe('{{#recommendations}} helper', function () {
             </li>
             <li class="recommendation">
                 <a href="https://recommendations2.com" data-recommendation="2" target="_blank" rel="noopener">
-                    <img class="recommendation-favicon" src="https://recommendations2.com/favicon.ico" alt="Recommendation 2" loading="lazy">
+                    <div class="recommendation-favicon">
+                        <img src="https://recommendations2.com/favicon.ico" alt="Recommendation 2" loading="lazy" onerror="this.style.display='none';">
+                    </div>
                     <h5 class="recommendation-title">Recommendation 2</h5>
                     <span class="recommendation-url">recommendations2.com</span>
                     <p class="recommendation-description">Description 2</p>
                 </a>
             </li>
         </ul>
-        `);
-        const actual = trimSpaces(response.string);
+        `;
+        const actual = response.string;
 
-        actual.should.equal(expected);
+        // Uncomment to debug
+        // console.log('Expected:');
+        // console.log(expected);
+        // console.log('Actual:');
+        // console.log(actual);
+
+        trimSpaces(actual).should.equal(trimSpaces(expected));
     });
 
     describe('when there are no recommendations', function () {
diff --git a/ghost/core/test/unit/frontend/helpers/t.test.js b/ghost/core/test/unit/frontend/helpers/t.test.js
index 433365936c6..6fcb736d1f2 100644
--- a/ghost/core/test/unit/frontend/helpers/t.test.js
+++ b/ghost/core/test/unit/frontend/helpers/t.test.js
@@ -53,4 +53,28 @@ describe('{{t}} helper', function () {
 
         rendered.should.eql('Top left Button');
     });
+
+    it('returns an empty string if translation key is an empty string', function () {
+        let rendered = t.call({}, '', {
+            hash: {}
+        });
+
+        rendered.should.eql('');
+    });
+
+    it('returns an empty string if translation key is missing', function () {
+        let rendered = t.call({}, undefined, {
+            hash: {}
+        });
+
+        rendered.should.eql('');
+    });
+
+    it('returns a translated string even if no options are passed', function () {
+        themeI18n.init({activeTheme: 'locale-theme', locale: 'en'});
+
+        let rendered = t.call({}, 'Top left Button');
+
+        rendered.should.eql('Left Button on Top');
+    });
 });
diff --git a/ghost/core/test/unit/frontend/meta/image-dimensions.test.js b/ghost/core/test/unit/frontend/meta/image-dimensions.test.js
index 6b3fc7e1a5f..c8cc38c338a 100644
--- a/ghost/core/test/unit/frontend/meta/image-dimensions.test.js
+++ b/ghost/core/test/unit/frontend/meta/image-dimensions.test.js
@@ -1,3 +1,4 @@
+const _ = require('lodash');
 const should = require('should');
 const sinon = require('sinon');
 const rewire = require('rewire');
@@ -218,4 +219,112 @@ describe('getImageDimensions', function () {
             done();
         }).catch(done);
     });
+
+    it('should adjust image sizes to a max width', function (done) {
+        const originalMetaData = {
+            coverImage: {
+                url: 'http://mysite.com/content/images/mypostcoverimage.jpg'
+            },
+            authorImage: {
+                url: 'http://mysite.com/content/images/me.jpg'
+            },
+            ogImage: {
+                url: 'http://mysite.com/content/images/super-facebook-image.jpg'
+            },
+            twitterImage: 'http://mysite.com/content/images/super-twitter-image.jpg',
+            site: {
+                logo: {
+                    url: 'http://mysite.com/content/images/logo.jpg'
+                }
+            }
+        };
+
+        // getImageDimensions modifies metaData so we clone so we can compare
+        // against the original
+        const metaData = _.cloneDeep(originalMetaData);
+
+        // callsFake rather than returns otherwise the object is passed by
+        // reference and assigned to each image meaning it gets modified when
+        // the first image is resized and later images no longer look oversized
+        sizeOfStub.callsFake(() => ({
+            width: 2000,
+            height: 1200,
+            type: 'jpg'
+        }));
+
+        getImageDimensions.__set__('imageSizeCache', {
+            getCachedImageSizeFromUrl: sizeOfStub
+        });
+
+        getImageDimensions(metaData).then(function (result) {
+            should.exist(result);
+            sizeOfStub.calledWith(originalMetaData.coverImage.url).should.be.true();
+            sizeOfStub.calledWith(originalMetaData.authorImage.url).should.be.true();
+            sizeOfStub.calledWith(originalMetaData.ogImage.url).should.be.true();
+            sizeOfStub.calledWith(originalMetaData.twitterImage).should.be.true();
+            sizeOfStub.calledWith(originalMetaData.site.logo.url).should.be.true();
+            result.coverImage.should.have.property('url');
+            result.coverImage.url.should.eql('http://mysite.com/content/images/size/w1200/mypostcoverimage.jpg');
+            result.coverImage.should.have.property('dimensions');
+            result.coverImage.dimensions.should.have.property('width', 1200);
+            result.coverImage.dimensions.should.have.property('height', 720);
+            result.authorImage.should.have.property('url');
+            result.authorImage.url.should.eql('http://mysite.com/content/images/size/w1200/me.jpg');
+            result.authorImage.should.have.property('dimensions');
+            result.authorImage.dimensions.should.have.property('width', 1200);
+            result.authorImage.dimensions.should.have.property('height', 720);
+            result.ogImage.should.have.property('url');
+            result.ogImage.url.should.eql('http://mysite.com/content/images/size/w1200/super-facebook-image.jpg');
+            result.ogImage.should.have.property('dimensions');
+            result.ogImage.dimensions.should.have.property('width', 1200);
+            result.ogImage.dimensions.should.have.property('height', 720);
+            result.twitterImage.should.eql('http://mysite.com/content/images/size/w1200/super-twitter-image.jpg');
+            done();
+        }).catch(done);
+    });
+
+    it('does not append image size prefix to external images', function (done) {
+        const originalMetaData = {
+            coverImage: {
+                url: 'http://anothersite.com/some/storage/mypostcoverimage.jpg'
+            },
+            authorImage: {
+                url: 'http://anothersite.com/some/storage/me.jpg'
+            },
+            ogImage: {
+                url: 'http://anothersite.com/some/storage/super-facebook-image.jpg'
+            },
+            twitterImage: 'http://anothersite.com/some/storage/super-twitter-image.jpg',
+            site: {
+                logo: {
+                    url: 'http://anothersite.com/some/storage/logo.jpg'
+                }
+            }
+        };
+
+        const metaData = _.cloneDeep(originalMetaData);
+
+        sizeOfStub.callsFake(() => ({
+            width: 2000,
+            height: 1200,
+            type: 'jpg'
+        }));
+
+        getImageDimensions.__set__('imageSizeCache', {
+            getCachedImageSizeFromUrl: sizeOfStub
+        });
+
+        getImageDimensions(metaData).then(function (result) {
+            should.exist(result);
+            result.coverImage.should.have.property('url');
+            result.coverImage.url.should.eql('http://anothersite.com/some/storage/mypostcoverimage.jpg');
+            result.authorImage.should.have.property('url');
+            result.authorImage.url.should.eql('http://anothersite.com/some/storage/me.jpg');
+            result.ogImage.should.have.property('url');
+            result.ogImage.url.should.eql('http://anothersite.com/some/storage/super-facebook-image.jpg');
+            result.site.logo.should.have.property('url');
+            result.site.logo.url.should.eql('http://anothersite.com/some/storage/logo.jpg');
+            done();
+        }).catch(done);
+    });
 });
diff --git a/ghost/core/test/unit/frontend/services/rendering/templates.test.js b/ghost/core/test/unit/frontend/services/rendering/templates.test.js
index 684da31547b..e8bef6ef582 100644
--- a/ghost/core/test/unit/frontend/services/rendering/templates.test.js
+++ b/ghost/core/test/unit/frontend/services/rendering/templates.test.js
@@ -281,7 +281,7 @@ describe('templates', function () {
                 hasTemplateStub.withArgs('tag-design').returns(true);
             });
 
-            it('will return correct view for a tag', function () {
+            it('will return correct view for a tag when template exists', function () {
                 const view = _private.getTemplateForEntries({name: 'tag', slugTemplate: true}, {slugParam: 'design'});
                 should.exist(view);
                 view.should.eql('tag-design');
@@ -454,28 +454,6 @@ describe('templates', function () {
             stubs.pickTemplate.calledWith('test', 'path/to/local/test.hbs').should.be.true();
         });
 
-        it('calls pickTemplate for custom routes', function () {
-            res.routerOptions = {
-                type: 'custom',
-                templates: 'test',
-                defaultTemplate: 'path/to/local/test.hbs'
-            };
-
-            // Call setTemplate
-            templates.setTemplate(req, res, data);
-
-            // should be testFromPickTemplate
-            res._template.should.eql('testFromPickTemplate');
-
-            // Only pickTemplate got called
-            stubs.pickTemplate.called.should.be.true();
-            stubs.getTemplateForEntry.called.should.be.false();
-            stubs.getTemplateForEntries.called.should.be.false();
-            stubs.getTemplateForError.called.should.be.false();
-
-            stubs.pickTemplate.calledWith('test', 'path/to/local/test.hbs').should.be.true();
-        });
-
         it('calls getTemplateForEntry for entry routes', function () {
             res.routerOptions = {
                 type: 'entry'
diff --git a/ghost/core/test/unit/frontend/services/routing/ParentRouter.test.js b/ghost/core/test/unit/frontend/services/routing/ParentRouter.test.js
index e7f812417f1..8c3664f7f6e 100644
--- a/ghost/core/test/unit/frontend/services/routing/ParentRouter.test.js
+++ b/ghost/core/test/unit/frontend/services/routing/ParentRouter.test.js
@@ -280,19 +280,19 @@ describe('UNIT - services/routing/ParentRouter', function () {
     });
 
     describe('fn: isRedirectEnabled', function () {
-        it('no data key defined', function () {
+        it('data is undefined', function () {
             const parentRouter = new ParentRouter();
             parentRouter.data = undefined;
             parentRouter.isRedirectEnabled('tags', 'bacon').should.be.false();
         });
 
-        it('no data key defined', function () {
+        it('data keys are undefined', function () {
             const parentRouter = new ParentRouter();
             parentRouter.data = {query: {}, router: {}};
             should.not.exist(parentRouter.isRedirectEnabled('tags', 'bacon'));
         });
 
-        it('no redirect', function () {
+        it('no redirect when unspecified slug', function () {
             const parentRouter = new ParentRouter();
 
             parentRouter.data = {
@@ -305,7 +305,7 @@ describe('UNIT - services/routing/ParentRouter', function () {
             should.not.exist(parentRouter.isRedirectEnabled('tags', 'bacon'));
         });
 
-        it('no redirect', function () {
+        it('no redirect when wrong slug', function () {
             const parentRouter = new ParentRouter();
 
             parentRouter.data = {
@@ -318,7 +318,7 @@ describe('UNIT - services/routing/ParentRouter', function () {
             should.not.exist(parentRouter.isRedirectEnabled('tags', 'bacon'));
         });
 
-        it('no redirect', function () {
+        it('no redirect when tag redirect=false', function () {
             const parentRouter = new ParentRouter();
 
             parentRouter.data = {
@@ -331,7 +331,7 @@ describe('UNIT - services/routing/ParentRouter', function () {
             should.not.exist(parentRouter.isRedirectEnabled('tags', 'bacon'));
         });
 
-        it('redirect', function () {
+        it('redirect (tags)', function () {
             const parentRouter = new ParentRouter();
 
             parentRouter.data = {
@@ -344,7 +344,7 @@ describe('UNIT - services/routing/ParentRouter', function () {
             should.exist(parentRouter.isRedirectEnabled('tags', 'bacon'));
         });
 
-        it('redirect', function () {
+        it('redirect (pages)', function () {
             const parentRouter = new ParentRouter();
 
             parentRouter.data = {
diff --git a/ghost/core/test/unit/frontend/services/routing/StaticRoutesRouter.test.js b/ghost/core/test/unit/frontend/services/routing/StaticRoutesRouter.test.js
index 8c31249a7f9..9ae79830e3c 100644
--- a/ghost/core/test/unit/frontend/services/routing/StaticRoutesRouter.test.js
+++ b/ghost/core/test/unit/frontend/services/routing/StaticRoutesRouter.test.js
@@ -90,7 +90,7 @@ describe('UNIT - services/routing/StaticRoutesRouter', function () {
             should.not.exist(res.locals.slug);
         });
 
-        it('fn: _prepareStaticRouteContext', function () {
+        it('fn: _prepareStaticRouteContext (mainRoute=root)', function () {
             const staticRoutesRouter = new StaticRoutesRouter('/', {templates: []}, routerCreatedSpy);
 
             staticRoutesRouter._prepareStaticRouteContext(req, res, next);
diff --git a/ghost/core/test/unit/frontend/services/rss/renderer.test.js b/ghost/core/test/unit/frontend/services/rss/renderer.test.js
index 7bf55e1789e..2641c7c1c5a 100644
--- a/ghost/core/test/unit/frontend/services/rss/renderer.test.js
+++ b/ghost/core/test/unit/frontend/services/rss/renderer.test.js
@@ -32,7 +32,7 @@ describe('RSS: Renderer', function () {
             rssCacheStub.firstCall.args.should.eql(['/rss/', {}]);
 
             res.set.calledOnce.should.be.true();
-            res.set.calledWith('Content-Type', 'text/xml; charset=UTF-8').should.be.true();
+            res.set.calledWith('Content-Type', 'application/rss+xml; charset=UTF-8').should.be.true();
 
             res.send.calledOnce.should.be.true();
             res.send.calledWith('dummyxml').should.be.true();
@@ -51,7 +51,7 @@ describe('RSS: Renderer', function () {
             rssCacheStub.firstCall.args.should.eql(['/rss/', {foo: 'bar'}]);
 
             res.set.calledOnce.should.be.true();
-            res.set.calledWith('Content-Type', 'text/xml; charset=UTF-8').should.be.true();
+            res.set.calledWith('Content-Type', 'application/rss+xml; charset=UTF-8').should.be.true();
 
             res.send.calledOnce.should.be.true();
             res.send.calledWith('dummyxml').should.be.true();
@@ -71,7 +71,7 @@ describe('RSS: Renderer', function () {
             rssCacheStub.firstCall.args.should.eql(['/rss/', {foo: 'baz', fizz: 'buzz'}]);
 
             res.set.calledOnce.should.be.true();
-            res.set.calledWith('Content-Type', 'text/xml; charset=UTF-8').should.be.true();
+            res.set.calledWith('Content-Type', 'application/rss+xml; charset=UTF-8').should.be.true();
 
             res.send.calledOnce.should.be.true();
             res.send.calledWith('dummyxml').should.be.true();
diff --git a/ghost/core/test/unit/frontend/web/middleware/frontend-caching.test.js b/ghost/core/test/unit/frontend/web/middleware/frontend-caching.test.js
new file mode 100644
index 00000000000..4492265c11d
--- /dev/null
+++ b/ghost/core/test/unit/frontend/web/middleware/frontend-caching.test.js
@@ -0,0 +1,94 @@
+const assert = require('node:assert').strict;
+const sinon = require('sinon');
+const testUtils = require('../../../../utils');
+const configUtils = require('../../../../utils/configUtils');
+
+const frontendCaching = require('../../../../../core/frontend/web/middleware/frontend-caching');
+
+const cacheMembersContentConfigKey = 'cacheMembersContent:enabled';
+
+describe('frontendCaching', function () {
+    let res;
+    let req;
+    let next;
+    let middleware;
+    let freeTier;
+    let premiumTier;
+
+    this.beforeEach(async function () {
+        res = {
+            set: sinon.spy(),
+            get: sinon.stub().returns(undefined)
+        };
+        req = sinon.spy();
+        next = sinon.spy();
+        freeTier = {id: 'freeTierId'};
+        premiumTier = {id: 'premiumTierId'};
+        middleware = await frontendCaching.getMiddleware(async () => Promise.resolve(freeTier));
+    });
+
+    this.afterEach(async function () {
+        sinon.restore();
+        await configUtils.restore();
+    });
+
+    it('should set cache control to private if the blog is private', function () {
+        res.isPrivateBlog = true;
+        middleware(req, res, next);
+        assert(res.set.calledOnce);
+        assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.private}));
+    });
+
+    it('should set cache control to private if the request is made by a member', function () {
+        req.member = true;
+        middleware(req, res, next);
+        assert.ok(res.set.calledOnce);
+        assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.private}));
+    });
+
+    it('should set cache control to public if the site is public and the request is not made by a member', function () {
+        req.member = undefined;
+        res.isPrivateBlog = undefined;
+        middleware(req, res, next);
+        assert.ok(res.set.calledOnce);
+        assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.public}));
+    });
+
+    it('should set cache control to public if the request is made by a member and caching members content is enabled', function () {
+        configUtils.set(cacheMembersContentConfigKey, true);
+        req.member = {
+            subscriptions: []
+        };
+        res.isPrivateBlog = undefined;
+        middleware(req, res, next);
+        assert.equal(res.set.callCount, 2);
+        assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.public}));
+        assert.ok(res.set.calledWith({'X-Member-Cache-Tier': 'freeTierId'}));
+    });
+
+    describe('calculateMemberTier', function () {
+        it('should return null if the member has more than one active subscription', function () {
+            const member = {
+                subscriptions: [{status: 'active'}, {status: 'active'}]
+            };
+            const memberTier = frontendCaching.calculateMemberTier(member, freeTier);
+            assert.equal(memberTier, null);
+        });
+
+        it('should return the tier if the member has one active subscription', function () {
+            const member = {
+                subscriptions: [{status: 'active', tier: premiumTier}]
+            };
+            const memberTier = frontendCaching.calculateMemberTier(member, freeTier);
+            assert.deepEqual(memberTier, premiumTier);
+        });
+
+        it('should return free if the member has no active subscriptions', function () {
+            const member = {
+                subscriptions: []
+            };
+            const memberTier = frontendCaching.calculateMemberTier(member, freeTier);
+            assert.equal(memberTier, freeTier);
+        });
+    });
+});
\ No newline at end of file
diff --git a/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js b/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js
index 80777ddd208..d4b8e5a4550 100644
--- a/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js
+++ b/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js
@@ -3,6 +3,7 @@ const sinon = require('sinon');
 const storage = require('../../../../../core/server/adapters/storage');
 const activeTheme = require('../../../../../core/frontend/services/theme-engine/active');
 const handleImageSizes = require('../../../../../core/frontend/web/middleware/handle-image-sizes.js');
+const errors = require('@tryghost/errors');
 const imageTransform = require('@tryghost/image-transform');
 
 const fakeResBase = {
@@ -28,7 +29,7 @@ describe('handleImageSizes middleware', function () {
         });
     });
 
-    it('calls next immediately if the url does not match /size/something/', function (done) {
+    it('calls next immediately if the url does not match /size/whatever/', function (done) {
         const fakeReq = {
             url: '/url/whatever/'
         };
@@ -67,7 +68,7 @@ describe('handleImageSizes middleware', function () {
         });
     });
 
-    it('calls next immediately if the url does not match /size/something/', function (done) {
+    it('calls next immediately if the url does not match /size//', function (done) {
         const fakeReq = {
             url: '/size//'
         };
@@ -293,6 +294,47 @@ describe('handleImageSizes middleware', function () {
             });
         });
 
+        it('redirects if timeout is exceeded', function (done) {
+            sinon.stub(imageTransform, 'canTransformFiles').returns(true);
+
+            dummyStorage.exists = async function () {
+                return false;
+            };
+
+            dummyStorage.read = async function () {
+                return buffer;
+            };
+
+            const error = new Error('Resize timeout');
+            error.code = 'IMAGE_PROCESSING';
+
+            resizeFromBufferStub.throws(error);
+
+            const fakeReq = {
+                url: '/size/w1000/blank.png',
+                originalUrl: '/blog/content/images/size/w1000/blank.png'
+            };
+
+            const fakeRes = {
+                redirect(url) {
+                    try {
+                        url.should.equal('/blog/content/images/blank.png');
+                    } catch (e) {
+                        return done(e);
+                    }
+                    done();
+                },
+                setHeader() {}
+            };
+
+            handleImageSizes(fakeReq, fakeRes, function next(err) {
+                if (err) {
+                    return done(err);
+                }
+                done(new Error('Should not have called next'));
+            });
+        });
+
         it('continues if file exists', function (done) {
             dummyStorage.exists = async function (path) {
                 if (path === '/size/w1000/blank.png') {
@@ -525,7 +567,12 @@ describe('handleImageSizes middleware', function () {
                     return done(err);
                 }
                 try {
-                    resizeFromBufferStub.calledOnceWithExactly(buffer, {withoutEnlargement: false, width: 1000, format: 'png'}).should.be.true();
+                    resizeFromBufferStub.calledOnceWithExactly(buffer, {
+                        withoutEnlargement: false,
+                        width: 1000,
+                        format: 'png',
+                        timeout: handleImageSizes.RESIZE_TIMEOUT_SECONDS
+                    }).should.be.true();
                     typeStub.calledOnceWithExactly('png').should.be.true();
                 } catch (e) {
                     return done(e);
@@ -560,7 +607,12 @@ describe('handleImageSizes middleware', function () {
                     return done(err);
                 }
                 try {
-                    resizeFromBufferStub.calledOnceWithExactly(buffer, {withoutEnlargement: true, width: 1000, format: 'webp'}).should.be.true();
+                    resizeFromBufferStub.calledOnceWithExactly(buffer, {
+                        withoutEnlargement: true,
+                        width: 1000,
+                        format: 'webp',
+                        timeout: handleImageSizes.RESIZE_TIMEOUT_SECONDS
+                    }).should.be.true();
                     typeStub.calledOnceWithExactly('webp').should.be.true();
                 } catch (e) {
                     return done(e);
@@ -595,7 +647,12 @@ describe('handleImageSizes middleware', function () {
                     return done(err);
                 }
                 try {
-                    resizeFromBufferStub.calledOnceWithExactly(buffer, {withoutEnlargement: true, width: 1000, format: 'avif'}).should.be.true();
+                    resizeFromBufferStub.calledOnceWithExactly(buffer, {
+                        withoutEnlargement: true,
+                        width: 1000,
+                        format: 'avif',
+                        timeout: handleImageSizes.RESIZE_TIMEOUT_SECONDS
+                    }).should.be.true();
                     typeStub.calledOnceWithExactly('image/avif').should.be.true();
                 } catch (e) {
                     return done(e);
@@ -630,7 +687,12 @@ describe('handleImageSizes middleware', function () {
                     return done(err);
                 }
                 try {
-                    resizeFromBufferStub.calledOnceWithExactly(buffer, {withoutEnlargement: true, width: 1000, format: 'webp'}).should.be.true();
+                    resizeFromBufferStub.calledOnceWithExactly(buffer, {
+                        withoutEnlargement: true,
+                        width: 1000,
+                        format: 'webp',
+                        timeout: handleImageSizes.RESIZE_TIMEOUT_SECONDS
+                    }).should.be.true();
                     typeStub.calledOnceWithExactly('webp').should.be.true();
                 } catch (e) {
                     return done(e);
@@ -665,7 +727,12 @@ describe('handleImageSizes middleware', function () {
                     return done(err);
                 }
                 try {
-                    resizeFromBufferStub.calledOnceWithExactly(buffer, {withoutEnlargement: true, width: 1000, format: 'gif'}).should.be.true();
+                    resizeFromBufferStub.calledOnceWithExactly(buffer, {
+                        withoutEnlargement: true,
+                        width: 1000,
+                        format: 'gif',
+                        timeout: handleImageSizes.RESIZE_TIMEOUT_SECONDS
+                    }).should.be.true();
                     typeStub.calledOnceWithExactly('gif').should.be.true();
                 } catch (e) {
                     return done(e);
@@ -673,5 +740,36 @@ describe('handleImageSizes middleware', function () {
                 done();
             });
         });
+
+        it('goes to next middleware with no error if source and resized image 404', function (done) {
+            dummyStorage.exists = async function () {
+                return false;
+            };
+            dummyStorage.read = async function () {
+                throw new errors.NotFoundError({
+                    message: 'File not found'
+                });
+            };
+
+            const fakeReq = {
+                url: '/size/w1000/2020/02/test.png',
+                originalUrl: '/2020/02/test.png'
+            };
+
+            const fakeRes = {
+                redirect() {
+                    done(new Error('Should not have called redirect'));
+                },
+                setHeader() {},
+                type: function () {}
+            };
+
+            handleImageSizes(fakeReq, fakeRes, function next(err) {
+                if (err) {
+                    return done(err);
+                }
+                done();
+            });
+        });
     });
 });
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/adapters/scheduling/utils.test.js b/ghost/core/test/unit/server/adapters/scheduling/utils.test.js
index 8d6b38a3d68..77b438b31c7 100644
--- a/ghost/core/test/unit/server/adapters/scheduling/utils.test.js
+++ b/ghost/core/test/unit/server/adapters/scheduling/utils.test.js
@@ -30,7 +30,7 @@ describe('Scheduling: utils', function () {
             }).catch(done);
         });
 
-        it('create good adapter', function (done) {
+        it('create good adapter from custom file', function (done) {
             scope.adapter = schedulingPath + 'another-scheduler.js';
 
             configUtils.set({
diff --git a/ghost/core/test/unit/server/adapters/storage/LocalBaseStorage.test.js b/ghost/core/test/unit/server/adapters/storage/LocalBaseStorage.test.js
index dd0724ee247..b74f28b49f7 100644
--- a/ghost/core/test/unit/server/adapters/storage/LocalBaseStorage.test.js
+++ b/ghost/core/test/unit/server/adapters/storage/LocalBaseStorage.test.js
@@ -1,7 +1,38 @@
+const assert = require('assert/strict');
+const path = require('path');
+const http = require('http');
+const express = require('express');
 const should = require('should');
 const LocalStorageBase = require('../../../../../core/server/adapters/storage/LocalStorageBase');
 
 describe('Local Storage Base', function () {
+    describe('serve', function () {
+        it('returns a 416 RangeNotSatisfiableError if given an invalid range', function (done) {
+            const localStorageBase = new LocalStorageBase({
+                storagePath: path.resolve(__dirname, 'media-storage'),
+                staticFileURLPrefix: 'content/media',
+                siteUrl: 'http://example.com/blog/'
+            });
+
+            const req = new http.IncomingMessage();
+            const res = new http.ServerResponse(req);
+
+            Object.setPrototypeOf(req, express.request);
+            Object.setPrototypeOf(res, express.response);
+
+            req.method = 'GET';
+            req.url = '/content/media/image.jpg';
+            req.headers = {
+                range: 'bytes=1000-999'
+            };
+
+            localStorageBase.serve()(req, res, (err) => {
+                assert.equal(err.errorType, 'RangeNotSatisfiableError');
+                done();
+            });
+        });
+    });
+
     describe('urlToPath', function () {
         it('returns path from url', function () {
             let localStorageBase = new LocalStorageBase({
diff --git a/ghost/core/test/unit/server/adapters/storage/LocalImagesStorage.test.js b/ghost/core/test/unit/server/adapters/storage/LocalImagesStorage.test.js
index 4096e0f531c..702ab103c3c 100644
--- a/ghost/core/test/unit/server/adapters/storage/LocalImagesStorage.test.js
+++ b/ghost/core/test/unit/server/adapters/storage/LocalImagesStorage.test.js
@@ -153,7 +153,7 @@ describe('Local Images Storage', function () {
                 });
         });
 
-        it('success', function (done) {
+        it('success (leading and trailing slashes)', function (done) {
             localFileStore.read({path: '/ghost-logo.png/'})
                 .then(function (bytes) {
                     bytes.length.should.eql(8638);
diff --git a/ghost/core/test/unit/server/adapters/storage/media-storage/content/media/image.jpg b/ghost/core/test/unit/server/adapters/storage/media-storage/content/media/image.jpg
new file mode 100644
index 00000000000..8198c77f7af
Binary files /dev/null and b/ghost/core/test/unit/server/adapters/storage/media-storage/content/media/image.jpg differ
diff --git a/ghost/core/test/unit/server/adapters/storage/utils.test.js b/ghost/core/test/unit/server/adapters/storage/utils.test.js
index a689b7d320a..6719c2ce485 100644
--- a/ghost/core/test/unit/server/adapters/storage/utils.test.js
+++ b/ghost/core/test/unit/server/adapters/storage/utils.test.js
@@ -132,7 +132,7 @@ describe('storage utils', function () {
             result.should.be.equal(true);
         });
 
-        it('should return true when relative URL and local file', function () {
+        it('should return true when relative URL and local file (blog subdir)', function () {
             const url = '/blog/content/images/2017/07/ghost-logo.png';
             let result;
 
diff --git a/ghost/core/test/unit/server/data/db/InstrumentConnectionPool.test.js b/ghost/core/test/unit/server/data/db/InstrumentConnectionPool.test.js
new file mode 100644
index 00000000000..0f065166bb5
--- /dev/null
+++ b/ghost/core/test/unit/server/data/db/InstrumentConnectionPool.test.js
@@ -0,0 +1,228 @@
+const sinon = require('sinon');
+const ConnectionPoolInstrumentation = require('../../../../../core/server/data/db/ConnectionPoolInstrumentation');
+const should = require('should');
+var EventEmitter = require('events').EventEmitter;
+
+describe('ConnectionPoolInstrumentation', function () {
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    it('getPoolMetrics', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4)
+                }
+            }
+        };
+        const logging = {};
+        const metrics = {};
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(true)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        const result = instrumentation.getPoolMetrics();
+        result.should.eql({
+            numPendingCreates: 1,
+            numPendingAcquires: 2,
+            numFree: 3,
+            numUsed: 4
+        });
+    });
+
+    it('should handle creating a request successfully', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4)
+                }
+            }
+        };
+        const logging = {
+            debug: sinon.stub()
+        };
+        const metrics = {
+            metric: sinon.stub()
+        };
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(true)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        instrumentation.handleCreateRequest(1);
+        instrumentation.handleCreateSuccess(1, {connectionId: 2, __knexUid: 3});
+        logging.debug.calledTwice.should.be.true();
+        metrics.metric.calledTwice.should.be.true();
+    });
+
+    it('should handle creating a request unsuccessfully', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4)
+                }
+            }
+        };
+        const logging = {
+            debug: sinon.stub(),
+            error: sinon.stub()
+        };
+        const metrics = {
+            metric: sinon.stub()
+        };
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(true)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        instrumentation.handleCreateRequest(1);
+        instrumentation.handleCreateFail(1, new Error('test'));
+        logging.error.calledOnce.should.be.true();
+        metrics.metric.calledTwice.should.be.true();
+    });
+
+    it('should handle acquiring a connection successfully', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4)
+                }
+            }
+        };
+        const logging = {
+            debug: sinon.stub()
+        };
+        const metrics = {
+            metric: sinon.stub()
+        };
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(true)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        instrumentation.handleAcquireRequest(1);
+        instrumentation.handleAcquireSuccess(1, {connectionId: 2, __knexUid: 3});
+        logging.debug.calledTwice.should.be.true();
+        metrics.metric.calledTwice.should.be.true();
+    });
+
+    it('should handle acquiring a connection unsuccessfully', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4)
+                }
+            }
+        };
+        const logging = {
+            debug: sinon.stub(),
+            error: sinon.stub()
+        };
+        const metrics = {
+            metric: sinon.stub()
+        };
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(true)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        instrumentation.handleAcquireRequest(1);
+        instrumentation.handleAcquireFail(1, new Error('test'));
+        logging.error.calledOnce.should.be.true();
+        metrics.metric.calledTwice.should.be.true();
+    });
+
+    it('should handle releasing a connection successfully', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4)
+                }
+            }
+        };
+        const logging = {
+            debug: sinon.stub()
+        };
+        const metrics = {
+            metric: sinon.stub()
+        };
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(true)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        instrumentation.handleRelease(1);
+        logging.debug.calledOnce.should.be.true();
+        metrics.metric.calledOnce.should.be.true();
+    });
+
+    it('should instrument the connection pool if enabled', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4),
+                    on: sinon.stub(),
+                    emitter: new EventEmitter()
+                }
+            }
+        };
+        const logging = {
+            debug: sinon.stub(),
+            error: sinon.stub()
+        };
+        const metrics = {
+            metric: sinon.stub()
+        };
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(true)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        instrumentation.instrument();
+        knex.client.pool.on.callCount.should.eql(7);
+    });
+
+    it('should not instrument the connection pool if disabled', async function () {
+        const knex = {
+            client: {
+                pool: {
+                    numPendingCreates: sinon.stub().returns(1),
+                    numPendingAcquires: sinon.stub().returns(2),
+                    numFree: sinon.stub().returns(3),
+                    numUsed: sinon.stub().returns(4),
+                    on: sinon.stub(),
+                    emitter: new EventEmitter()
+                }
+            }
+        };
+        const logging = {
+            debug: sinon.stub(),
+            error: sinon.stub()
+        };
+        const metrics = {
+            metric: sinon.stub()
+        };
+        const config = {
+            get: sinon.stub().withArgs('telemetry:connectionPool').returns(false)
+        };
+        const instrumentation = new ConnectionPoolInstrumentation({knex, logging, metrics, config});
+        instrumentation.instrument();
+        knex.client.pool.on.callCount.should.eql(0);
+    });
+});
\ No newline at end of file
diff --git a/ghost/core/test/unit/server/data/db/backup.test.js b/ghost/core/test/unit/server/data/db/backup.test.js
index f5c0be4e0c1..f2ddd95e55a 100644
--- a/ghost/core/test/unit/server/data/db/backup.test.js
+++ b/ghost/core/test/unit/server/data/db/backup.test.js
@@ -4,6 +4,7 @@ const fs = require('fs-extra');
 const models = require('../../../../../core/server/models');
 const exporter = require('../../../../../core/server/data/exporter');
 const dbBackup = require('../../../../../core/server/data/db/backup');
+const configUtils = require('../../../../utils/configUtils');
 
 describe('Backup', function () {
     let exportStub;
@@ -33,4 +34,16 @@ describe('Backup', function () {
             done();
         }).catch(done);
     });
+
+    it('should not create a backup JSON file if disabled', function (done) {
+        configUtils.set('disableJSBackups', true);
+
+        dbBackup.backup().then(function () {
+            exportStub.called.should.be.false();
+            filenameStub.called.should.be.false();
+            fsStub.called.should.be.false();
+
+            done();
+        }).catch(done);
+    });
 });
diff --git a/ghost/core/test/unit/server/data/exporter/index.test.js b/ghost/core/test/unit/server/data/exporter/index.test.js
index f90001c9943..080940e567a 100644
--- a/ghost/core/test/unit/server/data/exporter/index.test.js
+++ b/ghost/core/test/unit/server/data/exporter/index.test.js
@@ -236,7 +236,7 @@ describe('Exporter', function () {
 
             // NOTE: if default settings changed either modify the settings keys blocklist or increase allowedKeysLength
             //       This is a reminder to think about the importer/exporter scenarios ;)
-            const allowedKeysLength = 85;
+            const allowedKeysLength = 86;
             totalKeysLength.should.eql(SETTING_KEYS_BLOCKLIST.length + allowedKeysLength);
         });
     });
diff --git a/ghost/core/test/unit/server/data/importer/importers/data/products.test.js b/ghost/core/test/unit/server/data/importer/importers/data/products.test.js
index 7a1eab7284a..3e518a81622 100644
--- a/ghost/core/test/unit/server/data/importer/importers/data/products.test.js
+++ b/ghost/core/test/unit/server/data/importer/importers/data/products.test.js
@@ -109,5 +109,32 @@ describe('ProductsImporter', function () {
             importer.beforeImport();
             assert(importer.dataToImport.length === 1);
         });
+
+        it('Does not import a free product that has pricing', function () {
+            const invalidFreeProduct = {
+                id: 'free123',
+                name: 'Free 123',
+                slug: 'free-123',
+                active: 1,
+                welcome_page_url: null,
+                visibility: 'public',
+                trial_days: 0,
+                description: null,
+                type: 'free',
+                currency: 'usd',
+                monthly_price: 100,
+                yearly_price: 1000,
+                created_at: '2024-07-10T00:00:00.000Z',
+                updated_at: '2024-07-10T00:00:00.000Z',
+                monthly_price_id: 'price_1',
+                yearly_price_id: 'price_2'
+            };
+
+            const importer = new ProductsImporter({products: [invalidFreeProduct], stripe_prices: fakePrices});
+
+            importer.beforeImport();
+
+            assert(importer.dataToImport.length === 0);
+        });
     });
 });
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..8242d198c28 100644
--- a/ghost/core/test/unit/server/data/schema/integrity.test.js
+++ b/ghost/core/test/unit/server/data/schema/integrity.test.js
@@ -35,9 +35,9 @@ const validateRouteSettings = require('../../../../../core/server/services/route
  */
 describe('DB version integrity', function () {
     // Only these variables should need updating
-    const currentSchemaHash = '013334f4f51aae785b9afd345861c06a';
-    const currentFixturesHash = '4db87173699ad9c9d8a67ccab96dfd2d';
-    const currentSettingsHash = '3128d4ec667a50049486b0c21f04be07';
+    const currentSchemaHash = 'a4f016480ff73c6f52ee4c86482b45a7';
+    const currentFixturesHash = 'a489d615989eab1023d4b8af0ecee7fd';
+    const currentSettingsHash = '051ef2a50e2edb8723e89461448313cb';
     const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';
 
     // If this test is failing, then it is likely a change has been made that requires a DB version bump,
diff --git a/ghost/core/test/unit/server/lib/image/blog-icon.test.js b/ghost/core/test/unit/server/lib/image/blog-icon.test.js
index 5d3e9de9c10..4e9e9996f26 100644
--- a/ghost/core/test/unit/server/lib/image/blog-icon.test.js
+++ b/ghost/core/test/unit/server/lib/image/blog-icon.test.js
@@ -51,7 +51,7 @@ describe('lib/image: blog icon', function () {
                         }
                     }
                 }});
-                blogIcon.getIconUrl(true).should.deepEqual([{relativeUrl: '/content/images/2017/04/my-icon.ico'}, true]);
+                blogIcon.getIconUrl({absolute: true}).should.deepEqual([{relativeUrl: '/content/images/2017/04/my-icon.ico'}, true]);
             });
 
             it('custom uploaded png blog icon', function () {
@@ -64,7 +64,7 @@ describe('lib/image: blog icon', function () {
                         }
                     }
                 }});
-                blogIcon.getIconUrl(true).should.deepEqual([{relativeUrl: '/content/images/size/w256h256/2017/04/my-icon.png'}, true]);
+                blogIcon.getIconUrl({absolute: true}).should.deepEqual([{relativeUrl: '/content/images/size/w256h256/2017/04/my-icon.png'}, true]);
             });
 
             it('default ico blog icon', function () {
@@ -73,7 +73,17 @@ describe('lib/image: blog icon', function () {
                 }, settingsCache: {
                     get: () => {}
                 }});
-                blogIcon.getIconUrl(true).should.deepEqual([{relativeUrl: '/favicon.ico'}, true]);
+                blogIcon.getIconUrl({absolute: true}).should.deepEqual([{relativeUrl: '/favicon.ico'}, true]);
+            });
+
+            it('returns null if no fallback is requested', function () {
+                const blogIcon = new BlogIcon({config: {}, storageUtils: {}, urlUtils: {
+                    urlFor: (key, boolean) => [key, boolean]
+                }, settingsCache: {
+                    get: () => {}
+                }});
+
+                should.equal(blogIcon.getIconUrl({absolute: true, fallbackToDefault: false}), null);
             });
         });
     });
diff --git a/ghost/core/test/unit/server/lib/image/image-size.test.js b/ghost/core/test/unit/server/lib/image/image-size.test.js
index 96481c28c6b..c3bf2886843 100644
--- a/ghost/core/test/unit/server/lib/image/image-size.test.js
+++ b/ghost/core/test/unit/server/lib/image/image-size.test.js
@@ -5,6 +5,7 @@ const path = require('path');
 const errors = require('@tryghost/errors');
 const fs = require('fs');
 const ImageSize = require('../../../../../core/server/lib/image/ImageSize');
+const probe = require('probe-image-size');
 
 describe('lib/image: image size', function () {
     // use a 1x1 gif in nock responses because it's really small and easy to work with
@@ -18,7 +19,7 @@ describe('lib/image: image size', function () {
     it('[success] should have an image size function', function () {
         const imageSize = new ImageSize({config: {
             get: () => {}
-        }, tpl: {}, storage: {}, storageUtils: {}, validator: {}, urlUtils: {}, request: {}});
+        }, tpl: {}, storage: {}, storageUtils: {}, validator: {}, urlUtils: {}, request: {}, probe});
         should.exist(imageSize.getImageSizeFromUrl);
         should.exist(imageSize.getImageSizeFromStoragePath);
     });
@@ -42,7 +43,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMock.isDone().should.be.true();
@@ -77,7 +78,7 @@ describe('lib/image: image size', function () {
                     });
                 }
                 return Promise.reject();
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMock.isDone().should.be.false();
@@ -107,7 +108,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMock.isDone().should.be.true();
@@ -138,7 +139,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMockNotFound.isDone().should.be.false();
@@ -188,7 +189,7 @@ describe('lib/image: image size', function () {
                     });
                 }
                 return Promise.reject();
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMock.isDone().should.be.true();
@@ -218,7 +219,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMock.isDone().should.be.true();
@@ -254,7 +255,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMock.isDone().should.be.true();
@@ -300,7 +301,7 @@ describe('lib/image: image size', function () {
             }, validator: {}, urlUtils: {
                 urlFor: urlForStub,
                 getSubdir: urlGetSubdirStub
-            }, request: {}});
+            }, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url).then(function (res) {
                 requestMock.isDone().should.be.false();
@@ -328,7 +329,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url)
                 .catch(function (err) {
@@ -366,7 +367,7 @@ describe('lib/image: image size', function () {
                     return Promise.reject(new NotFound());
                 }
                 return Promise.reject();
-            }});
+            }}, probe);
 
             imageSize.getImageSizeFromUrl(url)
                 .catch(function (err) {
@@ -387,7 +388,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => false
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url)
                 .catch(function (err) {
@@ -398,7 +399,7 @@ describe('lib/image: image size', function () {
                 }).catch(done);
         });
 
-        it('[failure] will timeout', function (done) {
+        it('[failure] will handle responses timing out', function (done) {
             const url = 'https://static.wixstatic.com/media/355241_d31358572a2542c5a44738ddcb59e7ea.jpg_256';
 
             const requestMock = nock('https://static.wixstatic.com')
@@ -409,14 +410,18 @@ describe('lib/image: image size', function () {
             const imageSize = new ImageSize({config: {
                 get: (key) => {
                     if (key === 'times:getImageSizeTimeoutInMS') {
-                        return 1;
+                        return 50;
                     }
                 }
             }, tpl: {}, storage: {}, storageUtils: {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {},
+            probe(reqUrl, options) {
+                // simulate probe the request timing out by probe's option
+                return probe(reqUrl, {...options, response_timeout: 1});
+            }});
 
             imageSize.getImageSizeFromUrl(url)
                 .catch(function (err) {
@@ -441,7 +446,7 @@ describe('lib/image: image size', function () {
                 isLocalImage: () => false
             }, validator: {
                 isURL: () => true
-            }, urlUtils: {}, request: {}});
+            }, urlUtils: {}, request: {}, probe});
 
             imageSize.getImageSizeFromUrl(url)
                 .then(() => {
@@ -475,7 +480,7 @@ describe('lib/image: image size', function () {
                     });
                 }
                 return Promise.reject();
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromUrl(url)
                 .then(() => {
@@ -500,7 +505,7 @@ describe('lib/image: image size', function () {
                 isURL: () => true
             }, urlUtils: {}, request: () => {
                 return Promise.reject({});
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromUrl(url)
                 .catch(function (err) {
@@ -510,6 +515,38 @@ describe('lib/image: image size', function () {
                     done();
                 }).catch(done);
         });
+
+        it('[failure] handles probe being unresponsive', function (done) {
+            const url = 'http://img.stockfresh.com/files/f/feedough/x/11/1540353_20925115.jpg';
+            const requestMock = nock('http://img.stockfresh.com')
+                .get('/files/f/feedough/x/11/1540353_20925115.jpg')
+                .reply(200, GIF1x1);
+
+            const imageSize = new ImageSize({config: {
+                get: (key) => {
+                    if (key === 'times:getImageSizeTimeoutInMS') {
+                        return 1;
+                    }
+                }
+            }, tpl: {}, storage: {}, storageUtils: {
+                isLocalImage: () => false
+            }, validator: {
+                isURL: () => true
+            }, urlUtils: {}, request: {},
+            probe(reqUrl, options) {
+                // simulate probe being unresponsive by making the timeout longer than the request
+                return probe(reqUrl, {...options, response_timeout: 50});
+            }});
+
+            imageSize.getImageSizeFromUrl(url)
+                .catch(function (err) {
+                    requestMock.isDone().should.be.true();
+                    should.exist(err);
+                    err.errorType.should.be.equal('InternalServerError');
+                    err.message.should.be.equal('Probe unresponsive.');
+                    done();
+                }).catch(done);
+        });
     });
 
     describe('getImageSizeFromStoragePath', function () {
@@ -542,7 +579,7 @@ describe('lib/image: image size', function () {
                 getSubdir: urlGetSubdirStub
             }, request: () => {
                 return Promise.reject({});
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromStoragePath(url).then(function (res) {
                 should.exist(res);
@@ -585,7 +622,7 @@ describe('lib/image: image size', function () {
                 getSubdir: urlGetSubdirStub
             }, request: () => {
                 return Promise.reject({});
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromStoragePath(url).then(function (res) {
                 should.exist(res);
@@ -628,7 +665,7 @@ describe('lib/image: image size', function () {
                 getSubdir: urlGetSubdirStub
             }, request: () => {
                 return Promise.reject({});
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromStoragePath(url).then(function (res) {
                 should.exist(res);
@@ -671,7 +708,7 @@ describe('lib/image: image size', function () {
                 getSubdir: urlGetSubdirStub
             }, request: () => {
                 return Promise.reject({});
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromStoragePath(url).then(function (res) {
                 should.exist(res);
@@ -711,7 +748,7 @@ describe('lib/image: image size', function () {
                 getSubdir: urlGetSubdirStub
             }, request: () => {
                 return Promise.reject({});
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromStoragePath(url)
                 .catch(function (err) {
@@ -746,7 +783,7 @@ describe('lib/image: image size', function () {
                 getSubdir: urlGetSubdirStub
             }, request: () => {
                 return Promise.reject({});
-            }});
+            }, probe});
 
             imageSize.getImageSizeFromStoragePath(url)
                 .catch(function (err) {
diff --git a/ghost/core/test/unit/server/models/invite.test.js b/ghost/core/test/unit/server/models/invite.test.js
index 70e052516cd..166af92b348 100644
--- a/ghost/core/test/unit/server/models/invite.test.js
+++ b/ghost/core/test/unit/server/models/invite.test.js
@@ -153,6 +153,21 @@ describe('Unit: models/invite', function () {
                         });
                 });
 
+                it('invite editor with staff token', function () {
+                    loadedPermissions.apiKey = {
+                        roles: [{name: 'Admin Integration'}]
+                    };
+                    sinon.stub(models.Role, 'findOne').withArgs({id: 'role_id'}).resolves(roleModel);
+                    roleModel.get.withArgs('name').returns('Editor');
+
+                    return models.Invite.permissible(inviteModel, 'add', context, unsafeAttrs, loadedPermissions, true, true, true)
+                        .then(Promise.reject)
+                        .catch((err) => {
+                            (err instanceof errors.NoPermissionError).should.eql(true);
+                            delete loadedPermissions.apiKey;
+                        });
+                });
+
                 it('invite author', function () {
                     sinon.stub(models.Role, 'findOne').withArgs({id: 'role_id'}).resolves(roleModel);
                     roleModel.get.withArgs('name').returns('Author');
diff --git a/ghost/core/test/unit/server/models/post.test.js b/ghost/core/test/unit/server/models/post.test.js
index 9be8599febf..27e418969bd 100644
--- a/ghost/core/test/unit/server/models/post.test.js
+++ b/ghost/core/test/unit/server/models/post.test.js
@@ -392,17 +392,15 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
-                        false,
-                        true
+                        true,
+                        true,
+                        false
                     ).then(() => {
                         done(new Error('Permissible function should have rejected.'));
                     }).catch((error) => {
                         error.should.be.an.instanceof(errors.NoPermissionError);
-                        should(mockPostObj.get.called).be.false();
-                        should(mockPostObj.related.calledOnce).be.true();
                         done();
-                    });
+                    }).catch(done);
                 });
 
                 it('rejects if changing visibility', function (done) {
@@ -422,17 +420,15 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
-                        false,
-                        true
+                        true,
+                        true,
+                        false
                     ).then(() => {
                         done(new Error('Permissible function should have rejected.'));
                     }).catch((error) => {
                         error.should.be.an.instanceof(errors.NoPermissionError);
-                        should(mockPostObj.get.called).be.false();
-                        should(mockPostObj.related.calledOnce).be.true();
                         done();
-                    });
+                    }).catch(done);
                 });
 
                 it('rejects if changing authors.0', function (done) {
@@ -451,9 +447,9 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
                         true,
-                        true
+                        true,
+                        false
                     ).then(() => {
                         done(new Error('Permissible function should have rejected.'));
                     }).catch((error) => {
@@ -481,9 +477,9 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
                         true,
-                        true
+                        true,
+                        false
                     ).then((result) => {
                         should.exist(result);
                         should(result.excludedAttrs).deepEqual(['authors', 'tags']);
@@ -510,9 +506,9 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
                         true,
-                        true
+                        true,
+                        false
                     ).then(() => {
                         done(new Error('Permissible function should have rejected.'));
                     }).catch((error) => {
@@ -539,9 +535,9 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
                         true,
-                        true
+                        true,
+                        false
                     ).then(() => {
                         done(new Error('Permissible function should have rejected.'));
                     }).catch((error) => {
@@ -568,9 +564,9 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
                         true,
-                        true
+                        true,
+                        false
                     ).then((result) => {
                         should.exist(result);
                         should(result.excludedAttrs).deepEqual(['authors', 'tags']);
@@ -594,7 +590,7 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
+                        true,
                         true,
                         true
                     ).then(() => {
@@ -619,7 +615,7 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
+                        true,
                         true,
                         true
                     ).then(() => {
@@ -644,7 +640,7 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
+                        true,
                         true,
                         true
                     ).then(() => {
@@ -669,7 +665,7 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         unsafeAttrs,
                         testUtils.permissions.contributor,
-                        false,
+                        true,
                         true,
                         true
                     ).then((result) => {
@@ -697,7 +693,7 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         {},
                         testUtils.permissions.contributor,
-                        false,
+                        true,
                         true,
                         true
                     ).then(() => {
@@ -726,7 +722,7 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         {},
                         testUtils.permissions.contributor,
-                        false,
+                        true,
                         true,
                         true
                     ).then(() => {
@@ -755,7 +751,7 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                         context,
                         {},
                         testUtils.permissions.contributor,
-                        false,
+                        true,
                         true,
                         true
                     ).then((result) => {
@@ -887,60 +883,6 @@ describe('Unit: models/post: uses database (@TODO: fix me)', function () {
                     });
                 });
 
-                it('rejects if changing authors', function (done) {
-                    const mockPostObj = {
-                        related: sinon.stub()
-                    };
-                    const context = {user: 1};
-                    const unsafeAttrs = {authors: [{id: 2}]};
-
-                    mockPostObj.related.withArgs('authors').returns({models: [{id: 1}]});
-
-                    models.Post.permissible(
-                        mockPostObj,
-                        'edit',
-                        context,
-                        unsafeAttrs,
-                        testUtils.permissions.author,
-                        false,
-                        true,
-                        true
-                    ).then(() => {
-                        done(new Error('Permissible function should have rejected.'));
-                    }).catch((error) => {
-                        error.should.be.an.instanceof(errors.NoPermissionError);
-                        should(mockPostObj.related.calledTwice).be.true();
-                        done();
-                    });
-                });
-
-                it('rejects if changing authors', function (done) {
-                    const mockPostObj = {
-                        related: sinon.stub()
-                    };
-                    const context = {user: 1};
-                    const unsafeAttrs = {authors: [{id: 2}]};
-
-                    mockPostObj.related.withArgs('authors').returns({models: [{id: 1}]});
-
-                    models.Post.permissible(
-                        mockPostObj,
-                        'edit',
-                        context,
-                        unsafeAttrs,
-                        testUtils.permissions.author,
-                        false,
-                        true,
-                        true
-                    ).then(() => {
-                        done(new Error('Permissible function should have rejected.'));
-                    }).catch((error) => {
-                        error.should.be.an.instanceof(errors.NoPermissionError);
-                        mockPostObj.related.callCount.should.eql(2);
-                        done();
-                    });
-                });
-
                 it('resolves if none of the above cases are true', function () {
                     const mockPostObj = {
                         related: sinon.stub()
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..3913e8e8052 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
@@ -95,15 +95,29 @@ describe('UNIT: redirects CustomRedirectsAPI class', function () {
 
     describe('setFromFilePath', function () {
         it('throws a syntax error when setting invalid JSON redirects file', async function () {
+            const invalidJSON = '{invalid json';
             const invalidFilePath = path.join(__dirname, '/invalid/redirects/path.json');
-            fs.readFile.withArgs(invalidFilePath, 'utf-8').resolves('{invalid json');
+            fs.readFile.withArgs(invalidFilePath, 'utf-8').resolves(invalidJSON);
+
+            let expectedErrorMessage;
+
+            try {
+                JSON.parse(invalidJSON);
+            } catch (err) {
+                expectedErrorMessage = err.message;
+            }
+
+            if (!expectedErrorMessage) {
+                // This should never happen because the JSON is invalid
+                should.fail('expectedErrorMessage is not set');
+            }
 
             try {
                 await customRedirectsAPI.setFromFilePath(invalidFilePath, '.json');
                 should.fail('setFromFilePath did not throw');
             } catch (err) {
                 should.exist(err);
-                err.message.should.eql('Could not parse JSON: Unexpected token i in JSON at position 1.');
+                err.message.should.eql(`Could not parse JSON: ${expectedErrorMessage}.`);
             }
         });
 
@@ -116,7 +130,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.');
             }
         });
 
@@ -232,5 +259,48 @@ describe('UNIT: redirects CustomRedirectsAPI class', function () {
             // two redirects in total
             redirectManager.addRedirect.calledTwice.should.be.true();
         });
+
+        it('does not create a backup file from a bad redirect yaml file', async function () {
+            const incomingFilePath = path.join(__dirname, '/invalid/path/redirects_incoming.yaml');
+            const backupFilePath = path.join(basePath, 'backup.yaml');
+
+            const invalidYaml = `
+                301:
+                    /my-old-blog-post/: /revamped-url/
+                    /my-old-blog-post/: /revamped-url/
+
+                302:
+                    /another-old-blog-post/: /hello-there/
+            `;
+
+            // redirects.json file already exits
+            fs.pathExists.withArgs(`${basePath}redirects.json`).resolves(false);
+            fs.pathExists.withArgs(`${basePath}redirects.yaml`).resolves(true);
+            // incoming redirects file
+            fs.readFile.withArgs(incomingFilePath, 'utf-8').resolves(invalidYaml);
+            // backup file DOES not exists yet
+            fs.pathExists.withArgs(backupFilePath).resolves(false);
+            // should not be called
+            fs.unlink.withArgs(backupFilePath).resolves(false);
+            fs.move.withArgs(`${basePath}redirects.yaml`, backupFilePath).resolves(true);
+
+            customRedirectsAPI = new CustomRedirectsAPI({
+                basePath,
+                redirectManager,
+                getBackupFilePath: () => backupFilePath,
+                validate: () => {}
+            });
+
+            try {
+                await customRedirectsAPI.setFromFilePath(incomingFilePath, '.yaml');
+                should.fail('setFromFilePath did not throw');
+            } catch (err) {
+                should.exist(err);
+                err.errorType.should.eql('BadRequestError');
+            }
+
+            fs.unlink.called.should.not.be.true();
+            fs.move.called.should.not.be.true();
+        });
     });
 });
diff --git a/ghost/core/test/unit/server/services/link-redirection/LinkRedirectRepository.test.js b/ghost/core/test/unit/server/services/link-redirection/LinkRedirectRepository.test.js
new file mode 100644
index 00000000000..a398223f3f5
--- /dev/null
+++ b/ghost/core/test/unit/server/services/link-redirection/LinkRedirectRepository.test.js
@@ -0,0 +1,231 @@
+const should = require('should');
+const sinon = require('sinon');
+const ObjectID = require('bson-objectid').default;
+const EventEmitter = require('events').EventEmitter;
+const LinkRedirect = require('@tryghost/link-redirects').LinkRedirect;
+
+const LinkRedirectRepository = require('../../../../../core/server/services/link-redirection/LinkRedirectRepository');
+
+/**
+ * Create a stubbed LinkRedirect Bookshelf model for testing, with overridable values
+ * 
+ * @param {object} [values] - Values to override in the stubbed LinkRedirect model
+ * @param {string} [values.id] - The ID of the model
+ * @param {Date} [values.updated_at] - The updated_at date of the model
+ * @param {Date} [values.created_at] - The created_at date of the model
+ * @param {string} [values.from] - The from URL path of the model (path only)
+ * @param {string} [values.to] - The to URL of the model (full URL including protocol, but not a URL object)
+ * @returns {object} - A stubbed LinkRedirect Bookshelf model
+ * 
+ */
+function createRedirectModel(values = {}) {
+    const get = sinon.stub();
+    get.withArgs('updated_at').returns(values.updated_at || new Date('2022-10-20T00:00:10.000Z'));
+    get.withArgs('created_at').returns(values.created_at || new Date('2022-10-20T00:00:00.000Z'));
+    get.withArgs('from').returns(values.from || '/r/1234abcd');
+    get.withArgs('to').returns(values.to || 'https://google.com');
+    return {
+        id: values.id || '662194931d0ba6fb37c080ee',
+        get
+    };
+}
+
+/**
+ * Create a LinkRedirectRepository instance with stubbed dependencies
+ * Optionally override dependencies with custom stubs if needed
+ * 
+ * @param {object} deps 
+ * @param {object} [deps.LinkRedirect] - Stubbed LinkRedirect Bookshelf model
+ * @param {object} [deps.urlUtils] - Stubbed URL Utils module
+ * @param {object} [deps.cacheAdapter] - Stubbed cache adapter, or null is cache is disabled
+ * @param {object} [deps.EventRegistry] - Stubbed EventRegistry
+ * @returns {LinkRedirectRepository}
+ */
+function createLinkRedirectRepository(deps = {}) {
+    const linkRows = [
+        {id: '662194931d0ba6fb37c080ee'}
+    ];
+    const model = createRedirectModel();
+    const models = {
+        models: [model]
+    };
+    return new LinkRedirectRepository({
+        LinkRedirect: deps.LinkRedirect || {
+            findOne: sinon.stub().returns(model),
+            findAll: sinon.stub().returns(models),
+            getFilteredCollectionQuery: sinon.stub().returns({
+                select: sinon.stub().returns({
+                    distinct: sinon.stub().returns(linkRows)
+                })
+            }),
+            add: sinon.stub().callsFake((data) => {
+                return createRedirectModel(data);
+            })
+        },
+        urlUtils: deps.urlUtils || {
+            urlFor: sinon.stub().returns('https://example.com'),
+            relativeToAbsolute: sinon.stub().returns(new URL('https://example.com')),
+            absoluteToRelative: sinon.stub().returns('/r/1234abcd')
+        },
+        cacheAdapter: deps.cacheAdapter || null,
+        EventRegistry: deps.EventRegistry || new EventEmitter()
+    });
+}
+
+describe('UNIT: LinkRedirectRepository class', function () {
+    let linkRedirectRepository;
+
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    describe('fromModel', function () {
+        it('should set edited to false if updated_at equals created_at', function () {
+            const model = createRedirectModel({
+                updated_at: new Date('2022-10-20T00:00:00.000Z'),
+                created_at: new Date('2022-10-20T00:00:00.000Z')
+            });
+            linkRedirectRepository = createLinkRedirectRepository();
+            const linkRedirect = linkRedirectRepository.fromModel(model);
+            should(linkRedirect.from.href).equal('https://example.com/r/1234abcd');
+            should(linkRedirect.to.href).equal('https://google.com/');
+            should(linkRedirect.edited).be.false();
+            should(ObjectID.isValid(linkRedirect.link_id)).be.true();
+        });
+
+        it('should set edited to false if updated_at is within 1 second of created_at', function () {
+            const model = createRedirectModel({
+                updated_at: new Date('2022-10-20T00:00:00.999Z'),
+                created_at: new Date('2022-10-20T00:00:00.000Z')
+            });
+            linkRedirectRepository = createLinkRedirectRepository();
+            const linkRedirect = linkRedirectRepository.fromModel(model);
+            should(linkRedirect.from.href).equal('https://example.com/r/1234abcd');
+            should(linkRedirect.to.href).equal('https://google.com/');
+            should(linkRedirect.edited).be.false();
+            should(ObjectID.isValid(linkRedirect.link_id)).be.true();
+        });
+
+        it('should set edited to true if updated_at is greater than created_at by more than 1 second', function () {
+            const model = createRedirectModel({
+                updated_at: new Date('2022-10-20T00:00:10.000Z'),
+                created_at: new Date('2022-10-20T00:00:00.000Z')
+            });
+            linkRedirectRepository = createLinkRedirectRepository();
+            const linkRedirect = linkRedirectRepository.fromModel(model);
+            should(linkRedirect.from.href).equal('https://example.com/r/1234abcd');
+            should(linkRedirect.to.href).equal('https://google.com/');
+            should(linkRedirect.edited).be.true();
+            should(ObjectID.isValid(linkRedirect.link_id)).be.true();
+        });
+    });
+
+    describe('getAll', function () {
+        it('should return an array of LinkRedirect instances', async function () {
+            linkRedirectRepository = createLinkRedirectRepository();
+            const linkRedirects = await linkRedirectRepository.getAll({});
+            should(linkRedirects).be.an.Array();
+            should(linkRedirects.length).equal(1);
+            const linkRedirect = linkRedirects[0];
+            should(linkRedirect.from.href).equal('https://example.com/r/1234abcd');
+            should(linkRedirect.to.href).equal('https://google.com/');
+            should(linkRedirect.edited).be.true();
+            should(ObjectID.isValid(linkRedirect.link_id)).be.true();
+        });
+    });
+
+    describe('getFilteredIds', function () {
+        it('should return an array of link ids', async function () {
+            linkRedirectRepository = createLinkRedirectRepository();
+            const linkIds = await linkRedirectRepository.getFilteredIds({});
+            should(linkIds).be.an.Array();
+            should(linkIds.length).equal(1);
+            should(linkIds[0]).equal('662194931d0ba6fb37c080ee');
+        });
+    });
+
+    describe('getByURL', function () {
+        it('should return a LinkRedirect instance', async function () {
+            const url = new URL('https://example.com/r/1234abcd');
+            linkRedirectRepository = createLinkRedirectRepository();
+            const result = await linkRedirectRepository.getByURL(url);
+            should(result).be.an.Object();
+            should(result.from.href).equal(url.href);
+            should(result.to.href).equal('https://google.com/');
+        });
+
+        it('should return a LinkRedirect instance from cache if enabled and key exists', async function () {
+            const url = new URL('https://example.com/r/1234abcd');
+            const cacheAdapterStub = {
+                get: sinon.stub().returns({
+                    link_id: '662194931d0ba6fb37c080ee',
+                    from: 'https://example.com/r/1234abcd',
+                    to: 'https://google.com',
+                    edited: true
+                }),
+                reset: sinon.stub()
+            };
+            linkRedirectRepository = createLinkRedirectRepository({
+                cacheAdapter: cacheAdapterStub
+            });
+            const result = await linkRedirectRepository.getByURL(url);
+            should(result).be.an.Object();
+            should(result.from.href).equal('https://example.com/r/1234abcd');
+            should(result.to.href).equal('https://google.com/');
+            should(result.edited).be.true();
+            should(ObjectID.isValid(result.link_id)).be.true();
+        });
+
+        it('should return a LinkRedirect instance from the DB if cache is enabled and key does not exist', async function () {
+            const url = new URL('https://example.com/r/1234abcd');
+            const cacheAdapterStub = {
+                get: sinon.stub().returns(null),
+                set: sinon.stub(),
+                reset: sinon.stub()
+            };
+            linkRedirectRepository = createLinkRedirectRepository({
+                cacheAdapter: cacheAdapterStub
+            });
+            const result = await linkRedirectRepository.getByURL(url);
+            should(result).be.an.Object();
+            should(result.from.href).equal('https://example.com/r/1234abcd');
+            should(result.to.href).equal('https://google.com/');
+            should(result.edited).be.true();
+            should(ObjectID.isValid(result.link_id)).be.true();
+            should(cacheAdapterStub.set.calledOnce).be.true();
+        });
+    });
+
+    describe('caching', function () {
+        it('should add a new link redirect to the cache on save', async function () {
+            const cacheAdapterStub = {
+                set: sinon.stub()
+            };
+            linkRedirectRepository = createLinkRedirectRepository({
+                cacheAdapter: cacheAdapterStub
+            });
+
+            const linkRedirect = new LinkRedirect({
+                from: new URL('https://example.com/r/1234abcd'),
+                to: new URL('https://google.com')
+            });
+            await linkRedirectRepository.save(linkRedirect);
+            should(cacheAdapterStub.set.calledOnce).be.true();
+        });
+
+        it('should clear cache on site.changed event', function () {
+            const reset = sinon.stub();
+            const cacheAdapterStub = {
+                reset: reset
+            };
+            const EventRegistry = new EventEmitter();
+            linkRedirectRepository = createLinkRedirectRepository({
+                cacheAdapter: cacheAdapterStub,
+                EventRegistry
+            });
+
+            EventRegistry.emit('site.changed');
+            should(reset.calledOnce).be.true();
+        });
+    });
+});
\ No newline at end of file
diff --git a/ghost/core/test/unit/server/services/mail/GhostMailer.test.js b/ghost/core/test/unit/server/services/mail/GhostMailer.test.js
index fc4d79e043c..9845598ea2a 100644
--- a/ghost/core/test/unit/server/services/mail/GhostMailer.test.js
+++ b/ghost/core/test/unit/server/services/mail/GhostMailer.test.js
@@ -7,6 +7,7 @@ const configUtils = require('../../../../utils/configUtils');
 const urlUtils = require('../../../../../core/shared/url-utils');
 let mailer;
 const assert = require('assert/strict');
+const emailAddress = require('../../../../../core/server/services/email-address');
 
 // Mock SMTP config
 const SMTP = {
@@ -41,6 +42,11 @@ const mailDataIncomplete = {
 const sandbox = sinon.createSandbox();
 
 describe('Mail: Ghostmailer', function () {
+    before(function () {
+        emailAddress.init();
+        sinon.restore();
+    });
+
     afterEach(async function () {
         mailer = null;
         await configUtils.restore();
diff --git a/ghost/core/test/unit/server/services/members/RequestIntegrityTokenProvider.test.js b/ghost/core/test/unit/server/services/members/RequestIntegrityTokenProvider.test.js
new file mode 100644
index 00000000000..e13c0abd5bb
--- /dev/null
+++ b/ghost/core/test/unit/server/services/members/RequestIntegrityTokenProvider.test.js
@@ -0,0 +1,70 @@
+const sinon = require('sinon');
+const should = require('should');
+
+const RequestIntegrityTokenProvider = require('../../../../../core/server/services/members/RequestIntegrityTokenProvider');
+
+const tokenProvider = new RequestIntegrityTokenProvider({
+    themeSecret: 'test',
+    tokenDuration: 100
+});
+
+describe('RequestIntegrityTokenProvider', function () {
+    beforeEach(function () {
+        sinon.useFakeTimers(new Date('2021-01-01'));
+    });
+
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    describe('create', function () {
+        it('should create a HMAC digest from the secret', function () {
+            const token = tokenProvider.create();
+
+            token.should.be.a.String();
+            token.split(':').should.be.an.Array().with.lengthOf(3);
+            const [timestamp, nonce, digest] = token.split(':');
+
+            timestamp.should.equal((new Date('2021-01-01').valueOf() + 100).toString());
+
+            nonce.should.match(/[0-9a-f]{16}/);
+
+            digest.should.be.a.String().with.lengthOf(64);
+        });
+    });
+
+    describe('validate', function () {
+        it('should verify a HMAC digest from the secret', function () {
+            const token = tokenProvider.create();
+            const result = tokenProvider.validate(token);
+
+            result.should.be.true();
+        });
+
+        it('should fail to verify an expired token', function () {
+            const token = tokenProvider.create();
+            sinon.clock.tick(101);
+            const result = tokenProvider.validate(token);
+
+            result.should.be.false();
+        });
+
+        it('should fail to verify a malformed token', function () {
+            const token = 'invalid_token';
+            const result = tokenProvider.validate(token);
+
+            result.should.be.false();
+        });
+
+        it('should fail to verify a token with an invalid signature', function () {
+            const token = tokenProvider.create();
+            const [timestamp, nonce] = token.split(':');
+            const invalidDigest = 'a'.repeat(64); // Create an invalid digest
+            const invalidToken = `${timestamp}:${nonce}:${invalidDigest}`;
+
+            const result = tokenProvider.validate(invalidToken);
+
+            result.should.be.false();
+        });
+    });
+});
diff --git a/ghost/core/test/unit/server/services/members/middleware.test.js b/ghost/core/test/unit/server/services/members/middleware.test.js
index cca19f1411e..e1e65708160 100644
--- a/ghost/core/test/unit/server/services/members/middleware.test.js
+++ b/ghost/core/test/unit/server/services/members/middleware.test.js
@@ -192,4 +192,111 @@ describe('Members Service Middleware', function () {
             res.redirect.firstCall.args[0].should.eql('/blah/?action=signin&success=true');
         });
     });
-});
+
+    describe('updateMemberNewsletters', function () {
+        // let oldMembersService;
+        let req;
+        let res;
+
+        before(function () {
+            models.init();
+        });
+
+        beforeEach(function () {
+            req = {body: {newsletters: [], enable_comment_notifications: null}};
+            res = {writeHead: sinon.stub(), end: sinon.stub()};
+        });
+
+        afterEach(function () {
+            sinon.restore();
+        });
+
+        // auth happens prior to this middleware
+        it('returns 404 if no member uuid is part of the request', async function () {
+            req.query = {};
+
+            // Call the middleware
+            await membersMiddleware.updateMemberNewsletters(req, res);
+
+            // Check behavior
+            res.writeHead.calledOnce.should.be.true();
+            res.writeHead.firstCall.args[0].should.eql(404);
+            res.end.calledOnce.should.be.true();
+            res.end.firstCall.args[0].should.eql('Email address not found.');
+        });
+
+        // auth happens prior to this middleware
+        it('returns 404 if member uuid is not found', async function () {
+            req.query = {uuid: 'test'};
+            sinon.stub(membersService, 'api').get(() => {
+                return {
+                    members: {
+                        get: sinon.stub().resolves()
+                    }
+                };
+            });
+
+            // Call the middleware
+            await membersMiddleware.updateMemberNewsletters(req, res);
+
+            // Check behavior
+            res.writeHead.calledOnce.should.be.true();
+            res.writeHead.firstCall.args[0].should.eql(404);
+            res.end.calledOnce.should.be.true();
+            res.end.firstCall.args[0].should.eql('Email address not found.');
+        });
+
+        it('attempts to update newsletters', async function () {
+            res.json = sinon.stub();
+            // member data appended if authed via uuid+key or session
+            req.member = {
+                id: 'test',
+                email: 'test@email.com',
+                name: 'Test Name',
+                newsletters: [],
+                enable_comment_notifications: false,
+                status: 'free'
+            };
+            sinon.stub(membersService, 'api').get(() => {
+                return {
+                    members: {
+                        update: sinon.stub().resolves({
+                            ...req.member,
+                            toJSON: () => JSON.stringify(req.member)
+                        })
+                    }
+                };
+            });
+            await membersMiddleware.updateMemberNewsletters(req, res);
+            // the stubbing of the api is difficult to test with the current design, so we just check that the response is sent
+            res.json.calledOnce.should.be.true();
+        });
+
+        it('returns 400 on error', async function () {
+            // use a malformed request to trigger an error
+            // member data appended if authed via uuid+key or session
+            req.member = {
+                id: undefined,
+                email: 'test@email.com',
+                name: 'Test Name',
+                newsletters: [],
+                enable_comment_notifications: false,
+                status: 'free'
+            };
+            sinon.stub(membersService, 'api').get(() => {
+                return {
+                    members: {
+                        update: sinon.stub().rejects(new Error('Test Error'))
+                    }
+                };
+            });
+            await membersMiddleware.updateMemberNewsletters(req, res);
+
+            // Check behavior
+            res.writeHead.calledOnce.should.be.true();
+            res.writeHead.firstCall.args[0].should.eql(400);
+            res.end.calledOnce.should.be.true();
+            res.end.firstCall.args[0].should.eql('Failed to update newsletters');
+        });
+    });
+});
\ No newline at end of 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/core/test/unit/server/services/newsletters/service.test.js b/ghost/core/test/unit/server/services/newsletters/service.test.js
index a25d2f0a1e7..8836ee45f8a 100644
--- a/ghost/core/test/unit/server/services/newsletters/service.test.js
+++ b/ghost/core/test/unit/server/services/newsletters/service.test.js
@@ -8,7 +8,7 @@ const mail = require('../../../../../core/server/services/mail');
 // Mocked utilities
 const urlUtils = require('../../../../utils/urlUtils');
 const {mockManager} = require('../../../../utils/e2e-framework');
-
+const {EmailAddressService} = require('@tryghost/email-addresses');
 const NewslettersService = require('../../../../../core/server/services/newsletters/NewslettersService');
 
 class TestTokenProvider {
@@ -41,7 +41,30 @@ describe('NewslettersService', function () {
             mail,
             singleUseTokenProvider: tokenProvider,
             urlUtils: urlUtils.stubUrlUtilsFromConfig(),
-            limitService
+            limitService,
+            emailAddressService: {
+                service: new EmailAddressService({
+                    getManagedEmailEnabled: () => {
+                        return false;
+                    },
+                    getSendingDomain: () => {
+                        return null;
+                    },
+                    getDefaultEmail: () => {
+                        return {
+                            address: 'default@example.com'
+                        };
+                    },
+                    isValidEmailAddress: () => {
+                        return true;
+                    },
+                    labs: {
+                        isSet() {
+                            return false;
+                        }
+                    }
+                })
+            }
         });
     });
 
@@ -79,14 +102,12 @@ describe('NewslettersService', function () {
 
     // @TODO replace this with a specific function for fetching all available newsletters
     describe('browse', function () {
-        it('lists all newsletters by calling findAll and toJSON', async function () {
-            const toJSONStub = sinon.stub();
-            const findAllStub = sinon.stub(models.Newsletter, 'findAll').returns({toJSON: toJSONStub});
+        it('lists all newsletters by calling findPage', async function () {
+            const findAllStub = sinon.stub(models.Newsletter, 'findPage').returns({data: []});
 
             await newsletterService.browse({});
 
             sinon.assert.calledOnce(findAllStub);
-            sinon.assert.calledOnce(toJSONStub);
         });
     });
 
diff --git a/ghost/core/test/unit/server/services/permissions/can-this.test.js b/ghost/core/test/unit/server/services/permissions/can-this.test.js
index 49c40a5e234..653065640d6 100644
--- a/ghost/core/test/unit/server/services/permissions/can-this.test.js
+++ b/ghost/core/test/unit/server/services/permissions/can-this.test.js
@@ -308,96 +308,6 @@ describe('Permissions', function () {
                     .catch(done);
             });
 
-            it('Specific permissions: can edit correct specific tag (no permissible function on model)', function (done) {
-                const userProviderStub = sinon.stub(providers, 'user').callsFake(function () {
-                    // Fake the response from providers.user, which contains permissions and roles
-                    return Promise.resolve({
-                        permissions: models.Permissions.forge([
-                            {
-                                id: 'abc123',
-                                name: 'test',
-                                action_type: 'edit',
-                                object_type: 'tag',
-                                object_id: 1
-                            }
-                        ]).models,
-                        roles: undefined
-                    });
-                });
-
-                permissions
-                    .canThis({user: {}}) // user context
-                    .edit
-                    .tag({id: 1}) // tag id in model syntax
-                    .then(function (res) {
-                        userProviderStub.callCount.should.eql(1);
-                        should.not.exist(res);
-                        done();
-                    })
-                    .catch(done);
-            });
-
-            it('Specific permissions: cannot edit incorrect specific tag (no permissible function on model)', function (done) {
-                const userProviderStub = sinon.stub(providers, 'user').callsFake(function () {
-                    // Fake the response from providers.user, which contains permissions and roles
-                    return Promise.resolve({
-                        permissions: models.Permissions.forge([
-                            {
-                                id: 'abc123',
-                                name: 'test',
-                                action_type: 'edit',
-                                object_type: 'tag',
-                                object_id: 1
-                            }
-                        ]).models,
-                        roles: undefined
-                    });
-                });
-
-                permissions
-                    .canThis({user: {}}) // user context
-                    .edit
-                    .tag({id: 10}) // tag id in model syntax
-                    .then(function () {
-                        done(new Error('was able to edit tag without permission'));
-                    })
-                    .catch(function (err) {
-                        userProviderStub.callCount.should.eql(1);
-                        err.errorType.should.eql('NoPermissionError');
-                        done();
-                    });
-            });
-
-            // @TODO fix this case - it makes no sense?!
-            it('Specific permissions: CAN edit non-specific tag (no permissible function on model) @TODO fix this', function (done) {
-                const userProviderStub = sinon.stub(providers, 'user').callsFake(function () {
-                    // Fake the response from providers.user, which contains permissions and roles
-                    return Promise.resolve({
-                        permissions: models.Permissions.forge([
-                            {
-                                id: 'abc123',
-                                name: 'test',
-                                action_type: 'edit',
-                                object_type: 'tag',
-                                object_id: 1
-                            }
-                        ]).models,
-                        roles: undefined
-                    });
-                });
-
-                permissions
-                    .canThis({user: {}}) // user context
-                    .edit
-                    .tag() // tag id in model syntax
-                    .then(function (res) {
-                        userProviderStub.callCount.should.eql(1);
-                        should.not.exist(res);
-                        done();
-                    })
-                    .catch(done);
-            });
-
             it('With owner role: can edit tag (no permissible function on model)', function (done) {
                 const userProviderStub = sinon.stub(providers, 'user').callsFake(function () {
                     // Fake the response from providers.user, which contains permissions and roles
diff --git a/ghost/core/test/unit/server/services/public-config/config.test.js b/ghost/core/test/unit/server/services/public-config/config.test.js
new file mode 100644
index 00000000000..10868dbd5dc
--- /dev/null
+++ b/ghost/core/test/unit/server/services/public-config/config.test.js
@@ -0,0 +1,99 @@
+const assert = require('assert/strict');
+const configUtils = require('../../../../utils/configUtils');
+const getConfigProperties = require('../../../../../core/server/services/public-config/config');
+
+// List of allowed keys to be returned by the public-config service
+// This is kind of a duplicate of the keys in the config.js output serializer in the api-framework
+// However the list of keys returned by the public-config service can differ based on flags and config set, so we want to keep this explicit
+
+const allowedKeys = [
+    'version',
+    'environment',
+    'database',
+    'mail',
+    'useGravatar',
+    'labs',
+    'clientExtensions',
+    'enableDeveloperExperiments',
+    'stripeDirect',
+    'mailgunIsConfigured',
+    'emailAnalytics',
+    'hostSettings',
+    'tenor',
+    'pintura',
+    'signupForm'
+];
+
+describe('Public-config Service', function () {
+    describe('Config Properties', function () {
+        afterEach(async function () {
+            await configUtils.restore();
+        });
+
+        it('should return the correct default config properties', function () {
+            const configProperties = getConfigProperties();
+
+            assert.deepEqual(Object.keys(configProperties), allowedKeys);
+        });
+
+        it('should return null for tenor apikey when unset', function () {
+            let configProperties = getConfigProperties();
+
+            assert.equal(configProperties.tenor.googleApiKey, null);
+        });
+
+        it('should return tenor apikey when set', function () {
+            configUtils.set('tenor:googleApiKey', 'TENOR_KEY');
+
+            let configProperties = getConfigProperties();
+
+            assert.equal(configProperties.tenor.googleApiKey, 'TENOR_KEY');
+        });
+
+        it('should return true for mailgunIsConfigured when mailgun is configured', function () {
+            configUtils.set('bulkEmail', {
+                mailgun: 'exists'
+            });
+
+            let configProperties = getConfigProperties();
+
+            assert.equal(configProperties.mailgunIsConfigured, true);
+        });
+
+        it('should return false for mailgunIsConfigured when mailgun is not configured', function () {
+            configUtils.set('bulkEmail', {});
+
+            let configProperties = getConfigProperties();
+
+            assert.equal(configProperties.mailgunIsConfigured, false);
+        });
+
+        it('should NOT return stats by default', function () {
+            let configProperties = getConfigProperties();
+
+            assert.equal(configProperties.stats, undefined);
+        });
+
+        it('should return stats when tinybird config is set with the stats key', function () {
+            configUtils.set('tinybird', {
+                stats: {
+                    endpoint: 'xxx'
+                }
+            });
+
+            let configProperties = getConfigProperties();
+
+            assert.deepEqual(configProperties.stats, {endpoint: 'xxx'});
+        });
+
+        it('should NOT return stats when tinybird config is set without the stats key', function () {
+            configUtils.set('tinybird', {
+                url: 'xxx'
+            });
+
+            let configProperties = getConfigProperties();
+
+            assert.equal(configProperties.stats, undefined);
+        });
+    });
+});
diff --git a/ghost/core/test/unit/server/services/public-config/site.test.js b/ghost/core/test/unit/server/services/public-config/site.test.js
new file mode 100644
index 00000000000..ccd21aed6fb
--- /dev/null
+++ b/ghost/core/test/unit/server/services/public-config/site.test.js
@@ -0,0 +1,66 @@
+const assert = require('assert/strict');
+const configUtils = require('../../../../utils/configUtils');
+const getSiteProperties = require('../../../../../core/server/services/public-config/site');
+
+describe('Public-config Service', function () {
+    describe('Site Properties', function () {
+        describe('Sentry', function () {
+            const fakeDSN = 'https://aaabbbccc000111222333444555667@sentry.io/1234567';
+
+            afterEach(async function () {
+                await configUtils.restore();
+            });
+
+            it('should not include sentry properties if sentry disabled via config', function () {
+                configUtils.set({
+                    client_sentry: {
+                        disabled: true
+                    }
+                });
+
+                const siteProperties = getSiteProperties();
+
+                assert.equal(siteProperties.sentry_dsn, undefined);
+                assert.equal(siteProperties.sentry_env, undefined);
+            });
+
+            it('should not include sentry properties if sentry not present in config', function () {
+                const siteProperties = getSiteProperties();
+
+                assert.equal(siteProperties.sentry_dsn, undefined);
+                assert.equal(siteProperties.sentry_env, undefined);
+            });
+
+            it('should include sentry properties if sentry not disabled in config', function () {
+                configUtils.set({
+                    client_sentry: {
+                        disabled: false,
+                        dsn: fakeDSN
+                    }
+                });
+
+                const siteProperties = getSiteProperties();
+
+                assert.equal(siteProperties.sentry_dsn, fakeDSN);
+                assert.equal(siteProperties.sentry_env, 'testing'); // testing is the default env
+            });
+
+            it('should use PRO_ENV env var for sentry_env property if in config', function () {
+                const env = 'staging';
+
+                configUtils.set({
+                    client_sentry: {
+                        disabled: false,
+                        dsn: fakeDSN
+                    },
+                    PRO_ENV: env
+                });
+
+                const siteProperties = getSiteProperties();
+
+                assert.equal(siteProperties.sentry_dsn, fakeDSN);
+                assert.equal(siteProperties.sentry_env, env);
+            });
+        });
+    });
+});
diff --git a/ghost/core/test/unit/server/services/route-settings/validate.test.js b/ghost/core/test/unit/server/services/route-settings/validate.test.js
index 80c3caebdb0..7d308c5245e 100644
--- a/ghost/core/test/unit/server/services/route-settings/validate.test.js
+++ b/ghost/core/test/unit/server/services/route-settings/validate.test.js
@@ -76,7 +76,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without leading and trailing slashes (routes)', function () {
         try {
             validate({
                 routes: {
@@ -91,7 +91,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without trailing slashes (routes)', function () {
         try {
             validate({
                 routes: {
@@ -106,7 +106,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without leading slashes (routes)', function () {
         try {
             validate({
                 routes: {
@@ -121,7 +121,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without leading slashes (collections)', function () {
         try {
             validate({
                 collections: {
@@ -138,7 +138,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without leading and trailing slashes (collections)', function () {
         try {
             validate({
                 collections: {
@@ -155,7 +155,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without trailing slashes (collections)', function () {
         try {
             validate({
                 collections: {
@@ -172,7 +172,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without trailing slashes (permalink)', function () {
         try {
             validate({
                 collections: {
@@ -189,7 +189,7 @@ describe('UNIT: services/settings/validate', function () {
         throw new Error('should fail');
     });
 
-    it('throws error without leading or trailing slashes', function () {
+    it('throws error without leading and trailing slashes (permalink)', function () {
         try {
             validate({
                 collections: {
diff --git a/ghost/core/test/unit/server/services/segment/DomainEventsAnalytics.test.js b/ghost/core/test/unit/server/services/segment/DomainEventsAnalytics.test.js
deleted file mode 100644
index 9e2e6b83c7a..00000000000
--- a/ghost/core/test/unit/server/services/segment/DomainEventsAnalytics.test.js
+++ /dev/null
@@ -1,270 +0,0 @@
-const assert = require('assert/strict');
-const sinon = require('sinon');
-const ObjectId = require('bson-objectid').default;
-
-// To test
-const DomainEventsAnalytics = require('../../../../../core/server/services/segment/DomainEventsAnalytics');
-
-// Stubbed dependencies
-const DomainEvents = require('@tryghost/domain-events');
-const {MilestoneCreatedEvent} = require('@tryghost/milestones');
-const {StripeLiveEnabledEvent, StripeLiveDisabledEvent} = require('@tryghost/members-stripe-service').events;
-
-describe('DomainEventsAnalytics', function () {
-    describe('Constructor', function () {
-        it('doesn\'t throw', function () {
-            new DomainEventsAnalytics({});
-        });
-    });
-
-    describe('Domain events analytics service', function () {
-        let domainEventsAnalytics;
-        let analyticsStub;
-        let exceptionHandlerStub;
-        let loggingStub;
-        let domainEventsStub;
-
-        beforeEach(function () {
-            analyticsStub = sinon.stub();
-            exceptionHandlerStub = sinon.stub();
-            loggingStub = sinon.stub();
-            domainEventsStub = sinon.stub();
-        });
-
-        afterEach(function () {
-            sinon.restore();
-        });
-
-        it('subscribes to events', async function () {
-            domainEventsAnalytics = new DomainEventsAnalytics({
-                analytics: analyticsStub,
-                trackDefaults: {
-                    userId: '1234',
-                    properties: {email: 'john@test.com'}
-                },
-                prefix: 'Pro: ',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                DomainEvents: {
-                    subscribe: domainEventsStub
-                },
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            domainEventsAnalytics.subscribeToEvents();
-            assert(domainEventsStub.callCount === 3);
-            assert(loggingStub.callCount === 0);
-        });
-
-        it('handles milestone created event for 100 members', async function () {
-            domainEventsAnalytics = new DomainEventsAnalytics({
-                analytics: {
-                    track: analyticsStub
-                },
-                trackDefaults: {
-                    userId: '1234',
-                    properties: {email: 'john@test.com'}
-                },
-                prefix: 'Pro: ',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                DomainEvents,
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            domainEventsAnalytics.subscribeToEvents();
-
-            DomainEvents.dispatch(MilestoneCreatedEvent.create({
-                milestone: {
-                    id: new ObjectId().toHexString(),
-                    type: 'members',
-                    value: 100,
-                    createdAt: new Date(),
-                    emailSentAt: new Date()
-                }
-            }));
-
-            await DomainEvents.allSettled();
-
-            assert(analyticsStub.callCount === 1);
-            assert(analyticsStub.calledWith({
-                userId: '1234',
-                properties: {email: 'john@test.com'},
-                event: 'Pro: 100 Members reached'
-            }));
-
-            DomainEvents.dispatch(MilestoneCreatedEvent.create({
-                milestone: {
-                    id: new ObjectId().toHexString(),
-                    type: 'members',
-                    value: 1000,
-                    createdAt: new Date(),
-                    emailSentAt: new Date()
-                }
-            }));
-
-            await DomainEvents.allSettled();
-            // Analytics should not be called again
-            assert(analyticsStub.callCount === 1);
-            assert(loggingStub.callCount === 0);
-        });
-
-        it('handles milestone created event for $100 ARR', async function () {
-            domainEventsAnalytics = new DomainEventsAnalytics({
-                analytics: {
-                    track: analyticsStub
-                },
-                trackDefaults: {
-                    userId: '9876',
-                    properties: {email: 'john+arr@test.com'}
-                },
-                prefix: 'Pro: ',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                DomainEvents,
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            domainEventsAnalytics.subscribeToEvents();
-
-            DomainEvents.dispatch(MilestoneCreatedEvent.create({
-                milestone: {
-                    id: new ObjectId().toHexString(),
-                    type: 'arr',
-                    currency: 'usd',
-                    value: 100,
-                    createdAt: new Date(),
-                    emailSentAt: new Date()
-                }
-            }));
-
-            await DomainEvents.allSettled();
-
-            assert(analyticsStub.callCount === 1);
-            assert(analyticsStub.calledWith({
-                userId: '9876',
-                properties: {email: 'john+arr@test.com'},
-                event: 'Pro: $100 ARR reached'
-            }));
-            assert(loggingStub.callCount === 0);
-
-            DomainEvents.dispatch(MilestoneCreatedEvent.create({
-                milestone: {
-                    id: new ObjectId().toHexString(),
-                    type: 'arr',
-                    currency: 'usd',
-                    value: 1000,
-                    createdAt: new Date(),
-                    emailSentAt: new Date()
-                }
-            }));
-
-            await DomainEvents.allSettled();
-            // Analytics should not be called again
-            assert(analyticsStub.callCount === 1);
-            assert(loggingStub.callCount === 0);
-        });
-
-        it('handles Stripe live enabled and disabled events', async function () {
-            domainEventsAnalytics = new DomainEventsAnalytics({
-                analytics: {
-                    track: analyticsStub
-                },
-                trackDefaults: {
-                    userId: '9876',
-                    properties: {email: 'john+stripe@test.com'}
-                },
-                prefix: 'Pro: ',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                DomainEvents,
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            domainEventsAnalytics.subscribeToEvents();
-
-            DomainEvents.dispatch(StripeLiveEnabledEvent.create({
-                message: 'Stripe live mode enabled'
-            }));
-
-            await DomainEvents.allSettled();
-
-            assert(analyticsStub.callCount === 1);
-            assert(analyticsStub.getCall(0).calledWith({
-                userId: '9876',
-                properties: {email: 'john+stripe@test.com'},
-                event: 'Pro: Stripe Live Enabled'
-            }));
-            assert(loggingStub.callCount === 0);
-
-            DomainEvents.dispatch(StripeLiveDisabledEvent.create({
-                message: 'Stripe live mode disabled'
-            }));
-
-            await DomainEvents.allSettled();
-
-            assert(analyticsStub.callCount === 2);
-            assert(analyticsStub.getCall(1).calledWith({
-                userId: '9876',
-                properties: {email: 'john+stripe@test.com'},
-                event: 'Pro: Stripe Live Disabled'
-            }));
-
-            await DomainEvents.allSettled();
-
-            assert(loggingStub.callCount === 0);
-        });
-
-        it('can handle tracking errors', async function () {
-            let error = new Error('Test error');
-            domainEventsAnalytics = new DomainEventsAnalytics({
-                analytics: {
-                    track: analyticsStub.throws(error)
-                },
-                trackDefaults: {},
-                prefix: '',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                DomainEvents,
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            domainEventsAnalytics.subscribeToEvents();
-
-            try {
-                DomainEvents.dispatch(MilestoneCreatedEvent.create({
-                    milestone: {
-                        id: new ObjectId().toHexString(),
-                        type: 'arr',
-                        currency: 'usd',
-                        value: 100,
-                        createdAt: new Date(),
-                        emailSentAt: new Date()
-                    }
-                }));
-
-                await DomainEvents.allSettled();
-            } catch (err) {
-                assert(analyticsStub.callCount === 1);
-                assert(exceptionHandlerStub.callCount === 1);
-                assert(exceptionHandlerStub.calledWith(error));
-                assert(loggingStub.callCount === 1);
-            }
-        });
-    });
-});
diff --git a/ghost/core/test/unit/server/services/segment/ModelEventsAnalytics.test.js b/ghost/core/test/unit/server/services/segment/ModelEventsAnalytics.test.js
deleted file mode 100644
index 53b682a430f..00000000000
--- a/ghost/core/test/unit/server/services/segment/ModelEventsAnalytics.test.js
+++ /dev/null
@@ -1,148 +0,0 @@
-const assert = require('assert/strict');
-const sinon = require('sinon');
-
-// To test
-const ModelEventsAnalytics = require('../../../../../core/server/services/segment/ModelEventsAnalytics');
-
-// Stubbed dependencies
-const events = require('../../../../../core/server/lib/common/events');
-
-describe('ModelEventsAnalytics', function () {
-    describe('Constructor', function () {
-        it('doesn\'t throw', function () {
-            new ModelEventsAnalytics({});
-        });
-    });
-
-    describe('Model events analytics service', function () {
-        let modelEventsAnalytics;
-        let analyticsStub;
-        let exceptionHandlerStub;
-        let loggingStub;
-        let eventStub;
-
-        beforeEach(function () {
-            analyticsStub = sinon.stub();
-            exceptionHandlerStub = sinon.stub();
-            loggingStub = sinon.stub();
-            eventStub = sinon.stub();
-        });
-
-        afterEach(function () {
-            sinon.restore();
-        });
-
-        it('subscribes to events', async function () {
-            modelEventsAnalytics = new ModelEventsAnalytics({
-                analytics: analyticsStub,
-                trackDefaults: {
-                    userId: '1234',
-                    properties: {email: 'john@test.com'}
-                },
-                prefix: 'Pro: ',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                events: {
-                    on: eventStub
-                },
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            modelEventsAnalytics.subscribeToEvents();
-
-            assert(eventStub.callCount === 4);
-            assert(loggingStub.callCount === 0);
-        });
-
-        it('handles common model events', async function () {
-            modelEventsAnalytics = new ModelEventsAnalytics({
-                analytics: {
-                    track: analyticsStub
-                },
-                trackDefaults: {
-                    userId: '1234',
-                    properties: {email: 'john@test.com'}
-                },
-                prefix: 'Pro: ',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                events,
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            modelEventsAnalytics.subscribeToEvents();
-
-            events.emit('theme.uploaded', {name: 'Custom Super Theme'});
-            events.emit('post.published');
-            events.emit('page.published');
-            events.emit('integration.added');
-
-            assert(analyticsStub.callCount === 4);
-            assert(analyticsStub.getCall(0).calledWithExactly({
-                userId: '1234',
-                properties: {email: 'john@test.com'},
-                event: 'Pro: Theme Uploaded',
-                name: 'Custom Super Theme'
-            }));
-
-            assert(analyticsStub.getCall(1).calledWithExactly({
-                userId: '1234',
-                properties: {email: 'john@test.com'},
-                event: 'Pro: Post Published'
-            }));
-
-            assert(analyticsStub.getCall(2).calledWithExactly({
-                userId: '1234',
-                properties: {email: 'john@test.com'},
-                event: 'Pro: Page Published'
-            }));
-
-            assert(analyticsStub.getCall(3).calledWithExactly({
-                userId: '1234',
-                properties: {email: 'john@test.com'},
-                event: 'Pro: Custom Integration Added'
-            }));
-
-            events.emit('post.unpublished');
-
-            // Analytics should not be called again
-            assert(analyticsStub.callCount === 4);
-            assert(loggingStub.callCount === 0);
-        });
-
-        it('can handle tracking errors', async function () {
-            let error = new Error('Test error');
-            modelEventsAnalytics = new ModelEventsAnalytics({
-                analytics: {
-                    track: analyticsStub.throws(error)
-                },
-                trackDefaults: {},
-                prefix: '',
-                exceptionHandler: {
-                    captureException: exceptionHandlerStub
-                },
-                events,
-                logging: {
-                    error: loggingStub
-                }
-            });
-
-            modelEventsAnalytics.subscribeToEvents();
-
-            try {
-                events.emit('post.published');
-            } catch (err) {
-                assert(analyticsStub.callCount === 1);
-                assert(exceptionHandlerStub.callCount === 1);
-                assert(exceptionHandlerStub.calledWith(error));
-                assert(loggingStub.callCount === 1);
-            }
-        });
-    });
-});
diff --git a/ghost/core/test/unit/server/services/segment/index.test.js b/ghost/core/test/unit/server/services/segment/index.test.js
deleted file mode 100644
index c3dbe474af7..00000000000
--- a/ghost/core/test/unit/server/services/segment/index.test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const assert = require('assert/strict');
-
-describe('Segment Analytics Service', function () {
-    let segmentService;
-
-    it('Provides expected public API', async function () {
-        segmentService = require('../../../../../core/server/services/segment');
-
-        assert.ok(segmentService.init);
-    });
-});
diff --git a/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap b/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap
index 3df9cc19478..2426f5b0a90 100644
--- a/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap
+++ b/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap
@@ -188,8 +188,11 @@ exports[`UNIT > Settings BREAD Service: edit setting members_support_address tri
 
 exports[`UNIT > Settings BREAD Service: edit setting members_support_address triggers email verification 3: [metadata 1] 1`] = `
 Object {
+  "encoding": "base64",
   "forceTextContent": true,
-  "from": "noreply@example.com",
+  "from": "\\"Ghost at 127.0.0.1\\" <noreply@example.com>",
+  "generateTextFromHTML": false,
+  "replyTo": null,
   "subject": "Verify email address",
   "to": "support@example.com",
 }
diff --git a/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js b/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js
index 8f8c55c3436..6e1f28f71af 100644
--- a/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js
+++ b/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js
@@ -187,6 +187,16 @@ describe('UNIT > Settings BREAD Service:', function () {
                     isSet() {
                         return false;
                     }
+                },
+                emailAddressService: {
+                    service: {
+                        validate() {
+                            return {
+                                allowed: true,
+                                verificationEmailRequired: true
+                            };
+                        }
+                    }
                 }
             });
 
diff --git a/ghost/core/test/unit/server/services/slack-notifications/index.test.js b/ghost/core/test/unit/server/services/slack-notifications/index.test.js
index 1d082d5e2b5..8e91adb5775 100644
--- a/ghost/core/test/unit/server/services/slack-notifications/index.test.js
+++ b/ghost/core/test/unit/server/services/slack-notifications/index.test.js
@@ -9,7 +9,7 @@ describe('Slack Notifications Service', function () {
     let scope;
 
     beforeEach(function () {
-        configUtils.set('hostSettings', {milestones: {enabled: true, url: 'https://testhooks.slack.com/'}});
+        configUtils.set('hostSettings', {milestones: {enabled: true, url: 'https://testhooks.slack.com/', minThreshold: '100'}});
 
         scope = nock('https://testhooks.slack.com/')
             .post('/')
@@ -28,13 +28,13 @@ describe('Slack Notifications Service', function () {
             milestone: {
                 type: 'arr',
                 currency: 'usd',
-                name: 'arr-100-usd',
-                value: 100,
+                name: 'arr-1000-usd',
+                value: 1000,
                 createdAt: new Date(),
                 emailSentAt: new Date()
             },
             meta: {
-                currentValue: 105
+                currentValue: 1005
             }
         }));
 
diff --git a/ghost/core/test/unit/server/services/slack.test.js b/ghost/core/test/unit/server/services/slack.test.js
index be3a0192543..7b9b45f5ee0 100644
--- a/ghost/core/test/unit/server/services/slack.test.js
+++ b/ghost/core/test/unit/server/services/slack.test.js
@@ -38,10 +38,22 @@ describe('Slack', function () {
 
     it('listener() calls ping() with toJSONified model', function () {
         const testPost = _.clone(testUtils.DataGenerator.Content.posts[2]);
+        const testAuthor = _.clone(testUtils.DataGenerator.Content.users[0]);
 
         const testModel = {
             toJSON: function () {
                 return testPost;
+            },
+            related: function (relation) {
+                return {
+                    toJSON: function () {
+                        if (relation === 'authors') {
+                            return [testAuthor];
+                        }
+
+                        return [];
+                    }
+                };
             }
         };
 
@@ -52,7 +64,10 @@ describe('Slack', function () {
         listener(testModel);
 
         pingStub.calledOnce.should.be.true();
-        pingStub.calledWith(testPost).should.be.true();
+        pingStub.calledWith({
+            ...testPost,
+            authors: [testAuthor]
+        }).should.be.true();
 
         // Reset slack ping method
         resetSlack();
@@ -121,7 +136,10 @@ describe('Slack', function () {
             let requestUrl;
             let requestData;
 
-            const post = testUtils.DataGenerator.forKnex.createPost({slug: 'webhook-test'});
+            const post = testUtils.DataGenerator.forKnex.createPost({
+                slug: 'webhook-test',
+                html: `<p>Hello World!</p><p>This is a test post.</p><!--members-only--><p>This is members only content.</p>`
+            });
             urlService.getUrlByResourceId.withArgs(post.id, {absolute: true}).returns('http://myblog.com/' + post.slug + '/');
 
             settingsCacheStub.withArgs('slack_url').returns(slackURL);
@@ -140,7 +158,7 @@ describe('Slack', function () {
             requestUrl.should.equal(slackURL);
             requestData.attachments[0].title.should.equal(post.title);
             requestData.attachments[0].title_link.should.equal('http://myblog.com/webhook-test/');
-            requestData.attachments[0].fields[0].value.should.equal('## markdown.');
+            requestData.attachments[0].fields[0].value.should.equal('Hello World!This is a test post.');
             requestData.attachments[0].should.not.have.property('author_name');
             requestData.icon_url.should.equal('http://myblog.com/favicon.ico');
 
diff --git a/ghost/core/test/unit/server/services/url/Queue.test.js b/ghost/core/test/unit/server/services/url/Queue.test.js
index 4dc817bbbae..1e98a2c5ffd 100644
--- a/ghost/core/test/unit/server/services/url/Queue.test.js
+++ b/ghost/core/test/unit/server/services/url/Queue.test.js
@@ -169,7 +169,7 @@ describe('Unit: services/url/Queue', function () {
             });
         });
 
-        it('start twice', function (done) {
+        it('start twice with subscriber between starts', function (done) {
             let notified = 0;
             let called = 0;
 
diff --git a/ghost/core/test/unit/server/services/url/UrlService.test.js b/ghost/core/test/unit/server/services/url/UrlService.test.js
index d727e559738..61091b96db6 100644
--- a/ghost/core/test/unit/server/services/url/UrlService.test.js
+++ b/ghost/core/test/unit/server/services/url/UrlService.test.js
@@ -86,7 +86,7 @@ describe('Unit: services/url/UrlService', function () {
     });
 
     describe('fn: getResource', function () {
-        it('no resource for url found', function () {
+        it('no resource for url found (throws GhostError)', function () {
             urlService.finished = false;
             urlService.urls.getByUrl.withArgs('/blog-post/').returns([]);
 
@@ -130,7 +130,7 @@ describe('Unit: services/url/UrlService', function () {
             urlService.getResource('/blog-post/').should.eql(object2.resource);
         });
 
-        it('two resources for url found', function () {
+        it('two resources for url found (reverse registration order)', function () {
             const object1 = {generatorId: 0, resource: {a: 1}};
             const object2 = {generatorId: 1, resource: {a: 2}};
 
@@ -150,7 +150,7 @@ describe('Unit: services/url/UrlService', function () {
     });
 
     describe('fn: getPermalinkByUrl', function () {
-        it('found', function () {
+        it('found (primary_tag)', function () {
             urlService.urlGenerators = [
                 {
                     uid: 0,
@@ -168,7 +168,7 @@ describe('Unit: services/url/UrlService', function () {
             urlService.getPermalinkByUrl('/blog-post/').should.eql('/:primary_tag/');
         });
 
-        it('found', function () {
+        it('found (slug)', function () {
             urlService.urlGenerators = [
                 {
                     uid: 0,
diff --git a/ghost/core/test/unit/server/services/webhooks/trigger.test.js b/ghost/core/test/unit/server/services/webhooks/trigger.test.js
index 19919a52988..b4791ab7d02 100644
--- a/ghost/core/test/unit/server/services/webhooks/trigger.test.js
+++ b/ghost/core/test/unit/server/services/webhooks/trigger.test.js
@@ -1,83 +1,155 @@
 const assert = require('assert/strict');
+const crypto = require('crypto');
 const sinon = require('sinon');
 
 const WebhookTrigger = require('../../../../../core/server/services/webhooks/WebhookTrigger');
 
+const SIGNATURE_HEADER = 'X-Ghost-Signature';
+const SIGNATURE_REGEX = /^sha256=[a-z0-9]+, t=\d+$/;
+
 describe('Webhook Service', function () {
-    const models = {
-        Webhook: {
-            edit: () => sinon.stub().resolves(null),
-            destroy: () => sinon.stub().resolves(null),
-            findAllByEvent: () => sinon.stub().resolves(null),
-            getByEventAndTarget: () => sinon.stub().resolves(null),
-            add: () => sinon.stub().resolves(null)
-        }
-    };
-
-    let payload = sinon.stub().resolves(null);
-
-    afterEach(function () {
-        sinon.restore();
+    const WEBHOOK_EVENT = 'post.added';
+    const WEBHOOK_TARGET_URL = 'http://example.com';
+    const WEBHOOK_SECRET = 'abc123dontstealme';
+
+    let models, payload, request, webhookTrigger;
+
+    beforeEach(function () {
+        models = {
+            Webhook: {
+                edit: sinon.stub(),
+                destroy: sinon.stub(),
+                findAllByEvent: sinon.stub(),
+                getByEventAndTarget: sinon.stub(),
+                add: sinon.stub()
+            }
+        };
+
+        models.Webhook.edit.resolves(null);
+        models.Webhook.destroy.resolves(null);
+        models.Webhook.findAllByEvent.resolves(null);
+        models.Webhook.getByEventAndTarget.resolves(null);
+        models.Webhook.add.resolves(null);
+
+        payload = sinon.stub();
+        request = sinon.stub().resolves({});
+
+        webhookTrigger = new WebhookTrigger({models, payload, request});
+
+        sinon.stub(webhookTrigger, 'onSuccess').callsFake(() => Promise.resolve());
+        sinon.stub(webhookTrigger, 'onError').callsFake(() => Promise.resolve());
     });
 
     describe('trigger', function () {
-        it('Does not trigger payload handler when event and model that has no hooks registered', async function () {
-            sinon.stub(models.Webhook, 'findAllByEvent')
-                .withArgs('post.added', {context: {internal: true}})
+        it('does not trigger payload handler when there are no hooks registered for an event', async function () {
+            models.Webhook.findAllByEvent
+                .withArgs(WEBHOOK_EVENT, {context: {internal: true}})
                 .resolves({models: []});
 
-            const webhookTrigger = new WebhookTrigger({
-                models,
-                payload
-            });
-
-            await webhookTrigger.trigger('post.added');
+            await webhookTrigger.trigger(WEBHOOK_EVENT);
 
             assert.equal(models.Webhook.findAllByEvent.called, true);
             assert.equal(payload.called, false);
+            assert.equal(request.called, false);
+        });
+
+        it('triggers payload handler when there are hooks registered for an event', async function () {
+            const webhookModel = {
+                get: sinon.stub()
+            };
+
+            webhookModel.get
+                .withArgs('event').returns(WEBHOOK_EVENT)
+                .withArgs('target_url').returns(WEBHOOK_TARGET_URL);
+
+            models.Webhook.findAllByEvent
+                .withArgs(WEBHOOK_EVENT, {context: {internal: true}})
+                .resolves({models: [webhookModel]});
+
+            const postModel = sinon.stub();
+
+            payload
+                .withArgs(WEBHOOK_EVENT, postModel)
+                .resolves({data: [1]});
+
+            await webhookTrigger.trigger(WEBHOOK_EVENT, postModel);
+
+            assert.equal(models.Webhook.findAllByEvent.called, true);
+            assert.equal(payload.called, true);
+            assert.equal(request.called, true);
+            assert.equal(request.args[0][0], WEBHOOK_TARGET_URL);
+            assert.equal(request.args[0][1].body, '{"data":[1]}');
+            assert.deepEqual(Object.keys(request.args[0][1].headers), ['Content-Length', 'Content-Type', 'Content-Version']);
+            assert.equal(request.args[0][1].headers['Content-Length'], 12);
+            assert.equal(request.args[0][1].headers['Content-Type'], 'application/json');
+            assert.match(request.args[0][1].headers['Content-Version'], /v\d+\.\d+/);
         });
 
-        it('Does triggers payload handler and request when event when model has a registered hook', async function () {
-            const postModelStub = sinon.stub();
-            const webhookModelStub = {
-                get: () => {}
+        it('includes a signature header when a webhook has a secret', async function () {
+            const webhookModel = {
+                get: sinon.stub()
             };
-            sinon.stub(webhookModelStub, 'get')
-                .withArgs('event').returns('post.added')
-                .withArgs('target_url').returns('http://example.com');
 
-            const requestStub = sinon.stub().resolves({});
+            webhookModel.get
+                .withArgs('event').returns(WEBHOOK_EVENT)
+                .withArgs('target_url').returns(WEBHOOK_TARGET_URL)
+                .withArgs('secret').returns(WEBHOOK_SECRET);
 
-            sinon.stub(models.Webhook, 'findAllByEvent')
-                .withArgs('post.added', {context: {internal: true}})
-                .resolves({models: [webhookModelStub]});
+            models.Webhook.findAllByEvent
+                .withArgs(WEBHOOK_EVENT, {context: {internal: true}})
+                .resolves({models: [webhookModel]});
 
-            payload = sinon.stub().resolves({data: [1]});
+            const postModel = sinon.stub();
 
-            const webhookTrigger = new WebhookTrigger({
-                models,
-                payload,
-                request: requestStub
-            });
+            payload
+                .withArgs(WEBHOOK_EVENT, postModel)
+                .resolves({data: [1]});
 
-            sinon.stub(webhookTrigger, 'onSuccess').callsFake(function () {
-                return Promise.resolve();
-            });
-            sinon.stub(webhookTrigger, 'onError').callsFake(function () {
-                return Promise.resolve();
-            });
-            await webhookTrigger.trigger('post.added', postModelStub);
+            await webhookTrigger.trigger(WEBHOOK_EVENT, postModel);
 
             assert.equal(models.Webhook.findAllByEvent.called, true);
             assert.equal(payload.called, true);
+            assert.equal(request.called, true);
+            assert.equal(request.args[0][0], WEBHOOK_TARGET_URL);
+
+            const header = request.args[0][1].headers[SIGNATURE_HEADER];
+            assert.equal(SIGNATURE_REGEX.test(header), true);
+        });
+
+        it('uses the request payload and a timestamp to generate the hash in the signature header', async function () {
+            const clock = sinon.useFakeTimers();
+            const ts = Date.now();
+            const webhookModel = {
+                get: sinon.stub()
+            };
+
+            webhookModel.get
+                .withArgs('event').returns(WEBHOOK_EVENT)
+                .withArgs('target_url').returns(WEBHOOK_TARGET_URL)
+                .withArgs('secret').returns(WEBHOOK_SECRET);
+
+            models.Webhook.findAllByEvent
+                .withArgs(WEBHOOK_EVENT, {context: {internal: true}})
+                .resolves({models: [webhookModel]});
+
+            const postModel = sinon.stub();
+
+            payload
+                .withArgs(WEBHOOK_EVENT, postModel)
+                .resolves({data: [1]});
+
+            await webhookTrigger.trigger(WEBHOOK_EVENT, postModel);
+
+            assert.equal(models.Webhook.findAllByEvent.called, true);
+            assert.equal(payload.called, true);
+            assert.equal(request.called, true);
+            assert.equal(request.args[0][0], WEBHOOK_TARGET_URL);
+
+            const expectedHeader = `sha256=${crypto.createHmac('sha256', WEBHOOK_SECRET).update(`{"data":[1]}${ts}`).digest('hex')}, t=${ts}`;
+            const header = request.args[0][1].headers[SIGNATURE_HEADER];
+            assert.equal(expectedHeader, header);
 
-            assert.equal(requestStub.called, true);
-            assert.equal(requestStub.args[0][0], 'http://example.com');
-            assert.equal(requestStub.args[0][1].body, '{"data":[1]}');
-            assert.deepEqual(Object.keys(requestStub.args[0][1].headers), ['Content-Length', 'Content-Type', 'Content-Version']);
-            assert.equal(requestStub.args[0][1].headers['Content-Length'], 12);
-            assert.equal(requestStub.args[0][1].headers['Content-Type'], 'application/json');
-            assert.match(requestStub.args[0][1].headers['Content-Version'], /v\d+\.\d+/);
+            clock.restore();
         });
     });
 });
diff --git a/ghost/core/test/unit/server/web/api/middleware/cors.test.js b/ghost/core/test/unit/server/web/api/middleware/cors.test.js
index 49e11282864..e0502e8afc9 100644
--- a/ghost/core/test/unit/server/web/api/middleware/cors.test.js
+++ b/ghost/core/test/unit/server/web/api/middleware/cors.test.js
@@ -113,7 +113,7 @@ describe('cors', function () {
         done();
     });
 
-    it('should be enabled if the origin matches config.url', function (done) {
+    it('should be enabled if the origin matches config.admin.url', function (done) {
         const origin = 'http://admin:2222';
 
         configUtils.set({
diff --git a/ghost/core/test/unit/server/web/api/middleware/upload.test.js b/ghost/core/test/unit/server/web/api/middleware/upload.test.js
index 0037345747f..8e52af67b6a 100644
--- a/ghost/core/test/unit/server/web/api/middleware/upload.test.js
+++ b/ghost/core/test/unit/server/web/api/middleware/upload.test.js
@@ -1,18 +1,21 @@
 const should = require('should');
 const validation = require('../../../../../../core/server/web/api/middleware/upload')._test;
+const imageFixturePath = ('../../../../../utils/fixtures/images/');
+const fs = require('fs');
+const path = require('path');
 
 describe('web utils', function () {
     describe('checkFileExists', function () {
         it('should return true if file exists in input', function () {
-            validation.checkFileExists({mimetype: 'file', path: 'path'}).should.be.true();
+            validation.checkFileExists({mimetype: 'file', path: 'path'}).should.be.true;
         });
 
         it('should return false if file does not exist in input', function () {
-            validation.checkFileExists({}).should.be.false();
+            validation.checkFileExists({}).should.be.false;
         });
 
         it('should return false if file is incorrectly structured', function () {
-            validation.checkFileExists({type: 'file'}).should.be.false();
+            validation.checkFileExists({type: 'file'}).should.be.false;
         });
     });
 
@@ -22,22 +25,48 @@ describe('web utils', function () {
                 name: 'test.txt',
                 mimetype: 'text',
                 ext: '.txt'
-            }, ['text'], ['.txt']).should.be.true();
+            }, ['text'], ['.txt']).should.be.true;
 
             validation.checkFileIsValid({
                 name: 'test.jpg',
                 mimetype: 'jpeg',
                 ext: '.jpg'
-            }, ['text', 'jpeg'], ['.txt', '.jpg']).should.be.true();
+            }, ['text', 'jpeg'], ['.txt', '.jpg']).should.be.true;
         });
 
         it('returns false if file has invalid extension', function () {
-            validation.checkFileIsValid({name: 'test.txt', mimetype: 'text'}, ['text'], ['.tar']).should.be.false();
-            validation.checkFileIsValid({name: 'test', mimetype: 'text'}, ['text'], ['.txt']).should.be.false();
+            validation.checkFileIsValid({name: 'test.txt', mimetype: 'text'}, ['text'], ['.tar']).should.be.false;
+            validation.checkFileIsValid({name: 'test', mimetype: 'text'}, ['text'], ['.txt']).should.be.false;
         });
 
         it('returns false if file has invalid type', function () {
-            validation.checkFileIsValid({name: 'test.txt', mimetype: 'text'}, ['archive'], ['.txt']).should.be.false();
+            validation.checkFileIsValid({name: 'test.txt', mimetype: 'text'}, ['archive'], ['.txt']).should.be.false;
+        });
+    });
+
+    describe('isSvgSafe', function () {
+        it('detects a <script> tag in a svg file', async function () {
+            const filepath = path.join(__dirname, imageFixturePath, 'svg-with-script.svg');
+            const dirtySvgContent = fs.readFileSync(filepath, 'utf8');
+            dirtySvgContent.should.containEql('<script');
+            validation.isSvgSafe(filepath).should.be.false;
+        });
+        it('detects a on attribute in a svg file', async function () {
+            const filepath = path.join(__dirname, imageFixturePath, 'svg-with-script2.svg');
+            const dirtySvgContent = fs.readFileSync(filepath, 'utf8');
+            dirtySvgContent.should.containEql('onclick');
+            validation.isSvgSafe(filepath).should.be.false;
+        });
+        it('returns true for a safe svg file', async function () {
+            const filepath = path.join(__dirname, imageFixturePath, 'ghost-logo.svg');
+            const dirtySvgContent = fs.readFileSync(filepath, 'utf8');
+            dirtySvgContent.should.not.containEql('<script');
+            validation.isSvgSafe(filepath).should.be.true;
+        });
+
+        it('returns false for malformed svg', async function () {
+            const filepath = path.join(__dirname, imageFixturePath, 'svg-malformed.svg');
+            validation.isSvgSafe(filepath).should.be.false;
         });
     });
 });
diff --git a/ghost/core/test/unit/server/web/parent/middleware/queue-request.test.js b/ghost/core/test/unit/server/web/parent/middleware/queue-request.test.js
new file mode 100644
index 00000000000..3783c1381ee
--- /dev/null
+++ b/ghost/core/test/unit/server/web/parent/middleware/queue-request.test.js
@@ -0,0 +1,78 @@
+const assert = require('node:assert');
+const sinon = require('sinon');
+
+const queueRequest = require('../../../../../../core/server/web/parent/middleware/queue-request');
+
+describe('Queue request middleware', function () {
+    let req, res, next, config, queueFactory, queue;
+
+    beforeEach(function () {
+        req = {};
+        res = {};
+        next = sinon.stub();
+        config = {
+            concurrencyLimit: 123
+        };
+
+        queue = sinon.stub();
+        queue.queue = {
+            on: sinon.stub(),
+            getLength: sinon.stub().returns(0)
+        };
+
+        queueFactory = sinon.stub().returns(queue);
+    });
+
+    it('should configure the queue using the concurrency limit defined in the config', function () {
+        queueRequest(config, queueFactory);
+
+        assert.deepEqual(queueFactory.callCount, 1, 'queueFactory should be called once');
+        assert.deepEqual(queueFactory.getCall(0).args[0], {
+            activeLimit: config.concurrencyLimit,
+            queuedLimit: -1
+        }, 'queueFactory should be called with the queue limit from the config');
+    });
+
+    it('should throw an error if the concurrency limit is not defined in the config', function () {
+        assert.throws(() => {
+            queueRequest({}, queueFactory);
+        }, /concurrencyLimit must be defined when using queueRequest middleware/, 'error should be thrown');
+    });
+
+    it('should not queue requests for static assets', function () {
+        req.path = '/foo/bar.css'; // Assume any path with a file extension is a static asset
+
+        const mw = queueRequest(config, queueFactory);
+
+        mw(req, res, next);
+
+        assert(next.calledOnce, 'next should be called once');
+        assert.equal(queue.calledOnce, 0, 'queue should not be called');
+    });
+
+    it('should queue the request', function () {
+        req.path = '/foo/bar';
+
+        const mw = queueRequest(config, queueFactory);
+
+        mw(req, res, next);
+
+        assert(queue.calledOnce, 'queue should be called once');
+        assert(queue.calledWith(req, res, next), 'queue should be called with the correct arguments');
+    });
+
+    it('should record the queue depth on a request', function () {
+        const queueLength = 123;
+
+        queue.queue.getLength.returns(queueLength);
+
+        req.path = '/foo/bar';
+
+        const mw = queueRequest(config, queueFactory);
+
+        mw(req, res, next);
+
+        assert(queue.queue.getLength, 'queue should be called once');
+        assert(req.queueDepth === queueLength, 'queue depth should be set on the request');
+    });
+});
diff --git a/ghost/core/test/unit/shared/instrumentation.test.js b/ghost/core/test/unit/shared/instrumentation.test.js
new file mode 100644
index 00000000000..794c392f9a2
--- /dev/null
+++ b/ghost/core/test/unit/shared/instrumentation.test.js
@@ -0,0 +1,23 @@
+const assert = require('assert/strict');
+const sinon = require('sinon');
+
+describe('UNIT: instrumentation', function () {
+    it('should initialize OpenTelemetry if configured', async function () {
+        const config = {
+            get: sinon.stub().returns(true)
+        };
+        const instrumentation = require('../../../core/shared/instrumentation');
+        const result = await instrumentation.initOpenTelemetry({config});
+        assert.equal(result, true);
+    });
+
+    it('should not initialize OpenTelemetry if not configured', async function () {
+        const config = {
+            get: sinon.stub().returns(false)
+        };
+        const instrumentation = require('../../../core/shared/instrumentation');
+        
+        const result = await instrumentation.initOpenTelemetry({config});
+        assert.equal(result, false);
+    });
+});
\ No newline at end of file
diff --git a/ghost/core/test/unit/shared/labs.test.js b/ghost/core/test/unit/shared/labs.test.js
index e779728972e..1de44d22a5d 100644
--- a/ghost/core/test/unit/shared/labs.test.js
+++ b/ghost/core/test/unit/shared/labs.test.js
@@ -143,3 +143,13 @@ describe('Labs Service', function () {
         assert.equal(labs.isSet('publicAPI'), false);
     });
 });
+
+describe('Labs Service - Flag Integrity', function () {
+    it('should have no duplicate flags across categories', function () {
+        const allFlags = labs.getAllFlags();
+
+        const duplicates = allFlags.filter((flag, index) => allFlags.indexOf(flag) !== index);
+
+        assert.equal(duplicates.length, 0, `There are duplicate flags in the labs configuration: ${duplicates.join(', ')}`);
+    });
+});
diff --git a/ghost/core/test/unit/shared/sentry.test.js b/ghost/core/test/unit/shared/sentry.test.js
index cdd219b3a11..8b69e6d7745 100644
--- a/ghost/core/test/unit/shared/sentry.test.js
+++ b/ghost/core/test/unit/shared/sentry.test.js
@@ -1,6 +1,7 @@
 const assert = require('assert/strict');
 const sinon = require('sinon');
 const configUtils = require('../../utils/configUtils');
+const errors = require('@tryghost/errors');
 
 const Sentry = require('@sentry/node');
 
@@ -50,5 +51,134 @@ describe('UNIT: sentry', function () {
             assert.equal(initArgs[0].environment, 'testing', 'should be the testing env');
             assert.ok(initArgs[0].hasOwnProperty('beforeSend'), 'should have a beforeSend function');
         });
+
+        it('initialises sentry with the correct environment', function () {
+            const env = 'staging';
+
+            configUtils.set({
+                PRO_ENV: env
+            });
+
+            delete require.cache[require.resolve('../../../core/shared/sentry')];
+            require('../../../core/shared/sentry');
+
+            const initArgs = Sentry.init.getCall(1).args;
+
+            assert.equal(initArgs[0].environment, env, 'should be the correct env');
+        });
+    });
+
+    describe('beforeSend', function () {
+        this.beforeEach(function () {
+            configUtils.set({sentry: {disabled: false, dsn: fakeDSN}});
+            delete require.cache[require.resolve('../../../core/shared/sentry')];
+
+            sentry = require('../../../core/shared/sentry');
+        });
+
+        it('returns the event', function () {
+            sinon.stub(errors.utils, 'isGhostError').returns(false);
+            const beforeSend = sentry.beforeSend;
+            const event = {tags: {}};
+            const hint = {};
+
+            const result = beforeSend(event, hint);
+
+            assert.deepEqual(result, event);
+        });
+
+        it('returns the event, even if an exception is thrown internally', function () {
+            // Trigger an internal exception
+            sinon.stub(errors.utils, 'isGhostError').throws(new Error('test'));
+            const beforeSend = sentry.beforeSend;
+            const event = {tags: {}};
+            const hint = {};
+
+            const result = beforeSend(event, hint);
+
+            assert.deepEqual(result, event);
+        });
+
+        it('sets sql context for mysql2 errors', function () {
+            sinon.stub(errors.utils, 'isGhostError').returns(true);
+            const beforeSend = sentry.beforeSend;
+            const event = {
+                tags: {},
+                exception: {
+                    values: [{
+                        value: 'test',
+                        type: 'test'
+                    }]
+                }
+            };
+            const exception = {
+                sql: 'SELECT * FROM test',
+                errno: 123,
+                sqlErrorCode: 456,
+                sqlMessage: 'test message',
+                sqlState: 'test state',
+                code: 'UNEXPECTED_ERROR',
+                errorType: 'InternalServerError',
+                id: 'a1b2c3d4e5f6',
+                statusCode: 500
+            };
+            const hint = {
+                originalException: exception
+            };
+
+            const result = beforeSend(event, hint);
+
+            const expected = {
+                tags: {
+                    type: 'InternalServerError',
+                    code: 'UNEXPECTED_ERROR',
+                    id: 'a1b2c3d4e5f6',
+                    status_code: 500
+                },
+                exception: {
+                    values: [{
+                        value: 'test message',
+                        type: 'SQL Error 123: 456'
+                    }]
+                },
+                contexts: {
+                    mysql: {
+                        errno: 123,
+                        code: 456,
+                        sql: 'SELECT * FROM test',
+                        message: 'test message',
+                        state: 'test state'
+                    }
+                }
+            };
+
+            assert.deepEqual(result, expected);
+        });
+    });
+
+    describe('beforeSendTransaction', function () {
+        it('filters transactions based on an allow list', function () {
+            sentry = require('../../../core/shared/sentry');
+
+            const beforeSendTransaction = sentry. beforeSendTransaction;
+
+            const allowedTransactions = [
+                {transaction: 'GET /ghost/api/settings'},
+                {transaction: 'PUT /members/api/member'},
+                {transaction: 'POST /ghost/api/tiers'},
+                {transaction: 'DELETE /members/api/member'},
+                {transaction: 'GET /'},
+                {transaction: 'GET /:slug/options(edit)?/'},
+                {transaction: 'GET /author/:slug'},
+                {transaction: 'GET /tag/:slug'}
+            ];
+
+            allowedTransactions.forEach((transaction) => {
+                assert.equal(beforeSendTransaction(transaction), transaction);
+            });
+
+            assert.equal(beforeSendTransaction({transaction: 'GET /foo/bar'}), null);
+            assert.equal(beforeSendTransaction({transaction: 'Some other transaction'}), null);
+        });
     });
 });
diff --git a/ghost/core/test/utils/admin-utils.js b/ghost/core/test/utils/admin-utils.js
index df2e1c8d65c..793f8c970f5 100644
--- a/ghost/core/test/utils/admin-utils.js
+++ b/ghost/core/test/utils/admin-utils.js
@@ -15,3 +15,8 @@ module.exports.stubAdminFiles = () => {
         fs.ensureFileSync(filePath);
     });
 };
+
+module.exports.stubAuthFrameFiles = (publicPath) => {
+    const filePath = path.resolve(publicPath, 'admin-auth/index.html');
+    fs.ensureFileSync(filePath);
+};
diff --git a/ghost/core/test/utils/batch-email-utils.js b/ghost/core/test/utils/batch-email-utils.js
index 3ea122a0bc3..0e62524c29c 100644
--- a/ghost/core/test/utils/batch-email-utils.js
+++ b/ghost/core/test/utils/batch-email-utils.js
@@ -59,7 +59,7 @@ async function createPublishedPostEmail(agent, settings = {}, email_recipient_fi
 let lastEmailModel;
 
 /**
- * @typedef {{html: string, plaintext: string, emailModel: any, recipientData: any}} SendEmail
+ * @typedef {{html: string, plaintext: string, emailModel: any, recipientData: any, from: string, replyTo?: string}} SendEmail
  */
 
 /**
@@ -188,6 +188,10 @@ async function matchEmailSnapshot() {
         {
             match: linkRegexp,
             replacement: 'http://127.0.0.1:2369/r/xxxxxx'
+        },
+        {
+            match: /key=[0-9a-f]+/g,
+            replacement: 'key=xxxxxx'
         }
     ];
 
@@ -214,5 +218,6 @@ module.exports = {
     sendEmail,
     sendFailedEmail,
     retryEmail,
-    matchEmailSnapshot
+    matchEmailSnapshot,
+    getLastEmail
 };
diff --git a/ghost/core/test/utils/e2e-framework-mock-manager.js b/ghost/core/test/utils/e2e-framework-mock-manager.js
index d50bd3ad071..84df7fff44e 100644
--- a/ghost/core/test/utils/e2e-framework-mock-manager.js
+++ b/ghost/core/test/utils/e2e-framework-mock-manager.js
@@ -15,7 +15,7 @@ let emailCount = 0;
 
 // Mockable services
 const mailService = require('../../core/server/services/mail/index');
-const originalMailServiceSend = mailService.GhostMailer.prototype.send;
+const originalMailServiceSendMail = mailService.GhostMailer.prototype.sendMail;
 const labs = require('../../core/shared/labs');
 const events = require('../../core/server/lib/common/events');
 const settingsCache = require('../../core/shared/settings-cache');
@@ -106,8 +106,8 @@ const mockMail = (response = 'Mail is disabled') => {
         sendResponse: response
     });
 
-    mailService.GhostMailer.prototype.send = mockMailReceiver.send.bind(mockMailReceiver);
-    mocks.mail = sinon.spy(mailService.GhostMailer.prototype, 'send');
+    mailService.GhostMailer.prototype.sendMail = mockMailReceiver.send.bind(mockMailReceiver);
+    mocks.mail = sinon.spy(mailService.GhostMailer.prototype, 'sendMail');
     mocks.mockMailReceiver = mockMailReceiver;
 
     return mockMailReceiver;
@@ -281,7 +281,7 @@ const restore = () => {
         mocks.webhookMockReceiver.reset();
     }
 
-    mailService.GhostMailer.prototype.send = originalMailServiceSend;
+    mailService.GhostMailer.prototype.sendMail = originalMailServiceSendMail;
 
     // Disable network again after restoring sinon
     disableNetwork();
diff --git a/ghost/core/test/utils/fixtures/data-generator.js b/ghost/core/test/utils/fixtures/data-generator.js
index fec0b903aab..b1c5997acb7 100644
--- a/ghost/core/test/utils/fixtures/data-generator.js
+++ b/ghost/core/test/utils/fixtures/data-generator.js
@@ -64,6 +64,7 @@ DataGenerator.Content = {
             id: '618ba1ffbe2896088840a6e7',
             title: 'Not so short, bit complex',
             slug: 'not-so-short-bit-complex',
+            // NOTE: this has some invalid HTML, has a missing `</p>` after `</nav>`
             mobiledoc: DataGenerator.markdownToMobiledoc('<p><nav><ul><li><a href=\"#nowhere\" title=\"Anchor URL\">Lorem</a></li><li><a href=\"__GHOST_URL__/about#nowhere\" title=\"Relative URL\">Aliquam</a></li><li><a href=\"//somewhere.com/link#nowhere\" title=\"Protocol Relative URL\">Tortor</a></li><li><a href=\"http://somewhere.com/link#nowhere\" title=\"Absolute URL\">Morbi</a></li><li><a href=\"#nowhere\" title=\"Praesent dapibus, neque id cursus faucibus\">Praesent</a></li><li><a href=\"#nowhere\" title=\"Pellentesque fermentum dolor\">Pellentesque</a></li></ul></nav><p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p><table><thead><tr><th>1</th><th>2</th><th>3</th><th>4</th></tr></thead><tbody><tr><td>a</td><td>b</td><td>c</td><td>d</td></tr><tr><td>e</td><td>f</td><td>g</td><td>h</td></tr><tr><td>i</td><td>j</td><td>k</td><td>l</td></tr></tbody></table><dl><dt>Definition list</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd><dt>Lorem ipsum dolor sit amet</dt><dd>Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</dd></dl><ul><li>Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.</li><li>Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.</li><li>Phasellus ultrices nulla quis nibh. Quisque a lectus. Donec consectetuer ligula vulputate sem tristique cursus. Nam nulla quam, gravida non, commodo a, sodales sit amet, nisi.</li><li>Pellentesque fermentum dolor. Aliquam quam lectus, facilisis auctor, ultrices ut, elementum vulputate, nunc.</li></ul></p>'),
             published_at: new Date('2015-01-04'),
             featured: true
@@ -132,7 +133,8 @@ DataGenerator.Content = {
             slug: 'joe-bloggs',
             email: 'jbloggs@example.com',
             password: 'Sl1m3rson99',
-            profile_image: 'https://example.com/super_photo.jpg'
+            profile_image: 'https://example.com/super_photo.jpg',
+            paid_subscription_canceled_notification: true
         },
         {
             // admin
@@ -730,25 +732,27 @@ DataGenerator.Content = {
             id: ObjectId().toHexString(),
             uuid: '6b6afda6-4b5e-4893-bff6-f16859e8349a',
             status: 'submitted',
-            email_count: 2,
+            email_count: 6, // match the number of email_recipients relations below
             recipient_filter: 'all',
             subject: 'You got mailed!',
             html: '<p>Look! I\'m an email</p>',
             plaintext: 'Waba-daba-dab-da',
             track_opens: false,
-            submitted_at: moment().toDate()
+            submitted_at: moment().toDate(),
+            newsletter_id: null // newsletter[0] relation added later
         },
         {
             id: ObjectId().toHexString(),
             uuid: '365daa11-4bf0-4614-ad43-6346387ffa00',
             status: 'failed',
             error: 'Everything went south',
-            email_count: 3,
+            email_count: 3, // doesn't match the number of email_recipients relations below, some calculations may be off
             subject: 'You got mailed! Again!',
             html: '<p>What\'s that? Another email!</p>',
             plaintext: 'yes this is an email',
             track_opens: false,
-            submitted_at: moment().toDate()
+            submitted_at: moment().toDate(),
+            newsletter_id: null // newsletter[1] relation added later
         }
     ],
 
diff --git a/ghost/core/test/utils/fixtures/default-settings-browser.json b/ghost/core/test/utils/fixtures/default-settings-browser.json
index 592fdcd1664..712745f005e 100644
--- a/ghost/core/test/utils/fixtures/default-settings-browser.json
+++ b/ghost/core/test/utils/fixtures/default-settings-browser.json
@@ -326,6 +326,14 @@
             "defaultValue": "[\"free\"]",
             "type": "array"
         },
+        "portal_default_plan": {
+            "defaultValue": "yearly",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["yearly", "monthly"]]
+            },
+            "type": "string"
+        },
         "portal_products": {
             "defaultValue": "[]",
             "type": "array"
@@ -534,7 +542,7 @@
             "type": "string"
         },
         "donations_suggested_amount": {
-            "defaultValue": 0,
+            "defaultValue": 500,
             "validations": {
                 "isEmpty": false
             },
diff --git a/ghost/core/test/utils/fixtures/default-settings.json b/ghost/core/test/utils/fixtures/default-settings.json
index c039fbe451e..8117ecabb95 100644
--- a/ghost/core/test/utils/fixtures/default-settings.json
+++ b/ghost/core/test/utils/fixtures/default-settings.json
@@ -338,6 +338,14 @@
             "defaultValue": "[\"free\"]",
             "type": "array"
         },
+        "portal_default_plan": {
+            "defaultValue": "yearly",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["yearly", "monthly"]]
+            },
+            "type": "string"
+        },
         "portal_products": {
             "defaultValue": "[]",
             "type": "array"
@@ -567,7 +575,7 @@
             "type": "string"
         },
         "donations_suggested_amount": {
-            "defaultValue": 0,
+            "defaultValue": 500,
             "validations": {
                 "isEmpty": false
             },
diff --git a/ghost/core/test/utils/fixtures/email-service/golden-post.json b/ghost/core/test/utils/fixtures/email-service/golden-post.json
new file mode 100644
index 00000000000..7c5ef3e0c13
--- /dev/null
+++ b/ghost/core/test/utils/fixtures/email-service/golden-post.json
@@ -0,0 +1,391 @@
+{
+    "root": {
+        "children": [
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "This is just a simple paragraph, no frills.",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "paragraph",
+                "version": 1
+            },
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "This is block quote",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "extended-quote",
+                "version": 1
+            },
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "This is a...different block quote",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "aside",
+                "version": 1
+            },
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "This is a heading!",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "extended-heading",
+                "version": 1,
+                "tag": "h2"
+            },
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "Here's a smaller heading.",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "extended-heading",
+                "version": 1,
+                "tag": "h3"
+            },
+            {
+                "type": "image",
+                "version": 1,
+                "src": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8c/Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg/1920px-Cow_%28Fleckvieh_breed%29_Oeschinensee_Slaunger_2009-07-07.jpg",
+                "width": null,
+                "height": null,
+                "title": "",
+                "alt": "Cows eat grass.",
+                "caption": "<span style=\"white-space: pre-wrap;\">A lovely cow</span>",
+                "cardWidth": "regular",
+                "href": ""
+            },
+            {
+                "type": "markdown",
+                "version": 1,
+                "markdown": "# A heading\nand a paragraph (in markdown!)"
+            },
+            {
+                "type": "html",
+                "version": 1,
+                "html": "<p>A paragraph inside an HTML card.</p>\n<p>And another one, with some <b>bold</b> text.</p>"
+            },
+            {
+                "type": "horizontalrule",
+                "version": 1
+            },
+            {
+                "type": "gallery",
+                "version": 1,
+                "images": [
+                    {
+                        "row": 0,
+                        "src": "https://images.unsplash.com/photo-1702352461386-15dcf064708a?q=80&w=2128&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
+                        "width": null,
+                        "height": null,
+                        "alt": "",
+                        "caption": "",
+                        "fileName": "photo-1702352461386-15dcf064708a"
+                    },
+                    {
+                        "row": 0,
+                        "src": "https://images.unsplash.com/photo-1702377168432-ac8b5e387998?q=80&w=2070&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
+                        "width": null,
+                        "height": null,
+                        "alt": "",
+                        "caption": "",
+                        "fileName": "photo-1702377168432-ac8b5e387998"
+                    },
+                    {
+                        "row": 0,
+                        "src": "https://plus.unsplash.com/premium_photo-1700558685152-81f821a40724?q=80&w=2070&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D",
+                        "width": 2070,
+                        "height": 1380,
+                        "alt": "",
+                        "caption": "",
+                        "fileName": "premium_photo-1700558685152-81f821a40724"
+                    }
+                ],
+                "caption": "<p dir=\"ltr\"><span style=\"white-space: pre-wrap;\">A gallery.</span></p>"
+            },
+            {
+                "type": "bookmark",
+                "version": 1,
+                "url": "https://ghost.org",
+                "metadata": {
+                    "icon": "https://ghost.org/favicon.ico",
+                    "title": "Ghost: Independent technology for modern publishing",
+                    "description": "Beautiful, modern publishing with newsletters and premium subscriptions built-in. Used by Sky, 404Media, Lever News, Tangle, The Browser, and thousands more.",
+                    "author": "",
+                    "publisher": "Ghost - The Professional Publishing Platform",
+                    "thumbnail": "https://ghost.org/images/meta/ghost.png"
+                },
+                "caption": "<p><span style=\"white-space: pre-wrap;\">My favorite website.</span></p>"
+            },
+            {
+                "type": "email",
+                "version": 1,
+                "html": "<p><span style=\"white-space: pre-wrap;\">Hey </span><code spellcheck=\"false\" style=\"white-space: pre-wrap;\"><span>{first_name, \"there\"}</span></code><span style=\"white-space: pre-wrap;\">,</span></p>"
+            },
+            {
+                "type": "email-cta",
+                "version": 1,
+                "alignment": "left",
+                "buttonText": "",
+                "buttonUrl": "",
+                "html": "<p><span style=\"white-space: pre-wrap;\">Hello there, fellow users of electronic mail.</span></p>",
+                "segment": "status:free",
+                "showButton": false,
+                "showDividers": true
+            },
+            {
+                "type": "paywall",
+                "version": 1
+            },
+            {
+                "type": "button",
+                "version": 1,
+                "buttonText": "Click me, I'm a button!",
+                "alignment": "center",
+                "buttonUrl": "https://ghost.org"
+            },
+            {
+                "type": "callout",
+                "version": 1,
+                "calloutText": "<p><span style=\"white-space: pre-wrap;\">I had an idea...</span></p>",
+                "calloutEmoji": "💡",
+                "backgroundColor": "blue"
+            },
+            {
+                "type": "toggle",
+                "version": 1,
+                "heading": "<span style=\"white-space: pre-wrap;\">Spoiler alert!</span>",
+                "content": "<p><span style=\"white-space: pre-wrap;\">Just kidding</span></p>"
+            },
+            {
+                "type": "audio",
+                "version": 1,
+                "duration": 105.822041,
+                "mimeType": "audio/mpeg",
+                "src": "https://main.ghost.org/content/media/2023/12/sample.mp3",
+                "title": "Sample",
+                "thumbnailSrc": ""
+            },
+            {
+                "type": "video",
+                "version": 1,
+                "src": "https://main.ghost.org/content/media/2023/12/sample_640x360.mp4",
+                "caption": "<p dir=\"ltr\"><span style=\"white-space: pre-wrap;\">A lovely video of a woman on the beach doing nothing.</span></p>",
+                "fileName": "sample_640x360.mp4",
+                "mimeType": "video/mp4",
+                "width": 640,
+                "height": 360,
+                "duration": 13.346667,
+                "thumbnailSrc": "https://main.ghost.org/content/media/2023/12/sample_640x360_thumb.jpg",
+                "customThumbnailSrc": "",
+                "thumbnailWidth": 640,
+                "thumbnailHeight": 360,
+                "cardWidth": "regular",
+                "loop": true
+            },
+            {
+                "type": "product",
+                "version": 1,
+                "productImageSrc": "https://main.ghost.org/content/images/2023/12/ghost-logo.png",
+                "productImageWidth": 800,
+                "productImageHeight": 257,
+                "productTitle": "<span style=\"white-space: pre-wrap;\">Make a blog!</span>",
+                "productDescription": "<p dir=\"ltr\"><span style=\"white-space: pre-wrap;\">with Ghost</span></p>",
+                "productRatingEnabled": true,
+                "productStarRating": 5,
+                "productButtonEnabled": true,
+                "productButton": "Click here",
+                "productUrl": "https://ghost.org"
+            },
+            {
+                "type": "header",
+                "version": 2,
+                "size": "small",
+                "style": "dark",
+                "buttonEnabled": false,
+                "buttonUrl": "",
+                "buttonText": "",
+                "header": "<span style=\"white-space: pre-wrap;\">Good news everyone!</span>",
+                "subheader": "<span style=\"white-space: pre-wrap;\">This header renders properly in </span><i><em class=\"italic\" style=\"white-space: pre-wrap;\">all</em></i><span style=\"white-space: pre-wrap;\"> email clients!</span>",
+                "backgroundImageSrc": "",
+                "accentColor": "#14171b",
+                "alignment": "center",
+                "backgroundColor": "#000000",
+                "backgroundImageWidth": null,
+                "backgroundImageHeight": null,
+                "backgroundSize": "cover",
+                "textColor": "#FFFFFF",
+                "buttonColor": "#ffffff",
+                "buttonTextColor": "#000000",
+                "layout": "full",
+                "swapped": false
+            },
+            {
+                "type": "embed",
+                "version": 1,
+                "url": "https://www.youtube.com/watch?v=jfKfPfyJRdk",
+                "embedType": "video",
+                "html": "<iframe width=\"200\" height=\"150\" src=\"https://www.youtube.com/embed/jfKfPfyJRdk?feature=oembed\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share\" allowfullscreen title=\"lofi hip hop radio 📚 - beats to relax/study to\"></iframe>",
+                "metadata": {
+                    "title": "lofi hip hop radio 📚 - beats to relax/study to",
+                    "author_name": "Lofi Girl",
+                    "author_url": "https://www.youtube.com/@LofiGirl",
+                    "type": "video",
+                    "height": 150,
+                    "width": 200,
+                    "version": "1.0",
+                    "provider_name": "YouTube",
+                    "provider_url": "https://www.youtube.com/",
+                    "thumbnail_height": 360,
+                    "thumbnail_width": 480,
+                    "thumbnail_url": "https://i.ytimg.com/vi/jfKfPfyJRdk/hqdefault.jpg",
+                    "html": "<iframe width=\"200\" height=\"150\" src=\"https://www.youtube.com/embed/jfKfPfyJRdk?feature=oembed\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share\" allowfullscreen title=\"lofi hip hop radio 📚 - beats to relax/study to\"></iframe>"
+                },
+                "caption": ""
+            },
+            {
+                "type": "signup",
+                "version": 1,
+                "alignment": "left",
+                "backgroundColor": "#F0F0F0",
+                "backgroundImageSrc": "",
+                "backgroundSize": "cover",
+                "textColor": "#000000",
+                "buttonColor": "accent",
+                "buttonTextColor": "#FFFFFF",
+                "buttonText": "Subscribe",
+                "disclaimer": "<span style=\"white-space: pre-wrap;\">No spam. Unsubscribe anytime.</span>",
+                "header": "<span style=\"white-space: pre-wrap;\">Sign up for This Is The Main</span>",
+                "labels": [],
+                "layout": "wide",
+                "subheader": "<span style=\"white-space: pre-wrap;\">The testing and tweaking of Ghost, now with extra long description for the same price of epic staging</span>",
+                "successMessage": "Email sent! Check your inbox to complete your signup.",
+                "swapped": false
+            },
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "Some text.",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "paragraph",
+                "version": 1
+            },
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "A blockquote",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "extended-quote",
+                "version": 1
+            },
+            {
+                "children": [
+                    {
+                        "detail": 0,
+                        "format": 0,
+                        "mode": "normal",
+                        "style": "",
+                        "text": "Some more text.",
+                        "type": "extended-text",
+                        "version": 1
+                    }
+                ],
+                "direction": "ltr",
+                "format": "",
+                "indent": 0,
+                "type": "paragraph",
+                "version": 1
+            },
+            {
+                "type": "codeblock",
+                "version": 1,
+                "code": "console.log('Hello world!');",
+                "language": "javascript",
+                "caption": "<p><span style=\"white-space: pre-wrap;\">A tiny little script.</span></p>"
+            },
+            {
+                "type": "file",
+                "src": "https://main.ghost.org/content/files/2023/11/test.txt",
+                "fileTitle": "test",
+                "fileCaption": "A tiny text file.",
+                "fileName": "test.txt",
+                "fileSize": 16
+            }
+        ],
+        "direction": "ltr",
+        "format": "",
+        "indent": 0,
+        "type": "root",
+        "version": 1
+    }
+}
\ No newline at end of file
diff --git a/ghost/core/test/utils/fixtures/fixtures.json b/ghost/core/test/utils/fixtures/fixtures.json
index 6218bdf2185..c6f10459ba0 100644
--- a/ghost/core/test/utils/fixtures/fixtures.json
+++ b/ghost/core/test/utils/fixtures/fixtures.json
@@ -1105,7 +1105,7 @@
                     "recommendation": ["browse", "read"]
                 },
                 "Author": {
-                    "post": ["browse", "read", "add"],
+                    "post": ["browse", "read", "edit", "add", "destroy"],
                     "setting": ["browse", "read"],
                     "slug": "all",
                     "tag": ["browse", "read", "add"],
@@ -1122,7 +1122,7 @@
                     "recommendation": ["browse", "read"]
                 },
                 "Contributor": {
-                    "post": ["browse", "read", "add"],
+                    "post": ["browse", "read", "edit", "add", "destroy"],
                     "setting": ["browse", "read"],
                     "slug": "all",
                     "tag": ["browse", "read"],
diff --git a/ghost/core/test/utils/fixtures/images/svg-malformed.svg b/ghost/core/test/utils/fixtures/images/svg-malformed.svg
new file mode 100644
index 00000000000..9318418344a
--- /dev/null
+++ b/ghost/core/test/utils/fixtures/images/svg-malformed.svg
@@ -0,0 +1 @@
+<
diff --git a/ghost/core/test/utils/fixtures/images/svg-with-script.svg b/ghost/core/test/utils/fixtures/images/svg-with-script.svg
new file mode 100644
index 00000000000..95c081598cb
--- /dev/null
+++ b/ghost/core/test/utils/fixtures/images/svg-with-script.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
+   <rect width="300" height="100" style="fill:rgb(0,0,255);stroke-width:3;stroke:rgb(0,0,0)" />
+   <script type="text/javascript">
+      alert(1);
+   </script>
+</svg>
\ No newline at end of file
diff --git a/ghost/core/test/utils/fixtures/images/svg-with-script2.svg b/ghost/core/test/utils/fixtures/images/svg-with-script2.svg
new file mode 100644
index 00000000000..11a4b938cf2
--- /dev/null
+++ b/ghost/core/test/utils/fixtures/images/svg-with-script2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
+   <rect width="300" height="100" style="fill:rgb(0,0,255);stroke-width:3;stroke:rgb(0,0,0)" />
+   <button onclick="alert(1)">Click me</button>
+</svg>
\ No newline at end of file
diff --git a/ghost/core/test/utils/fixtures/import/zips/empty.zip b/ghost/core/test/utils/fixtures/import/zips/empty.zip
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ghost/core/test/utils/fixtures/import/zips/malformed-comments.zip b/ghost/core/test/utils/fixtures/import/zips/malformed-comments.zip
new file mode 100644
index 00000000000..2da0f78d9df
Binary files /dev/null and b/ghost/core/test/utils/fixtures/import/zips/malformed-comments.zip differ
diff --git a/ghost/core/test/utils/stripe-mocker.js b/ghost/core/test/utils/stripe-mocker.js
index 0794af909c7..a1562bf6641 100644
--- a/ghost/core/test/utils/stripe-mocker.js
+++ b/ghost/core/test/utils/stripe-mocker.js
@@ -6,9 +6,16 @@ let tiers = {};
 let models = {};
 const crypto = require('crypto');
 
+// @ts-check
+/**
+ * @typedef {"customers" | "checkout" | "subscriptions" | "coupons" | "payment_methods" | "prices" | "setup_intents" | "products"} resource
+ */
+
 /**
  * The Stripe Mocker mimics an in memory version of the Stripe API. We can use it to quickly create new subscriptions and get a close to real world test environment with working webhooks etc.
- * If you create a new subscription, it will automatically send the customer.subscription.created webhook. So you can test what happens.
+ * 
+ * If you create a new subscription, it will by default send the checkout.session.completed webhook.
+ * If you update a subscription, it will by default send the customer.subscription.updated webhook.
  */
 class StripeMocker {
     customers = [];
@@ -49,10 +56,19 @@ class StripeMocker {
         models = require('../../core/server/models');
     }
 
+    /**
+     * Generates a random ID.
+     * @returns {string} The generated random ID.
+     */
     #generateRandomId() {
         return crypto.randomBytes(8).toString('hex');
     }
 
+    /**
+     * Creates a mock Stripe customer.
+     * @param {object} overrides - Optional overrides for the customer object.
+     * @returns {object} - The created Stripe customer object.
+     */
     createCustomer(overrides = {}) {
         const customerId = `cus_${this.#generateRandomId()}`;
         const stripeCustomer = {
@@ -71,10 +87,10 @@ class StripeMocker {
     }
 
     /**
-     *
-     * @param {*} tierSlug
+     * Fetches a mock Stripe price for a given product/tier (by slug).
+     * @param {string} tierSlug
      * @param {'month' | 'year'} cadence
-     * @returns
+     * @returns {Promise<object>} - The fetched Stripe price object.
      */
     async getPriceForTier(tierSlug, cadence) {
         const product = await models.Product.findOne({slug: tierSlug});
@@ -89,13 +105,13 @@ class StripeMocker {
     }
 
     /**
-     *
+     * Creates a Ghost tier (product).
      * @param {object} data
      * @param {string} [data.name]
      * @param {string} data.currency
      * @param {number} data.monthly_price
      * @param {number} data.yearly_price
-     * @returns
+     * @returns {Promise<object>} - The created product object.
      */
     async createTier({name, currency, monthly_price, yearly_price}) {
         const result = await tiers.api.add({
@@ -110,6 +126,15 @@ class StripeMocker {
         });
     }
 
+    /**
+     * Creates a trial subscription.
+     *
+     * @param {object} options - The options for creating the trial subscription.
+     * @param {string} options.customer - The customer ID.
+     * @param {string} options.price - The price ID.
+     * @param {object} [options.overrides] - Optional overrides for the trial subscription.
+     * @returns {Promise<object>} - The created trial subscription object.
+     */
     async createTrialSubscription({customer, price, ...overrides}) {
         return await this.createSubscription({
             customer,
@@ -143,6 +168,17 @@ class StripeMocker {
         await DomainEvents.allSettled();
     }
 
+    /**
+     * Creates a subscription for a customer.
+     *
+     * @param {object} data - The data for creating the subscription.
+     * @param {object} data.customer - The customer object.
+     * @param {object} data.price - The price object.
+     * @param {object} [data.overrides] - Optional overrides for the subscription object.
+     * @param {object} options - The options for creating the subscription.
+     * @param {object} [options.sendWebhook=true] - Whether to send a webhook or not.
+     * @returns {Promise<Object>} The created subscription object.
+     */
     async createSubscription({customer, price, ...overrides}, options = {sendWebhook: true}) {
         const subscriptionId = `sub_${this.#generateRandomId()}`;
 
@@ -188,6 +224,14 @@ class StripeMocker {
         return subscription;
     }
 
+    /**
+     * Retrieves requested data from the in-memory storage similar to a HTTP request.
+     *
+     * @param {Array} arr - The array to search in.
+     * @param {string} id - The id to search for.
+     * @returns {Array} - An array containing the HTTP status code and the setup intent object.
+     *                   If the setup intent is not found, returns [404].
+     */
     #getData(arr, id) {
         const setupIntent = arr.find(c => c.id === id);
         if (!setupIntent) {
@@ -196,6 +240,15 @@ class StripeMocker {
         return [200, setupIntent];
     }
 
+    /**
+     * Handles creation and updating of in memory resources.
+     *
+     * @param {Array} arr - The array to store the processed data.
+     * @param {string} id - The ID of the resource.
+     * @param {string} body - The body of the POST request.
+     * @param {resource} resource - The type of resource.
+     * @returns {Array} - An array containing the HTTP status code and the processed data.
+     */
     #postData(arr, id, body, resource) {
         const qs = require('qs');
         let decoded = qs.parse(body, {
@@ -309,6 +362,9 @@ class StripeMocker {
         return [200, subscription];
     }
 
+    /**
+     * Removes all the registered nock interceptors.
+     */
     remove() {
         for (const interceptor of this.nockInterceptors) {
             nock.removeInterceptor(interceptor);
@@ -316,6 +372,10 @@ class StripeMocker {
         this.nockInterceptors = [];
     }
 
+    /**
+     * Stubs the Stripe API.
+     * This will intercept all requests to the Stripe API and return the mocked data. 
+     */
     stub() {
         this.remove();
 
@@ -425,10 +485,13 @@ class StripeMocker {
             });
     }
 
+    /**
+     * Sends a webhook event to the Stripe webhook controller.
+     * 
+     * @param {any} event - The webhook event to send.
+     * @returns {Promise<void>} - A promise that resolves when the webhook event is handled.
+     */
     async sendWebhook(event) {
-        /**
-         * @type {any}
-         */
         const webhookController = stripeService.webhookController;
         await webhookController.handleEvent(event);
     }
diff --git a/ghost/custom-theme-settings-service/package.json b/ghost/custom-theme-settings-service/package.json
index 243934ec72f..ebfcb428967 100644
--- a/ghost/custom-theme-settings-service/package.json
+++ b/ghost/custom-theme-settings-service/package.json
@@ -18,17 +18,17 @@
     "lib"
   ],
   "devDependencies": {
-    "@tryghost/nql-lang": "0.5.0",
+    "@tryghost/nql-lang": "0.6.1",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/nql": "0.11.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/debug": "0.1.32",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/nql": "0.12.4",
+    "@tryghost/tpl": "0.1.32",
     "lodash": "4.17.21"
   }
 }
diff --git a/ghost/data-generator/lib/DataGenerator.js b/ghost/data-generator/lib/DataGenerator.js
index 62884ec9e07..01db0abbf53 100644
--- a/ghost/data-generator/lib/DataGenerator.js
+++ b/ghost/data-generator/lib/DataGenerator.js
@@ -3,42 +3,64 @@ const fs = require('fs/promises');
 const JsonImporter = require('./utils/JsonImporter');
 const {getProcessRoot} = require('@tryghost/root-utils');
 const topologicalSort = require('./utils/topological-sort');
-
+const {faker} = require('@faker-js/faker');
+const {faker: americanFaker} = require('@faker-js/faker/locale/en_US');
+const crypto = require('crypto');
+const {Buffer} = require('node:buffer');
+const DatabaseInfo = require('@tryghost/database-info');
+const errors = require('@tryghost/errors');
 const importers = require('./importers').reduce((acc, val) => {
     acc[val.table] = val;
     return acc;
 }, {});
-const schema = require('../../core/core/server/data/schema').tables;
 
 class DataGenerator {
+    /**
+     *
+     * @param {object} options
+     * @param {Record<string,number>} [options.quantities] Pass in custom amounts for specific tables
+     * @param {number} [options.seed] If you pass the same seed, the same data will be generated if you used the same options too and if the data generation code remained the same.
+     */
     constructor({
         knex,
         tables,
+        schemaTables,
         clearDatabase = false,
         baseDataPack = '',
         baseUrl,
         logger,
-        withDefault
+        printDependencies,
+        withDefault,
+        seed,
+        quantities = {},
+        useTransaction = true
     }) {
         this.knex = knex;
         this.tableList = tables || [];
+        this.schemaTables = schemaTables;
         this.willClearData = clearDatabase;
         this.useBaseDataPack = baseDataPack !== '';
         this.baseDataPack = baseDataPack;
         this.baseUrl = baseUrl;
         this.logger = logger;
         this.withDefault = withDefault;
+        this.printDependencies = printDependencies;
+        this.seed = seed;
+        this.quantities = quantities;
+        this.useTransaction = useTransaction;
     }
 
     sortTableList() {
         // Add missing dependencies
         for (const table of this.tableList) {
             table.importer = importers[table.name];
+
             // eslint-disable-next-line no-unused-vars
-            table.dependencies = Object.entries(schema[table.name]).reduce((acc, [_col, data]) => {
+            table.dependencies = Object.entries(this.schemaTables[table.name]).reduce((acc, [_col, data]) => {
                 if (data.references) {
                     const referencedTable = data.references.split('.')[0];
-                    if (!acc.includes(referencedTable)) {
+                    // The ghost_subscriptions_id property has a foreign key to the subscriptions table, but we don't use that table yet atm, so don't add it as a dependency
+                    if (!acc.includes(referencedTable) && referencedTable !== 'subscriptions') {
                         acc.push(referencedTable);
                     }
                 }
@@ -79,7 +101,7 @@ class DataGenerator {
                 // Avoid deleting the admin user
                 await transaction(table).del().whereNot('id', '1');
             } else {
-                await transaction(table).del();
+                await transaction(table).truncate();
             }
         }
     }
@@ -91,7 +113,7 @@ class DataGenerator {
         }
         let baseData = {};
         try {
-            baseData = JSON.parse(await (await fs.readFile(baseDataPack)).toString());
+            baseData = JSON.parse((await fs.readFile(baseDataPack)).toString());
             this.logger.info('Read base data pack');
         } catch (error) {
             this.logger.error('Failed to read data pack: ', error);
@@ -133,13 +155,13 @@ class DataGenerator {
     }
 
     async importData() {
-        const transaction = await this.knex.transaction();
+        const start = Date.now();
 
         // Add default tables if none are specified
         if (this.tableList.length === 0) {
             this.tableList = Object.keys(importers).map(name => ({name}));
         } else if (this.withDefault) {
-            // Add default tables to the end of the list
+        // Add default tables to the end of the list
             const defaultTables = Object.keys(importers).map(name => ({name}));
             for (const table of defaultTables) {
                 if (!this.tableList.find(t => t.name === table.name)) {
@@ -151,13 +173,48 @@ class DataGenerator {
         // Error if we have an unknown table
         for (const table of this.tableList) {
             if (importers[table.name] === undefined) {
-                // eslint-disable-next-line
-                throw new Error(`Unknown table: ${table.name}`);
+                throw new errors.IncorrectUsageError({message: `Unknown table: ${table.name}`});
             }
         }
 
         this.sortTableList();
 
+        if (this.printDependencies) {
+            this.logger.info('Table dependencies:');
+            for (const table of this.tableList) {
+                this.logger.info(`\t${table.name}: ${table.dependencies.join(', ')}`);
+            }
+            process.exit(0);
+        }
+
+        if (this.useTransaction) {
+            await this.knex.transaction(async (transaction) => {
+                if (!DatabaseInfo.isSQLite(this.knex)) {
+                    await transaction.raw('SET autocommit=0;');
+                }
+
+                await this.#run(transaction);
+            }, {isolationLevel: 'read committed'});
+        } else {
+            await this.#run(this.knex);
+        }
+
+        this.logger.info(`Completed data import in ${((Date.now() - start) / 1000).toFixed(1)}s`);
+    }
+
+    async #run(transaction) {
+        if (!DatabaseInfo.isSQLite(this.knex)) {
+            if (process.env.DISABLE_FAST_IMPORT) {
+                await transaction.raw('SET FOREIGN_KEY_CHECKS=0;');
+                await transaction.raw('SET unique_checks=0;');
+            } else {
+                await transaction.raw('ALTER INSTANCE DISABLE INNODB REDO_LOG;');
+                await transaction.raw('SET FOREIGN_KEY_CHECKS=0;');
+                await transaction.raw('SET unique_checks=0;');
+                await transaction.raw('SET GLOBAL local_infile=1;');
+            }
+        }
+
         if (this.willClearData) {
             await this.clearData(transaction);
         }
@@ -166,13 +223,49 @@ class DataGenerator {
             await this.importBasePack(transaction);
         }
 
+        // Set quantities for tables
         for (const table of this.tableList) {
-            this.logger.info('Importing content for table', table.name);
-            // Add all common options to every importer, whether they use them or not
-            const tableImporter = new table.importer(this.knex, transaction, {
-                baseUrl: this.baseUrl
-            });
-            await tableImporter.import(table.quantity ?? undefined);
+            if (this.quantities[table.name] !== undefined) {
+                table.quantity = this.quantities[table.name];
+            }
+        }
+
+        const cryptoRandomBytes = crypto.randomBytes;
+
+        if (this.seed) {
+            // The probality distributions library uses crypto.randomBytes, which we can't seed, so we need to override it
+            crypto.randomBytes = (size) => {
+                const buffer = Buffer.alloc(size);
+                for (let i = 0; i < size; i++) {
+                    buffer[i] = Math.floor(faker.datatype.number({min: 0, max: 255}));
+                }
+                return buffer;
+            };
+        }
+
+        try {
+            for (const table of this.tableList) {
+                if (this.seed) {
+                    // We reset the seed for every table, so the chosen tables don't affect the data and changes in one importer don't affect the others
+                    faker.seed(this.seed);
+                    americanFaker.seed(this.seed);
+                }
+
+                // Add all common options to every importer, whether they use them or not
+                const tableImporter = new table.importer(this.knex, transaction, {
+                    baseUrl: this.baseUrl
+                });
+
+                const amount = table.quantity ?? tableImporter.defaultQuantity;
+                this.logger.info('Importing content for table', table.name, amount ? `(${amount} records)` : '');
+
+                await tableImporter.import(table.quantity ?? undefined);
+            }
+        } finally {
+            if (this.seed) {
+                // Revert crypto.randomBytes to the original function
+                crypto.randomBytes = cryptoRandomBytes;
+            }
         }
 
         // Finalise all tables - uses new table importer objects to avoid keeping all data in memory
@@ -183,7 +276,12 @@ class DataGenerator {
             await tableImporter.finalise();
         }
 
-        await transaction.commit();
+        // Re-enable the redo log because it's a persisted global
+        // Leaving it disabled can break the database in the event of an unexpected shutdown
+        // See https://dev.mysql.com/doc/refman/8.0/en/innodb-redo-log.html#innodb-disable-redo-logging
+        if (!DatabaseInfo.isSQLite(this.knex) && !process.env.DISABLE_FAST_IMPORT) {
+            await transaction.raw('ALTER INSTANCE ENABLE INNODB REDO_LOG;');
+        }
     }
 }
 
diff --git a/ghost/data-generator/lib/importers/BenefitsImporter.js b/ghost/data-generator/lib/importers/BenefitsImporter.js
index c0dd3f2a688..aa773abb5e5 100644
--- a/ghost/data-generator/lib/importers/BenefitsImporter.js
+++ b/ghost/data-generator/lib/importers/BenefitsImporter.js
@@ -17,7 +17,7 @@ class BenefitsImporter extends TableImporter {
         const sixMonthsLater = new Date(blogStartDate);
         sixMonthsLater.setMonth(sixMonthsLater.getMonth() + 6);
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             name: name,
             slug: `${slugify(name)}-${faker.random.numeric(3)}`,
             created_at: faker.date.between(blogStartDate, sixMonthsLater)
diff --git a/ghost/data-generator/lib/importers/CommentsImporter.js b/ghost/data-generator/lib/importers/CommentsImporter.js
new file mode 100644
index 00000000000..b9588b2b3df
--- /dev/null
+++ b/ghost/data-generator/lib/importers/CommentsImporter.js
@@ -0,0 +1,73 @@
+const {faker} = require('@faker-js/faker');
+const TableImporter = require('./TableImporter');
+const {luck} = require('../utils/random');
+const generateEvents = require('../utils/event-generator');
+const dateToDatabaseString = require('../utils/database-date');
+
+class CommentsImporter extends TableImporter {
+    static table = 'comments';
+    static dependencies = ['posts'];
+
+    constructor(knex, transaction) {
+        super(CommentsImporter.table, knex, transaction);
+    }
+
+    async import(quantity) {
+        const posts = await this.transaction.select('id', 'published_at').from('posts')
+            .where('status', 'published');
+        this.members = await this.transaction.select('id', 'created_at').from('members');
+
+        this.commentsPerPost = quantity ? quantity / posts.length : 10;
+
+        await this.importForEach(posts, this.commentsPerPost);
+    }
+
+    setReferencedModel(model) {
+        this.model = model;
+
+        this.commentIds = [];
+
+        this.timestamps = generateEvents({
+            shape: 'ease-out',
+            trend: 'negative',
+            // Steady readers login more, readers who lose interest read less overall.
+            // ceil because members will all have logged in at least once
+            total: faker.datatype.number({min: 0, max: this.commentsPerPost}),
+            startTime: new Date(model.published_at),
+            endTime: new Date()
+        });
+
+        this.possibleMembers = this.members.filter(member => new Date(member.created_at) < new Date(model.published_at));
+    }
+
+    generate() {
+        const timestamp = this.timestamps.pop();
+        if (!timestamp) {
+            // Out of events for this post
+            return null;
+        }
+
+        if (this.possibleMembers.length === 0) {
+            return null;
+        }
+
+        const isReply = luck(30) && this.commentIds.length > 0; // 30% of comments are replies
+
+        const event = {
+            id: this.fastFakeObjectId(),
+            post_id: this.model.id,
+            member_id: this.possibleMembers[faker.datatype.number(this.possibleMembers.length - 1)].id,
+            parent_id: isReply ? this.commentIds[faker.datatype.number(this.commentIds.length - 1)] : undefined,
+            status: 'published',
+            created_at: dateToDatabaseString(timestamp),
+            updated_at: dateToDatabaseString(timestamp),
+            html: `<p>${faker.lorem.sentence().replace(/[&<>"']/g, c => `&#${c.charCodeAt(0)};`)}</p>`
+        };
+
+        this.commentIds.push(event.id);
+
+        return event;
+    }
+}
+
+module.exports = CommentsImporter;
diff --git a/ghost/data-generator/lib/importers/EmailBatchesImporter.js b/ghost/data-generator/lib/importers/EmailBatchesImporter.js
index b09da9a6f89..f10e5c1be15 100644
--- a/ghost/data-generator/lib/importers/EmailBatchesImporter.js
+++ b/ghost/data-generator/lib/importers/EmailBatchesImporter.js
@@ -11,10 +11,12 @@ class EmailBatchesImporter extends TableImporter {
     }
 
     async import(quantity) {
-        const emails = await this.transaction.select('id', 'created_at').from('emails');
+        const emails = await this.transaction.select('id', 'created_at', 'email_count').from('emails');
 
-        // TODO: Generate >1 batch per email
-        await this.importForEach(emails, quantity ?? emails.length);
+        // 1 batch per 1000 recipients
+        await this.importForEach(emails, quantity ?? (() => {
+            return Math.ceil(this.model.email_count / 1000);
+        }));
     }
 
     generate() {
@@ -23,7 +25,7 @@ class EmailBatchesImporter extends TableImporter {
         latestUpdatedDate.setHours(latestUpdatedDate.getHours() + 1);
 
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             email_id: this.model.id,
             provider_id: `${new Date().toISOString().split('.')[0].replace(/[^0-9]/g, '')}.${faker.datatype.hexadecimal({length: 16, prefix: '', case: 'lower'})}@m.example.com`,
             status: 'submitted', // TODO: introduce failures
diff --git a/ghost/data-generator/lib/importers/EmailRecipientFailuresImporter.js b/ghost/data-generator/lib/importers/EmailRecipientFailuresImporter.js
new file mode 100644
index 00000000000..c321bddd102
--- /dev/null
+++ b/ghost/data-generator/lib/importers/EmailRecipientFailuresImporter.js
@@ -0,0 +1,67 @@
+const TableImporter = require('./TableImporter');
+const {faker} = require('@faker-js/faker');
+
+class EmailRecipientFailuresImporter extends TableImporter {
+    static table = 'email_recipient_failures';
+    static dependencies = ['email_recipients'];
+
+    constructor(knex, transaction) {
+        super(EmailRecipientFailuresImporter.table, knex, transaction);
+    }
+
+    async import(quantity) {
+        const recipients = await this.transaction
+            .select(
+                'id',
+                'email_id',
+                'member_id',
+                'failed_at')
+            .from('email_recipients')
+            .whereNotNull('failed_at');
+
+        await this.importForEach(recipients, quantity ? quantity / recipients.length : 1);
+    }
+
+    generate() {
+        const errors = [
+            {
+                severity: 'permanent',
+                code: 605,
+                enhanced_code: null,
+                message: 'Not delivering to previously bounced address'
+            },
+            {
+                severity: 'permanent',
+                code: 451,
+                enhanced_code: '4.7.652',
+                message: '4.7.652 The mail server [xxx.xxx.xxx.xxx] has exceeded the maximum number of connections.'
+            },
+            {
+                message: 'No MX for example.com',
+                code: 498,
+                enhanced_code: null,
+                severity: 'permanent'
+            },
+            {
+                severity: 'temporary',
+                code: 552,
+                enhanced_code: null,
+                message: '5.2.2 <xxxxxxxx@example.com>: user is over quota'
+            }
+        ];
+
+        const error = faker.helpers.arrayElement(errors);
+
+        return {
+            id: this.fastFakeObjectId(),
+            email_id: this.model.email_id,
+            member_id: this.model.member_id,
+            email_recipient_id: this.model.id,
+            event_id: faker.random.alphaNumeric(20),
+            ...error,
+            failed_at: this.model.failed_at
+        };
+    }
+}
+
+module.exports = EmailRecipientFailuresImporter;
diff --git a/ghost/data-generator/lib/importers/EmailRecipientsImporter.js b/ghost/data-generator/lib/importers/EmailRecipientsImporter.js
index b51383aa1ae..f886fc4393c 100644
--- a/ghost/data-generator/lib/importers/EmailRecipientsImporter.js
+++ b/ghost/data-generator/lib/importers/EmailRecipientsImporter.js
@@ -2,6 +2,7 @@ const TableImporter = require('./TableImporter');
 const {faker} = require('@faker-js/faker');
 const generateEvents = require('../utils/event-generator');
 const dateToDatabaseString = require('../utils/database-date');
+const debug = require('@tryghost/debug')('EmailRecipientsImporter');
 
 const emailStatus = {
     delivered: Symbol(),
@@ -10,6 +11,25 @@ const emailStatus = {
     none: Symbol()
 };
 
+function findFirstHigherIndex(arr, target) {
+    let start = 0;
+    let end = arr.length - 1;
+    let result = -1;
+
+    while (start <= end) {
+        let mid = Math.floor((start + end) / 2);
+
+        if (arr[mid] >= target) {
+            result = mid;
+            end = mid - 1; // Continue searching in the left half
+        } else {
+            start = mid + 1; // Continue searching in the right half
+        }
+    }
+
+    return result; // Return -1 if no element is higher than target
+}
+
 class EmailRecipientsImporter extends TableImporter {
     static table = 'email_recipients';
     static dependencies = ['emails', 'email_batches', 'members', 'members_subscribe_events'];
@@ -19,6 +39,11 @@ class EmailRecipientsImporter extends TableImporter {
     }
 
     async import(quantity) {
+        if (quantity === 0) {
+            return;
+        }
+
+        const now = Date.now();
         const emails = await this.transaction
             .select(
                 'id',
@@ -28,58 +53,125 @@ class EmailRecipientsImporter extends TableImporter {
                 'opened_count',
                 'failed_count')
             .from('emails');
-        this.emailBatches = await this.transaction.select('id', 'email_id', 'updated_at').from('email_batches');
-        this.members = await this.transaction.select('id', 'uuid', 'email', 'name').from('members');
-        this.membersSubscribeEvents = await this.transaction.select('id', 'newsletter_id', 'created_at', 'member_id').from('members_subscribe_events');
+        this.emails = new Map();
+
+        for (const email of emails) {
+            this.emails.set(email.id, email);
+        }
+
+        this.emailBatches = await this.transaction.select('id', 'email_id', 'updated_at').from('email_batches').orderBy('email_id');
+        const members = await this.transaction.select('id', 'uuid', 'email', 'name').from('members');
+        this.membersSubscribeEvents = await this.transaction.select('id', 'newsletter_id', 'created_at', 'member_id').from('members_subscribe_events').orderBy('created_at', 'asc'); // Order required for better performance in setReferencedModel
+
+        // Create a map for fast lookups
+        this.members = new Map();
+        for (const member of members) {
+            this.members.set(member.id, member);
+        }
+
+        // Save indexes of each batch for performance (remarkable faster than doing findIndex on each generate call)
+        let lastEmailId = null;
+        let lastIndex = 0;
+        for (const batch of this.emailBatches) {
+            if (batch.email_id !== lastEmailId) {
+                lastIndex = 0;
+                lastEmailId = batch.email_id;
+            }
+            batch.index = lastIndex;
+            lastIndex += 1;
+        }
 
-        await this.importForEach(emails, quantity ? quantity / emails.length : this.members.length);
+        // Now reorder by email id
+
+        debug (`Prepared data for ${this.name} in ${Date.now() - now}ms`);
+
+        // We use the same event curve for all emails to speed up the generation
+        // Spread over 14 days
+        this.eventStartTimeUsed = new Date();
+        const endTime = new Date(this.eventStartTimeUsed.getTime() + 1000 * 60 * 60 * 24 * 14);
+        this.eventCurve = generateEvents({
+            shape: 'ease-out',
+            trend: 'negative',
+            total: 1000,
+            startTime: this.eventStartTimeUsed,
+            endTime
+        });
+
+        this.membersSubscribeEventsByNewsletterId = new Map();
+        this.membersSubscribeEventsCreatedAtsByNewsletterId = new Map();
+        for (const memberSubscribeEvent of this.membersSubscribeEvents) {
+            if (!this.membersSubscribeEventsByNewsletterId.has(memberSubscribeEvent.newsletter_id)) {
+                this.membersSubscribeEventsByNewsletterId.set(memberSubscribeEvent.newsletter_id, []);
+            }
+            this.membersSubscribeEventsByNewsletterId.get(memberSubscribeEvent.newsletter_id).push(memberSubscribeEvent);
+
+            if (!this.membersSubscribeEventsCreatedAtsByNewsletterId.has(memberSubscribeEvent.newsletter_id)) {
+                this.membersSubscribeEventsCreatedAtsByNewsletterId.set(memberSubscribeEvent.newsletter_id, []);
+            }
+
+            if (!(memberSubscribeEvent.created_at instanceof Date)) {
+                // SQLite fix
+                memberSubscribeEvent.created_at = new Date(memberSubscribeEvent.created_at);
+            }
+            this.membersSubscribeEventsCreatedAtsByNewsletterId.get(memberSubscribeEvent.newsletter_id).push(memberSubscribeEvent.created_at.getTime());
+        }
+
+        await this.importForEach(this.emailBatches, quantity ? quantity / emails.length : 1000);
     }
 
     setReferencedModel(model) {
-        this.model = model;
-        this.batch = this.emailBatches.find(batch => batch.email_id === model.id);
+        this.batch = model;
+        this.model = this.emails.get(this.batch.email_id);
+        this.batchIndex = this.batch.index;
+
         // Shallow clone members list so we can shuffle and modify it
         const earliestOpenTime = new Date(this.batch.updated_at);
         const latestOpenTime = new Date(this.batch.updated_at);
         latestOpenTime.setDate(latestOpenTime.getDate() + 14);
-        const currentTime = new Date();
-        this.membersList = this.membersSubscribeEvents
-            .filter(entry => entry.newsletter_id === this.model.newsletter_id)
-            .filter(entry => new Date(entry.created_at) < earliestOpenTime)
+
+        // Get all members that were subscribed to this newsletter BEFORE the batch was sent
+        // We use binary search to speed up it up
+        const lastIndex = findFirstHigherIndex(this.membersSubscribeEventsCreatedAtsByNewsletterId.get(this.model.newsletter_id), earliestOpenTime);
+
+        this.membersList = this.membersSubscribeEventsByNewsletterId.get(this.model.newsletter_id).slice(0, Math.max(0, lastIndex - 1))
+            .slice(this.batchIndex * 1000, (this.batchIndex + 1) * 1000)
             .map(memberSubscribeEvent => memberSubscribeEvent.member_id);
-        this.events = this.membersList.length > 0 ? generateEvents({
-            shape: 'ease-out',
-            trend: 'negative',
-            total: this.membersList.length,
-            startTime: earliestOpenTime,
-            endTime: currentTime < latestOpenTime ? currentTime : latestOpenTime
-        }) : [];
+
+        this.events = faker.helpers.shuffle(this.eventCurve.slice(0, this.membersList.length));
+        this.eventIndex = 0;
+
         this.emailMeta = {
-            emailCount: this.model.email_count,
             // delievered and not opened
             deliveredCount: this.model.delivered_count - this.model.opened_count,
             openedCount: this.model.opened_count,
             failedCount: this.model.failed_count
         };
+
+        let offset = this.batchIndex * 1000;
+
+        // We always first create the failures, then the opened, then the delivered, so we need to remove those from the meta so we don't generate them multiple times
+        this.emailMeta = {
+            failedCount: Math.max(0, this.emailMeta.failedCount - offset),
+            openedCount: Math.max(0, this.emailMeta.openedCount - Math.max(0, offset - this.emailMeta.failedCount)),
+            deliveredCount: Math.max(0, this.emailMeta.deliveredCount - Math.max(0, offset - this.emailMeta.failedCount - this.emailMeta.openedCount))
+        };
     }
 
     generate() {
-        if (this.emailMeta.emailCount <= 0) {
+        let timestamp = this.events.pop();
+        if (!timestamp) {
             return;
         }
-        this.emailMeta.emailCount -= 1;
 
-        const timestamp = this.events.shift();
-        if (!timestamp) {
-            return;
+        // The events are generated for a different time, so we need to move them to the batch time
+        timestamp = new Date(timestamp.getTime() - this.eventStartTimeUsed.getTime() + new Date(this.batch.updated_at).getTime());
+
+        if (timestamp > new Date()) {
+            timestamp = new Date();
         }
 
-        const memberIdIndex = faker.datatype.number({
-            min: 0,
-            max: this.membersList.length - 1
-        });
-        const [memberId] = this.membersList.splice(memberIdIndex, 1);
-        const member = this.members.find(m => m.id === memberId);
+        const memberId = this.membersList[this.events.length];
+        const member = this.members.get(memberId);
 
         let status = emailStatus.none;
         if (this.emailMeta.failedCount > 0) {
@@ -95,17 +187,18 @@ class EmailRecipientsImporter extends TableImporter {
 
         let deliveredTime;
         if (status === emailStatus.opened) {
-            const startDate = new Date(this.batch.updated_at).valueOf();
-            const endDate = timestamp.valueOf();
-            deliveredTime = new Date(startDate + (Math.random() * (endDate - startDate)));
+            const startDate = this.batch.updated_at;
+            const endDate = timestamp;
+            deliveredTime = faker.date.between(startDate, endDate);
         }
 
         return {
-            id: faker.database.mongodbObjectId(),
+            // Using sorted ids are much much faster (35% as far as my testing goes) for huge imports
+            id: this.fastFakeObjectId(),
             email_id: this.model.id,
             batch_id: this.batch.id,
             member_id: member.id,
-            processed_at: this.batch.updated_at,
+            processed_at: dateToDatabaseString(this.batch.updated_at),
             delivered_at: status === emailStatus.opened ? dateToDatabaseString(deliveredTime) : status === emailStatus.delivered ? dateToDatabaseString(timestamp) : null,
             opened_at: status === emailStatus.opened ? dateToDatabaseString(timestamp) : null,
             failed_at: status === emailStatus.failed ? dateToDatabaseString(timestamp) : null,
diff --git a/ghost/data-generator/lib/importers/EmailsImporter.js b/ghost/data-generator/lib/importers/EmailsImporter.js
index 81921b322f0..3d35e23a641 100644
--- a/ghost/data-generator/lib/importers/EmailsImporter.js
+++ b/ghost/data-generator/lib/importers/EmailsImporter.js
@@ -13,15 +13,20 @@ class EmailsImporter extends TableImporter {
     }
 
     async import(quantity) {
-        const posts = await this.transaction.select('id', 'title', 'published_at').from('posts').where('type', 'post');
+        if (quantity === 0) {
+            return;
+        }
+
+        const posts = await this.transaction.select('id', 'title', 'published_at').from('posts').where('type', 'post').where('status', 'published').orderBy('published_at', 'desc');
         this.newsletters = await this.transaction.select('id').from('newsletters').orderBy('sort_order');
         this.membersSubscribeEvents = await this.transaction.select('id', 'newsletter_id', 'created_at').from('members_subscribe_events');
 
-        await this.importForEach(posts, quantity ? quantity / posts.length : 1);
+        // Only generate emails for last 25% of posts, and only generate emails for 50% of those
+        await this.importForEach(posts.slice(0, Math.ceil(posts.length / 4)), quantity ? quantity / posts.length : 0.5);
     }
 
     generate() {
-        const id = faker.database.mongodbObjectId();
+        const id = this.fastFakeObjectId();
 
         let newsletter;
         if (this.newsletters.length === 0) {
diff --git a/ghost/data-generator/lib/importers/LabelsImporter.js b/ghost/data-generator/lib/importers/LabelsImporter.js
index d4db241a88d..df5862eac3d 100644
--- a/ghost/data-generator/lib/importers/LabelsImporter.js
+++ b/ghost/data-generator/lib/importers/LabelsImporter.js
@@ -27,7 +27,7 @@ class LabelsImporter extends TableImporter {
     generate() {
         const name = this.generateName();
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             name: name,
             slug: `${slugify(name)}`,
             created_at: dateToDatabaseString(blogStartDate),
diff --git a/ghost/data-generator/lib/importers/MembersClickEventsImporter.js b/ghost/data-generator/lib/importers/MembersClickEventsImporter.js
index da65f5593eb..4ffc85000be 100644
--- a/ghost/data-generator/lib/importers/MembersClickEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersClickEventsImporter.js
@@ -12,11 +12,25 @@ class MembersClickEventsImporter extends TableImporter {
     }
 
     async import(quantity) {
-        const emailRecipients = await this.transaction.select('id', 'opened_at', 'email_id', 'member_id').from('email_recipients');
-        this.redirects = await this.transaction.select('id', 'post_id').from('redirects');
-        this.emails = await this.transaction.select('id', 'post_id').from('emails');
+        const emailRecipients = await this.transaction.select('id', 'opened_at', 'email_id', 'member_id').from('email_recipients').whereNotNull('opened_at');
+        const redirects = await this.transaction.select('id', 'post_id').from('redirects');
+        const emails = await this.transaction.select('id', 'post_id').from('emails');
         this.quantity = quantity ? quantity / emailRecipients.length : 2;
 
+        // Create maps for faster lookups (this does make a difference for large data generation)
+        this.emails = new Map();
+        for (const email of emails) {
+            this.emails.set(email.id, email);
+        }
+
+        this.redirects = new Map();
+        for (const redirect of redirects) {
+            if (!this.redirects.has(redirect.post_id)) {
+                this.redirects.set(redirect.post_id, []);
+            }
+            this.redirects.get(redirect.post_id).push(redirect);
+        }
+
         await this.importForEach(emailRecipients, this.quantity);
     }
 
@@ -26,28 +40,27 @@ class MembersClickEventsImporter extends TableImporter {
             min: 0,
             max: this.quantity
         }) : 0;
-        const email = this.emails.find(e => e.id === this.model.email_id);
-        this.redirectList = this.redirects.filter(redirect => redirect.post_id === email.post_id);
+        const email = this.emails.get(model.email_id);
+        this.redirectList = this.redirects.get(email.post_id) ?? [];
     }
 
     generate() {
-        if (this.amount <= 0 || this.redirectList.length === 0) {
+        if (this.amount <= 0 || this.redirectList.length === 0 || !this.model.opened_at) {
             return;
         }
         this.amount -= 1;
 
         const openedAt = new Date(this.model.opened_at);
-        const laterOn = new Date(this.model.opened_at);
-        laterOn.setMinutes(laterOn.getMinutes() + 15);
-        const clickTime = new Date(openedAt.valueOf() + (Math.random() * (laterOn.valueOf() - openedAt.valueOf())));
+        const laterOn = new Date(openedAt.getTime() + 1000 * 60 * 15);
+        const clickTime = faker.date.between(openedAt.getTime(), laterOn.getTime()); //added getTime here because it threw random errors
 
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             member_id: this.model.member_id,
-            redirect_id: this.redirectList[faker.datatype.number({
+            redirect_id: this.redirectList[this.redirectList.length === 1 ? 0 : (faker.datatype.number({
                 min: 0,
                 max: this.redirectList.length - 1
-            })].id,
+            }))].id,
             created_at: dateToDatabaseString(clickTime)
         };
     }
diff --git a/ghost/data-generator/lib/importers/MembersCreatedEventsImporter.js b/ghost/data-generator/lib/importers/MembersCreatedEventsImporter.js
index c5131e4070f..d0a7ff1b589 100644
--- a/ghost/data-generator/lib/importers/MembersCreatedEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersCreatedEventsImporter.js
@@ -1,10 +1,11 @@
 const TableImporter = require('./TableImporter');
 const {faker} = require('@faker-js/faker');
 const {luck} = require('../utils/random');
+const dateToDatabaseString = require('../utils/database-date');
 
 class MembersCreatedEventsImporter extends TableImporter {
     static table = 'members_created_events';
-    static dependencies = ['members', 'posts'];
+    static dependencies = ['members', 'posts', 'mentions'];
 
     constructor(knex, transaction) {
         super(MembersCreatedEventsImporter.table, knex, transaction);
@@ -13,6 +14,7 @@ class MembersCreatedEventsImporter extends TableImporter {
     async import(quantity) {
         const members = await this.transaction.select('id', 'created_at').from('members');
         this.posts = await this.transaction.select('id', 'published_at', 'visibility', 'type', 'slug').from('posts').orderBy('published_at', 'desc');
+        this.incomingRecommendations = await this.transaction.select('id', 'source', 'created_at').from('mentions');
 
         await this.importForEach(members, quantity ? quantity / members.length : 1);
     }
@@ -31,7 +33,19 @@ class MembersCreatedEventsImporter extends TableImporter {
 
     generate() {
         const source = this.generateSource();
-        let attribution = {};
+
+        // We need to add all properties here already otherwise CSV imports won't know all the columns
+        let attribution = {
+            attribution_id: null,
+            attribution_type: null,
+            attribution_url: null
+        };
+        let referrer = {
+            referrer_source: null,
+            referrer_url: null,
+            referrer_medium: null
+        };
+
         if (source === 'member' && luck(30)) {
             const post = this.posts.find(p => p.visibility === 'public' && new Date(p.published_at) < new Date(this.model.created_at));
             if (post) {
@@ -42,12 +56,47 @@ class MembersCreatedEventsImporter extends TableImporter {
                 };
             }
         }
-        return Object.assign({}, {
-            id: faker.database.mongodbObjectId(),
-            created_at: this.model.created_at,
+
+        if (source === 'member' && luck(40)) {
+            if (luck(20)) {
+                // Ghost network
+                referrer = {
+                    referrer_source: luck(20) ? 'Ghost.org' : 'Ghost Explore',
+                    referrer_url: 'ghost.org',
+                    referrer_medium: 'Ghost Network'
+                };
+            } else {
+                // Incoming recommendation
+                const incomingRecommendation = faker.helpers.arrayElement(this.incomingRecommendations);
+
+                const hostname = new URL(incomingRecommendation.source).hostname;
+                referrer = {
+                    referrer_source: hostname,
+                    referrer_url: hostname,
+                    referrer_medium: faker.helpers.arrayElement([null, 'Email'])
+                };
+            }
+        }
+
+        if (source === 'import') {
+            referrer.referrer_source = 'Imported';
+            referrer.referrer_medium = 'Member Importer';
+        } else if (source === 'admin') {
+            referrer.referrer_source = 'Created manually';
+            referrer.referrer_medium = 'Ghost Admin';
+        } else if (source === 'api') {
+            referrer.referrer_source = 'Created via API';
+            referrer.referrer_medium = 'Admin API';
+        }
+
+        return {
+            id: this.fastFakeObjectId(),
+            created_at: dateToDatabaseString(this.model.created_at),
             member_id: this.model.id,
-            source
-        }, attribution);
+            source,
+            ...attribution,
+            ...referrer
+        };
     }
 }
 
diff --git a/ghost/data-generator/lib/importers/MembersFeedbackImporter.js b/ghost/data-generator/lib/importers/MembersFeedbackImporter.js
index f8d5b5cdd1b..793f48691d7 100644
--- a/ghost/data-generator/lib/importers/MembersFeedbackImporter.js
+++ b/ghost/data-generator/lib/importers/MembersFeedbackImporter.js
@@ -28,11 +28,11 @@ class MembersFeedbackImporter extends TableImporter {
         const openedAt = new Date(this.model.opened_at);
         const laterOn = new Date(this.model.opened_at);
         laterOn.setMinutes(laterOn.getMinutes() + 60);
-        const feedbackTime = new Date(openedAt.valueOf() + (Math.random() * (laterOn.valueOf() - openedAt.valueOf())));
+        const feedbackTime = faker.date.between(openedAt, laterOn);
 
         const postId = this.emails.find(email => email.id === this.model.email_id).post_id;
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             score: luck(70) ? 1 : 0,
             member_id: this.model.member_id,
             post_id: postId,
diff --git a/ghost/data-generator/lib/importers/MembersImporter.js b/ghost/data-generator/lib/importers/MembersImporter.js
index ba6c30bd533..fa2592e2280 100644
--- a/ghost/data-generator/lib/importers/MembersImporter.js
+++ b/ghost/data-generator/lib/importers/MembersImporter.js
@@ -5,6 +5,7 @@ const {blogStartDate: startTime} = require('../utils/blog-info');
 const generateEvents = require('../utils/event-generator');
 const {luck} = require('../utils/random');
 const dateToDatabaseString = require('../utils/database-date');
+const debug = require('@tryghost/debug')('MembersImporter');
 
 class MembersImporter extends TableImporter {
     static table = 'members';
@@ -19,6 +20,8 @@ class MembersImporter extends TableImporter {
     }
 
     async import(quantity = this.defaultQuantity) {
+        const generateNow = Date.now();
+
         this.timestamps = generateEvents({
             shape: 'ease-in',
             trend: 'positive',
@@ -26,6 +29,7 @@ class MembersImporter extends TableImporter {
             startTime,
             endTime: new Date()
         }).sort();
+        debug(`${this.name} generated ${this.timestamps.length} timestamps in ${Date.now() - generateNow}ms`);
 
         await super.import(quantity);
     }
@@ -62,16 +66,17 @@ class MembersImporter extends TableImporter {
     }
 
     generate() {
-        const id = faker.database.mongodbObjectId();
+        const id = this.fastFakeObjectId();
         // Use name from American locale to reflect an English-speaking audience
         const name = `${americanFaker.name.firstName()} ${americanFaker.name.lastName()}`;
-        const timestamp = this.timestamps.shift();
+        const timestamp = this.timestamps.pop();
 
         return {
             id,
             uuid: faker.datatype.uuid(),
-            email: `${name.replace(' ', '.').replace(/[^a-zA-Z0-9]/g, '').toLowerCase()}${faker.datatype.number({min: 1000, max: 9999})}@example.com`,
-            status: luck(5) ? 'comped' : luck(25) ? 'paid' : 'free',
+            transient_id: faker.datatype.uuid(),
+            email: `${name.replace(' ', '.').replace(/[^a-zA-Z0-9]/g, '').toLowerCase()}${faker.datatype.number({min: 0, max: 999999})}@example.com`,
+            status: luck(5) ? 'comped' : luck(15) ? 'paid' : 'free',
             name: name,
             expertise: luck(30) ? faker.name.jobTitle() : undefined,
             geolocation: JSON.stringify({
diff --git a/ghost/data-generator/lib/importers/MembersLabelsImporter.js b/ghost/data-generator/lib/importers/MembersLabelsImporter.js
index 9c45279232c..6fb37a673d7 100644
--- a/ghost/data-generator/lib/importers/MembersLabelsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersLabelsImporter.js
@@ -25,7 +25,7 @@ class MembersLabelsImporter extends TableImporter {
         }
         // TODO: Ensure we don't generate the same member label twice
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             member_id: this.model.id,
             label_id: this.labels[faker.datatype.number({
                 min: 0,
diff --git a/ghost/data-generator/lib/importers/MembersLoginEventsImporter.js b/ghost/data-generator/lib/importers/MembersLoginEventsImporter.js
index bfebbdd141f..21db6f5633c 100644
--- a/ghost/data-generator/lib/importers/MembersLoginEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersLoginEventsImporter.js
@@ -1,5 +1,4 @@
 const TableImporter = require('./TableImporter');
-const {faker} = require('@faker-js/faker');
 const {luck} = require('../utils/random');
 const generateEvents = require('../utils/event-generator');
 const dateToDatabaseString = require('../utils/database-date');
@@ -13,9 +12,25 @@ class MembersLoginEventsImporter extends TableImporter {
     }
 
     async import(quantity) {
-        const members = await this.transaction.select('id', 'created_at').from('members');
+        if (quantity === 0) {
+            return;
+        }
+
+        let offset = 0;
+        let limit = 100000;
+
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const members = await this.transaction.select('id', 'created_at').from('members').limit(limit).offset(offset);
 
-        await this.importForEach(members, quantity ? quantity / members.length : 5);
+            if (members.length === 0) {
+                break;
+            }
+
+            await this.importForEach(members, quantity ? quantity / members.length : 5);
+
+            offset += limit;
+        }
     }
 
     setReferencedModel(model) {
@@ -31,20 +46,20 @@ class MembersLoginEventsImporter extends TableImporter {
             trend: 'negative',
             // Steady readers login more, readers who lose interest read less overall.
             // ceil because members will all have logged in at least once
-            total: shape === 'flat' ? Math.ceil(daysBetween / 3) : Math.ceil(daysBetween / 7),
+            total: Math.min(5, shape === 'flat' ? Math.ceil(daysBetween / 3) : Math.ceil(daysBetween / 7)),
             startTime: new Date(model.created_at),
             endTime: endDate
         });
     }
 
     generate() {
-        const timestamp = this.timestamps.shift();
+        const timestamp = this.timestamps.pop();
         if (!timestamp) {
             // Out of events for this user
             return null;
         }
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             created_at: dateToDatabaseString(timestamp),
             member_id: this.model.id
         };
diff --git a/ghost/data-generator/lib/importers/MembersNewslettersImporter.js b/ghost/data-generator/lib/importers/MembersNewslettersImporter.js
index dc4ee0185d7..294cae5093d 100644
--- a/ghost/data-generator/lib/importers/MembersNewslettersImporter.js
+++ b/ghost/data-generator/lib/importers/MembersNewslettersImporter.js
@@ -1,4 +1,3 @@
-const {faker} = require('@faker-js/faker');
 const TableImporter = require('./TableImporter');
 
 class MembersNewslettersImporter extends TableImporter {
@@ -10,14 +9,26 @@ class MembersNewslettersImporter extends TableImporter {
     }
 
     async import(quantity) {
-        const membersSubscribeEvents = await this.transaction.select('member_id', 'newsletter_id').from('members_subscribe_events');
+        let offset = 0;
+        let limit = 100000;
 
-        await this.importForEach(membersSubscribeEvents, quantity ? quantity / membersSubscribeEvents.length : 1);
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const membersSubscribeEvents = await this.transaction.select('member_id', 'newsletter_id').from('members_subscribe_events').limit(limit).offset(offset);
+
+            if (membersSubscribeEvents.length === 0) {
+                break;
+            }
+
+            await this.importForEach(membersSubscribeEvents, quantity ? quantity / membersSubscribeEvents.length : 1);
+
+            offset += limit;
+        }
     }
 
     generate() {
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             member_id: this.model.member_id,
             newsletter_id: this.model.newsletter_id
         };
diff --git a/ghost/data-generator/lib/importers/MembersPaidSubscriptionEventsImporter.js b/ghost/data-generator/lib/importers/MembersPaidSubscriptionEventsImporter.js
index afc212f2e5d..c80e6ca07d2 100644
--- a/ghost/data-generator/lib/importers/MembersPaidSubscriptionEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersPaidSubscriptionEventsImporter.js
@@ -1,42 +1,97 @@
 const TableImporter = require('./TableImporter');
-const {faker} = require('@faker-js/faker');
 
 class MembersPaidSubscriptionEventsImporter extends TableImporter {
     static table = 'members_paid_subscription_events';
-    static dependencies = ['subscriptions', 'members_stripe_customers_subscriptions'];
+    static dependencies = ['members_stripe_customers_subscriptions'];
 
     constructor(knex, transaction) {
         super(MembersPaidSubscriptionEventsImporter.table, knex, transaction);
     }
 
-    async import(quantity) {
-        const subscriptions = await this.transaction.select('id', 'member_id', 'currency', 'created_at').from('subscriptions');
-        this.membersStripeCustomersSubscriptions = await this.transaction.select('id', 'ghost_subscription_id', 'plan_id', 'mrr').from('members_stripe_customers_subscriptions');
+    async import() {
+        let offset = 0;
+        let limit = 1000;
 
-        await this.importForEach(subscriptions, quantity ? quantity / subscriptions.length : 1);
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const subscriptions = await this.transaction.select('id', 'customer_id', 'plan_currency', 'plan_amount', 'created_at', 'plan_id', 'status', 'cancel_at_period_end', 'current_period_end').from('members_stripe_customers_subscriptions').limit(limit).offset(offset);
+
+            if (subscriptions.length === 0) {
+                break;
+            }
+            const membersStripeCustomers = await this.transaction.select('id', 'member_id', 'customer_id').from('members_stripe_customers').whereIn('customer_id', subscriptions.map(subscription => subscription.customer_id));
+
+            this.membersStripeCustomers = new Map();
+            for (const customer of membersStripeCustomers) {
+                this.membersStripeCustomers.set(customer.customer_id, customer);
+            }
+            await this.importForEach(subscriptions, 2);
+
+            offset += limit;
+        }
+    }
+
+    setReferencedModel(model) {
+        this.model = model;
+        this.count = 0;
+    }
+
+    isActiveSubscriptionStatus(status) {
+        return ['active', 'trialing', 'unpaid', 'past_due'].includes(status);
+    }
+
+    getStatus(modelToCheck) {
+        const status = modelToCheck.status;
+        const canceled = modelToCheck.cancel_at_period_end;
+
+        if (status === 'canceled') {
+            return 'expired';
+        }
+
+        if (canceled) {
+            return 'canceled';
+        }
+
+        if (this.isActiveSubscriptionStatus(status)) {
+            return 'active';
+        }
+
+        return 'inactive';
     }
 
     generate() {
-        if (!this.model.currency) {
+        this.count += 1;
+
+        const isActive = this.isActiveSubscriptionStatus(this.model.status);
+        if (this.count > 1 && isActive) {
+            // We only need one event, because the MRR is still here
+            return;
+        }
+
+        if (this.model.status === 'incomplete' || this.model.status === 'incomplete_expired') {
             // Not a paid subscription
-            return null;
+            return;
         }
-        // TODO: Implement upgrades
-        const membersStripeCustomersSubscription = this.membersStripeCustomersSubscriptions.find((m) => {
-            return m.ghost_subscription_id === this.model.id;
-        });
+
+        const memberCustomer = this.membersStripeCustomers.get(this.model.customer_id);
+        const isMonthly = this.model.plan_interval === 'month';
+
+        // Note that we need to recalculate the MRR, because it will be zero for inactive subscrptions
+        const mrr = isMonthly ? this.model.plan_amount : Math.floor(this.model.plan_amount / 12);
+
+        // todo: implement + MRR and -MRR in case of inactive subscriptions
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             // TODO: Support expired / updated / cancelled events too
-            type: 'created',
-            member_id: this.model.member_id,
+            type: this.count === 1 ? 'created' : this.getStatus(this.model),
+            member_id: memberCustomer.member_id,
             subscription_id: this.model.id,
-            from_plan: null,
-            to_plan: membersStripeCustomersSubscription.plan_id,
-            currency: this.model.currency,
+            from_plan: this.count === 1 ? null : this.model.plan_id,
+            to_plan: this.count === 1 ? this.model.plan_id : null,
+            currency: this.model.plan_currency,
             source: 'stripe',
-            mrr_delta: membersStripeCustomersSubscription.mrr,
-            created_at: this.model.created_at
+            mrr_delta: this.count === 1 ? mrr : -mrr,
+            created_at: this.count === 1 ? this.model.created_at : this.model.current_period_end
         };
     }
 }
diff --git a/ghost/data-generator/lib/importers/MembersProductsImporter.js b/ghost/data-generator/lib/importers/MembersProductsImporter.js
index ff4a5652255..3cdc93e819b 100644
--- a/ghost/data-generator/lib/importers/MembersProductsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersProductsImporter.js
@@ -1,6 +1,7 @@
 const {faker} = require('@faker-js/faker');
 const TableImporter = require('./TableImporter');
 const {luck} = require('../utils/random');
+const dateToDatabaseString = require('../utils/database-date');
 
 class MembersProductsImporter extends TableImporter {
     static table = 'members_products';
@@ -12,7 +13,7 @@ class MembersProductsImporter extends TableImporter {
 
     async import(quantity) {
         const members = await this.transaction.select('id').from('members').whereNot('status', 'free');
-        this.products = await this.transaction.select('id').from('products').whereNot('name', 'Free');
+        this.products = await this.transaction.select('id').from('products').whereNot('type', 'fee');
 
         await this.importForEach(members, quantity ? quantity / members.length : 1);
     }
@@ -29,10 +30,11 @@ class MembersProductsImporter extends TableImporter {
 
     generate() {
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             member_id: this.model.id,
             product_id: this.getProduct().id,
-            sort_order: 0
+            sort_order: 0,
+            expiry_at: this.model.status === 'paid' ? null : (luck(50) ? null : dateToDatabaseString(faker.date.future()))
         };
     }
 }
diff --git a/ghost/data-generator/lib/importers/MembersStatusEventsImporter.js b/ghost/data-generator/lib/importers/MembersStatusEventsImporter.js
index 90b98f78ddd..7b9b68e1188 100644
--- a/ghost/data-generator/lib/importers/MembersStatusEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersStatusEventsImporter.js
@@ -11,22 +11,33 @@ class MembersStatusEventsImporter extends TableImporter {
     }
 
     async import(quantity) {
-        const members = await this.transaction.select('id', 'created_at', 'status').from('members');
+        let offset = 0;
+        let limit = 100000;
 
-        await this.importForEach(members, quantity ? quantity / members.length : 2);
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const members = await this.transaction.select('id', 'created_at', 'status').from('members').limit(limit).offset(offset);
+
+            if (members.length === 0) {
+                break;
+            }
+
+            await this.importForEach(members, quantity ? quantity / members.length : 2);
+            offset += limit;
+        }
     }
 
     setReferencedModel(model) {
         this.events = [{
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             member_id: model.id,
             from_status: null,
             to_status: 'free',
-            created_at: model.created_at
+            created_at: dateToDatabaseString(model.created_at)
         }];
         if (model.status !== 'free') {
             this.events.push({
-                id: faker.database.mongodbObjectId(),
+                id: this.fastFakeObjectId(),
                 member_id: model.id,
                 from_status: 'free',
                 to_status: model.status,
@@ -36,7 +47,7 @@ class MembersStatusEventsImporter extends TableImporter {
     }
 
     generate() {
-        const event = this.events.shift();
+        const event = this.events.pop();
         if (!event) {
             return null;
         }
diff --git a/ghost/data-generator/lib/importers/MembersStripeCustomersImporter.js b/ghost/data-generator/lib/importers/MembersStripeCustomersImporter.js
index 832277f3101..a545833afda 100644
--- a/ghost/data-generator/lib/importers/MembersStripeCustomersImporter.js
+++ b/ghost/data-generator/lib/importers/MembersStripeCustomersImporter.js
@@ -10,14 +10,41 @@ class MembersStripeCustomersImporter extends TableImporter {
     }
 
     async import(quantity) {
-        const members = await this.transaction.select('id', 'name', 'email', 'created_at').from('members');
+        if (quantity === 0) {
+            return;
+        }
 
-        await this.importForEach(members, quantity ? quantity / members.length : 1);
+        let offset = 0;
+        let limit = 100000;
+
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const members = await this.transaction.select('id', 'name', 'email', 'created_at', 'status').from('members').limit(limit).offset(offset);
+
+            if (members.length === 0) {
+                break;
+            }
+
+            await this.importForEach(members, quantity ? quantity / members.length : 1);
+            offset += limit;
+        }
     }
 
     generate() {
+        if (this.model.status !== 'paid') {
+            // Only 30% of free members should have a stripe customer = have had a subscription in the past or tried to subscribe
+            // The number should increase the older the member is
+
+            const daysSinceMemberCreated = Math.floor((new Date() - new Date(this.model.created_at)) / (1000 * 60 * 60 * 24));
+            const shouldHaveStripeCustomer = faker.datatype.number({min: 0, max: 100}) < Math.max(Math.min(daysSinceMemberCreated / 60, 15), 2);
+
+            if (!shouldHaveStripeCustomer) {
+                return;
+            }
+        }
+
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             member_id: this.model.id,
             customer_id: `cus_${faker.random.alphaNumeric(14, {
                 casing: 'mixed'
diff --git a/ghost/data-generator/lib/importers/MembersStripeCustomersSubscriptionsImporter.js b/ghost/data-generator/lib/importers/MembersStripeCustomersSubscriptionsImporter.js
index 4bf38f20a84..b3f8f22a727 100644
--- a/ghost/data-generator/lib/importers/MembersStripeCustomersSubscriptionsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersStripeCustomersSubscriptionsImporter.js
@@ -1,52 +1,257 @@
 const {faker} = require('@faker-js/faker');
 const TableImporter = require('./TableImporter');
+const dateToDatabaseString = require('../utils/database-date');
+const generateEvents = require('../utils/event-generator');
+const {luck} = require('../utils/random');
 
 class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
     static table = 'members_stripe_customers_subscriptions';
-    static dependencies = ['subscriptions', 'members_stripe_customers', 'products', 'stripe_products', 'stripe_prices'];
+    static dependencies = ['members', 'members_products', 'members_stripe_customers', 'products', 'stripe_products', 'stripe_prices'];
 
     constructor(knex, transaction) {
         super(MembersStripeCustomersSubscriptionsImporter.table, knex, transaction);
     }
 
     async import() {
-        const subscriptions = await this.transaction.select('id', 'member_id', 'tier_id', 'cadence', 'created_at', 'expires_at').from('subscriptions');
-        this.membersStripeCustomers = await this.transaction.select('id', 'member_id', 'customer_id').from('members_stripe_customers');
-        this.products = await this.transaction.select('id', 'name').from('products');
+        let offset = 0;
+        let limit = 5000;
+        this.products = await this.transaction.select('id', 'name').from('products').whereNot('type', 'free');
         this.stripeProducts = await this.transaction.select('id', 'product_id', 'stripe_product_id').from('stripe_products');
         this.stripePrices = await this.transaction.select('id', 'nickname', 'stripe_product_id', 'stripe_price_id', 'amount', 'interval', 'currency').from('stripe_prices');
 
-        await this.importForEach(subscriptions, 1);
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const membersStripeCustomers = await this.transaction.select('id', 'member_id', 'customer_id').from('members_stripe_customers').limit(limit).offset(offset);
+
+            if (membersStripeCustomers.length === 0) {
+                break;
+            }
+
+            this.members = await this.transaction.select('id', 'status', 'created_at').from('members').whereIn('id', membersStripeCustomers.map(m => m.member_id));
+
+            if (this.members.length === 0) {
+                continue;
+            }
+
+            const membersProducts = await this.transaction.select('member_id', 'product_id').from('members_products').whereIn('member_id', this.members.map(member => member.id));
+            //const membersStripeCustomers = await this.transaction.select('id', 'member_id', 'customer_id').from('members_stripe_customers').whereIn('member_id', this.members.map(member => member.id));
+
+            this.membersStripeCustomers = new Map();
+            for (const customer of membersStripeCustomers) {
+                this.membersStripeCustomers.set(customer.member_id, customer);
+            }
+
+            this.membersProducts = new Map();
+
+            for (const product of membersProducts) {
+                this.membersProducts.set(product.member_id, product);
+            }
+
+            await this.importForEach(this.members, 1.2);
+
+            offset += limit;
+        }
+    }
+
+    setReferencedModel(model) {
+        this.model = model;
+        this.count = 0;
+        this.lastSubscriptionStart = null;
     }
 
     generate() {
-        const customer = this.membersStripeCustomers.find(c => this.model.member_id === c.member_id);
-        const isMonthly = this.model.cadence === 'month';
-        const ghostProduct = this.products.find(product => product.id === this.model.tier_id);
-        const stripeProduct = this.stripeProducts.find(product => product.product_id === this.model.tier_id);
+        this.count += 1;
+
+        const member = this.model;
+        const customer = this.membersStripeCustomers.get(this.model.id);
+
+        if (!customer) {
+            // This is a requirement, so skip if we don't have a customer
+            return;
+        }
+
+        if (this.count > 1 && member.status !== 'paid') {
+            return;
+        }
+
+        const memberProduct = this.membersProducts.get(this.model.id);
+        let ghostProduct = memberProduct ? this.products.find(product => product.id === memberProduct.product_id) : null;
+
+        // Whether we should create a valid subscription or not
+        // We'll only create one valid subscription for each member if they are currently paid
+        let createValid = this.count === 1 && member.status === 'paid';
+
+        if (!ghostProduct) {
+            // Generate canceled, incomplete, incomplete_expired or unpaid subscriptions
+            // Choose a random paid product
+            ghostProduct = faker.helpers.arrayElement(this.products);
+            createValid = false;
+        }
+
+        const isMonthly = luck(70);
+        const stripeProduct = this.stripeProducts.find(product => product.product_id === ghostProduct.id);
         const stripePrice = this.stripePrices.find((price) => {
             return price.stripe_product_id === stripeProduct.stripe_product_id &&
                 (isMonthly ? price.interval === 'month' : price.interval === 'year');
         });
-        const mrr = isMonthly ? stripePrice.amount : Math.floor(stripePrice.amount / 12);
+        const mrr = createValid ? (isMonthly ? stripePrice.amount : Math.floor(stripePrice.amount / 12)) : 0;
+
+        const referenceEndDate = this.lastSubscriptionStart ?? new Date();
+
+        if (!createValid) {
+            if (isMonthly) {
+                referenceEndDate.setMonth(referenceEndDate.getMonth() - 1);
+            } else {
+                referenceEndDate.setFullYear(referenceEndDate.getFullYear() - 1);
+            }
+        }
+
+        if (referenceEndDate < member.created_at) {
+            // Not possible to create an invalid subscription here
+            return;
+        }
+
+        const [startDate] = generateEvents({
+            total: 1,
+            trend: 'negative',
+            startTime: new Date(member.created_at),
+            endTime: referenceEndDate,
+            shape: 'ease-out'
+        });
+        this.lastSubscriptionStart = startDate;
+        const endDate = new Date(startDate);
+
+        if (createValid) {
+            // End date should be in the future
+
+            if (isMonthly) {
+                endDate.setFullYear(new Date().getFullYear());
+                endDate.setMonth(new Date().getMonth());
+                if (endDate < new Date()) {
+                    endDate.setMonth(endDate.getMonth() + 1);
+                }
+            } else {
+                endDate.setFullYear(new Date().getFullYear());
+                if (endDate < new Date()) {
+                    endDate.setFullYear(endDate.getFullYear() + 1);
+                }
+            }
+        } else {
+            // End date should be in the past
+            if (isMonthly) {
+                // What is the month difference between startDate and now? Pick a random number in between
+                const monthDiff = (new Date().getFullYear() - startDate.getFullYear()) * 12 + (new Date().getMonth() - startDate.getMonth());
+                if (monthDiff === 0) {
+                    // Not possible to create an invalid subscription here
+                    return;
+                }
+
+                const randomMonthDiff = faker.datatype.number({min: 1, max: monthDiff});
+                endDate.setMonth(startDate.getMonth() + randomMonthDiff);
+            } else {
+                // What is the year difference between startDate and now? Pick a random number in between
+                const yearDiff = new Date().getFullYear() - startDate.getFullYear();
+
+                if (yearDiff === 0) {
+                    // Not possible to create an invalid subscription here
+                    return;
+                }
+                const randomYearDiff = faker.datatype.number({min: 1, max: yearDiff});
+
+                endDate.setFullYear(startDate.getFullYear() + randomYearDiff);
+            }
+        }
+
+        // Simulate some different statusses here:
+        // - active, not ending (cancel_at_period_end  = false)
+        // - active, ending (cancel_at_period_end = true)
+        // - canceled -> current_period_end can be in both past or present, cancel_at_period_end can be both true or false
+        // - incomplete_expired -> user tried to pay but 3D secure expired
+        // - incomplete -> waiting on 3D secure
+        // - trialing -> need to set trial_end_at to a date in the future
+        // - past_due -> last paymet failed, but subscription still active until tried a couple of times
+        // - unpaid -> all payment attempts failed - but keep the subscription active (special setting in Stripe)
+
+        const validStatusses = new Array(10).fill({
+            status: 'active',
+            cancel_at_period_end: false
+        });
+
+        // Trialing only possible when the startDate > 1 month ago
+        const monthAgo = new Date();
+
+        if (!isMonthly) {
+            // Year ago
+            monthAgo.setFullYear(monthAgo.getFullYear() - 1);
+        } else {
+            // Month ago
+            monthAgo.setMonth(monthAgo.getMonth() - 1);
+        }
+
+        if (startDate > monthAgo) {
+            validStatusses.push({
+                status: 'trialing',
+                cancel_at_period_end: false,
+                trial_end_at: dateToDatabaseString(endDate),
+                trial_start_at: dateToDatabaseString(startDate)
+            });
+        }
+
+        // Past due only possible if startDate < 1 month ago
+        if (startDate < monthAgo) {
+            validStatusses.push({
+                status: 'past_due',
+                cancel_at_period_end: false
+            });
+            validStatusses.push({
+                status: 'unpaid',
+                cancel_at_period_end: false
+            });
+        }
+
+        const invalidStatusses = [
+            {
+                status: 'canceled',
+                cancel_at_period_end: true
+            },
+            {
+                status: 'canceled',
+                cancel_at_period_end: false
+            },
+            {
+                status: 'incomplete_expired',
+                cancel_at_period_end: false
+            },
+            {
+                status: 'incomplete',
+                cancel_at_period_end: false
+            }
+        ];
+
+        const status = createValid ? faker.helpers.arrayElement(validStatusses) : faker.helpers.arrayElement(invalidStatusses);
+
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             customer_id: customer.customer_id,
-            ghost_subscription_id: this.model.id,
             subscription_id: `sub_${faker.random.alphaNumeric(14)}`,
             stripe_price_id: stripePrice.stripe_price_id,
-            status: 'active',
-            cancel_at_period_end: false,
-            current_period_end: this.model.expires_at,
-            start_date: this.model.created_at,
-            created_at: this.model.created_at,
+            start_date: dateToDatabaseString(startDate),
+            created_at: dateToDatabaseString(startDate),
             created_by: 'unused',
             mrr,
             plan_id: stripeProduct.stripe_product_id,
             plan_nickname: `${ghostProduct.name} - ${stripePrice.nickname}`,
             plan_interval: stripePrice.interval,
             plan_amount: stripePrice.amount,
-            plan_currency: stripePrice.currency
+            plan_currency: stripePrice.currency,
+
+            // Defaults
+            status: 'active',
+            cancel_at_period_end: false,
+            current_period_end: dateToDatabaseString(endDate),
+
+            // Override
+            ...status
         };
     }
 }
diff --git a/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js b/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js
index d46a3782a4a..2902ca121d4 100644
--- a/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js
@@ -5,18 +5,32 @@ const dateToDatabaseString = require('../utils/database-date');
 
 class MembersSubscribeEventsImporter extends TableImporter {
     static table = 'members_subscribe_events';
-    static dependencies = ['members', 'newsletters', 'subscriptions'];
+    static dependencies = ['members', 'newsletters'];
 
     constructor(knex, transaction) {
         super(MembersSubscribeEventsImporter.table, knex, transaction);
     }
 
     async import(quantity) {
-        const members = await this.transaction.select('id', 'created_at', 'status').from('members');
+        if (quantity === 0) {
+            return;
+        }
+
+        let offset = 0;
+        let limit = 100000;
         this.newsletters = await this.transaction.select('id').from('newsletters').orderBy('sort_order');
-        this.subscriptions = await this.transaction.select('member_id', 'created_at').from('subscriptions');
 
-        await this.importForEach(members, quantity ? quantity / members.length : 2);
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const members = await this.transaction.select('id', 'created_at', 'status').from('members').limit(limit).offset(offset);
+
+            if (members.length === 0) {
+                break;
+            }
+
+            await this.importForEach(members, quantity ? quantity / members.length : this.newsletters.length);
+            offset += limit;
+        }
     }
 
     setReferencedModel(model) {
@@ -32,27 +46,20 @@ class MembersSubscribeEventsImporter extends TableImporter {
             return null;
         }
 
-        let createdAt = dateToDatabaseString(faker.date.between(new Date(this.model.created_at), new Date()));
         let subscribed = luck(80);
 
-        // Free newsletter by default
-        let newsletterId = this.newsletters[1].id;
-        if (this.model.status === 'paid' && count === 0) {
-            // Paid newsletter
-            newsletterId = this.newsletters[0].id;
-            createdAt = this.subscriptions.find(s => s.member_id === this.model.id).created_at;
-            subscribed = luck(98);
-        }
-
         if (!subscribed) {
             return null;
         }
 
+        const createdAt = dateToDatabaseString(faker.date.between(new Date(this.model.created_at), new Date()));
+        const newsletterId = this.newsletters[count % this.newsletters.length].id;
+
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             member_id: this.model.id,
             newsletter_id: newsletterId,
-            subscribed: true,
+            subscribed: 1,
             created_at: createdAt,
             source: 'member'
         };
diff --git a/ghost/data-generator/lib/importers/MembersSubscriptionCreatedEventsImporter.js b/ghost/data-generator/lib/importers/MembersSubscriptionCreatedEventsImporter.js
index 081436a5cdb..a1e5e724bf6 100644
--- a/ghost/data-generator/lib/importers/MembersSubscriptionCreatedEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersSubscriptionCreatedEventsImporter.js
@@ -4,25 +4,51 @@ const {luck} = require('../utils/random');
 
 class MembersSubscriptionCreatedEventsImporter extends TableImporter {
     static table = 'members_subscription_created_events';
-    static dependencies = ['members_stripe_customers_subscriptions', 'subscriptions', 'posts'];
+    static dependencies = ['members_stripe_customers', 'members_stripe_customers_subscriptions', 'posts', 'mentions'];
 
     constructor(knex, transaction) {
         super(MembersSubscriptionCreatedEventsImporter.table, knex, transaction);
     }
 
     async import(quantity) {
-        const membersStripeCustomersSubscriptions = await this.transaction.select('id', 'ghost_subscription_id').from('members_stripe_customers_subscriptions');
-        this.subscriptions = await this.transaction.select('id', 'created_at', 'member_id').from('subscriptions');
-        this.posts = await this.transaction.select('id', 'published_at', 'visibility', 'type', 'slug').from('posts').orderBy('published_at', 'desc');
+        let offset = 0;
+        let limit = 1000;
+        this.posts = await this.transaction.select('id', 'published_at', 'visibility', 'type', 'slug').from('posts').whereNotNull('published_at').where('visibility', 'public').orderBy('published_at', 'desc');
+        this.incomingRecommendations = await this.transaction.select('id', 'source', 'created_at').from('mentions');
 
-        await this.importForEach(membersStripeCustomersSubscriptions, quantity ? quantity / membersStripeCustomersSubscriptions.length : 1);
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const membersStripeCustomersSubscriptions = await this.transaction.select('id', 'created_at', 'customer_id').from('members_stripe_customers_subscriptions').limit(limit).offset(offset);
+
+            if (membersStripeCustomersSubscriptions.length === 0) {
+                break;
+            }
+            const membersStripeCustomers = await this.transaction.select('id', 'member_id', 'customer_id').from('members_stripe_customers').whereIn('customer_id', membersStripeCustomersSubscriptions.map(subscription => subscription.customer_id));
+
+            this.membersStripeCustomers = new Map();
+            for (const memberStripeCustomer of membersStripeCustomers) {
+                this.membersStripeCustomers.set(memberStripeCustomer.customer_id, memberStripeCustomer);
+            }
+            await this.importForEach(membersStripeCustomersSubscriptions, quantity ? quantity / membersStripeCustomersSubscriptions.length : 1);
+            offset += limit;
+        }
     }
 
     generate() {
-        const subscription = this.subscriptions.find(s => s.id === this.model.ghost_subscription_id);
-        let attribution = {};
-        if (luck(10)) {
-            const post = this.posts.find(p => p.visibility === 'public' && new Date(p.published_at) < new Date(subscription.created_at));
+        // We need to add all properties here already otherwise CSV imports won't know all the columns
+        let attribution = {
+            attribution_id: null,
+            attribution_type: null,
+            attribution_url: null
+        };
+        let referrer = {
+            referrer_source: null,
+            referrer_url: null,
+            referrer_medium: null
+        };
+
+        if (luck(30)) {
+            const post = this.posts.find(p => p.visibility === 'public' && new Date(p.published_at) < new Date(this.model.created_at));
             if (post) {
                 attribution = {
                     attribution_id: post.id,
@@ -31,16 +57,38 @@ class MembersSubscriptionCreatedEventsImporter extends TableImporter {
                 };
             }
         }
-        return Object.assign({}, {
-            id: faker.database.mongodbObjectId(),
-            created_at: subscription.created_at,
-            member_id: subscription.member_id,
+
+        if (luck(40)) {
+            if (luck(20)) {
+                // Ghost network
+                referrer = {
+                    referrer_source: luck(20) ? 'Ghost.org' : 'Ghost Explore',
+                    referrer_url: 'ghost.org',
+                    referrer_medium: 'Ghost Network'
+                };
+            } else {
+                // Incoming recommendation
+                const incomingRecommendation = faker.helpers.arrayElement(this.incomingRecommendations);
+
+                const hostname = new URL(incomingRecommendation.source).hostname;
+                referrer = {
+                    referrer_source: hostname,
+                    referrer_url: hostname,
+                    referrer_medium: faker.helpers.arrayElement([null, 'Email'])
+                };
+            }
+        }
+
+        const memberCustomer = this.membersStripeCustomers.get(this.model.customer_id);
+
+        return {
+            id: this.fastFakeObjectId(),
+            created_at: this.model.created_at,
+            member_id: memberCustomer.member_id,
             subscription_id: this.model.id,
-            // TODO: Implement referrers
-            referrer_source: null,
-            referrer_medium: null,
-            referrer_url: null
-        }, attribution);
+            ...attribution,
+            ...referrer
+        };
     }
 }
 
diff --git a/ghost/data-generator/lib/importers/NewslettersImporter.js b/ghost/data-generator/lib/importers/NewslettersImporter.js
index f8b0011c535..4cbf39e7ee5 100644
--- a/ghost/data-generator/lib/importers/NewslettersImporter.js
+++ b/ghost/data-generator/lib/importers/NewslettersImporter.js
@@ -6,23 +6,25 @@ const {slugify} = require('@tryghost/string');
 class NewslettersImporter extends TableImporter {
     static table = 'newsletters';
     static dependencies = [];
+
     defaultQuantity = 2;
 
+    sortOrder = 0;
+
     constructor(knex, transaction) {
         super(NewslettersImporter.table, knex, transaction);
-        this.sortOrder = 0;
-        // TODO: Use random names if we ever need more than 2 newsletters
-        this.names = ['Regular premium', 'Occasional freebie'];
     }
 
     generate() {
-        const name = this.names.shift();
+        const name = `${faker.commerce.productAdjective()} ${faker.word.noun()}`;
         const sortOrder = this.sortOrder;
         this.sortOrder = this.sortOrder + 1;
+
         const weekAfter = new Date(blogStartDate);
         weekAfter.setDate(weekAfter.getDate() + 7);
+
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             uuid: faker.datatype.uuid(),
             name: name,
             slug: `${slugify(name)}-${faker.random.numeric(3)}`,
diff --git a/ghost/data-generator/lib/importers/OffersImporter.js b/ghost/data-generator/lib/importers/OffersImporter.js
index 3ab55c268dc..e72c021cbee 100644
--- a/ghost/data-generator/lib/importers/OffersImporter.js
+++ b/ghost/data-generator/lib/importers/OffersImporter.js
@@ -14,7 +14,7 @@ class OffersImporter extends TableImporter {
     }
 
     async import(quantity = this.defaultQuantity) {
-        this.products = await this.transaction.select('id', 'currency').from('products');
+        this.products = await this.transaction.select('id', 'currency').from('products').where('type', 'paid');
         this.names = ['Black Friday', 'Free Trial'];
         this.count = 0;
 
@@ -22,7 +22,7 @@ class OffersImporter extends TableImporter {
     }
 
     generate() {
-        const name = this.names.shift();
+        const name = this.names.pop();
 
         const product = this.products[faker.datatype.number({
             min: 0,
@@ -47,7 +47,7 @@ class OffersImporter extends TableImporter {
         // created_at: {type: 'dateTime', nullable: false},
         // updated_at: {type: 'dateTime', nullable: true}
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             active: true,
             name,
             code: slugify(name),
diff --git a/ghost/data-generator/lib/importers/PostsAuthorsImporter.js b/ghost/data-generator/lib/importers/PostsAuthorsImporter.js
index 4d714b240a2..e9672249569 100644
--- a/ghost/data-generator/lib/importers/PostsAuthorsImporter.js
+++ b/ghost/data-generator/lib/importers/PostsAuthorsImporter.js
@@ -21,7 +21,7 @@ class PostsAuthorsImporter extends TableImporter {
         const sortOrder = this.sortOrder;
         this.sortOrder = this.sortOrder + 1;
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             post_id: this.model.id,
             author_id: this.users[faker.datatype.number(this.users.length - 1)].id,
             sort_order: sortOrder
diff --git a/ghost/data-generator/lib/importers/PostsImporter.js b/ghost/data-generator/lib/importers/PostsImporter.js
index ee3500c550f..1f615a2fdc0 100644
--- a/ghost/data-generator/lib/importers/PostsImporter.js
+++ b/ghost/data-generator/lib/importers/PostsImporter.js
@@ -51,36 +51,48 @@ class PostsImporter extends TableImporter {
         const visibility = luck(85) ? 'paid' : luck(10) ? 'members' : 'public';
 
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             created_at: dateToDatabaseString(timestamp),
             created_by: '1',
             updated_at: dateToDatabaseString(timestamp),
-            published_at: status === 'published' ? dateToDatabaseString(faker.date.soon(5, timestamp)) : null,
+            published_at: status === 'published' ? dateToDatabaseString(timestamp) : status === 'scheduled' ? dateToDatabaseString(faker.date.soon(5, timestamp)) : null,
             uuid: faker.datatype.uuid(),
             title: title,
             type: this.type,
             slug: `${slugify(title)}-${faker.random.numeric(3)}`,
             status,
             visibility,
-            mobiledoc: JSON.stringify({
-                version: '0.3.1',
-                atoms: [],
-                cards: [],
-                markups: [['em']],
-                sections: content.map(paragraph => [
-                    1,
-                    'p',
-                    [
-                        [
-                            0,
-                            [],
-                            0,
-                            paragraph
-                        ]
-                    ]
-                ])
+            lexical: JSON.stringify({
+                root: {
+                    children: content.map(paragraph => (
+                        {
+                            children: [
+                                {
+                                    detail: 0,
+                                    format: 0,
+                                    mode: 'normal',
+                                    style: '',
+                                    text: paragraph,
+                                    type: 'extended-text',
+                                    version: 1
+                                }
+                            ],
+                            direction: 'ltr',
+                            format: '',
+                            indent: 0,
+                            type: 'paragraph',
+                            version: 1
+                        }
+                    )),
+                    direction: 'ltr',
+                    format: '',
+                    indent: 0,
+                    type: 'root',
+                    version: 1
+                }
             }),
             html: content.map(paragraph => `<p>${paragraph}</p>`).join(''),
+            plaintext: content.join('\n\n'),
             email_recipient_filter: 'all',
             newsletter_id: this.type === 'post' && status === 'published' && luck(90) ? (visibility === 'paid' ? this.newsletters[0].id : this.newsletters[1].id) : null
         };
diff --git a/ghost/data-generator/lib/importers/PostsProductsImporter.js b/ghost/data-generator/lib/importers/PostsProductsImporter.js
index 8a223c684c1..a5f6f2335a2 100644
--- a/ghost/data-generator/lib/importers/PostsProductsImporter.js
+++ b/ghost/data-generator/lib/importers/PostsProductsImporter.js
@@ -1,4 +1,3 @@
-const {faker} = require('@faker-js/faker');
 const TableImporter = require('./TableImporter');
 
 class PostsProductsImporter extends TableImporter {
@@ -25,7 +24,7 @@ class PostsProductsImporter extends TableImporter {
         const sortOrder = this.sortOrder;
         this.sortOrder = this.sortOrder + 1;
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             post_id: this.model.id,
             product_id: this.products[sortOrder].id,
             sort_order: this.sortOrder
diff --git a/ghost/data-generator/lib/importers/PostsTagsImporter.js b/ghost/data-generator/lib/importers/PostsTagsImporter.js
index b9fcbe3e7dc..ce2eeff9af7 100644
--- a/ghost/data-generator/lib/importers/PostsTagsImporter.js
+++ b/ghost/data-generator/lib/importers/PostsTagsImporter.js
@@ -35,7 +35,7 @@ class PostsTagsImporter extends TableImporter {
         this.notIndex.push(tagIndex);
 
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             post_id: this.model.id,
             tag_id: this.tags[tagIndex].id,
             sort_order: sortOrder
diff --git a/ghost/data-generator/lib/importers/ProductsBenefitsImporter.js b/ghost/data-generator/lib/importers/ProductsBenefitsImporter.js
index 58cff71b041..bcc1e921297 100644
--- a/ghost/data-generator/lib/importers/ProductsBenefitsImporter.js
+++ b/ghost/data-generator/lib/importers/ProductsBenefitsImporter.js
@@ -1,4 +1,3 @@
-const {faker} = require('@faker-js/faker');
 const TableImporter = require('./TableImporter');
 
 class ProductsBenefitsImporter extends TableImporter {
@@ -44,7 +43,7 @@ class ProductsBenefitsImporter extends TableImporter {
         const sortOrder = this.sortOrder;
         this.sortOrder = this.sortOrder + 1;
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             product_id: this.model.id,
             benefit_id: this.benefits[sortOrder].id,
             sort_order: sortOrder
diff --git a/ghost/data-generator/lib/importers/ProductsImporter.js b/ghost/data-generator/lib/importers/ProductsImporter.js
index 6ad6102873d..e80bae13f1f 100644
--- a/ghost/data-generator/lib/importers/ProductsImporter.js
+++ b/ghost/data-generator/lib/importers/ProductsImporter.js
@@ -14,7 +14,7 @@ class ProductsImporter extends TableImporter {
 
     async import(quantity = this.defaultQuantity) {
         // TODO: Add random products if quantity != 4
-        this.names = ['Free', 'Bronze', 'Silver', 'Gold'];
+        this.names = ['Free', 'Bronze', 'Silver', 'Gold'].reverse();
         this.count = 0;
 
         await super.import(quantity);
@@ -61,7 +61,7 @@ class ProductsImporter extends TableImporter {
     }
 
     generate() {
-        const name = this.names.shift();
+        const name = this.names.pop();
         const count = this.count;
         this.count = this.count + 1;
         const sixMonthsLater = new Date(blogStartDate);
@@ -78,7 +78,7 @@ class ProductsImporter extends TableImporter {
             tierInfo.yearly_price = count * 5000;
         }
         return Object.assign({}, {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             name: name,
             slug: `${slugify(name)}-${faker.random.numeric(3)}`,
             visibility: 'public',
diff --git a/ghost/data-generator/lib/importers/RecommendationClickEventsImporter.js b/ghost/data-generator/lib/importers/RecommendationClickEventsImporter.js
new file mode 100644
index 00000000000..0df2df5273d
--- /dev/null
+++ b/ghost/data-generator/lib/importers/RecommendationClickEventsImporter.js
@@ -0,0 +1,32 @@
+const TableImporter = require('./TableImporter');
+const {faker} = require('@faker-js/faker');
+const {luck} = require('../utils/random');
+
+class RecommendationClickEventsImporter extends TableImporter {
+    static table = 'recommendation_click_events';
+    static dependencies = ['recommendations', 'members'];
+
+    constructor(knex, transaction) {
+        super(RecommendationClickEventsImporter.table, knex, transaction);
+    }
+
+    async import(quantity) {
+        const recommendations = await this.transaction.select('id', 'created_at').from('recommendations');
+        this.members = await this.transaction.select('id').from('members').limit(500);
+
+        await this.importForEach(recommendations, quantity ? quantity / recommendations.length : () => faker.datatype.number({min: 0, max: 30}));
+    }
+
+    generate() {
+        // Not unique
+        const member = luck(30) ? null : faker.helpers.arrayElement(this.members);
+        return {
+            id: this.fastFakeObjectId(),
+            recommendation_id: this.model.id,
+            member_id: member?.id ?? null,
+            created_at: faker.date.past()
+        };
+    }
+}
+
+module.exports = RecommendationClickEventsImporter;
diff --git a/ghost/data-generator/lib/importers/RecommendationSubscribeEventsImporter.js b/ghost/data-generator/lib/importers/RecommendationSubscribeEventsImporter.js
new file mode 100644
index 00000000000..a507d259283
--- /dev/null
+++ b/ghost/data-generator/lib/importers/RecommendationSubscribeEventsImporter.js
@@ -0,0 +1,32 @@
+const TableImporter = require('./TableImporter');
+const {faker} = require('@faker-js/faker');
+const {luck} = require('../utils/random');
+
+class RecommendationSubscribeEventsImporter extends TableImporter {
+    static table = 'recommendation_subscribe_events';
+    static dependencies = ['recommendations', 'members'];
+
+    constructor(knex, transaction) {
+        super(RecommendationSubscribeEventsImporter.table, knex, transaction);
+    }
+
+    async import(quantity) {
+        const recommendations = await this.transaction.select('id', 'created_at').from('recommendations').where('one_click_subscribe', true);
+        this.members = await this.transaction.select('id').from('members').limit(500);
+
+        await this.importForEach(recommendations, quantity ? quantity / recommendations.length : () => faker.datatype.number({min: 0, max: 50}));
+    }
+
+    generate() {
+        // Not unique
+        const member = luck(1) ? null : faker.helpers.arrayElement(this.members);
+        return {
+            id: this.fastFakeObjectId(),
+            recommendation_id: this.model.id,
+            member_id: member?.id ?? null,
+            created_at: faker.date.past()
+        };
+    }
+}
+
+module.exports = RecommendationSubscribeEventsImporter;
diff --git a/ghost/data-generator/lib/importers/RecommendationsImporter.js b/ghost/data-generator/lib/importers/RecommendationsImporter.js
new file mode 100644
index 00000000000..b3a8c6ee5bb
--- /dev/null
+++ b/ghost/data-generator/lib/importers/RecommendationsImporter.js
@@ -0,0 +1,34 @@
+const TableImporter = require('./TableImporter');
+const {faker} = require('@faker-js/faker');
+
+function capitalize(str) {
+    return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+class RecommendationsImporter extends TableImporter {
+    static table = 'recommendations';
+    static dependencies = [];
+    defaultQuantity = 15;
+
+    constructor(knex, transaction) {
+        super(RecommendationsImporter.table, knex, transaction);
+    }
+
+    generate() {
+        const id = this.fastFakeObjectId();
+        return {
+            id,
+            url: faker.internet.url(),
+            title: capitalize(`${faker.word.adjective()} ${faker.word.noun()}`),
+            excerpt: faker.lorem.sentence(),
+            featured_image: `https://api.dicebear.com/5.x/shapes/png?size=256&seed=${id}`,
+            favicon: `https://api.dicebear.com/5.x/shapes/png?size=32&seed=${id}`,
+            description: faker.lorem.sentence(),
+            one_click_subscribe: faker.datatype.boolean(),
+            created_at: faker.date.past(),
+            updated_at: faker.date.past()
+        };
+    }
+}
+
+module.exports = RecommendationsImporter;
diff --git a/ghost/data-generator/lib/importers/RedirectsImporter.js b/ghost/data-generator/lib/importers/RedirectsImporter.js
index 5034bdf9f1f..c61b21b7e4a 100644
--- a/ghost/data-generator/lib/importers/RedirectsImporter.js
+++ b/ghost/data-generator/lib/importers/RedirectsImporter.js
@@ -36,8 +36,8 @@ class RedirectsImporter extends TableImporter {
         }
         this.amount -= 1;
         return {
-            id: faker.database.mongodbObjectId(),
-            from: `/r/${faker.datatype.hexadecimal({length: 32, prefix: '', case: 'lower'})}`,
+            id: this.fastFakeObjectId(),
+            from: `/r/${faker.datatype.hexadecimal({length: 8, prefix: '', case: 'lower'})}`,
             to: `${faker.internet.url()}/${faker.helpers.slugify(`${faker.word.adjective()} ${faker.word.noun()}`).toLowerCase()}`,
             post_id: this.model.id,
             created_at: this.model.published_at,
diff --git a/ghost/data-generator/lib/importers/RolesUsersImporter.js b/ghost/data-generator/lib/importers/RolesUsersImporter.js
index 4c830cdf67a..98c8ad14c6b 100644
--- a/ghost/data-generator/lib/importers/RolesUsersImporter.js
+++ b/ghost/data-generator/lib/importers/RolesUsersImporter.js
@@ -32,7 +32,7 @@ class RolesUsersImporter extends TableImporter {
             return;
         }
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             role_id: actualRole.id,
             user_id: this.model.id
         };
diff --git a/ghost/data-generator/lib/importers/StripePricesImporter.js b/ghost/data-generator/lib/importers/StripePricesImporter.js
index 287531b395d..2765ec5cbf2 100644
--- a/ghost/data-generator/lib/importers/StripePricesImporter.js
+++ b/ghost/data-generator/lib/importers/StripePricesImporter.js
@@ -54,7 +54,7 @@ class StripePricesImporter extends TableImporter {
         }
 
         return Object.assign({}, {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             stripe_price_id: faker.datatype.hexadecimal({
                 length: 64,
                 prefix: ''
diff --git a/ghost/data-generator/lib/importers/StripeProductsImporter.js b/ghost/data-generator/lib/importers/StripeProductsImporter.js
index 952336bf1d0..b93882316b1 100644
--- a/ghost/data-generator/lib/importers/StripeProductsImporter.js
+++ b/ghost/data-generator/lib/importers/StripeProductsImporter.js
@@ -20,7 +20,7 @@ class StripeProductsImporter extends TableImporter {
 
     generate() {
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             product_id: this.model.id,
             stripe_product_id: faker.datatype.hexadecimal({
                 length: 64,
diff --git a/ghost/data-generator/lib/importers/SubscriptionsImporter.js b/ghost/data-generator/lib/importers/SubscriptionsImporter.js
deleted file mode 100644
index 2172fc08333..00000000000
--- a/ghost/data-generator/lib/importers/SubscriptionsImporter.js
+++ /dev/null
@@ -1,70 +0,0 @@
-const {faker} = require('@faker-js/faker');
-const generateEvents = require('../utils/event-generator');
-const TableImporter = require('./TableImporter');
-const dateToDatabaseString = require('../utils/database-date');
-
-class SubscriptionsImporter extends TableImporter {
-    static table = 'subscriptions';
-    static dependencies = ['members', 'members_products', 'stripe_products', 'stripe_prices'];
-
-    constructor(knex, transaction) {
-        super(SubscriptionsImporter.table, knex, transaction);
-    }
-
-    async import() {
-        const membersProducts = await this.transaction.select('member_id', 'product_id').from('members_products');
-        this.members = await this.transaction.select('id', 'status', 'created_at').from('members');
-        this.stripeProducts = await this.transaction.select('product_id', 'stripe_product_id').from('stripe_products');
-        this.stripePrices = await this.transaction.select('stripe_product_id', 'currency', 'amount', 'interval').from('stripe_prices');
-        await this.importForEach(membersProducts, 1);
-    }
-
-    generate() {
-        const member = this.members.find(m => m.id === this.model.member_id);
-        const status = member.status;
-        const billingInfo = {};
-        const isMonthly = faker.datatype.boolean();
-        if (status === 'paid') {
-            const stripeProduct = this.stripeProducts.find(product => product.product_id === this.model.product_id);
-            const stripePrice = this.stripePrices.find((price) => {
-                return price.stripe_product_id === stripeProduct.stripe_product_id &&
-                    (isMonthly ? price.interval === 'month' : price.interval === 'year');
-            });
-
-            billingInfo.cadence = isMonthly ? 'month' : 'year';
-            billingInfo.currency = stripePrice.currency;
-            billingInfo.amount = stripePrice.amount;
-        }
-        const [startDate] = generateEvents({
-            total: 1,
-            trend: 'negative',
-            startTime: new Date(member.created_at),
-            endTime: new Date(),
-            shape: 'ease-out'
-        });
-        const endDate = new Date(startDate);
-        if (isMonthly) {
-            endDate.setMonth(new Date().getMonth());
-            if (endDate < new Date()) {
-                endDate.setMonth(endDate.getMonth() + 1);
-            }
-        } else {
-            endDate.setFullYear(new Date().getFullYear());
-            if (endDate < new Date()) {
-                endDate.setFullYear(endDate.getFullYear() + 1);
-            }
-        }
-        return Object.assign({}, {
-            id: faker.database.mongodbObjectId(),
-            type: status,
-            status: 'active',
-            member_id: this.model.member_id,
-            tier_id: this.model.product_id,
-            payment_provider: 'stripe',
-            expires_at: dateToDatabaseString(endDate),
-            created_at: dateToDatabaseString(startDate)
-        }, billingInfo);
-    }
-}
-
-module.exports = SubscriptionsImporter;
diff --git a/ghost/data-generator/lib/importers/TableImporter.js b/ghost/data-generator/lib/importers/TableImporter.js
index 04f1ac5a561..cab459d7ba9 100644
--- a/ghost/data-generator/lib/importers/TableImporter.js
+++ b/ghost/data-generator/lib/importers/TableImporter.js
@@ -1,3 +1,14 @@
+const debug = require('@tryghost/debug')('TableImporter');
+const dateToDatabaseString = require('../utils/database-date');
+const path = require('path');
+const createCsvWriter = require('csv-writer').createObjectCsvWriter;
+const fs = require('fs');
+const {luck} = require('../utils/random');
+const os = require('os');
+const crypto = require('crypto');
+const logging = require('@tryghost/logging');
+const errors = require('@tryghost/errors');
+
 class TableImporter {
     /**
      * @type {object|undefined} model Referenced model when generating data
@@ -21,27 +32,32 @@ class TableImporter {
         this.transaction = transaction;
     }
 
-    async import(amount = this.defaultQuantity) {
-        const batchSize = 500;
-        let batch = [];
+    fastFakeObjectId() {
+        // It is important that IDs are generated for a timestamp < NOW (for email batch sending) and that
+        // generating the ids is fast.
+        return `00000000` + crypto.randomBytes(8).toString('hex');
+    }
+
+    async #generateData(amount = this.defaultQuantity) {
+        let data = [];
 
         for (let i = 0; i < amount; i++) {
             const model = await this.generate();
             if (model) {
-                batch.push(model);
-            } else {
-                // After first null assume that there is no more data
-                break;
-            }
-            if (batch.length === batchSize) {
-                await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
-                batch = [];
+                data.push(model);
             }
         }
 
-        // Process final batch
-        if (batch.length > 0) {
-            await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
+        return data;
+    }
+
+    async import(amount = this.defaultQuantity) {
+        const generateNow = Date.now();
+        const data = await this.#generateData(amount);
+        debug(`${this.name} generated ${data.length} records in ${Date.now() - generateNow}ms`);
+
+        if (data.length > 0) {
+            await this.batchInsert(data);
         }
     }
 
@@ -50,34 +66,97 @@ class TableImporter {
      * @param {Number|function} amount Number of records to import per model
      */
     async importForEach(models = [], amount) {
-        const batchSize = 500;
-        let batch = [];
+        const data = [];
+
+        debug (`Generating data for ${models.length} models x ${amount} for ${this.name}`);
+        const now = Date.now();
+        let settingReferenceModel = 0;
 
         for (const model of models) {
+            let s = Date.now();
             this.setReferencedModel(model);
+            settingReferenceModel += Date.now() - s;
+
             let currentAmount = (typeof amount === 'function') ? amount() : amount;
             if (!Number.isInteger(currentAmount)) {
-                currentAmount = Math.floor(currentAmount) + ((Math.random() < currentAmount % 1) ? 1 : 0);
+                currentAmount = Math.floor(currentAmount) + luck((currentAmount % 1) * 100);
+            }
+
+            const generatedData = await this.#generateData(currentAmount);
+            if (generatedData.length > 0) {
+                data.push(...generatedData);
+            }
+        }
+
+        debug(`${this.name} generated ${data.length} records in ${Date.now() - now}ms (${settingReferenceModel}ms setting reference model)`);
+
+        if (data.length > 0) {
+            await this.batchInsert(data);
+        }
+    }
+
+    async batchInsert(data) {
+        // Write to CSV file
+        const rootFolder = os.tmpdir();
+        const filePath = path.join(rootFolder, `${this.name}.csv`);
+        let now = Date.now();
+
+        if (data.length > 5000 && !process.env.DISABLE_FAST_IMPORT) {
+            try {
+                await fs.promises.unlink(filePath);
+            } catch (e) {
+                // Ignore: file doesn't exist
             }
-            for (let i = 0; i < currentAmount; i++) {
-                const data = await this.generate();
-                if (data) {
-                    batch.push(data);
-                } else {
-                    // After first null assume that there is no more data for this model
-                    break;
+
+            const csvWriter = createCsvWriter({
+                path: filePath,
+                header: Object.keys(data[0]).map((key) => {
+                    return {id: key, title: key};
+                })
+            });
+
+            // Loop the data in chunks of 50.000 items
+            const batchSize = 50000;
+
+            // Otherwise we get a out of range error because csvWriter tries to create a string that is too long
+            for (let i = 0; i < data.length; i += batchSize) {
+                const slicedData = data.slice(i, i + batchSize);
+
+                // Map data to what MySQL expects in the CSV for values like booleans, null and dates
+                for (let j = 0; j < slicedData.length; j++) {
+                    const obj = slicedData[j];
+
+                    for (const [key, value] of Object.entries(obj)) {
+                        if (typeof value === 'boolean') {
+                            obj[key] = value ? 1 : 0;
+                        } else if (value instanceof Date) {
+                            obj[key] = dateToDatabaseString(value);
+                        } else if (value === null) {
+                            obj[key] = '\\N';
+                        }
+                    }
                 }
-                if (batch.length === batchSize) {
-                    await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
-                    batch = [];
+                await csvWriter.writeRecords(slicedData);
+            }
+
+            debug(`${this.name} saved CSV import file in ${Date.now() - now}ms`);
+            now = Date.now();
+
+            // Import from CSV file
+            const [result] = await this.transaction.raw(`LOAD DATA LOCAL INFILE '${filePath}' INTO TABLE \`${this.name}\` FIELDS TERMINATED BY ',' ENCLOSED BY '"' IGNORE 1 LINES (${Object.keys(data[0]).map(d => '`' + d + '`').join(',')});`);
+            if (result.affectedRows !== data.length) {
+                if (Math.abs(result.affectedRows - data.length) > 0.01 * data.length) {
+                    throw new errors.InternalServerError({
+                        message: `CSV import failed: expected ${data.length} imported rows, got ${result.affectedRows}`
+                    });
                 }
+                logging.warn(`CSV import warning: expected ${data.length} imported rows, got ${result.affectedRows}.`);
             }
+        } else {
+            await this.knex.batchInsert(this.name, data).transacting(this.transaction);
         }
 
-        // Process final batch
-        if (batch.length > 0) {
-            await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
-        }
+        debug(`${this.name} imported ${data.length} records in ${Date.now() - now}ms`);
     }
 
     /**
diff --git a/ghost/data-generator/lib/importers/TagsImporter.js b/ghost/data-generator/lib/importers/TagsImporter.js
index 812afd62a10..85b9c21cd3a 100644
--- a/ghost/data-generator/lib/importers/TagsImporter.js
+++ b/ghost/data-generator/lib/importers/TagsImporter.js
@@ -28,7 +28,7 @@ class TagsImporter extends TableImporter {
         const twoYearsAgo = new Date();
         twoYearsAgo.setFullYear(twoYearsAgo.getFullYear() - 2);
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             name: name,
             slug: `${slugify(name)}-${faker.random.numeric(3)}`,
             description: faker.lorem.sentence(),
diff --git a/ghost/data-generator/lib/importers/UsersImporter.js b/ghost/data-generator/lib/importers/UsersImporter.js
index abbe1055c58..6327af14c55 100644
--- a/ghost/data-generator/lib/importers/UsersImporter.js
+++ b/ghost/data-generator/lib/importers/UsersImporter.js
@@ -16,7 +16,7 @@ class UsersImporter extends TableImporter {
     async generate() {
         const name = `${faker.name.firstName()} ${faker.name.lastName()}`;
         return {
-            id: faker.database.mongodbObjectId(),
+            id: this.fastFakeObjectId(),
             name: name,
             slug: slugify(name),
             password: await security.password.hash(faker.color.human()),
diff --git a/ghost/data-generator/lib/importers/WebMentionsImporter.js b/ghost/data-generator/lib/importers/WebMentionsImporter.js
index 4ca62e91bd8..fa9a13c47fa 100644
--- a/ghost/data-generator/lib/importers/WebMentionsImporter.js
+++ b/ghost/data-generator/lib/importers/WebMentionsImporter.js
@@ -1,12 +1,11 @@
 const TableImporter = require('./TableImporter');
 const {faker} = require('@faker-js/faker');
-const generateEvents = require('../utils/event-generator');
-const {luck} = require('../utils/random');
 const dateToDatabaseString = require('../utils/database-date');
 
 class WebMentionsImporter extends TableImporter {
     static table = 'mentions';
-    static dependencies = ['posts'];
+    static dependencies = [];
+    defaultQuantity = 23;
 
     constructor(knex, transaction, {baseUrl}) {
         super(WebMentionsImporter.table, knex, transaction);
@@ -14,73 +13,28 @@ class WebMentionsImporter extends TableImporter {
         this.baseUrl = baseUrl;
     }
 
-    async import(quantity) {
-        const posts = await this.transaction.select('id', 'slug', 'published_at').from('posts').where('type', 'post');
-
-        this.quantity = quantity ? quantity / posts.length : 4;
-        await this.importForEach(posts, this.quantity);
-    }
-
-    setReferencedModel(model) {
-        this.model = model;
-
-        // Most web mentions published soon after publication date
-        const startDate = new Date(this.model.published_at);
-        // End date should be either 1 year after post is published, or current date, whichever is first
-        const endDate = new Date(Math.min(new Date().valueOf(), new Date(startDate).setFullYear(startDate.getFullYear() + 1)));
-        this.timestamps = generateEvents({
-            shape: 'ease-out',
-            trend: 'negative',
-            total: this.quantity,
-            startTime: startDate,
-            endTime: endDate
-        }).sort();
-    }
-
     generate() {
-        if (luck(50)) {
-            // 50% chance of 1 mention, 25% chance of 2 mentions, etc.
-            return null;
-        }
-
-        const id = faker.database.mongodbObjectId();
-        const timestamp = this.timestamps.shift();
+        const id = this.fastFakeObjectId();
 
         const author = `${faker.name.fullName()}`;
-        /**
-        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
-        source: {type: 'string', maxlength: 2000, nullable: false},
-        source_title: {type: 'string', maxlength: 2000, nullable: true},
-        source_site_title: {type: 'string', maxlength: 2000, nullable: true},
-        source_excerpt: {type: 'string', maxlength: 2000, nullable: true},
-        source_author: {type: 'string', maxlength: 2000, nullable: true},
-        source_featured_image: {type: 'string', maxlength: 2000, nullable: true},
-        source_favicon: {type: 'string', maxlength: 2000, nullable: true},
-        target: {type: 'string', maxlength: 2000, nullable: false},
-        resource_id: {type: 'string', maxlength: 24, nullable: true},
-        resource_type: {type: 'string', maxlength: 50, nullable: true},
-        created_at: {type: 'dateTime', nullable: false},
-        payload: {type: 'text', maxlength: 65535, nullable: true},
-        deleted: {type: 'boolean', nullable: false, defaultTo: false},
-        verified: {type: 'boolean', nullable: false, defaultTo: false}
-         */
+
+        // Generating only incoming recommendations for now, since we don't use webmentions for other things atm
         return {
             id,
-            source: `${faker.internet.url()}/${faker.helpers.slugify(`${faker.word.adjective()} ${faker.word.noun()}`).toLowerCase()}`,
+            source: `${faker.internet.url()}/.well-known/recommendations.json`,
             source_title: faker.lorem.sentence(5),
             source_site_title: `${author}'s ${faker.word.noun()}`,
             source_excerpt: faker.lorem.paragraph(),
             source_author: author,
             source_featured_image: `https://api.dicebear.com/5.x/shapes/png?size=256&seed=${id}`,
             source_favicon: `https://api.dicebear.com/5.x/bottts/png?size=32&seed=${id}`,
-            target: `${this.baseUrl}${this.model.slug}/`,
-            resource_id: this.model.id,
-            resource_type: 'post', // TODO: Randomise resource type - should also include pages
-            created_at: dateToDatabaseString(timestamp),
-            payload: JSON.stringify({
-                // TODO: Add some random payload
-            }),
-            deleted: Math.floor(Math.random() * 2) ? true : false
+            target: `${this.baseUrl}`,
+            resource_id: null,
+            resource_type: null,
+            created_at: dateToDatabaseString(faker.date.past()),
+            payload: JSON.stringify({}),
+            deleted: 0,
+            verified: 1
         };
     }
 }
diff --git a/ghost/data-generator/lib/importers/index.js b/ghost/data-generator/lib/importers/index.js
index 4ccbfc32ea4..efe2d9d4667 100644
--- a/ghost/data-generator/lib/importers/index.js
+++ b/ghost/data-generator/lib/importers/index.js
@@ -15,10 +15,10 @@ module.exports = [
     require('./MembersNewslettersImporter'),
     require('./StripeProductsImporter'),
     require('./StripePricesImporter'),
-    require('./SubscriptionsImporter'),
     require('./EmailsImporter'),
     require('./EmailBatchesImporter'),
     require('./EmailRecipientsImporter'),
+    require('./EmailRecipientFailuresImporter'),
     require('./RedirectsImporter'),
     require('./MembersClickEventsImporter'),
     require('./OffersImporter'),
@@ -33,5 +33,9 @@ module.exports = [
     require('./LabelsImporter'),
     require('./MembersLabelsImporter'),
     require('./RolesUsersImporter'),
-    require('./MembersFeedbackImporter')
+    require('./MembersFeedbackImporter'),
+    require('./RecommendationsImporter'),
+    require('./RecommendationClickEventsImporter'),
+    require('./RecommendationSubscribeEventsImporter'),
+    require('./CommentsImporter')
 ];
diff --git a/ghost/data-generator/lib/utils/JsonImporter.js b/ghost/data-generator/lib/utils/JsonImporter.js
index ed5f8bd97a7..d3ee30bece1 100644
--- a/ghost/data-generator/lib/utils/JsonImporter.js
+++ b/ghost/data-generator/lib/utils/JsonImporter.js
@@ -1,7 +1,8 @@
-const {faker} = require('@faker-js/faker');
+const TableImporter = require('../importers/TableImporter');
 
-class JsonImporter {
+class JsonImporter extends TableImporter {
     constructor(knex, transaction) {
+        super();
         this.knex = knex;
         this.transaction = transaction;
     }
@@ -25,7 +26,7 @@ class JsonImporter {
     }) {
         for (const obj of data) {
             if (!('id' in obj)) {
-                obj.id = faker.database.mongodbObjectId();
+                obj.id = this.fastFakeObjectId();
             }
         }
         if (rows.findIndex(row => row === 'id') === -1) {
diff --git a/ghost/data-generator/lib/utils/database-date.js b/ghost/data-generator/lib/utils/database-date.js
index 3d8034c0a3c..01da9ee611d 100644
--- a/ghost/data-generator/lib/utils/database-date.js
+++ b/ghost/data-generator/lib/utils/database-date.js
@@ -1,3 +1,7 @@
 module.exports = function dateToDatabaseString(date) {
+    if (typeof date === 'string') {
+        // SQLite fix when reusing other dates from the db
+        return date;
+    }
     return date.toISOString().replace('Z','').replace('T', ' ');
 };
diff --git a/ghost/data-generator/lib/utils/event-generator.js b/ghost/data-generator/lib/utils/event-generator.js
index d72597004da..8f1e480802c 100644
--- a/ghost/data-generator/lib/utils/event-generator.js
+++ b/ghost/data-generator/lib/utils/event-generator.js
@@ -7,6 +7,10 @@ const generateEvents = ({
     startTime = new Date(),
     endTime = new Date()
 } = {}) => {
+    if (total <= 0) {
+        return [];
+    }
+
     let alpha = 0;
     let beta = 0;
     let positiveTrend = trend === 'positive';
@@ -29,6 +33,7 @@ const generateEvents = ({
         beta = 1;
         break;
     }
+
     const data = probabilityDistributions.rbeta(total, alpha, beta, 0);
     const startTimeValue = startTime.valueOf();
     const timeDifference = endTime.valueOf() - startTimeValue;
diff --git a/ghost/data-generator/package.json b/ghost/data-generator/package.json
index 810ed13eeb8..97deb478a27 100644
--- a/ghost/data-generator/package.json
+++ b/ghost/data-generator/package.json
@@ -18,6 +18,7 @@
     "lib"
   ],
   "devDependencies": {
+    "@tryghost/debug": "0.1.32",
     "c8": "8.0.1",
     "knex": "2.4.2",
     "mocha": "10.2.0",
@@ -26,8 +27,9 @@
   },
   "dependencies": {
     "@faker-js/faker": "7.6.0",
-    "@tryghost/root-utils": "0.3.22",
-    "@tryghost/string": "0.2.4",
+    "@tryghost/root-utils": "0.3.30",
+    "@tryghost/string": "0.2.12",
+    "csv-writer": "1.6.0",
     "probability-distributions": "0.9.1"
   }
 }
diff --git a/ghost/data-generator/test/data-generator.test.js b/ghost/data-generator/test/data-generator.test.js
index a947969437c..e70b17a33e7 100644
--- a/ghost/data-generator/test/data-generator.test.js
+++ b/ghost/data-generator/test/data-generator.test.js
@@ -13,6 +13,8 @@ const DataGenerator = require('../index');
 
 const schema = require('../../core/core/server/data/schema');
 
+const schemaTables = schema.tables;
+
 describe('Data Generator', function () {
     let db;
 
@@ -76,7 +78,8 @@ describe('Data Generator', function () {
         const dataGenerator = new DataGenerator({
             eventsOnly: false,
             knex: db,
-            schema: schema,
+            schema,
+            schemaTables,
             logger: {
                 info: () => { },
                 ok: () => { }
diff --git a/ghost/domain-events/package.json b/ghost/domain-events/package.json
index 996321ebb99..70be7359d40 100644
--- a/ghost/domain-events/package.json
+++ b/ghost/domain-events/package.json
@@ -19,7 +19,7 @@
     "lib"
   ],
   "devDependencies": {
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/logging": "2.4.18",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "should": "13.2.3"
diff --git a/ghost/donations/package.json b/ghost/donations/package.json
index e65081381aa..df3eb7d6815 100644
--- a/ghost/donations/package.json
+++ b/ghost/donations/package.json
@@ -8,8 +8,8 @@
   "types": "build/index.d.ts",
   "scripts": {
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
-    "build": "tsc",
-    "build:ts": "yarn build",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
     "prepare": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
@@ -25,8 +25,8 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0",
-    "ts-node": "10.9.1",
-    "typescript": "5.2.2"
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5"
   },
   "dependencies": {}
 }
diff --git a/ghost/donations/src/DonationBookshelfRepository.ts b/ghost/donations/src/DonationBookshelfRepository.ts
index d56c32e04a6..3d1fddab0b7 100644
--- a/ghost/donations/src/DonationBookshelfRepository.ts
+++ b/ghost/donations/src/DonationBookshelfRepository.ts
@@ -12,6 +12,7 @@ type DonationEventModelInstance = BookshelfModelInstance & {
     member_id: string | null;
     amount: number;
     currency: string;
+    donation_message: string | null;
 
     attribution_id: string | null;
     attribution_url: string | null;
@@ -36,6 +37,7 @@ export class DonationBookshelfRepository implements DonationRepository {
             member_id: event.memberId,
             amount: event.amount,
             currency: event.currency,
+            donation_message: event.donationMessage,
 
             attribution_id: event.attributionId,
             attribution_url: event.attributionUrl,
diff --git a/ghost/donations/src/DonationPaymentEvent.ts b/ghost/donations/src/DonationPaymentEvent.ts
index 1202744ccdd..0a3523b2e1e 100644
--- a/ghost/donations/src/DonationPaymentEvent.ts
+++ b/ghost/donations/src/DonationPaymentEvent.ts
@@ -5,6 +5,7 @@ export class DonationPaymentEvent {
     memberId: string | null;
     amount: number;
     currency: string;
+    donationMessage: string | null;
 
     attributionId: string | null;
     attributionUrl: string | null;
@@ -21,6 +22,7 @@ export class DonationPaymentEvent {
         this.memberId = data.memberId;
         this.amount = data.amount;
         this.currency = data.currency;
+        this.donationMessage = data.donationMessage;
 
         this.attributionId = data.attributionId;
         this.attributionUrl = data.attributionUrl;
diff --git a/ghost/email-addresses/.eslintrc.js b/ghost/email-addresses/.eslintrc.js
new file mode 100644
index 00000000000..cb690be63fa
--- /dev/null
+++ b/ghost/email-addresses/.eslintrc.js
@@ -0,0 +1,6 @@
+module.exports = {
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/ts'
+    ]
+};
diff --git a/ghost/email-addresses/README.md b/ghost/email-addresses/README.md
new file mode 100644
index 00000000000..c60312a3e21
--- /dev/null
+++ b/ghost/email-addresses/README.md
@@ -0,0 +1,21 @@
+# Email addresses
+
+
+## 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/ghost/email-addresses/package.json b/ghost/email-addresses/package.json
new file mode 100644
index 00000000000..5710e1be7db
--- /dev/null
+++ b/ghost/email-addresses/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "@tryghost/email-addresses",
+  "version": "0.0.0",
+  "repository": "https://github.com/TryGhost/Ghost/tree/main/packages/email-addresses",
+  "author": "Ghost Foundation",
+  "private": true,
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
+  "scripts": {
+    "dev": "tsc --watch --preserveWatchOutput --sourceMap",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
+    "prepare": "tsc",
+    "test:unit": "NODE_ENV=testing c8 --src src --all --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
+    "test": "yarn test:types && yarn test:unit",
+    "test:types": "tsc --noEmit",
+    "lint:code": "eslint src/ --ext .ts --cache",
+    "lint": "yarn lint:code && yarn lint:test",
+    "lint:test": "eslint -c test/.eslintrc.js test/ --ext .ts --cache"
+  },
+  "files": [
+    "build"
+  ],
+  "devDependencies": {
+    "c8": "8.0.1",
+    "mocha": "10.2.0",
+    "sinon": "15.2.0",
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5"
+  },
+  "dependencies": {
+    "nodemailer": "6.9.15"
+  }
+}
diff --git a/ghost/email-addresses/src/EmailAddressParser.ts b/ghost/email-addresses/src/EmailAddressParser.ts
new file mode 100644
index 00000000000..b9fdd63d7fa
--- /dev/null
+++ b/ghost/email-addresses/src/EmailAddressParser.ts
@@ -0,0 +1,41 @@
+import addressparser from 'nodemailer/lib/addressparser';
+
+export type EmailAddress = {
+    address: string,
+    name?: string
+}
+
+export class EmailAddressParser {
+    static parse(email: string) : EmailAddress|null {
+        if (!email || typeof email !== 'string' || !email.length) {
+            return null;
+        }
+
+        const parsed = addressparser(email);
+
+        if (parsed.length !== 1) {
+            return null;
+        }
+        const first = parsed[0];
+
+        // Check first has a group property
+        if ('group' in first) {
+            // Unsupported format
+            return null;
+        }
+
+        return {
+            address: first.address,
+            name: first.name || undefined
+        };
+    }
+
+    static stringify(email: EmailAddress) : string {
+        if (!email.name) {
+            return email.address;
+        }
+
+        const escapedName = email.name.replace(/"/g, '\\"');
+        return `"${escapedName}" <${email.address}>`;
+    }
+}
diff --git a/ghost/email-addresses/src/EmailAddressService.ts b/ghost/email-addresses/src/EmailAddressService.ts
new file mode 100644
index 00000000000..0d0d2d92599
--- /dev/null
+++ b/ghost/email-addresses/src/EmailAddressService.ts
@@ -0,0 +1,186 @@
+import logging from '@tryghost/logging';
+import {EmailAddress, EmailAddressParser} from './EmailAddressParser';
+
+export type EmailAddresses = {
+    from: EmailAddress,
+    replyTo?: EmailAddress
+}
+
+export type EmailAddressesValidation = {
+    allowed: boolean,
+    verificationEmailRequired: boolean,
+    reason?: string
+}
+
+export type EmailAddressType = 'from' | 'replyTo';
+
+type LabsService = {
+    isSet: (flag: string) => boolean
+}
+
+export class EmailAddressService {
+    #getManagedEmailEnabled: () => boolean;
+    #getSendingDomain: () => string | null;
+    #getDefaultEmail: () => EmailAddress;
+    #isValidEmailAddress: (email: string) => boolean;
+    #labs: LabsService;
+
+    constructor(dependencies: {
+        getManagedEmailEnabled: () => boolean,
+        getSendingDomain: () => string | null,
+        getDefaultEmail: () => EmailAddress,
+        isValidEmailAddress: (email: string) => boolean,
+        labs: LabsService
+
+    }) {
+        this.#getManagedEmailEnabled = dependencies.getManagedEmailEnabled;
+        this.#getSendingDomain = dependencies.getSendingDomain;
+        this.#getDefaultEmail = dependencies.getDefaultEmail;
+        this.#isValidEmailAddress = dependencies.isValidEmailAddress;
+        this.#labs = dependencies.labs;
+    }
+
+    get sendingDomain(): string | null {
+        return this.#getSendingDomain();
+    }
+
+    get managedEmailEnabled(): boolean {
+        return this.#getManagedEmailEnabled();
+    }
+
+    get useNewEmailAddresses() {
+        return this.managedEmailEnabled || this.#labs.isSet('newEmailAddresses');
+    }
+
+    get defaultFromEmail(): EmailAddress {
+        return this.#getDefaultEmail();
+    }
+
+    getAddressFromString(from: string, replyTo?: string): EmailAddresses {
+        const parsedFrom = EmailAddressParser.parse(from);
+        const parsedReplyTo = replyTo ? EmailAddressParser.parse(replyTo) : undefined;
+
+        return this.getAddress({
+            from: parsedFrom ?? this.defaultFromEmail,
+            replyTo: parsedReplyTo ?? undefined
+        });
+    }
+
+    /**
+     * When sending an email, we should always ensure DMARC alignment.
+     * Because of that, we restrict which email addresses we send from. All emails should be either
+     * send from a configured domain (hostSettings.managedEmail.sendingDomains), or from the configured email address (mail.from).
+     *
+     * If we send an email from an email address that doesn't pass, we'll just default to the default email address,
+     * and instead add a replyTo email address from the requested from address.
+     */
+    getAddress(preferred: EmailAddresses): EmailAddresses {
+        if (preferred.replyTo && !this.#isValidEmailAddress(preferred.replyTo.address)) {
+            // Remove invalid replyTo addresses
+            logging.error(`[EmailAddresses] Invalid replyTo address: ${preferred.replyTo.address}`);
+            preferred.replyTo = undefined;
+        }
+
+        // Validate the from address
+        if (!this.#isValidEmailAddress(preferred.from.address)) {
+            // Never allow an invalid email address
+            return {
+                from: this.defaultFromEmail,
+                replyTo: preferred.replyTo || undefined
+            };
+        }
+
+        if (!this.managedEmailEnabled) {
+            // Self hoster or legacy Ghost Pro
+            return preferred;
+        }
+
+        // Case: always allow the default from address
+        if (preferred.from.address === this.defaultFromEmail.address) {
+            if (!preferred.from.name) {
+                // Use the default sender name if it is missing
+                preferred.from.name = this.defaultFromEmail.name;
+            }
+
+            return preferred;
+        }
+
+        if (this.sendingDomain) {
+            // Check if FROM address is from the sending domain
+            if (preferred.from.address.endsWith(`@${this.sendingDomain}`)) {
+                return preferred;
+            }
+
+            // Invalid configuration: don't allow to send from this sending domain
+            logging.error(`[EmailAddresses] Invalid configuration: cannot send emails from ${preferred.from.address} when sending domain is ${this.sendingDomain}`);
+        }
+
+        // Only allow to send from the configured from address
+        const address = {
+            from: this.defaultFromEmail,
+            replyTo: preferred.replyTo || preferred.from
+        };
+
+        // Do allow to change the sender name if requested
+        if (preferred.from.name) {
+            address.from.name = preferred.from.name;
+        }
+
+        if (address.replyTo.address === address.from.address) {
+            return {
+                from: address.from
+            };
+        }
+
+        return address;
+    }
+
+    /**
+     * When changing any from or reply to addresses in the system, we need to validate them
+     */
+    validate(email: string, type: EmailAddressType): EmailAddressesValidation {
+        if (!this.#isValidEmailAddress(email)) {
+            // Never allow an invalid email address
+            return {
+                allowed: email === this.defaultFromEmail.address, // Localhost email noreply@127.0.0.1 is marked as invalid, but we should allow it
+                verificationEmailRequired: false,
+                reason: 'invalid'
+            };
+        }
+
+        if (!this.managedEmailEnabled) {
+            // Self hoster or legacy Ghost Pro
+            return {
+                allowed: true,
+                verificationEmailRequired: !this.useNewEmailAddresses // Self hosters don't need to verify email addresses
+            };
+        }
+
+        if (this.sendingDomain) {
+            // Only allow it if it ends with the sending domain
+            if (email.endsWith(`@${this.sendingDomain}`)) {
+                return {
+                    allowed: true,
+                    verificationEmailRequired: false
+                };
+            }
+
+            // Use same restrictions as one without a sending domain for other addresses
+        }
+
+        // Only allow to edit the replyTo address, with verification
+        if (type === 'replyTo') {
+            return {
+                allowed: true,
+                verificationEmailRequired: email !== this.defaultFromEmail.address
+            };
+        }
+
+        // Not allowed to change from
+        return {
+            allowed: email === this.defaultFromEmail.address,
+            verificationEmailRequired: false,
+            reason: 'not allowed'
+        };
+    }
+}
diff --git a/ghost/email-addresses/src/index.ts b/ghost/email-addresses/src/index.ts
new file mode 100644
index 00000000000..5163235bb04
--- /dev/null
+++ b/ghost/email-addresses/src/index.ts
@@ -0,0 +1,2 @@
+export * from './EmailAddressService';
+export * from './EmailAddressParser';
diff --git a/ghost/email-addresses/src/libraries.d.ts b/ghost/email-addresses/src/libraries.d.ts
new file mode 100644
index 00000000000..30ebbde8f2c
--- /dev/null
+++ b/ghost/email-addresses/src/libraries.d.ts
@@ -0,0 +1,3 @@
+declare module '@tryghost/errors';
+declare module '@tryghost/tpl';
+declare module '@tryghost/logging';
diff --git a/ghost/email-addresses/test/.eslintrc.js b/ghost/email-addresses/test/.eslintrc.js
new file mode 100644
index 00000000000..6fe6dc1504a
--- /dev/null
+++ b/ghost/email-addresses/test/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+    parser: '@typescript-eslint/parser',
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/test'
+    ]
+};
diff --git a/ghost/email-addresses/test/hello.test.ts b/ghost/email-addresses/test/hello.test.ts
new file mode 100644
index 00000000000..e66b88fad49
--- /dev/null
+++ b/ghost/email-addresses/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/ghost/email-addresses/tsconfig.json b/ghost/email-addresses/tsconfig.json
new file mode 100644
index 00000000000..7f7ed386648
--- /dev/null
+++ b/ghost/email-addresses/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.json",
+  "include": [
+    "src/**/*"
+  ],
+  "compilerOptions": {
+    "outDir": "build"
+  }
+}
diff --git a/ghost/email-analytics-service/package.json b/ghost/email-analytics-service/package.json
index 7207e9a5478..473c67fad30 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.32",
     "lodash": "4.17.21"
   }
 }
diff --git a/ghost/email-content-generator/lib/EmailContentGenerator.js b/ghost/email-content-generator/lib/EmailContentGenerator.js
index 7edbb439530..92480ab754c 100644
--- a/ghost/email-content-generator/lib/EmailContentGenerator.js
+++ b/ghost/email-content-generator/lib/EmailContentGenerator.js
@@ -1,7 +1,6 @@
 const _ = require('lodash').runInContext();
 const fs = require('fs-extra');
 const path = require('path');
-const htmlToText = require('html-to-text');
 
 _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
 
@@ -41,7 +40,8 @@ class EmailContentGenerator {
         const compiled = _.template(content);
         const htmlContent = compiled(data);
 
-        // generate a plain-text version of the same email
+        // lazyload the lib, and generate a plain-text version of the same email
+        const htmlToText = require('html-to-text');
         const textContent = htmlToText.fromString(htmlContent);
 
         return {
diff --git a/ghost/email-content-generator/package.json b/ghost/email-content-generator/package.json
index 1288077c626..6a24a8dc775 100644
--- a/ghost/email-content-generator/package.json
+++ b/ghost/email-content-generator/package.json
@@ -22,7 +22,7 @@
     "mocha": "10.2.0"
   },
   "dependencies": {
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "html-to-text": "5.1.1",
     "lodash": "4.17.21"
   }
diff --git a/ghost/email-service/lib/BatchSendingService.js b/ghost/email-service/lib/BatchSendingService.js
index 407bb3d786e..15f66610671 100644
--- a/ghost/email-service/lib/BatchSendingService.js
+++ b/ghost/email-service/lib/BatchSendingService.js
@@ -130,8 +130,7 @@ class BatchSendingService {
     async emailJob({emailId}) {
         logging.info(`Starting email job for email ${emailId}`);
 
-        // We'll stop all automatic DB retries after this date
-        const retryCutOffTime = new Date(Date.now() + this.#BEFORE_RETRY_CONFIG.maxTime);
+        const startTime = Date.now();
 
         // Check if email is 'pending' only + change status to submitting in one transaction.
         // This allows us to have a lock around the email job that makes sure an email can only have one active job.
@@ -146,6 +145,12 @@ class BatchSendingService {
             return;
         }
 
+        // We'll stop all automatic DB retries after this date
+        const expectedBatchCount = Math.ceil(email.get('email_count') / 1000);
+        const minimumSecondsPerBatch = 26; // In case of database issues, we make sure we expand the retry window relative to the amount of batches
+        const stopAfter = Math.max(expectedBatchCount * minimumSecondsPerBatch * 1000, this.#BEFORE_RETRY_CONFIG.maxTime);
+        const retryCutOffTime = new Date(startTime + stopAfter);
+
         // Save a strict cutoff time for retries
         email._retryCutOffTime = retryCutOffTime;
 
@@ -216,7 +221,7 @@ class BatchSendingService {
     async getBatches(email) {
         logging.info(`Getting batches for email ${email.id}`);
 
-        return await this.#models.EmailBatch.findAll({filter: 'email_id:' + email.id});
+        return await this.#models.EmailBatch.findAll({filter: 'email_id:\'' + email.id + '\''});
     }
 
     /**
@@ -247,7 +252,9 @@ 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}'`;
+                logging.info(`Fetching members batch for email ${email.id} segment ${segment}, lastId: ${lastId} ${filter}`);
+
                 members = await this.#models.Member.getFilteredCollectionQuery({filter})
                     .orderByRaw('id DESC')
                     .select('members.id', 'members.uuid', 'members.email', 'members.name').limit(BATCH_SIZE + 1);
@@ -276,6 +283,14 @@ class BatchSendingService {
         if (email.get('email_count') !== totalCount) {
             logging.error(`Email ${email.id} has wrong stored email_count ${email.get('email_count')}, did expect ${totalCount}. Updating the model.`);
 
+            // If the error rate is greater than 1%, we log it to Sentry so we can investigate
+            // Some differences are expected, e.g. if a new member signs up while we are sending the email
+            const errorRate = Math.abs((totalCount - email.get('email_count')) / email.get('email_count'));
+            if (this.#sentry && errorRate >= 0.01) {
+                // we don't have a real exception, so just log a message to Sentry
+                this.#sentry.captureMessage(`Email ${email.id} has wrong stored email_count ${email.get('email_count')}, did expect ${totalCount}.`);
+            }
+
             // We update the email model because this might happen in rare cases where the initial member count changed (e.g. deleted members)
             // between creating the email and sending it
             await email.save({
@@ -501,22 +516,13 @@ class BatchSendingService {
      * @returns {Promise<MemberLike[]>}
      */
     async getBatchMembers(batchId) {
-        let models = await this.#models.EmailRecipient.findAll({filter: `batch_id:${batchId}`, withRelated: ['member', 'member.stripeSubscriptions', 'member.products']});
+        let models = await this.#models.EmailRecipient.findAll({filter: `batch_id:'${batchId}'`, withRelated: ['member', 'member.stripeSubscriptions', 'member.products']});
 
         const BATCH_SIZE = this.#sendingService.getMaximumRecipients();
         if (models.length > BATCH_SIZE) {
-            // @NOTE: filtering by batch_id is our best effort to "correct" returned data
-            logging.warn(`Email batch ${batchId} has ${models.length} members, which exceeds the maximum of ${BATCH_SIZE} members per batch. Filtering by batch_id: ${batchId}`);
-            models = models.filter(m => m.get('batch_id') === batchId);
-
-            if (models.length > BATCH_SIZE) {
-                // @NOTE this is a best effort logic to still try sending an email batch
-                //       even if it exceeds the maximum recipients limit of the sending service.
-                //       In theory this should never happen, but being extra safe to make sure
-                //       the email delivery still happens.
-                logging.error(`Email batch ${batchId} has ${models.length} members, which exceeds the maximum of ${BATCH_SIZE}. Truncating to ${BATCH_SIZE}`);
-                models = models.slice(0, BATCH_SIZE);
-            }
+            throw new errors.EmailError({
+                message: `Email batch ${batchId} has ${models.length} members, which exceeds the maximum of ${BATCH_SIZE} members per batch.`
+            });
         }
 
         return models.map((model) => {
@@ -582,18 +588,28 @@ class BatchSendingService {
                 options = {...options, stopAfterDate};
             }
         }
+        const retryCount = (options.retryCount ?? 0);
 
         try {
-            return await func();
+            if (retryCount > 0) {
+                logging.info(`[BULK_EMAIL_DB_RETRY] ${options.description} - Retrying ${retryCount + 1}th try`);
+            } else {
+                logging.info(`[BULK_EMAIL_DB_RETRY] ${options.description} - Started (1st try)`);
+            }
+
+            const response = await func();
+
+            logging.info(`[BULK_EMAIL_DB_RETRY] ${options.description} - Finished (after ${retryCount + 1}${retryCount === 0 ? 'st try' : ' tries'})`);
+
+            return response;
         } catch (e) {
-            const retryCount = (options.retryCount ?? 0);
             const sleep = (options.sleep ?? 0);
             if (retryCount >= options.maxRetries || (options.stopAfterDate && (new Date(Date.now() + sleep)) > options.stopAfterDate)) {
                 if (retryCount > 0) {
                     const ghostError = new errors.EmailError({
                         err: e,
                         code: 'BULK_EMAIL_DB_RETRY',
-                        message: `[BULK_EMAIL_DB_RETRY] ${options.description} - Stopped retrying`,
+                        message: `[BULK_EMAIL_DB_RETRY] ${options.description} - Failed and stopped retrying: ${retryCount >= options.maxRetries ? 'max retries reached' : 'max time reached'}`,
                         context: e.message
                     });
 
@@ -605,7 +621,7 @@ class BatchSendingService {
             const ghostError = new errors.EmailError({
                 err: e,
                 code: 'BULK_EMAIL_DB_RETRY',
-                message: `[BULK_EMAIL_DB_RETRY] ${options.description} - After ${retryCount} retries`,
+                message: `[BULK_EMAIL_DB_RETRY] ${options.description} - Failed (${retryCount + 1}${retryCount === 0 ? 'st' : 'th'} try)`,
                 context: e.message
             });
 
diff --git a/ghost/email-service/lib/EmailEventStorage.js b/ghost/email-service/lib/EmailEventStorage.js
index 749b4edeb10..55b5187b6ce 100644
--- a/ghost/email-service/lib/EmailEventStorage.js
+++ b/ghost/email-service/lib/EmailEventStorage.js
@@ -5,11 +5,13 @@ class EmailEventStorage {
     #db;
     #membersRepository;
     #models;
+    #emailSuppressionList;
 
-    constructor({db, models, membersRepository}) {
+    constructor({db, models, membersRepository, emailSuppressionList}) {
         this.#db = db;
         this.#models = models;
         this.#membersRepository = membersRepository;
+        this.#emailSuppressionList = emailSuppressionList;
     }
 
     async handleDelivered(event) {
@@ -111,7 +113,16 @@ class EmailEventStorage {
     }
 
     async handleUnsubscribed(event) {
-        return this.unsubscribeFromNewsletters(event);
+        try {
+            // Unsubscribe member from the specific newsletter
+            const newsletters = await this.findNewslettersToKeep(event);
+            await this.#membersRepository.update({newsletters}, {id: event.memberId});
+
+            // Remove member from Mailgun's suppression list
+            await this.#emailSuppressionList.removeUnsubscribe(event.email);
+        } catch (err) {
+            logging.error(err);
+        }
     }
 
     async handleComplained(event) {
@@ -128,11 +139,22 @@ class EmailEventStorage {
         }
     }
 
-    async unsubscribeFromNewsletters(event) {
+    async findNewslettersToKeep(event) {
         try {
-            await this.#membersRepository.update({newsletters: []}, {id: event.memberId});
+            const member = await this.#membersRepository.get({email: event.email}, {
+                withRelated: ['newsletters']
+            });
+            const existingNewsletters = member.related('newsletters');
+
+            const email = await this.#models.Email.findOne({id: event.emailId});
+            const newsletterToRemove = email.get('newsletter_id');
+
+            return existingNewsletters.models.filter(newsletter => newsletter.id !== newsletterToRemove).map((n) => {
+                return {id: n.id};
+            });
         } catch (err) {
             logging.error(err);
+            return [];
         }
     }
 }
diff --git a/ghost/email-service/lib/EmailRenderer.js b/ghost/email-service/lib/EmailRenderer.js
index 83e384fe51f..474b3d7c203 100644
--- a/ghost/email-service/lib/EmailRenderer.js
+++ b/ghost/email-service/lib/EmailRenderer.js
@@ -9,6 +9,9 @@ const {DateTime} = require('luxon');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 const tpl = require('@tryghost/tpl');
 const cheerio = require('cheerio');
+const {EmailAddressParser} = require('@tryghost/email-addresses');
+const {registerHelpers} = require('./helpers/register-helpers');
+const crypto = require('crypto');
 
 const messages = {
     subscriptionStatus: {
@@ -108,13 +111,14 @@ class EmailRenderer {
     #memberAttributionService;
     #outboundLinkTagger;
     #audienceFeedbackService;
+    #emailAddressService;
     #labs;
     #models;
 
     /**
      * @param {object} dependencies
      * @param {object} dependencies.settingsCache
-     * @param {{getNoReplyAddress(): string, getMembersSupportAddress(): string}} dependencies.settingsHelpers
+     * @param {{getNoReplyAddress(): string, getMembersSupportAddress(): string, getMembersValidationKey(): string}} dependencies.settingsHelpers
      * @param {object} dependencies.renderers
      * @param {{render(object, options): string}} dependencies.renderers.lexical
      * @param {{render(object, options): string}} dependencies.renderers.mobiledoc
@@ -126,6 +130,7 @@ class EmailRenderer {
      * @param {object} dependencies.linkTracking
      * @param {object} dependencies.memberAttributionService
      * @param {object} dependencies.audienceFeedbackService
+     * @param {object} dependencies.emailAddressService
      * @param {object} dependencies.outboundLinkTagger
      * @param {object} dependencies.labs
      * @param {{Post: object}} dependencies.models
@@ -142,6 +147,7 @@ class EmailRenderer {
         linkTracking,
         memberAttributionService,
         audienceFeedbackService,
+        emailAddressService,
         outboundLinkTagger,
         labs,
         models
@@ -157,16 +163,18 @@ class EmailRenderer {
         this.#linkTracking = linkTracking;
         this.#memberAttributionService = memberAttributionService;
         this.#audienceFeedbackService = audienceFeedbackService;
+        this.#emailAddressService = emailAddressService;
         this.#outboundLinkTagger = outboundLinkTagger;
         this.#labs = labs;
         this.#models = models;
     }
 
-    getSubject(post) {
-        return post.related('posts_meta')?.get('email_subject') || post.get('title');
+    getSubject(post, isTestEmail = false) {
+        const subject = post.related('posts_meta')?.get('email_subject') || post.get('title');
+        return isTestEmail ? `[TEST] ${subject}` : subject;
     }
 
-    getFromAddress(_post, newsletter) {
+    #getRawFromAddress(post, newsletter) {
         let senderName = this.#settingsCache.get('title') ? this.#settingsCache.get('title').replace(/"/g, '\\"') : '';
         if (newsletter.get('sender_name')) {
             senderName = newsletter.get('sender_name');
@@ -185,8 +193,19 @@ class EmailRenderer {
                 fromAddress = localAddress;
             }
         }
+        return {
+            address: fromAddress,
+            name: senderName || undefined
+        };
+    }
+
+    getFromAddress(post, newsletter) {
+        // Clean from address to ensure DMARC alignment
+        const addresses = this.#emailAddressService.getAddress({
+            from: this.#getRawFromAddress(post, newsletter)
+        });
 
-        return senderName ? `"${senderName}" <${fromAddress}>` : fromAddress;
+        return EmailAddressParser.stringify(addresses.from);
     }
 
     /**
@@ -195,10 +214,25 @@ class EmailRenderer {
      * @returns {string|null}
      */
     getReplyToAddress(post, newsletter) {
-        if (newsletter.get('sender_reply_to') === 'support') {
+        const replyToAddress = newsletter.get('sender_reply_to');
+
+        if (replyToAddress === 'support') {
             return this.#settingsHelpers.getMembersSupportAddress();
         }
-        return this.getFromAddress(post, newsletter);
+
+        if (replyToAddress === 'newsletter' && !this.#emailAddressService.managedEmailEnabled) {
+            return this.getFromAddress(post, newsletter);
+        }
+
+        const addresses = this.#emailAddressService.getAddress({
+            from: this.#getRawFromAddress(post, newsletter),
+            replyTo: replyToAddress === 'newsletter' ? undefined : {address: replyToAddress}
+        });
+
+        if (addresses.replyTo) {
+            return EmailAddressParser.stringify(addresses.replyTo);
+        }
+        return null;
     }
 
     /**
@@ -345,6 +379,11 @@ class EmailRenderer {
                     url = this.#outboundLinkTagger.addToUrl(url);
                 }
 
+                // Don't add tracking to the Powered by Ghost badge
+                if (url.hostname === 'ghost.org' && url.pathname === '/' && url.searchParams.get('via') === 'pbg-newsletter') {
+                    return url.toString();
+                }
+
                 // Add link click tracking
                 url = await this.#linkTracking.service.addTrackingToUrl(url, post, '--uuid--');
 
@@ -368,15 +407,45 @@ 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};
+        });
+
+        // Add a class to each figcaption so we can style them in the email
+        $('figcaption').each((i, elem) => !!($(elem).addClass('kg-card-figcaption')));
+        html = $.html();
+
         // 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');
 
@@ -433,9 +502,14 @@ class EmailRenderer {
     createUnsubscribeUrl(uuid, options = {}) {
         const siteUrl = this.#urlUtils.urlFor('home', true);
         const unsubscribeUrl = new URL(siteUrl);
+        const key = this.#settingsHelpers.getMembersValidationKey();
         unsubscribeUrl.pathname = `${unsubscribeUrl.pathname}/unsubscribe/`.replace('//', '/');
         if (uuid) {
+            // hash key with member uuid for verification (and to not leak uuid) - it's possible to update member email prefs without logging in
+            // @ts-ignore
+            const hmac = crypto.createHmac('sha256', key).update(`${uuid}`).digest('hex');
             unsubscribeUrl.searchParams.set('uuid', uuid);
+            unsubscribeUrl.searchParams.set('key', hmac);
         } else {
             unsubscribeUrl.searchParams.set('preview', '1');
         }
@@ -571,6 +645,12 @@ class EmailRenderer {
                     return member.uuid;
                 }
             },
+            {
+                id: 'key',
+                getValue: (member) => {
+                    return crypto.createHmac('sha256', this.#settingsHelpers.getMembersValidationKey()).update(member.uuid).digest('hex');
+                }
+            },
             {
                 id: 'first_name',
                 getValue: (member) => {
@@ -619,22 +699,17 @@ class EmailRenderer {
                 getValue: (member) => {
                     return this.getMemberStatusText(member);
                 }
+            },
+            // List unsubscribe header to unsubcribe in one-click
+            {
+                id: 'list_unsubscribe',
+                getValue: (member) => {
+                    return this.createUnsubscribeUrl(member.uuid, {newsletterUuid});
+                },
+                required: true // Used in email headers
             }
         ];
 
-        if (this.#labs.isSet('listUnsubscribeHeader')) {
-            baseDefinitions.push(
-                {
-                    id: 'list_unsubscribe',
-                    getValue: (member) => {
-                        // Same URL
-                        return this.createUnsubscribeUrl(member.uuid, {newsletterUuid});
-                    },
-                    required: true // Used in email headers
-                }
-            );
-        }
-
         // Now loop through all the definenitions to see which ones are actually used + to add fallbacks if needed
         const EMAIL_REPLACEMENT_REGEX = /%%\{(.*?)\}%%/g;
         const REPLACEMENT_STRING_REGEX = /^(?<recipientProperty>\w+?)(?:,? *(?:"|&quot;)(?<fallback>.*?)(?:"|&quot;))?$/;
@@ -692,62 +767,20 @@ class EmailRenderer {
         return replacements;
     }
 
+    getLabs() {
+        return this.#labs;
+    }
+
     async renderTemplate(data) {
+        const labs = this.getLabs();
         this.#handlebars = require('handlebars').create();
 
-        // Helpers
-        this.#handlebars.registerHelper('if', function (conditional, options) {
-            if (conditional) {
-                return options.fn(this);
-            } else {
-                return options.inverse(this);
-            }
-        });
-
-        this.#handlebars.registerHelper('and', function () {
-            const len = arguments.length - 1;
-
-            for (let i = 0; i < len; i++) {
-                if (!arguments[i]) {
-                    return false;
-                }
-            }
-
-            return true;
-        });
-
-        this.#handlebars.registerHelper('not', function () {
-            const len = arguments.length - 1;
-
-            for (let i = 0; i < len; i++) {
-                if (!arguments[i]) {
-                    return true;
-                }
-            }
-
-            return false;
-        });
-
-        this.#handlebars.registerHelper('or', function () {
-            const len = arguments.length - 1;
-
-            for (let i = 0; i < len; i++) {
-                if (arguments[i]) {
-                    return true;
-                }
-            }
-
-            return false;
-        });
+        // Register helpers
+        registerHelpers(this.#handlebars, labs);
 
         // Partials
-        if (this.#labs.isSet('emailCustomization')) {
-            const cssPartialSource = await fs.readFile(path.join(__dirname, './email-templates/partials/', `styles.hbs`), 'utf8');
-            this.#handlebars.registerPartial('styles', cssPartialSource);
-        } else {
-            const cssPartialSource = await fs.readFile(path.join(__dirname, './email-templates/partials/', `styles-old.hbs`), 'utf8');
-            this.#handlebars.registerPartial('styles', cssPartialSource);
-        }
+        const cssPartialSource = await fs.readFile(path.join(__dirname, './email-templates/partials/', `styles.hbs`), 'utf8');
+        this.#handlebars.registerPartial('styles', cssPartialSource);
 
         const paywallPartial = await fs.readFile(path.join(__dirname, './email-templates/partials/', `paywall.hbs`), 'utf8');
         this.#handlebars.registerPartial('paywall', paywallPartial);
@@ -762,13 +795,9 @@ class EmailRenderer {
         this.#handlebars.registerPartial('latestPosts', latestPostsPartial);
 
         // Actual template
-        if (this.#labs.isSet('emailCustomization')) {
-            const htmlTemplateSource = await fs.readFile(path.join(__dirname, './email-templates/', `template.hbs`), 'utf8');
-            this.#renderTemplate = this.#handlebars.compile(Buffer.from(htmlTemplateSource).toString());
-        } else {
-            const htmlTemplateSource = await fs.readFile(path.join(__dirname, './email-templates/', `template-old.hbs`), 'utf8');
-            this.#renderTemplate = this.#handlebars.compile(Buffer.from(htmlTemplateSource).toString());
-        }
+        const htmlTemplateSource = await fs.readFile(path.join(__dirname, './email-templates/', `template.hbs`), 'utf8');
+        this.#renderTemplate = this.#handlebars.compile(Buffer.from(htmlTemplateSource).toString());
+    
         return this.#renderTemplate(data);
     }
 
@@ -809,18 +838,23 @@ class EmailRenderer {
      *
      * @param {*} text
      * @param {number} maxLength
-     * @param {number} maxLengthMobile should be larger than maxLength
+     * @param {number} maxLengthMobile should be smaller than maxLength
      * @returns
      */
     truncateHtml(text, maxLength, maxLengthMobile) {
-        if (!maxLengthMobile || maxLength >= maxLengthMobile) {
+        if (!maxLengthMobile || maxLength <= maxLengthMobile) {
             return escapeHtml(this.truncateText(text, maxLength));
         }
-        if (text && text.length > maxLength) {
-            if (text.length <= maxLengthMobile) {
-                return escapeHtml(text.substring(0, maxLength - 1)) + '<span class="mobile-only">' + escapeHtml(text.substring(maxLength - 1, maxLengthMobile - 1)) + '</span>' + '<span class="hide-mobile">…</span>';
+        if (text && text.length > maxLengthMobile) {
+            let ellipsis = '';
+
+            if (text.length > maxLengthMobile && text.length <= maxLength) {
+                ellipsis = '<span class="hide-desktop">…</span>';
+            } else if (text.length > maxLength) {
+                ellipsis = '…';
             }
-            return escapeHtml(text.substring(0, maxLength - 1)) + '<span class="mobile-only">' + escapeHtml(text.substring(maxLength - 1, maxLengthMobile - 1)) + '</span>' + '…';
+
+            return escapeHtml(text.substring(0, maxLengthMobile - 1)) + '<span class="desktop-only">' + escapeHtml(text.substring(maxLengthMobile - 1, maxLength - 1)) + '</span>' + ellipsis;
         } else {
             return escapeHtml(text ?? '');
         }
@@ -940,13 +974,15 @@ class EmailRenderer {
         const positiveLink = this.#audienceFeedbackService.buildLink(
             '--uuid--',
             post.id,
-            1
-        ).href.replace('--uuid--', '%%{uuid}%%');
+            1,
+            '--key--'
+        ).href.replace('--uuid--', '%%{uuid}%%').replace('--key--', '%%{key}%%');
         const negativeLink = this.#audienceFeedbackService.buildLink(
             '--uuid--',
             post.id,
-            0
-        ).href.replace('--uuid--', '%%{uuid}%%');
+            0,
+            '--key--'
+        ).href.replace('--uuid--', '%%{uuid}%%').replace('--key--', '%%{key}%%');
 
         const commentUrl = new URL(postUrl);
         commentUrl.hash = '#ghost-comments';
@@ -958,7 +994,7 @@ class EmailRenderer {
         if (newsletter.get('show_latest_posts')) {
             // Fetch last 3 published posts
             const {data} = await this.#models.Post.findPage({
-                filter: 'status:published+id:-' + post.id,
+                filter: `status:published+id:-'${post.id}'`,
                 order: 'published_at DESC',
                 limit: 3
             });
@@ -969,7 +1005,7 @@ class EmailRenderer {
                 const {href: featureImageMobile, width: featureImageMobileWidth, height: featureImageMobileHeight} = await this.limitImageWidth(latestPost.get('feature_image'), 600, 480);
 
                 latestPosts.push({
-                    title: this.truncateHtml(latestPost.get('title'), featureImage ? 85 : 105, 105),
+                    title: this.truncateHtml(latestPost.get('title'), featureImage ? 85 : 95, featureImageMobile ? 55 : 75),
                     url: this.#getPostUrl(latestPost),
                     featureImage: featureImage ? {
                         src: featureImage,
@@ -981,7 +1017,7 @@ class EmailRenderer {
                         width: featureImageMobileWidth,
                         height: featureImageMobileHeight
                     } : null,
-                    excerpt: this.truncateHtml(latestPost.get('custom_excerpt') || latestPost.get('plaintext'), featureImage ? 60 : 70, 105)
+                    excerpt: this.truncateHtml(latestPost.get('custom_excerpt') || latestPost.get('plaintext'), featureImage ? 120 : 130, featureImageMobile ? 90 : 100)
                 });
 
                 if (featureImage) {
@@ -990,6 +1026,16 @@ class EmailRenderer {
             }
         }
 
+        let excerptFontClass = '';
+        const bodyFont = newsletter.get('body_font_category');
+        const titleFont = newsletter.get('title_font_category');
+
+        if (titleFont === 'serif' && bodyFont === 'serif') {
+            excerptFontClass = 'post-excerpt-serif-serif';
+        } else if (titleFont === 'serif' && bodyFont !== 'serif') {
+            excerptFontClass = 'post-excerpt-serif-sans';
+        }
+
         const data = {
             site: {
                 title: this.#settingsCache.get('title'),
@@ -1008,6 +1054,7 @@ class EmailRenderer {
                 commentUrl: commentUrl.href,
                 authors,
                 publishedAt,
+                customExcerpt: post.get('custom_excerpt'),
                 feature_image: postFeatureImage,
                 feature_image_width: postFeatureImageWidth,
                 feature_image_height: postFeatureImageHeight,
@@ -1018,6 +1065,7 @@ class EmailRenderer {
             newsletter: {
                 name: newsletter.get('name'),
                 showPostTitleSection: newsletter.get('show_post_title_section'),
+                showExcerpt: newsletter.get('show_excerpt'),
                 showCommentCta: newsletter.get('show_comment_cta') && this.#settingsCache.get('comments_enabled') !== 'off' && !hasEmailOnlyFlag,
                 showSubscriptionDetails: newsletter.get('show_subscription_details')
             },
@@ -1049,8 +1097,9 @@ class EmailRenderer {
             footerContent: newsletter.get('footer_content'),
 
             classes: {
-                title: 'post-title' + (newsletter.get('title_font_category') === 'serif' ? ` post-title-serif` : ``) + (newsletter.get('title_alignment') === 'left' ? ` post-title-left` : ``),
+                title: 'post-title' + ` ` + (post.get('custom_excerpt') ? 'post-title-with-excerpt' : 'post-title-no-excerpt') + (newsletter.get('title_font_category') === 'serif' ? ` post-title-serif` : ``) + (newsletter.get('title_alignment') === 'left' ? ` post-title-left` : ``),
                 titleLink: 'post-title-link' + (newsletter.get('title_alignment') === 'left' ? ` post-title-link-left` : ``),
+                excerpt: 'post-excerpt' + ` ` + (newsletter.get('show_feature_image') && !!postFeatureImage ? 'post-excerpt-with-feature-image' : 'post-excerpt-no-feature-image') + ` ` + excerptFontClass + (newsletter.get('title_alignment') === 'left' ? ` post-excerpt-left` : ``),
                 meta: 'post-meta' + (newsletter.get('title_alignment') === 'left' ? ` post-meta-left` : ` post-meta-center`),
                 body: newsletter.get('body_font_category') === 'sans_serif' ? `post-content-sans-serif` : `post-content`
             },
diff --git a/ghost/email-service/lib/EmailSegmenter.js b/ghost/email-service/lib/EmailSegmenter.js
index ccdf61f26a4..938d4adc198 100644
--- a/ghost/email-service/lib/EmailSegmenter.js
+++ b/ghost/email-service/lib/EmailSegmenter.js
@@ -26,7 +26,7 @@ class EmailSegmenter {
     }
 
     getMemberFilterForSegment(newsletter, emailRecipientFilter, segment) {
-        const filter = [`newsletters.id:${newsletter.id}`, 'email_disabled:0'];
+        const filter = [`newsletters.id:'${newsletter.id}'`, 'email_disabled:0'];
 
         switch (emailRecipientFilter) {
         case 'all':
diff --git a/ghost/email-service/lib/EmailService.js b/ghost/email-service/lib/EmailService.js
index 475577de37f..52f1bd82772 100644
--- a/ghost/email-service/lib/EmailService.js
+++ b/ghost/email-service/lib/EmailService.js
@@ -301,7 +301,8 @@ class EmailService {
             emailId: null
         }, {
             clickTrackingEnabled: false,
-            openTrackingEnabled: false
+            openTrackingEnabled: false,
+            isTestEmail: true
         });
     }
 }
diff --git a/ghost/email-service/lib/SendingService.js b/ghost/email-service/lib/SendingService.js
index 24461d01d58..ec9ed90b13d 100644
--- a/ghost/email-service/lib/SendingService.js
+++ b/ghost/email-service/lib/SendingService.js
@@ -88,6 +88,7 @@ class SendingService {
     */
     async send({post, newsletter, segment, members, emailId}, options) {
         const cacheId = emailId + '-' + (segment ?? 'null');
+        const isTestEmail = options.isTestEmail ?? false;
 
         /**
          * @type {EmailBody | null}
@@ -114,7 +115,7 @@ class SendingService {
 
         const recipients = this.buildRecipients(members, emailBody.replacements);
         return await this.#emailProvider.send({
-            subject: this.#emailRenderer.getSubject(post),
+            subject: this.#emailRenderer.getSubject(post, isTestEmail),
             from: this.#emailRenderer.getFromAddress(post, newsletter),
             replyTo: this.#emailRenderer.getReplyToAddress(post, newsletter) ?? undefined,
             html: emailBody.html,
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/paywall.hbs b/ghost/email-service/lib/email-templates/partials/paywall.hbs
index 0fceaf846a2..f379922fc84 100644
--- a/ghost/email-service/lib/email-templates/partials/paywall.hbs
+++ b/ghost/email-service/lib/email-templates/partials/paywall.hbs
@@ -3,21 +3,15 @@
         style="position: relative; display: block; width: 100%; margin: 3em 0; padding: 0; height: 1px; border: 0; border-top: 1px solid #e5eff5;">
     <h2
         style="margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 1.11em; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 26px;">
-        Subscribe to <span style="white-space: nowrap; font-size: 26px !important;">continue reading.</span></h2>
+        Upgrade to <span style="white-space: nowrap; font-size: 26px!important;">continue reading.</span></h2>
     <p style="margin: 0 auto 1.5em auto; line-height: 1.6em; max-width: 440px;">Become a paid member of {{site.title}} to get access to all
-    <span style="white-space: nowrap;">subscriber-only content.</span></p>
+    <span style="white-space: nowrap;">premium content.</span></p>
     <div class="btn btn-accent" style="box-sizing: border-box; width: 100%; display: table;">
-        <table border="0" cellspacing="0" cellpadding="0" align="center"
-            style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+        <table border="0" cellspacing="0" cellpadding="0" align="center" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
             <tbody>
                 <tr>
-                    <td align="center"
-                        style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; text-align: center; border-radius: 5px;"
-                        valign="top" bgcolor="{{accentColor}}">
-                        <a href="{{paywall.signupUrl}}"
-                            style="overflow-wrap: anywhere; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-decoration: none; background-color: {{accentColor}}; border-color: {{accentColor}}; color: #FFFFFF;"
-                            target="_blank">Subscribe
-                        </a>
+                    <td align="center" valign="top" bgcolor="{{accentColor}}" style="vertical-align: top; text-align: center; border-radius: 5px;">
+                        <a href="{{paywall.signupUrl}}" style="overflow-wrap: anywhere; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-decoration: none; background-color: {{accentColor}}; border-color: {{accentColor}}; color: #FFFFFF;" target="_blank">Upgrade</a>
                     </td>
                 </tr>
             </tbody>
diff --git a/ghost/email-service/lib/email-templates/partials/styles-old.hbs b/ghost/email-service/lib/email-templates/partials/styles-old.hbs
deleted file mode 100644
index 196c380547c..00000000000
--- a/ghost/email-service/lib/email-templates/partials/styles-old.hbs
+++ /dev/null
@@ -1,1616 +0,0 @@
-<style>
-/* -------------------------------------
-    GLOBAL RESETS
-------------------------------------- */
-
-/*All the styling goes here*/
-
-img {
-    border: none;
-    -ms-interpolation-mode: bicubic;
-    max-width: 100%;
-}
-
-img.is-dark-background {
-        display: none !important;
-        mso-hide: all !important;
-}
-
-body {
-    background-color: #fff;
-    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: 18px;
-    line-height: 1.4;
-    margin: 0;
-    padding: 0;
-    -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%;
-    color: #15212A;
-}
-
-table {
-    border-collapse: separate;
-    mso-table-lspace: 0pt;
-    mso-table-rspace: 0pt;
-    width: 100%;
-}
-
-table td {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    font-size: 18px;
-    vertical-align: top;
-    color: #15212A;
-}
-
-/* -------------------------------------
-    BODY & CONTAINER
-------------------------------------- */
-.body {
-    background-color: #fff;
-    width: 100%;
-}
-
-/* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-.container {
-    display: block;
-    margin: 0 auto !important;
-    /* makes it centered */
-    max-width: 600px;
-}
-
-/* This should also be a block element, so that it will fill 100% of the .container */
-.content {
-    box-sizing: border-box;
-    display: block;
-    margin: 0 auto;
-    max-width: 600px;
-}
-
-.content a {
-    overflow-wrap: anywhere;
-}
-
-/* -------------------------------------
-    POST CONTENT
-------------------------------------- */
-hr {
-    position: relative;
-    display: block;
-    width: 100%;
-    margin: 3em 0;
-    padding: 0;
-    height: 1px;
-    border: 0;
-    border-top: 1px solid #e5eff5;
-}
-
-p,
-ul,
-ol,
-dl,
-blockquote {
-    margin: 0 0 1.5em 0;
-    line-height: 1.6em;
-}
-
-ol,
-ul {
-    padding-left: 1.3em;
-    padding-right: 1.5em;
-}
-
-ol ol,
-ul ul,
-ul ol,
-ol ul {
-    margin: 0.5em 0 1em;
-}
-
-ul {
-    list-style: disc;
-}
-
-ul ul {
-    list-style: circle;
-}
-
-ul ul ul {
-    list-style: square;
-}
-
-ol {
-    list-style: decimal;
-}
-
-ol ol {
-    list-style: lower-alpha;
-}
-
-ol ol ol {
-    list-style: lower-roman;
-}
-
-ul,
-ol {
-    max-width: 100%;
-}
-
-li {
-    margin: 0.5em 0;
-    padding-left: 0.3em;
-    line-height: 1.6em;
-}
-
-dt {
-    float: left;
-    margin: 0 20px 0 0;
-    width: 120px;
-    color: #15212A;
-    font-weight: 500;
-    text-align: right;
-}
-
-dd {
-    margin: 0 0 5px 0;
-    text-align: left;
-}
-
-blockquote {
-    margin: 2em 0 2em 0;
-    padding: 0 25px 0 25px;
-    border-left: {{accentColor}} 2px solid;
-    font-size: 17px;
-    font-weight: 500;
-    line-height: 1.6em;
-    letter-spacing: -0.2px;
-}
-
-blockquote.kg-blockquote-alt {
-    border-left: 0 none;
-    padding: 0 50px 0 50px;
-    text-align: center;
-    font-size: 1.2em;
-    font-style: italic;
-    color: #999999;
-}
-
-blockquote p {
-    margin: 0.8em 0;
-    font-size: 1em;
-}
-
-blockquote small {
-    display: inline-block;
-    margin: 0.8em 0 0.8em 1.5em;
-    font-size: 0.9em;
-    opacity: 0.8;
-}
-
-blockquote cite {
-    font-weight: bold;
-}
-blockquote cite a {
-    font-weight: normal;
-}
-
-a {
-    color: {{accentColor}};
-    text-decoration: none;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-    margin-top: 0;
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    line-height: 1.11em;
-    font-weight: 700;
-    text-rendering: optimizeLegibility;
-}
-
-h1 {
-    margin: 1.5em 0 0.5em 0;
-    font-size: 42px;
-    font-weight: 700;
-}
-
-h2 {
-    margin: 1.5em 0 0.5em 0;
-    font-size: 32px;
-}
-
-h3 {
-    margin: 1.5em 0 0.5em 0;
-    font-size: 26px;
-}
-
-h4 {
-    margin: 1.8em 0 0.5em 0;
-    font-size: 21px;
-    line-height: 1.2em;
-}
-
-h5 {
-    margin: 2em 0 0.5em 0;
-    font-size: 19px;
-    line-height: 1.3em;
-}
-
-h6 {
-    margin: 2em 0 0.5em 0;
-    font-size: 19px;
-    line-height: 1.3em;
-    font-weight: 700;
-}
-
-h1 strong,
-h2 strong,
-h3 strong,
-h4 strong,
-h5 strong,
-h6 strong {
-    font-weight: 800;
-}
-
-strong {
-    font-weight: 700;
-}
-
-figure {
-    margin: 0 0 1.5em;
-    padding: 0;
-}
-
-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;
-    padding-top: 5px;
-    line-height: 1.5em;
-}
-
-code {
-    font-size: 0.9em;
-}
-
-pre {
-    white-space: pre-wrap;
-    overflow: auto;
-    background: #15212A;
-    padding: 15px;
-    border-radius: 3px;
-    line-height: 1.2em;
-    color: #ffffff;
-}
-
-p code,
-li code {
-    background: #F2F7FA;
-    word-break: break-all;
-    padding: 1px 7px;
-    border-radius: 3px;
-    color: {{accentColor}};
-}
-
-figure blockquote p {
-    font-size: 1em;
-}
-
-.header-image {
-    padding-top: 24px;
-}
-
-.site-icon {
-    padding-bottom: 10px;
-    padding-top: 20px;
-    text-align: center;
-    border-radius: 3px;
-}
-
-.site-icon img {
-    width: 48px;
-    height: 48px;
-    border-radius: 3px;
-}
-
-.site-info {
-    padding-top: 50px;
-}
-
-.site-info-bordered {
-    padding-top: 50px;
-    border-bottom: 1px solid #e5eff5;
-}
-
-.site-url {
-    color: #15212A;
-    font-size: 16px;
-    letter-spacing: -0.1px;
-    font-weight: 700;
-    text-transform: uppercase;
-    text-align: center;
-}
-
-.site-url-bottom-padding {
-    padding-bottom: 50px;
-}
-
-.site-title {
-    color: #15212A;
-}
-
-.site-subtitle {
-    color: #8695a4;
-    font-size: 14px;
-    font-weight: 400;
-    text-transform: none;
-}
-
-.post-title {
-    padding-bottom: 16px;
-    font-size: 42px;
-    line-height: 1.1em;
-    font-weight: 700;
-    text-align: center;
-}
-.post-title-serif {
-    font-family: Georgia, serif;
-    letter-spacing: -0.01em;
-}
-.post-title-left {
-    text-align: left;
-}
-
-.post-title-link {
-    color: #15212A;
-    display: block;
-    text-align: center;
-    margin-top: 50px;
-}
-.post-title-link-left {
-    text-align: left;
-}
-
-.post-meta,
-.view-online {
-    color: #738a94;
-    font-size: 13px;
-    letter-spacing: 0.1px;
-    text-align: center;
-}
-
-.post-meta-left {
-    text-align: left;
-}
-
-.post-meta-left.view-online-mobile {
-    display: none !important;
-}
-
-.post-meta-left.view-online {
-    text-align: right;
-}
-
-.post-meta-center.view-online {
-    display: none !important;
-}
-
-.post-meta-center .view-online,
-.post-meta-center .view-online a {
-    text-decoration: underline !important;
-}
-
-.post-meta-date {
-    white-space: nowrap;
-}
-
-.comment-link {
-    color: #738a94;
-    font-size: 13px;
-    letter-spacing: 0.1px;
-}
-
-.comment-link img {
-    width: 16px;
-    height: 16px;
-    margin-bottom: 1px;
-    vertical-align: middle;
-}
-
-.view-online-link {
-    word-wrap: none;
-    white-space: nowrap;
-    color: #738a94;
-}
-
-.feature-image-row:first-child > td {
-    padding-top: 24px;
-}
-
-.feature-image {
-    padding-bottom: 30px;
-    width: 100%;
-}
-
-.feature-image-with-caption {
-    padding-bottom: 10px;
-}
-
-.feature-image-caption {
-    width: 100%;
-    padding-bottom: 30px;
-    text-align: center;
-    font-size: 13px;
-    color: #738a94;
-}
-
-/* -------------------------------------
-    FEEDBACK BUTTONS
-------------------------------------- */
-
-.feedback-buttons {
-    width: auto !important;
-    margin: auto;
-}
-
-.feedback-buttons-mobile {
-    display: none !important;
-    mso-hide: all !important;
-}
-
-.feedback-button-mobile-text {
-    color: #15212A;
-    font-size: 13px !important;
-    font-weight: 500;
-    margin-bottom: 0;
-}
-
-/* -------------------------------------
-    LATEST POSTS TABLE
-------------------------------------- */
-
-.latest-posts-header {
-    margin: 0;
-    padding: 8px 0 16px;
-    color: #15212A;
-    font-size: 14px;
-    font-weight: 700;
-    text-transform: uppercase;
-}
-
-.latest-post {
-    padding: 8px 0;
-}
-
-.latest-post a {
-    text-decoration: none !important;
-}
-
-.latest-post-img a {
-    display: block;
-    height: 100px;
-    overflow: hidden;
-    color: inherit;
-    text-decoration: none;
-}
-
-.latest-post-img img,
-.latest-post-img-mobile 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;
-}
-
-.latest-post h4 {
-    margin: 0;
-    padding: 2px 0 4px;
-    font-size: 19px;
-    font-weight: 700;
-}
-
-.latest-post h4.no-image {
-    padding: 12px 0 4px;
-}
-
-.latest-post h4 a {
-    color: #15212A !important;
-}
-
-.latest-post p {
-    margin: 0;
-    padding: 0;
-    color: #738a94;
-    font-size: 15px;
-    font-weight: 400;
-}
-
-.latest-post p a {
-    color: #738a94 !important;
-}
-
-/* -------------------------------------
-    SUBSCRIPTION DETAILS BOX
-------------------------------------- */
-
-.subscription-box {
-    padding: 32px 0;
-    border-bottom: 1px solid #e5eff5;
-    color: #15212A;
-}
-
-.subscription-box h3 {
-    font-size: 14px;
-    font-weight: 700;
-    text-transform: uppercase;
-    margin: 0 0 18px;
-}
-
-.subscription-box p {
-    margin-bottom: 0;
-    color: #15212A !important;
-    font-size: 15px;
-    font-weight: 400;
-    line-height: 1.45em;
-    text-decoration: none;
-}
-
-.subscription-box p a {
-    color: #15212A !important;
-    text-decoration: none;
-}
-
-.manage-subscription {
-    white-space: nowrap;
-    font-size: 15px;
-    font-weight: 600;
-    text-align: right;
-    line-height: 1.45em;
-    vertical-align: bottom;
-    color: {{accentColor}};
-}
-
-/* -------------------------------------
-    POST CONTENT
-------------------------------------- */
-
-.post-content {
-    max-width: 600px !important;
-    font-family: Georgia, serif;
-    font-size: 18px;
-    line-height: 1.5em;
-    color: #15212A;
-    padding-bottom: 20px;
-    border-bottom: 1px solid #e5eff5;
-}
-
-.post-content-sans-serif {
-    max-width: 600px !important;
-    font-size: 17px;
-    line-height: 1.5em;
-    color: #15212A;
-    padding-bottom: 20px;
-    border-bottom: 1px solid #e5eff5;
-}
-
-.post-content-row:first-child > td, .header-image-row + .post-content-row > td {
-    padding-top: 52px;
-}
-
-.post-content a,
-.post-content-sans-serif a {
-    color: {{accentColor}};
-    text-decoration: underline;
-}
-
-a[data-flickr-embed] img {
-    height: auto;
-}
-
-.kg-bookmark-card {
-    width: 100%;
-    background: #ffffff;
-}
-
-.kg-bookmark-card a {
-    text-decoration: none;
-}
-
-.kg-card + .kg-bookmark-card {
-    margin-top: 0;
-}
-
-.kg-image-card img {
-    display: block;
-    margin: 0 auto;
-    width: auto;
-    height: auto !important;
-}
-
-.kg-bookmark-container {
-    display: flex;
-    min-height: 148px;
-    color: #15212A;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
-    text-decoration: none;
-    border-radius: 3px;
-    border: 1px solid #e5eff5;
-}
-
-.kg-bookmark-content {
-    display: inline-block;
-    width: 100%;
-    padding: 20px;
-}
-
-.kg-bookmark-title {
-    color: #15212A;
-    font-size: 15px;
-    line-height: 1.5em;
-    font-weight: 600;
-}
-
-.kg-bookmark-description {
-    display: -webkit-box;
-    overflow-y: hidden;
-    margin-top: 12px;
-    max-height: 40px;
-    color: #738a94;
-    font-size: 13px;
-    line-height: 1.5em;
-    font-weight: 400;
-
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-
-.kg-bookmark-thumbnail {
-    min-width: 140px;
-    max-width: 180px;
-    background-repeat: no-repeat;
-    background-size: cover;
-    background-position: center;
-    border-radius: 0 2px 2px 0;
-}
-
-.kg-bookmark-thumbnail img {
-    display: none;
-}
-
-.kg-bookmark-metadata {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    margin-top: 14px;
-    color: #15212A;
-    font-size: 13px;
-    font-weight: 400;
-}
-
-.kg-bookmark-icon {
-    margin-right: 8px;
-    width: 22px;
-    height: 22px;
-}
-
-.kg-bookmark-icon[src$=".svg"] {
-    display: none;
-}
-
-.kg-bookmark-author {
-    line-height: 1.5em;
-}
-
-.kg-bookmark-publisher {
-    overflow: hidden;
-    max-width: 240px;
-    line-height: 1.5em;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.kg-bookmark-publisher:before {
-    content: "•";
-    margin: 0 6px;
-}
-
-.kg-gallery-container {
-    margin-top: -20px;
-}
-
-.kg-gallery-image img {
-    width: 100% !important;
-    height: auto !important;
-    padding-top: 20px;
-}
-
-.kg-video-preview {
-    background-color: #1d1f21;
-    background-image: radial-gradient(circle at center, #5b5f66, #1d1f21);
-    display: block;
-    text-decoration: none !important;
-}
-
-.kg-video-preview table {
-    background-size: cover;
-    min-height: 200px; /* for when images aren't loaded */
-}
-
-.kg-video-play-button {
-    height: 2em;
-    width: 3em;
-    margin: 0 auto;
-    border-radius: 10px;
-    padding: 1em 0.8em 0.6em 1em;
-    font-size: 1em; /* change this to resize */
-    background-color: rgba(0,0,0,0.85);
-}
-
-.kg-video-play-button div {
-    display: block;
-    width: 0;
-    height: 0;
-    margin: 0 auto;
-    line-height: 0px; /* fix for Yahoo Mail */
-    border-color: transparent transparent transparent white;
-    border-style: solid;
-    border-width: 0.8em 0 0.8em 1.5em;
-}
-
-.kg-nft-link {
-    display: block;
-    text-decoration: none !important;
-    color: #15212A !important;
-    font-family: inherit !important;
-    font-size: 14px;
-    line-height: 1.3em;
-    padding-top: 4px;
-    padding-right: 20px;
-    padding-left: 20px;
-    padding-bottom: 4px;
-}
-
-.kg-twitter-link {
-    display: block;
-    text-decoration: none !important;
-    color: #15212A !important;
-    font-family: inherit !important;
-    font-size: 15px;
-    padding: 8px;
-    line-height: 1.3em;
-}
-
-.kg-audio-thumbnail.placeholder {
-    background-color: {{accentColor}} !important;
-}
-
-.kg-callout-card {
-    display: flex;
-    margin: 0 0 1.5em 0;
-    padding: 20px 28px;
-    border-radius: 3px;
-}
-
-.kg-callout-card p {
-    margin: 0
-}
-
-.kg-callout-card-grey {
-    background: #eef0f2;
-}
-
-.kg-callout-card-white {
-    background: #fff;
-    box-shadow: inset 0 0 0 1px #dddedf;
-}
-
-.kg-callout-card-blue {
-    background: #E9F6FB;
-}
-
-.kg-callout-card-green {
-    background: #E8F8EA;
-}
-
-.kg-callout-card-yellow {
-    background: #FCF4E3;
-}
-
-.kg-callout-card-red {
-    background: #FBE9E9;
-}
-
-.kg-callout-card-pink {
-    background: #FCEEF8;
-}
-
-.kg-callout-card-purple {
-    background: #F2EDFC;
-}
-
-.kg-callout-card-accent {
-    background: {{accentColor}};
-    color: #fff;
-}
-
-.kg-callout-card-accent a {
-    color: #fff;
-}
-
-.kg-callout-emoji {
-    padding-right: 12px;
-    font-size: 20px;
-}
-
-.kg-header-card {
-    margin: 0 0 1.5em 0;
-    padding: 110px 35px 110px 35px;
-    text-align: center;
-}
-
-.kg-header-card.kg-size-small {
-    padding-top: 75px;
-    padding-bottom: 75px;
-}
-
-.kg-header-card.kg-size-large {
-    padding-top: 140px;
-    padding-bottom: 140px;
-}
-
-.kg-header-card.kg-align-left {
-    text-align: left;
-}
-
-.kg-header-card.kg-style-dark {
-    background: #15171a;
-    color: #ffffff;
-}
-
-.kg-header-card.kg-style-light {
-    background-color: #F9F9FA;
-}
-
-.kg-header-card.kg-style-accent {
-    background: {{accentColor}};
-    color: #ffffff;
-}
-
-.kg-header-card.kg-style-image {
-    background-color: #e7e7eb;
-    background-size: cover;
-    background-position: center center;
-    color: #ffffff;
-}
-
-.kg-header-card h2 {
-    font-size: 3em;
-    font-weight: 700;
-    line-height: 1.1em;
-    margin: 0 0 0.125em;
-}
-
-.kg-header-card h2 strong {
-    font-weight: 800;
-}
-
-.kg-header-card.kg-size-small h2 {
-    font-size: 2.5em;
-}
-
-.kg-header-card.kg-size-large h2 {
-    font-size: 3.5em;
-}
-
-.kg-header-card h3 {
-    font-size: 1.125em;
-    font-weight: 500;
-    line-height: 1.3em;
-    margin: 0;
-}
-
-.kg-header-card h3 strong {
-    font-weight: 700;
-}
-
-.kg-header-card.kg-size-large h3 {
-    font-size: 1.25em;
-}
-
-.kg-header-card.kg-size-small h3 {
-    font-size: 1em;
-}
-
-.kg-header-card-button {
-    margin-top: 1.75em;
-    background: #ffffff;
-    border-radius: 5px;
-    box-sizing: border-box;
-    cursor: pointer;
-    display: inline-block;
-    font-size: 14px;
-    font-weight: bold;
-    margin: 0;
-    padding: 8px 16px;
-    text-decoration: none !important;
-    color: #15171A;
-}
-
-.kg-size-large .kg-header-card-button {
-    margin-top: 2em;
-}
-
-.kg-size-small .kg-header-card-button {
-    margin-top: 1.5em;
-}
-
-.kg-style-light .kg-header-card-button {
-    background: {{accentColor}} !important;
-    color: #ffffff !important;
-}
-
-/* Header v2 */
-
-.kg-header-card.kg-v2 {
-    padding: 0;
-    text-align: inherit;
-}
-
-.kg-header-card.kg-v2 .kg-header-card-image {
-    height: 320px;
-    background-repeat: no-repeat;
-}
-
-.kg-header-card.kg-v2 .kg-header-card-content {
-    padding: 80px 48px;
-}
-
-.kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
-    padding-top: 64px;
-    padding-bottom: 64px;
-}
-
-.kg-header-card.kg-v2 .kg-header-card-heading {
-    margin: 0;
-    line-height: 1em;
-}
-
-.kg-header-card.kg-v2 .kg-header-card-subheading {
-    margin: 0.75em 0 0;
-}
-
-.kg-header-card.kg-v2 .kg-header-card-heading a,
-.kg-header-card.kg-v2 .kg-header-card-subheading a {
-    color: inherit;
-}
-
-.kg-header-card.kg-v2 .kg-header-card-button {
-    margin-top: 24px;
-    padding: 10px 20px;
-    font-size: 16px;
-    font-weight: 500;
-}
-
-.kg-product-card {
-    width: 100%;
-    margin: 0 0 1.5em;
-    padding: 20px;
-    border-radius: 3px;
-    border: 1px solid #e5eff5;
-}
-.kg-product-card-image {
-    width: 100%;
-}
-.kg-product-rating img {
-    width: 96px;
-    border: none;
-}
-.kg-audio-card {
-    width: auto;
-    width: 100%;
-    margin: 0 auto 1.5em;
-    border-radius: 3px;
-    border: 1px solid #e5eff5;
-}
-.kg-audio-title {
-    display: block;
-    padding-right: 20px;
-    padding-bottom: 4px;
-    padding-top: 4px;
-    font-size: 16px;
-    font-weight: 600;
-    line-height: 18px;
-    text-decoration: none !important;
-    color: #15212A !important;
-}
-.kg-audio-play-button {
-    display: block;
-    box-sizing: border-box;
-    width: 16px;
-    height: 16px;
-    color: #15212A !important;
-    border-style: solid;
-    border-width: 8px 0px 8px 16px;
-    border-color: transparent transparent transparent currentColor;
-}
-.kg-audio-duration {
-    display: block;
-    text-decoration: none !important;
-    font-size: 13px;
-    color: #15171A !important;
-}
-.kg-audio-link {
-    color: #738a94 !important;
-}
-.kg-file-card {
-    width: auto;
-    width: 100%;
-    margin: 0 0 1.5em 0;
-    border-radius: 3px;
-    border: 1px solid #e5eff5;
-}
-.kg-file-title {
-    display: block;
-    width: 100%;
-    padding-left: 12px;
-    padding-top: 8px;
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 1.3em;
-    text-decoration: none !important;
-    color: #15212A !important;
-}
-.kg-file-description {
-    display: block;
-    width: 100%;
-    padding-left: 12px;
-    padding-top: 2px;
-    font-size: 15px;
-    line-height: 1.4em;
-    text-decoration: none !important;
-    color: #738a94 !important;
-}
-.kg-file-meta {
-    display: block;
-    width: 100%;
-    padding-left: 12px;
-    padding-top: 4px;
-    padding-bottom: 8px;
-    font-size: 13px;
-    line-height: 1.4em;
-    text-decoration: none !important;
-    color: #738a94 !important;
-}
-.kg-file-name {
-    font-weight: 500;
-    color: #15212A !important;
-}
-.kg-file-thumbnail {
-    position: relative;
-    vertical-align: middle;
-    text-align: center;
-    border-radius: 2px;
-    background-color: {{accentColor}} !important;
-}
-.kg-twitter-card {
-    width: auto;
-    width: 100%;
-    margin: 0 auto;
-    border-radius: 12px;
-    border: 1px solid #e5eff5;
-}
-
-.kg-toggle-card {
-    background: transparent;
-    padding: 20px;
-    margin-bottom: 1.5em;
-    border-radius: 4px;
-    border: 1px solid {{secondaryBorderColor}};
-}
-
-
-/* -------------------------------------
-    HEADER, FOOTER, MAIN
-------------------------------------- */
-.main {
-    background: #ffffff;
-    border-radius: 3px;
-    border-spacing: 20px 0;
-    width: 100%;
-}
-
-.wrapper {
-    box-sizing: border-box;
-}
-
-.content-block {
-    padding-bottom: 10px;
-    padding-top: 10px;
-}
-
-.footer {
-    color: #738a94;
-    margin-top: 20px;
-    text-align: center;
-    font-size: 13px;
-    padding-bottom: 10px;
-    padding-top: 10px;
-    padding-left: 30px;
-    padding-right: 30px;
-    line-height: 1.5em;
-}
-
-.footer a {
-    color: #738a94;
-    text-decoration: underline;
-}
-
-/* -------------------------------------
-    BUTTONS
-------------------------------------- */
-.btn {
-    box-sizing: border-box;
-    width: 100%;
-    display: table;
-}
-
-.btn>tbody>tr>td {
-    padding-bottom: 15px;
-}
-
-.btn table {
-    width: auto;
-}
-
-.btn table td {
-    background-color: #ffffff;
-    border-radius: 5px;
-    text-align: center;
-}
-
-.btn a {
-    background-color: #ffffff;
-    border: solid 1px #3498db;
-    border-radius: 5px;
-    box-sizing: border-box;
-    color: #3498db;
-    cursor: pointer;
-    display: inline-block;
-    font-size: 14px;
-    font-weight: bold;
-    margin: 0;
-    padding: 12px 25px;
-    text-decoration: none;
-}
-
-.btn-primary table td {
-    background-color: #3498db;
-}
-
-.btn-primary a {
-    background-color: #3498db;
-    border-color: #3498db;
-    color: #ffffff;
-}
-
-.btn-accent table td {
-    background-color: {{adjustedAccentColor}};
-}
-
-.btn-accent a {
-    background-color: {{adjustedAccentColor}};
-    border-color: {{adjustedAccentColor}};
-    color: {{adjustedAccentContrastColor}};
-}
-
-/* -------------------------------------
-    OTHER STYLES THAT MIGHT BE USEFUL
-------------------------------------- */
-.last {
-    margin-bottom: 0;
-}
-
-.first {
-    margin-top: 0;
-}
-
-.align-center {
-    text-align: center;
-}
-
-.align-right {
-    text-align: right;
-}
-
-.align-left {
-    text-align: left;
-}
-
-.clear {
-    clear: both;
-}
-
-.mt0 {
-    margin-top: 0;
-}
-
-.mb0 {
-    margin-bottom: 0;
-}
-
-.preheader {
-    color: transparent;
-    display: none;
-    height: 0;
-    max-height: 0;
-    max-width: 0;
-    opacity: 0;
-    overflow: hidden;
-    mso-hide: all;
-    visibility: hidden;
-    width: 0;
-}
-
-.mobile-only {
-    display: none;
-}
-
-/* -------------------------------------
-    RESPONSIVE AND MOBILE FRIENDLY STYLES
-------------------------------------- */
-@media only screen and (max-width: 620px) {
-
-    table.body {
-        width: 100%;
-        min-width: 100%;
-    }
-
-    .hide-mobile {
-        display: none;
-    }
-
-    .mobile-only {
-        display: initial !important;
-    }
-
-    table.body p,
-    table.body ul,
-    table.body ol,
-    table.body td,
-    table.body span {
-        font-size: 16px !important;
-    }
-
-    table.body pre {
-        white-space: pre-wrap !important;
-        word-break: break-word !important;
-    }
-
-    table.body .content {
-        padding: 0 !important;
-    }
-
-    table.body .container {
-        padding: 0 !important;
-        width: 100% !important;
-    }
-
-    table.body .main {
-        border-spacing: 10px 0 !important;
-        border-left-width: 0 !important;
-        border-radius: 0 !important;
-        border-right-width: 0 !important;
-    }
-
-    table.body .btn table {
-        width: 100% !important;
-    }
-
-    table.body .btn a {
-        width: 100% !important;
-    }
-
-    table.body .img-responsive {
-        height: auto !important;
-        max-width: 100% !important;
-        width: auto !important;
-    }
-
-    table.body .site-icon img {
-        width: 40px !important;
-        height: 40px !important;
-    }
-
-    table.body .site-url a {
-        font-size: 14px !important;
-        padding-bottom: 15px !important;
-    }
-
-    table.body .post-meta,
-    table.body .post-meta-date {
-        white-space: normal !important;
-        font-size: 12px !important;
-        line-height: 1.5em;
-    }
-
-    table.body .post-meta,
-    table.body .view-online {
-        width: 100% !important;
-    }
-
-    table.body .post-meta-left,
-    table.body .post-meta-left.view-online {
-        width: 100% !important;
-        text-align: left !important;
-    }
-
-    table.body .post-meta.view-online-mobile {
-        display: table-row !important;
-    }
-
-    table.body .post-meta-left.view-online-mobile,
-    table.body .post-meta-left.view-online-mobile .view-online {
-        text-align: left !important;
-    }
-
-    table.body .post-meta.view-online.desktop {
-        display: none !important;
-    }
-
-    table.body .view-online {
-        text-decoration: underline;
-    }
-
-
-    table.body .view-online-link,
-    table.body .comment-link,
-    table.body .footer,
-    table.body .footer a {
-        font-size: 12px !important;
-    }
-
-    table.body .post-title a {
-        font-size: 32px !important;
-        line-height: 1.15em !important;
-    }
-
-    table.feedback-buttons {
-        display: none !important;
-    }
-
-    table.feedback-buttons-mobile {
-        display: table !important;
-        width: 100% !important;
-        max-width: 390px;
-    }
-
-    table.body .feedback-button-mobile-text {
-        font-size: 13px !important;
-    }
-
-    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%;
-    }
-
-    table.body .latest-post-title {
-        display: inline-block !important;
-        width: 100%;
-        padding-right: 0 !important;
-        padding-bottom: 8px !important;
-    }
-
-    table.body .latest-post h4, table.body .latest-post h4 span {
-        padding: 4px 0 !important;
-        font-size: 18px !important;
-    }
-
-    table.body .latest-post p, table.body .latest-post p span {
-        font-size: 13px !important;
-        line-height: 1.25em;
-    }
-
-    table.body .subscription-box h3 {
-        font-size: 14px !important;
-    }
-
-    table.body .subscription-box p,
-    table.body .subscription-box p span {
-        font-size: 13px !important;
-    }
-
-    table.body .subscription-details,
-    table.body .manage-subscription {
-        display: inline-block;
-        width: 100%;
-        text-align: left !important;
-        font-size: 13px !important;
-    }
-
-    table.body .subscription-details {
-        padding-bottom: 12px;
-    }
-
-    table.body .kg-bookmark-card {
-        width: 90vw;
-    }
-
-    table.body .kg-bookmark-thumbnail {
-        display: none !important;
-    }
-
-    table.body .kg-bookmark-metadata span {
-        font-size: 13px !important;
-    }
-
-    table.body .kg-embed-card {
-        max-width: 90vw !important;
-    }
-
-    table.body h1 {
-        font-size: 32px !important;
-        line-height: 1.3em !important;
-    }
-
-    table.body h2 {
-        font-size: 26px !important;
-        line-height: 1.22em !important;
-    }
-
-    table.body h3 {
-        font-size: 21px !important;
-        line-height: 1.25em !important;
-    }
-
-    table.body h4 {
-        font-size: 19px !important;
-        line-height: 1.3em !important;
-    }
-
-    table.body h5 {
-        font-size: 16px !important;
-        line-height: 1.4em !important;
-    }
-
-    table.body h6 {
-        font-size: 16px !important;
-        line-height: 1.4em !important;
-    }
-
-    table.body blockquote {
-        font-size: 17px;
-        line-height: 1.6em;
-        margin-bottom: 0;
-        padding-left: 15px;
-    }
-
-    table.body blockquote.kg-blockquote-alt {
-        border-left: 0 none !important;
-        margin: 0 0 2.5em 0 !important;
-        padding: 0 50px 0 50px !important;
-        font-size: 1.2em;
-    }
-
-    table.body blockquote + * {
-        margin-top: 1.5em !important;
-    }
-
-    table.body hr {
-        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;
-    }
-
-    table.body .kg-header-card.kg-v2 .kg-header-card-content {
-        padding-top: 64px !important;
-        padding-bottom: 64px !important;
-    }
-
-    table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
-        padding-top: 52px !important;
-        padding-bottom: 52px !important;
-    }
-
-    table.body .kg-header-card.kg-v2 .kg-header-card-heading {
-        font-size: 2.2em !important;
-        line-height: 1.1 !important;
-    }
-
-    table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
-        line-height: 1.3em !important;
-    }
-
-}
-
-/* -------------------------------------
-    PRESERVE THESE STYLES IN THE HEAD
-------------------------------------- */
-@media all {
-    .subscription-details p.hidden {
-        display: none !important;
-    }
-
-    .ExternalClass {
-        width: 100%;
-    }
-
-    .ExternalClass,
-    .ExternalClass p,
-    .ExternalClass span,
-    .ExternalClass font,
-    .ExternalClass td,
-    .ExternalClass div {
-        line-height: 100%;
-    }
-
-    .apple-link a {
-        color: inherit !important;
-        font-family: inherit !important;
-        font-size: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-        text-decoration: none !important;
-    }
-
-    #MessageViewBody a {
-        color: inherit;
-        text-decoration: none;
-        font-size: inherit;
-        font-family: inherit;
-        font-weight: inherit;
-        line-height: inherit;
-    }
-
-    .btn-primary table td:hover {
-        background-color: #34495e !important;
-    }
-
-    .btn-primary a:hover {
-        background-color: #34495e !important;
-        border-color: #34495e !important;
-    }
-}
-
-{{#if showBadge}}
-    .footer-powered {
-        text-align: center;
-        padding-top: 70px;
-        padding-bottom: 40px;
-    }
-
-    .gh-powered {
-        width: 142px;
-        height: 30px;
-    }
-{{/if}}
-
-</style>
diff --git a/ghost/email-service/lib/email-templates/partials/styles.hbs b/ghost/email-service/lib/email-templates/partials/styles.hbs
index 4c36cd85057..4f2b39ea48c 100644
--- a/ghost/email-service/lib/email-templates/partials/styles.hbs
+++ b/ghost/email-service/lib/email-templates/partials/styles.hbs
@@ -11,25 +11,13 @@ img {
     max-width: 100%;
 }
 
-img.is-light-background {
-    {{#if backgroundIsDark}}
-        display: none !important;
-        mso-hide: all !important;
-    {{else}}
-        display: initial !important;
-    {{/if}}
-}
-
 img.is-dark-background {
-    {{#if backgroundIsDark}}
-        display: initial !important;
-    {{else}}
         display: none !important;
         mso-hide: all !important;
-    {{/if}}
 }
 
 body {
+    background-color: #fff;
     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: 18px;
@@ -38,7 +26,7 @@ body {
     padding: 0;
     -ms-text-size-adjust: 100%;
     -webkit-text-size-adjust: 100%;
-    color: {{textColor}};
+    color: #15212A;
 }
 
 table {
@@ -52,13 +40,14 @@ table td {
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
     font-size: 18px;
     vertical-align: top;
-    color: {{textColor}};
+    color: #15212A;
 }
 
 /* -------------------------------------
     BODY & CONTAINER
 ------------------------------------- */
 .body {
+    background-color: #fff;
     width: 100%;
 }
 
@@ -66,11 +55,8 @@ table td {
 .container {
     display: block;
     margin: 0 auto !important;
-    padding: 12px;
     /* makes it centered */
     max-width: 600px;
-    background-color: {{backgroundColor}};
-    color: {{textColor}};
 }
 
 /* This should also be a block element, so that it will fill 100% of the .container */
@@ -79,9 +65,6 @@ table td {
     display: block;
     margin: 0 auto;
     max-width: 600px;
-    {{#if borderColor}}
-        border: 1px solid {{borderColor}};
-    {{/if}}
 }
 
 .content a {
@@ -99,8 +82,7 @@ hr {
     padding: 0;
     height: 1px;
     border: 0;
-    border-top: 1px solid #e5eff5 !important;
-    border-top: 1px solid {{secondaryBorderColor}} !important;
+    border-top: 1px solid #e5eff5;
 }
 
 p,
@@ -164,7 +146,7 @@ dt {
     float: left;
     margin: 0 20px 0 0;
     width: 120px;
-    color: {{textColor}};
+    color: #15212A;
     font-weight: 500;
     text-align: right;
 }
@@ -175,10 +157,9 @@ dd {
 }
 
 blockquote {
-    margin: 2em 0 2em 0;
-    padding: 0 25px 0 25px;
-    border-left: {{linkColor}} 2px solid;
-    color: {{textColor}};
+    margin: 0;
+    padding: 0;
+    border-left: {{accentColor}} 2px solid;
     font-size: 17px;
     font-weight: 500;
     line-height: 1.6em;
@@ -187,19 +168,23 @@ blockquote {
 
 blockquote.kg-blockquote-alt {
     border-left: 0 none;
-    padding: 0 50px 0 50px;
     text-align: center;
     font-size: 1.2em;
     font-style: italic;
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
+    color: #738a94;
 }
 
 blockquote p {
-    margin: 0.8em 0;
+    margin: 2em 25px;
+    padding: 0 !important;
     font-size: 1em;
 }
 
+blockquote.kg-blockquote-alt p {
+    margin-right: 50px;
+    margin-left: 50px;
+}
+
 blockquote small {
     display: inline-block;
     margin: 0.8em 0 0.8em 1.5em;
@@ -215,12 +200,8 @@ blockquote cite a {
 }
 
 a {
-    color: {{linkColor}};
-    {{#if backgroundIsDark}}
-        text-decoration: underline;
-    {{else}}
-        text-decoration: none;
-    {{/if}}
+    color: {{accentColor}};
+    text-decoration: none;
 }
 
 h1,
@@ -234,7 +215,6 @@ h6 {
     line-height: 1.11em;
     font-weight: 700;
     text-rendering: optimizeLegibility;
-    color: {{titleColor}};
 }
 
 h1 {
@@ -293,9 +273,15 @@ 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;
-    padding-top: 5px;
+    font-size: 13px;
+    padding-top: 10px;
+    padding-bottom: 10px;
     line-height: 1.5em;
+    color: #738a94;
+}
+
+figcaption a {
+    text-decoration: none!important;
 }
 
 code {
@@ -327,33 +313,28 @@ figure blockquote p {
 
 .header-image {
     padding-top: 24px;
+    padding-bottom: 16px;
 }
 
 .site-icon {
-    padding-bottom: 10px;
-    padding-top: 20px;
+    padding-bottom: 8px;
+    padding-top: 8px;
     text-align: center;
     border-radius: 3px;
 }
 
 .site-icon img {
-    width: 48px;
-    height: 48px;
+    width: 44px;
+    height: 44px;
     border-radius: 3px;
 }
 
 .site-info {
-    padding-top: 50px;
-}
-
-.site-info-bordered {
-    padding-top: 50px;
-    border-bottom: 1px solid #e5eff5;
-    border-bottom: 1px solid {{secondaryBorderColor}};
+    padding-top: 32px;
 }
 
 .site-url {
-    color: {{textColor}};
+    color: #15212A;
     font-size: 16px;
     letter-spacing: -0.1px;
     font-weight: 700;
@@ -362,30 +343,35 @@ figure blockquote p {
 }
 
 .site-url-bottom-padding {
-    padding-bottom: 50px;
+    padding-bottom: 12px;
 }
 
 .site-title {
-    text-decoration: none !important;
-    color: {{textColor}};
+    color: #15212A;
 }
 
 .site-subtitle {
-    text-decoration: none !important;
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
-    font-size: 14px;
+    color: #738a94;
+    font-size: 13px;
     font-weight: 400;
     text-transform: none;
 }
 
 .post-title {
-    padding-bottom: 16px;
-    font-size: 42px;
+    font-size: 36px;
     line-height: 1.1em;
     font-weight: 700;
     text-align: center;
 }
+
+.post-title-with-excerpt {
+    padding-bottom: 8px;
+}
+
+.post-title-no-excerpt {
+    padding-bottom: 16px;
+}
+
 .post-title-serif {
     font-family: Georgia, serif;
     letter-spacing: -0.01em;
@@ -395,23 +381,55 @@ figure blockquote p {
 }
 
 .post-title-link {
+    color: #15212A;
     display: block;
     text-align: center;
-    margin-top: 50px;
-    text-decoration: none !important;
-    color: {{titleColor}};
+    margin-top: 32px;
 }
-
 .post-title-link-left {
     text-align: left;
 }
 
+.post-excerpt-wrapper {
+    width: 100%;
+    max-width: 600px !important;
+}
+
+.post-excerpt {
+    margin: 0;
+    color: #15212A;
+    font-size: 19px;
+    line-height: 1.4em;
+    text-align: center;
+}
+
+.post-excerpt-with-feature-image {
+    padding-bottom: 28px;
+}
+
+.post-excerpt-no-feature-image {
+    padding-bottom: 32px;
+}
+
+.post-excerpt-serif-serif {
+    font-family: Georgia, serif;
+    font-size: 20px;
+}
+
+.post-excerpt-serif-sans {
+    font-size: 20px;
+    font-family: Georgia, serif;
+}
+
+.post-excerpt-left {
+    text-align: left;
+}
+
 .post-meta,
 .view-online {
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
+    color: #738a94;
     font-size: 13px;
-    letter-spacing: 0.1px;
+    font-weight: 400;
     text-align: center;
 }
 
@@ -440,48 +458,43 @@ figure blockquote p {
     white-space: nowrap;
 }
 
-.comment-link {
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
-    font-size: 13px;
-    letter-spacing: 0.1px;
-    text-decoration: none;
-}
-
-.comment-link img {
-    width: 16px;
-    height: 16px;
-    margin-bottom: 1px;
-    vertical-align: middle;
-}
-
 .view-online-link {
     word-wrap: none;
     white-space: nowrap;
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
-}
-
-.feature-image-row:first-child > td {
-    padding-top: 24px;
+    color: #738a94;
+    text-decoration: underline !important;
 }
 
 .feature-image {
     padding-bottom: 30px;
     width: 100%;
+    text-align: center;
+}
+
+.feature-image-row:first-child > td,
+.header-image-row + .feature-image-row > td,
+.site-info-row + .feature-image-row > td {
+    padding-top: 24px;
 }
 
 .feature-image-with-caption {
-    padding-bottom: 10px;
+    width: 100%;
+    padding: 0;
+    font-size: 13px!important;
 }
 
 .feature-image-caption {
     width: 100%;
-    padding-bottom: 30px;
+    padding-top: 5px;
+    padding-bottom: 32px;
     text-align: center;
+    font-size: 13px !important;
+    color: #738a94;
+    line-height: 1.5em;
+}
+
+.kg-card-figcaption {
     font-size: 13px;
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
 }
 
 /* -------------------------------------
@@ -490,7 +503,6 @@ figure blockquote p {
 
 .feedback-buttons {
     width: auto !important;
-    max-width: 600px !important;
     margin: auto;
 }
 
@@ -500,7 +512,7 @@ figure blockquote p {
 }
 
 .feedback-button-mobile-text {
-    color: {{textColor}};
+    color: #15212A;
     font-size: 13px !important;
     font-weight: 500;
     margin-bottom: 0;
@@ -512,16 +524,16 @@ figure blockquote p {
 
 .latest-posts-header {
     margin: 0;
-    padding: 8px 0 16px;
-    color: {{titleColor}};
-    font-size: 14px;
+    padding: 8px 0 8px;
+    color: #15212A;
+    font-size: 13px;
     font-weight: 700;
     text-transform: uppercase;
 }
 
 .latest-post {
     max-width: 600px !important;
-    padding: 8px 0;
+    padding: 16px 0;
 }
 
 .latest-post a {
@@ -536,20 +548,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 +559,7 @@ figure blockquote p {
 .latest-post h4 {
     margin: 0;
     padding: 2px 0 4px;
-    font-size: 19px;
+    font-size: 18px;
     font-weight: 700;
 }
 
@@ -566,21 +568,19 @@ figure blockquote p {
 }
 
 .latest-post h4 a {
-    color: {{textColor}} !important;
+    color: #15212A !important;
 }
 
 .latest-post p {
     margin: 0;
     padding: 0;
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
+    color: #738a94;
     font-size: 15px;
     font-weight: 400;
 }
 
 .latest-post p a {
-    color: {{textColor}} !important;
-    color: {{secondaryTextColor}} !important;
+    color: #738a94 !important;
 }
 
 /* -------------------------------------
@@ -588,15 +588,12 @@ figure blockquote p {
 ------------------------------------- */
 
 .subscription-box {
-    max-width: 600px !important;
     padding: 32px 0;
     border-bottom: 1px solid #e5eff5;
-    border-bottom: 1px solid {{secondaryBorderColor}};
-    color: {{textColor}};
+    color: #15212A;
 }
 
 .subscription-box h3 {
-    color: {{titleColor}} !important;
     font-size: 14px;
     font-weight: 700;
     text-transform: uppercase;
@@ -605,7 +602,7 @@ figure blockquote p {
 
 .subscription-box p {
     margin-bottom: 0;
-    color: {{textColor}} !important;
+    color: #15212A !important;
     font-size: 15px;
     font-weight: 400;
     line-height: 1.45em;
@@ -613,7 +610,7 @@ figure blockquote p {
 }
 
 .subscription-box p a {
-    color: {{textColor}} !important;
+    color: #15212A !important;
     text-decoration: none;
 }
 
@@ -624,10 +621,7 @@ figure blockquote p {
     text-align: right;
     line-height: 1.45em;
     vertical-align: bottom;
-    color: {{linkColor}};
-    {{#if backgroundIsDark}}
-    text-decoration: underline;
-    {{/if}}
+    color: {{accentColor}};
 }
 
 /* -------------------------------------
@@ -639,29 +633,27 @@ figure blockquote p {
     font-family: Georgia, serif;
     font-size: 18px;
     line-height: 1.5em;
-    color: {{textColor}};
+    color: #15212A;
     padding-bottom: 20px;
     border-bottom: 1px solid #e5eff5;
-    border-bottom: 1px solid {{secondaryBorderColor}};
 }
 
 .post-content-sans-serif {
     max-width: 600px !important;
     font-size: 17px;
     line-height: 1.5em;
-    color: {{textColor}};
+    color: #15212A;
     padding-bottom: 20px;
     border-bottom: 1px solid #e5eff5;
-    border-bottom: 1px solid {{secondaryBorderColor}};
 }
 
 .post-content-row:first-child > td, .header-image-row + .post-content-row > td {
-    padding-top: 52px;
+    padding-top: 32px;
 }
 
 .post-content a,
 .post-content-sans-serif a {
-    color: {{linkColor}};
+    color: {{accentColor}};
     text-decoration: underline;
 }
 
@@ -671,7 +663,7 @@ a[data-flickr-embed] img {
 
 .kg-bookmark-card {
     width: 100%;
-    background: {{backgroundColor}};
+    background: #ffffff;
 }
 
 .kg-bookmark-card a {
@@ -685,19 +677,22 @@ a[data-flickr-embed] img {
 .kg-image-card img {
     display: block;
     margin: 0 auto;
+    height: auto;
     width: auto;
-    height: auto !important;
+}
+
+.kg-image-card span {
+    text-align: center;
 }
 
 .kg-bookmark-container {
     display: flex;
     min-height: 148px;
-    color: {{textColor}};
+    color: #15212A;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
     text-decoration: none;
     border-radius: 3px;
     border: 1px solid #e5eff5;
-    border: 1px solid {{secondaryBorderColor}};
 }
 
 .kg-bookmark-content {
@@ -707,7 +702,7 @@ a[data-flickr-embed] img {
 }
 
 .kg-bookmark-title {
-    color: {{textColor}};
+    color: #15212A;
     font-size: 15px;
     line-height: 1.5em;
     font-weight: 600;
@@ -718,8 +713,7 @@ a[data-flickr-embed] img {
     overflow-y: hidden;
     margin-top: 12px;
     max-height: 40px;
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
+    color: #738a94;
     font-size: 13px;
     line-height: 1.5em;
     font-weight: 400;
@@ -746,7 +740,7 @@ a[data-flickr-embed] img {
     flex-wrap: wrap;
     align-items: center;
     margin-top: 14px;
-    color: {{textColor}};
+    color: #15212A;
     font-size: 13px;
     font-weight: 400;
 }
@@ -824,7 +818,7 @@ a[data-flickr-embed] img {
 .kg-nft-link {
     display: block;
     text-decoration: none !important;
-    color: {{textColor}} !important;
+    color: #15212A !important;
     font-family: inherit !important;
     font-size: 14px;
     line-height: 1.3em;
@@ -845,12 +839,7 @@ a[data-flickr-embed] img {
 }
 
 .kg-audio-thumbnail.placeholder {
-    {{#if backgroundIsDark}}
-        background: {{backgroundColor}} !important;
-        background: rgba(255, 255, 255, 0.25) !important;
-    {{else}}
-        background: {{accentColor}} !important;
-    {{/if}}
+    background-color: {{accentColor}} !important;
 }
 
 .kg-callout-card {
@@ -860,14 +849,6 @@ a[data-flickr-embed] img {
     border-radius: 3px;
 }
 
-.kg-callout-card p {
-    margin: 0
-}
-
-.kg-callout-text {
-    color: #15212A;
-}
-
 .kg-callout-card-grey {
     background: #eef0f2;
 }
@@ -903,10 +884,10 @@ a[data-flickr-embed] img {
 
 .kg-callout-card-accent {
     background: {{accentColor}};
+    color: #fff;
 }
 
-.kg-callout-card-accent a,
-.kg-callout-card-accent .kg-callout-text {
+.kg-callout-card-accent a {
     color: #fff;
 }
 
@@ -937,10 +918,6 @@ a[data-flickr-embed] img {
 
 .kg-header-card.kg-style-dark {
     background: #15171a;
-}
-
-.kg-header-card.kg-style-dark h2,
-.kg-header-card.kg-style-dark h3 {
     color: #ffffff;
 }
 
@@ -948,17 +925,8 @@ a[data-flickr-embed] img {
     background-color: #F9F9FA;
 }
 
-.kg-header-card.kg-style-light h2,
-.kg-header-card.kg-style-light h3 {
-    color: #15171a;
-}
-
 .kg-header-card.kg-style-accent {
     background: {{accentColor}};
-}
-
-.kg-header-card.kg-style-accent h2,
-.kg-header-card.kg-style-accent h3 {
     color: #ffffff;
 }
 
@@ -966,10 +934,6 @@ a[data-flickr-embed] img {
     background-color: #e7e7eb;
     background-size: cover;
     background-position: center center;
-}
-
-.kg-header-card.kg-style-image h2,
-.kg-header-card.kg-style-image h3 {
     color: #ffffff;
 }
 
@@ -1023,7 +987,7 @@ a[data-flickr-embed] img {
     margin: 0;
     padding: 8px 16px;
     text-decoration: none !important;
-    color: #15171A !important;
+    color: #15171A;
 }
 
 .kg-size-large .kg-header-card-button {
@@ -1039,150 +1003,163 @@ a[data-flickr-embed] img {
     color: #ffffff !important;
 }
 
+/* Header v2 */
+
+.kg-header-card.kg-v2 {
+    padding: 0;
+    text-align: inherit;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-image {
+    height: 320px;
+    background-repeat: no-repeat;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-content {
+    padding: 80px 48px;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+    padding-top: 64px;
+    padding-bottom: 64px;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-heading {
+    margin: 0;
+    line-height: 1em;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-subheading {
+    margin: 0.75em 0 0;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-heading a,
+.kg-header-card.kg-v2 .kg-header-card-subheading a {
+    color: inherit;
+}
+
+.kg-header-card.kg-v2 .kg-header-card-button {
+    margin-top: 24px;
+    padding: 10px 20px;
+    font-size: 16px;
+    font-weight: 500;
+}
+
 .kg-product-card {
     width: 100%;
-    margin: 0 0 1.5em; 
+    margin: 0 0 1.5em;
     padding: 20px;
-    border-radius: 3px; 
+    border-radius: 3px;
     border: 1px solid #e5eff5;
-    border: 1px solid {{secondaryBorderColor}};
 }
-
-.kg-product-card .btn-accent a {
-    {{#if backgroundIsDark}}
-        color: #15212A !important;
-    {{/if}}
+.kg-product-card-image {
+    width: 100%;
 }
-
 .kg-product-rating img {
     width: 96px;
     border: none;
 }
-
 .kg-audio-card {
-    width: auto; 
+    width: auto;
     width: 100%;
     margin: 0 auto 1.5em;
-    border-radius: 3px; 
+    border-radius: 3px;
     border: 1px solid #e5eff5;
-    border: 1px solid {{secondaryBorderColor}};
 }
-
 .kg-audio-title {
-    display: block; 
-    padding-right: 20px; 
-    padding-bottom: 4px; 
-    padding-top: 4px; 
-    font-size: 16px; 
-    font-weight: 600; 
-    line-height: 18px; 
-    text-decoration: none !important; 
-    color: {{textColor}} !important;
+    display: block;
+    padding-right: 20px;
+    padding-bottom: 4px;
+    padding-top: 4px;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 18px;
+    text-decoration: none !important;
+    color: #15212A !important;
 }
-
 .kg-audio-play-button {
-    display: block; 
-    box-sizing: border-box; 
-    width: 16px; 
-    height: 16px; 
-    color: {{textColor}} !important; 
-    border-style: solid; 
-    border-width: 8px 0px 8px 16px; 
+    display: block;
+    box-sizing: border-box;
+    width: 16px;
+    height: 16px;
+    color: #15212A !important;
+    border-style: solid;
+    border-width: 8px 0px 8px 16px;
     border-color: transparent transparent transparent currentColor;
 }
-
 .kg-audio-duration {
-    display: block; 
-    text-decoration: none; 
-    font-size: 13px; 
-    text-decoration: none !important; 
-    color: {{textColor}} !important;
+    display: block;
+    text-decoration: none !important;
+    font-size: 13px;
+    color: #15171A !important;
 }
-
 .kg-audio-link {
-    text-decoration: none !important; 
-    color: {{textColor}}; 
-    color: {{secondaryTextColor}};
+    color: #738a94 !important;
 }
-
 .kg-file-card {
+    width: auto;
     width: 100%;
     margin: 0 0 1.5em 0;
-    border-radius: 3px; 
+    border-radius: 3px;
     border: 1px solid #e5eff5;
-    border: 1px solid {{secondaryBorderColor}};
 }
-
 .kg-file-title {
-    display: block; 
-    width: 100%; 
-    padding-left: 12px; 
-    padding-top: 8px; 
-    font-size: 17px; 
-    font-weight: bold; 
-    line-height: 1.3em; 
+    display: block;
+    width: 100%;
+    padding-left: 12px;
+    padding-top: 8px;
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 1.3em;
     text-decoration: none !important;
-    color: {{textColor}} !important; 
+    color: #15212A !important;
 }
-
 .kg-file-description {
-    display: block; 
-    width: 100%; 
-    padding-left: 12px; 
-    padding-top: 2px; 
-    font-size: 15px; 
-    line-height: 1.4em; 
+    display: block;
+    width: 100%;
+    padding-left: 12px;
+    padding-top: 2px;
+    font-size: 15px;
+    line-height: 1.4em;
     text-decoration: none !important;
-    color: {{textColor}} !important; 
-    color: {{secondaryTextColor}} !important; 
+    color: #738a94 !important;
 }
-
 .kg-file-meta {
     display: block;
-    width: 100%; 
-    padding-left: 12px; 
-    padding-top: 4px; 
+    width: 100%;
+    padding-left: 12px;
+    padding-top: 4px;
     padding-bottom: 8px;
-    font-size: 13px; 
-    line-height: 1.4em; 
+    font-size: 13px;
+    line-height: 1.4em;
     text-decoration: none !important;
-    color: {{textColor}} !important;
-    color: {{secondaryTextColor}} !important; 
+    color: #738a94 !important;
 }
-
 .kg-file-name {
-    font-weight: 500; 
-    color: {{textColor}};
+    font-weight: 500;
+    color: #15212A !important;
 }
-
 .kg-file-thumbnail {
-    position: relative; 
-    vertical-align: middle; 
-    text-align: center; 
+    position: relative;
+    vertical-align: middle;
+    text-align: center;
     border-radius: 2px;
-    {{#if backgroundIsDark}}
-        background: {{backgroundColor}} !important;
-        background: rgba(255, 255, 255, 0.25) !important;
-    {{else}}
-        background: {{accentColor}} !important;
-    {{/if}}
+    background-color: {{accentColor}} !important;
 }
-
 .kg-twitter-card {
-    width: auto; 
+    width: auto;
     width: 100%;
     margin: 0 auto;
-    background: #FFFFFF !important;
-    border-radius: 12px; 
+    border-radius: 12px;
     border: 1px solid #e5eff5;
 }
 
 .kg-toggle-card {
     background: transparent;
-    padding: 20px; 
+    padding: 20px;
     margin-bottom: 1.5em;
-    border-radius: 4px; 
-    border: 1px solid {{secondaryBorderColor}}; 
+    border-radius: 4px;
+    border: 1px solid #738a94;
 }
 
 
@@ -1190,10 +1167,10 @@ a[data-flickr-embed] img {
     HEADER, FOOTER, MAIN
 ------------------------------------- */
 .main {
+    background: #ffffff;
     border-radius: 3px;
     border-spacing: 20px 0;
     width: 100%;
-    background: {{backgroundColor}};
 }
 
 .wrapper {
@@ -1206,11 +1183,10 @@ a[data-flickr-embed] img {
 }
 
 .footer {
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
+    color: #738a94;
     margin-top: 20px;
     text-align: center;
-    font-size: 13px;
+    font-size: 13px!important;
     padding-bottom: 10px;
     padding-top: 10px;
     padding-left: 30px;
@@ -1219,9 +1195,9 @@ a[data-flickr-embed] img {
 }
 
 .footer a {
-    color: {{textColor}};
-    color: {{secondaryTextColor}};
+    color: #738a94;
     text-decoration: underline;
+    font-size: 13px;
 }
 
 /* -------------------------------------
@@ -1245,6 +1221,7 @@ a[data-flickr-embed] img {
     background-color: #ffffff;
     border-radius: 5px;
     text-align: center;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 }
 
 .btn a {
@@ -1273,23 +1250,13 @@ a[data-flickr-embed] img {
 }
 
 .btn-accent table td {
-    {{#if backgroundIsDark}}
-        background-color: #FFFFFF;
-    {{else}}
-        background-color: {{adjustedAccentColor}};
-    {{/if}}
+    background-color: {{adjustedAccentColor}};
 }
 
 .btn-accent a {
-    {{#if backgroundIsDark}}
-        background-color: #FFFFFF;
-        border-color: #FFFFFF !important;
-        color: #15212A;
-    {{else}}
-        background-color: {{adjustedAccentColor}};
-        border-color: {{adjustedAccentColor}} !important;
-        color: {{adjustedAccentContrastColor}};
-    {{/if}}
+    background-color: {{adjustedAccentColor}};
+    border-color: {{adjustedAccentColor}};
+    color: {{adjustedAccentContrastColor}};
 }
 
 /* -------------------------------------
@@ -1344,6 +1311,10 @@ a[data-flickr-embed] img {
     display: none;
 }
 
+.hide-desktop {
+    display: none;
+}
+
 /* -------------------------------------
     RESPONSIVE AND MOBILE FRIENDLY STYLES
 ------------------------------------- */
@@ -1352,8 +1323,6 @@ a[data-flickr-embed] img {
     table.body {
         width: 100%;
         min-width: 100%;
-        padding: 8px 4px;
-        background-color: {{backgroundColor}};
     }
 
     .hide-mobile {
@@ -1364,12 +1333,32 @@ a[data-flickr-embed] img {
         display: initial !important;
     }
 
+    .hide-desktop {
+        display: initial !important;
+    }
+
+    .desktop-only {
+        display: none !important;
+    }
+
     table.body p,
     table.body ul,
     table.body ol,
-    table.body td,
-    table.body span {
+    table.body td {
+        font-size: 16px;
+    }
+
+    table.body .post-excerpt {
+        font-size: 16px !important;
+    }
+
+    table.body .kg-callout-card {
+        padding: 16px 24px !important;
+    }
+
+    table.body .kg-callout-text {
         font-size: 16px !important;
+        line-height: 1.5em !important;
     }
 
     table.body pre {
@@ -1407,21 +1396,37 @@ a[data-flickr-embed] img {
         width: auto !important;
     }
 
+    table.body .site-icon {
+        padding-top: 0 !important;
+    }
+
+    table.body .site-info {
+        padding-top: 24px !important;
+    }
+
+    table.body .post-title-link {
+        margin-top: 24px !important;
+    }
+
+    table.body .post-meta-wrapper {
+        padding-bottom: 24px !important;
+    }
+
     table.body .site-icon img {
-        width: 40px !important;
-        height: 40px !important;
+        width: 36px !important;
+        height: 36px !important;
     }
 
     table.body .site-url a {
-        font-size: 14px !important;
-        padding-bottom: 15px !important;
+        font-size: 13px !important;
+        padding-bottom: 16px !important;
     }
 
     table.body .post-meta,
     table.body .post-meta-date {
         white-space: normal !important;
-        font-size: 12px !important;
-        line-height: 1.5em;
+        font-size: 13px !important;
+        line-height: 1.2em;
     }
 
     table.body .post-meta,
@@ -1453,16 +1458,19 @@ a[data-flickr-embed] img {
     }
 
 
+    table.body .footer p, table.body .footer p span {
+        font-size: 13px !important;
+    }
+
     table.body .view-online-link,
-    table.body .comment-link,
     table.body .footer,
     table.body .footer a {
-        font-size: 12px !important;
+        font-size: 13px !important;
     }
 
     table.body .post-title a {
-        font-size: 32px !important;
-        line-height: 1.15em !important;
+        font-size: 26px !important;
+        line-height: 1.1em !important;
     }
 
     table.feedback-buttons {
@@ -1475,43 +1483,28 @@ a[data-flickr-embed] img {
         max-width: 390px;
     }
 
-    table.feedback-buttons-mobile a,
-    table.body .feedback-button-mobile-text {
-        text-decoration: none !important;
-    }
-
     table.body .feedback-button-mobile-text {
         font-size: 13px !important;
     }
 
     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 .subscription-box h3 {
@@ -1556,7 +1549,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;
     }
@@ -1582,32 +1576,67 @@ a[data-flickr-embed] img {
     }
 
     table.body blockquote {
-        font-size: 17px;
+        font-size: 16px !important;
         line-height: 1.6em;
         margin-bottom: 0;
-        padding-left: 15px;
+    }
+
+    table.body blockquote p {
+        margin-right: 15px !important;
+        margin-left: 15px !important;
     }
 
     table.body blockquote.kg-blockquote-alt {
         border-left: 0 none !important;
-        margin: 0 0 2.5em 0 !important;
-        padding: 0 50px 0 50px !important;
-        font-size: 1.2em;
+        margin: 0 !important;
+        font-size: 18px !important;
+        line-height: 1.4em !important;
     }
 
-    table.body blockquote + * {
-        margin-top: 1.5em !important;
+    table.body blockquote.kg-blockquote-alt p {
+        margin-right: 20px !important;
+        margin-left: 20px !important;
     }
 
     table.body hr {
         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;
+    }
+
+    table.body .kg-header-card.kg-v2 .kg-header-card-content {
+        padding-top: 64px !important;
+        padding-bottom: 64px !important;
+    }
+
+    table.body .kg-header-card.kg-v2 .kg-header-card-image + .kg-header-card-content {
+        padding-top: 52px !important;
+        padding-bottom: 52px !important;
     }
 
+    table.body .kg-header-card.kg-v2 .kg-header-card-heading {
+        font-size: 2.2em !important;
+        line-height: 1.1 !important;
+    }
+
+    table.body .kg-header-card.kg-v2 .kg-header-card-subheading {
+        line-height: 1.3em !important;
+    }
+
+   .feature-image-caption {
+        font-size: 13px!important;
+   }
+
+   .kg-card-figcaption {
+        font-size: 13px!important;
+    }
+
+   .kg-card-figcaption p, .kg-card-figcaption p span {
+        font-size: 13px!important;
+   }
+
 }
 
 /* -------------------------------------
diff --git a/ghost/email-service/lib/email-templates/template-old.hbs b/ghost/email-service/lib/email-templates/template-old.hbs
deleted file mode 100644
index f913d99b8a2..00000000000
--- a/ghost/email-service/lib/email-templates/template-old.hbs
+++ /dev/null
@@ -1,240 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <meta name="viewport" content="width=device-width" />
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
-        <title>{{post.title}}</title>
-        {{>styles}}
-    </head>
-    <body>
-        <span class="preheader">{{preheader}}</span>
-        <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body" width="100%">
-            <!-- Outlook doesn't respect max-width so we need an extra centered table -->
-            <!--[if mso]>
-            <tr>
-                <td>
-                    <center>
-                        <table border="0" cellpadding="0" cellspacing="0" width="600">
-            <![endif]-->
-            <tr>
-                <td>&nbsp;</td>
-                <td class="container">
-                    <div class="content">
-                        <!-- START CENTERED WHITE CONTAINER -->
-                        <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="main" width="100%">
-
-                            <!-- START MAIN CONTENT AREA -->
-                            <tr>
-                                <td class="wrapper">
-                                    <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
-                                        {{#if headerImage}}
-                                            <tr class="header-image-row">
-                                                <td class="header-image" width="100%" align="center">
-                                                    <img
-                                                        src="{{headerImage}}"
-                                                        {{#if headerImageWidth}}
-                                                            width="{{headerImageWidth}}"
-                                                        {{/if}}
-                                                    >
-                                                </td>
-                                            </tr>
-                                        {{/if}}
-
-                                        {{#if (or showHeaderIcon showHeaderTitle showHeaderName) }}
-                                            <tr>
-                                                <td class="{{#if (and newsletter.showPostTitleSection showHeaderTitle) }}site-info-bordered{{else}}site-info{{/if}}" width="100%" align="center">
-                                                    <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                                        {{#if (and showHeaderIcon site.iconUrl) }}
-                                                            <tr>
-                                                                <td class="site-icon"><a href="{{site.url}}"><img src="{{site.iconUrl}}" alt="{{site.title}}" border="0" width="48" height="48"></a></td>
-                                                            </tr>
-                                                        {{/if}}
-                                                        {{#if showHeaderTitle }}
-                                                            <tr>
-                                                                <td class="site-url {{#unless showHeaderName}}site-url-bottom-padding{{/unless}}"><div style="width: 100% !important;"><a href="{{site.url}}" class="site-title">{{site.title}}</a></div></td>
-                                                            </tr>
-                                                        {{/if}}
-                                                        {{#if (and showHeaderName showHeaderTitle) }}
-                                                            <tr>
-                                                                <td class="site-url site-url-bottom-padding"><div style="width: 100% !important;"><a href="{{site.url}}" class="site-subtitle">{{newsletter.name}}</a></div></td>
-                                                            </tr>
-                                                        {{/if}}
-                                                        {{#if (and showHeaderName (not showHeaderTitle)) }}
-                                                            <tr>
-                                                                <td class="site-url site-url-bottom-padding"><div style="width: 100% !important;"><a href="{{site.url}}" class="site-title">{{newsletter.name}}</a></div></td>
-                                                            </tr>
-                                                        {{/if}}
-
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        {{/if}}
-
-                                        {{#if newsletter.showPostTitleSection}}
-                                            <tr>
-                                                <td class="{{classes.title}}">
-                                                    <a href="{{post.url}}" class="{{classes.titleLink}}">{{post.title}}</a>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td style="width: 100%">
-                                                    <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-bottom: 48px;">
-                                                        <tr>
-                                                            <td height="20" class="{{classes.meta}}" style="padding: 0;">
-                                                                By {{post.authors}} • <span class="post-meta-date">{{post.publishedAt}} </span>
-                                                                {{#if newsletter.showCommentCta}}
-                                                                    <a href="{{post.commentUrl}}" class="comment-link" valign="middle">
-                                                                        • <img src="https://static.ghost.org/v5.0.0/images/comment-icon.png" border="0" width="16" height="16" alt="Comment">
-                                                                    </a>
-                                                                {{/if}}
-                                                            </td>
-                                                            <td class="{{classes.meta}} view-online desktop">
-                                                                <a href="{{post.url}}" class="view-online-link">View in browser</a>
-                                                            </td>
-                                                        </tr>
-                                                        <tr class="{{classes.meta}} view-online-mobile">
-                                                            <td height="20" class="view-online">
-                                                                <a href="{{post.url}}" class="view-online-link">View in browser</a>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        {{/if}}
-
-                                        {{#if showFeatureImage }}
-                                            <tr class="feature-image-row">
-                                                <td class="feature-image
-                                                    {{#if post.feature_image_caption }}
-                                                        feature-image-with-caption
-                                                    {{/if}}
-                                                "><img
-                                                    src="{{post.feature_image}}"
-                                                    {{#if post.feature_image_width }}
-                                                        width="{{post.feature_image_width}}"
-                                                    {{/if}}
-                                                    {{#if post.feature_image_alt }}
-                                                        alt="{{post.feature_image_alt}}"
-                                                    {{/if}}
-                                                ></td>
-                                            </tr>
-                                            {{#if post.feature_image_caption }}
-                                                <tr>
-                                                    <td class="feature-image-caption" align="center">{{{post.feature_image_caption}}}</td>
-                                                </tr>
-                                            {{/if}}
-                                        {{/if}}
-                                        <tr class="post-content-row">
-                                            <td class="{{classes.body}}">
-                                                <!-- POST CONTENT START -->
-                                                {{{html}}}
-                                                <!-- POST CONTENT END -->
-
-                                                {{#if paywall}}
-                                                    {{>paywall}}
-                                                {{/if}}
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-
-                            <!-- END MAIN CONTENT AREA -->
-
-                            {{#if (or feedbackButtons newsletter.showCommentCta) }}
-                                <tr>
-                                    <td dir="ltr" width="100%" style="background-color: #ffffff; text-align: center; padding: 32px 0 24px; border-bottom: 1px solid #e5eff5;" align="center">
-                                        <table class="feedback-buttons" role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                            <tr>
-                                                {{#if feedbackButtons }}
-                                                    {{> feedbackButton feedbackButtons href=feedbackButtons.likeHref buttonText='More like this' iconUrl="https://static.ghost.org/v5.0.0/images/more-like-this.png" width="145" height="36" }}
-                                                    {{> feedbackButton feedbackButtons href=feedbackButtons.dislikeHref buttonText='Less like this' iconUrl="https://static.ghost.org/v5.0.0/images/less-like-this.png" width="142" height="36" }}
-                                                {{/if}}
-                                                {{#if newsletter.showCommentCta}}
-                                                    {{> feedbackButton href=post.commentUrl buttonText='Comment' iconUrl="https://static.ghost.org/v5.0.0/images/comment.png" width="122" height="36" }}
-                                                {{/if}}
-                                            </tr>
-                                        </table>
-                                        <table class="feedback-buttons-mobile" role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                            <tr>
-                                                {{#if feedbackButtons }}
-                                                    {{> feedbackButtonMobile feedbackButtons href=feedbackButtons.likeHref buttonText='More like this' iconUrl="https://static.ghost.org/v5.0.0/images/more-like-this-mobile.png" width="42" height="42" }}
-                                                    {{> feedbackButtonMobile feedbackButtons href=feedbackButtons.dislikeHref buttonText='Less like this' iconUrl="https://static.ghost.org/v5.0.0/images/less-like-this-mobile.png" width="42" height="42" }}
-                                                {{/if}}
-                                                {{#if newsletter.showCommentCta}}
-                                                    {{> feedbackButtonMobile href=post.commentUrl buttonText='Comment' iconUrl="https://static.ghost.org/v5.0.0/images/comment-mobile.png" width="42" height="42" }}
-                                                {{/if}}
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                            {{/if}}
-
-                             {{#if latestPosts.length}}
-                                <tr>
-                                    <td style="padding: 24px 0; border-bottom: 1px solid #e5eff5;">
-                                        <h3 class="latest-posts-header">Keep reading</h3>
-                                        {{> latestPosts}}
-                                    </td>
-                                </tr>
-                            {{/if}}
-
-                            {{#if newsletter.showSubscriptionDetails}}
-                                <tr>
-                                    <td class="subscription-box">
-                                        <h3>Subscription details</h3>
-                                        <p style="margin-bottom: 16px;">
-                                            <span>You are receiving this because you are a <strong>%%{status}%% subscriber</strong> to {{site.title}}.</span> %%{status_text}%%
-                                        </p>
-                                        <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
-                                            <tr>
-                                                <td class="subscription-details">
-                                                    <p class="%%{name_class}%%">Name: %%{name, "not provided"}%%</p>
-                                                    <p>Email: <a href="#">%%{email}%%</a></p>
-                                                    <p>Member since: %%{created_at}%%</p>
-                                                </td>
-                                                <td align="right" valign="bottom" class="manage-subscription">
-                                                    <a href="%%{manage_account_url}%%"> Manage subscription &rarr;</a>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                            {{/if}}
-
-                            <tr>
-                                <td class="wrapper" align="center">
-                                    <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-top: 40px; padding-bottom: 30px;">
-                                        {{#if footerContent }}
-                                            <tr><td class="footer">{{{footerContent}}}</td></tr>
-                                        {{/if}}
-                                        <tr>
-                                            <td class="footer">{{site.title}} &copy; {{year}} – <a href="%%{unsubscribe_url}%%">Unsubscribe</a></td>
-                                        </tr>
-
-                                        {{#if showBadge }}
-                                            <tr>
-                                                <td class="footer-powered"><a href="https://ghost.org/"><img src="https://static.ghost.org/v4.0.0/images/powered.png" border="0" width="142" height="30" class="gh-powered" alt="Powered by Ghost"></a></td>
-                                            </tr>
-                                        {{/if}}
-                                    </table>
-                                </td>
-                            </tr>
-
-                        </table>
-                        <!-- END CENTERED WHITE CONTAINER -->
-                    </div>
-                </td>
-                <td>&nbsp;</td>
-            </tr>
-
-            <!--[if mso]>
-                            </table>
-                        </center>
-                    </td>
-                </tr>
-            <![endif]-->
-        </table>
-    </body>
-</html>
diff --git a/ghost/email-service/lib/email-templates/template.hbs b/ghost/email-service/lib/email-templates/template.hbs
index b0a0108f678..f99551134fc 100644
--- a/ghost/email-service/lib/email-templates/template.hbs
+++ b/ghost/email-service/lib/email-templates/template.hbs
@@ -22,7 +22,7 @@
                 <td class="container">
                     <div class="content">
                         <!-- START CENTERED WHITE CONTAINER -->
-                        <table role="presentation" border="0" cellpadding="0" cellspacing="20" class="main" width="100%">
+                        <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="main" width="100%">
 
                             <!-- START MAIN CONTENT AREA -->
                             <tr>
@@ -31,23 +31,25 @@
                                         {{#if headerImage}}
                                             <tr class="header-image-row">
                                                 <td class="header-image" width="100%" align="center">
-                                                    <img
-                                                        src="{{headerImage}}"
-                                                        {{#if headerImageWidth}}
-                                                            width="{{headerImageWidth}}"
-                                                        {{/if}}
-                                                    >
+                                                    <a href="{{site.url}}">
+                                                        <img
+                                                            src="{{headerImage}}"
+                                                            {{#if headerImageWidth}}
+                                                                width="{{headerImageWidth}}"
+                                                            {{/if}}
+                                                        >
+                                                    </a>
                                                 </td>
                                             </tr>
                                         {{/if}}
 
                                         {{#if (or showHeaderIcon showHeaderTitle showHeaderName) }}
-                                            <tr>
-                                                <td class="{{#if (and newsletter.showPostTitleSection showHeaderTitle) }}site-info-bordered{{else}}site-info{{/if}}" width="100%" align="center">
+                                            <tr class="site-info-row">
+                                                <td class="site-info" width="100%" align="center">
                                                     <table role="presentation" border="0" cellpadding="0" cellspacing="0">
                                                         {{#if (and showHeaderIcon site.iconUrl) }}
                                                             <tr>
-                                                                <td class="site-icon"><a href="{{site.url}}"><img src="{{site.iconUrl}}" alt="{{site.title}}" border="0"></a></td>
+                                                                <td class="site-icon"><a href="{{site.url}}"><img src="{{site.iconUrl}}" alt="{{site.title}}" border="0" width="48" height="48"></a></td>
                                                             </tr>
                                                         {{/if}}
                                                         {{#if showHeaderTitle }}
@@ -77,21 +79,19 @@
                                                     <a href="{{post.url}}" class="{{classes.titleLink}}">{{post.title}}</a>
                                                 </td>
                                             </tr>
+                                            {{#if (and newsletter.showExcerpt post.customExcerpt)}}
+                                                <tr>
+                                                    <td class="post-excerpt-wrapper" style="width: 100%">
+                                                        <p class="{{classes.excerpt}}">{{post.customExcerpt}}</p>
+                                                    </td>
+                                                </tr>
+                                            {{/if}}
                                             <tr>
                                                 <td style="width: 100%">
-                                                    <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-bottom: 48px;">
+                                                    <table class="post-meta-wrapper" role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-bottom: 32px;">
                                                         <tr>
                                                             <td height="20" class="{{classes.meta}}" style="padding: 0;">
                                                                 By {{post.authors}} • <span class="post-meta-date">{{post.publishedAt}} </span>
-                                                                {{#if newsletter.showCommentCta}}
-                                                                    <a href="{{post.commentUrl}}" class="comment-link" valign="middle">
-                                                                        {{#if backgroundIsDark}}
-                                                                            • <img src="https://static.ghost.org/v5.0.0/images/comment-icon-darkmode.png" border="0" width="16" height="16" alt="Comment">
-                                                                        {{else}}
-                                                                            • <img src="https://static.ghost.org/v5.0.0/images/comment-icon.png" border="0" width="16" height="16" alt="Comment">
-                                                                        {{/if}}
-                                                                    </a>
-                                                                {{/if}}
                                                             </td>
                                                             <td class="{{classes.meta}} view-online desktop">
                                                                 <a href="{{post.url}}" class="view-online-link">View in browser</a>
@@ -113,7 +113,7 @@
                                                     {{#if post.feature_image_caption }}
                                                         feature-image-with-caption
                                                     {{/if}}
-                                                "><img
+                                                " align="center"><img
                                                     src="{{post.feature_image}}"
                                                     {{#if post.feature_image_width }}
                                                         width="{{post.feature_image_width}}"
@@ -123,9 +123,14 @@
                                                     {{/if}}
                                                 ></td>
                                             </tr>
-                                            {{#if post.feature_image_caption }}
+
+                                             {{#if post.feature_image_caption }}
                                                 <tr>
-                                                    <td class="feature-image-caption" align="center">{{{post.feature_image_caption}}}</td>
+                                                    <td align="center">
+                                                        <div class="feature-image-caption">
+                                                            {{{post.feature_image_caption}}}
+                                                        </div>
+                                                    </td>
                                                 </tr>
                                             {{/if}}
                                         {{/if}}
@@ -148,7 +153,7 @@
 
                             {{#if (or feedbackButtons newsletter.showCommentCta) }}
                                 <tr>
-                                    <td dir="ltr" width="100%" style="background-color: {{backgroundColor}}; text-align: center; padding: 32px 0 24px; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid {{secondaryBorderColor}};" align="center">
+                                    <td dir="ltr" width="100%" style="background-color: #ffffff; text-align: center; padding: 32px 0 24px; border-bottom: 1px solid #e5eff5;" align="center">
                                         <table class="feedback-buttons" role="presentation" border="0" cellpadding="0" cellspacing="0">
                                             <tr>
                                                 {{#if feedbackButtons }}
@@ -177,7 +182,7 @@
 
                              {{#if latestPosts.length}}
                                 <tr>
-                                    <td style="padding: 24px 0; border-bottom: 1px solid #e5eff5; border-bottom: 1px solid {{secondaryBorderColor}};">
+                                    <td style="padding: 24px 0; border-bottom: 1px solid #e5eff5;">
                                         <h3 class="latest-posts-header">Keep reading</h3>
                                         {{> latestPosts}}
                                     </td>
@@ -219,7 +224,7 @@
 
                                         {{#if showBadge }}
                                             <tr>
-                                                <td class="footer-powered"><a href="https://ghost.org/"><img src="https://static.ghost.org/v4.0.0/images/powered.png" border="0" width="142" height="30" class="gh-powered" alt="Powered by Ghost"></a></td>
+                                                <td class="footer-powered"><a href="https://ghost.org/?via=pbg-newsletter"><img src="https://static.ghost.org/v4.0.0/images/powered.png" border="0" width="142" height="30" class="gh-powered" alt="Powered by Ghost"></a></td>
                                             </tr>
                                         {{/if}}
                                     </table>
diff --git a/ghost/email-service/lib/helpers/register-helpers.js b/ghost/email-service/lib/helpers/register-helpers.js
new file mode 100644
index 00000000000..8d097f251a8
--- /dev/null
+++ b/ghost/email-service/lib/helpers/register-helpers.js
@@ -0,0 +1,55 @@
+module.exports = {
+    registerHelpers(handlebars, labs) {
+        handlebars.registerHelper('if', function (conditional, options) {
+            if (conditional) {
+                return options.fn(this);
+            } else {
+                return options.inverse(this);
+            }
+        });
+
+        handlebars.registerHelper('and', function () {
+            const len = arguments.length - 1;
+
+            for (let i = 0; i < len; i++) {
+                if (!arguments[i]) {
+                    return false;
+                }
+            }
+
+            return true;
+        });
+
+        handlebars.registerHelper('not', function () {
+            const len = arguments.length - 1;
+
+            for (let i = 0; i < len; i++) {
+                if (!arguments[i]) {
+                    return true;
+                }
+            }
+
+            return false;
+        });
+
+        handlebars.registerHelper('or', function () {
+            const len = arguments.length - 1;
+
+            for (let i = 0; i < len; i++) {
+                if (arguments[i]) {
+                    return true;
+                }
+            }
+
+            return false;
+        });
+
+        handlebars.registerHelper('hasFeature', function (flag, options) {
+            if (labs.isSet(flag)) {
+                return options.fn(this);
+            } else {
+                return options.inverse(this);
+            }
+        });
+    }
+};
diff --git a/ghost/email-service/package.json b/ghost/email-service/package.json
index 67a931e4359..fe4fc9f7102 100644
--- a/ghost/email-service/package.json
+++ b/ghost/email-service/package.json
@@ -19,24 +19,24 @@
   ],
   "devDependencies": {
     "c8": "8.0.1",
-    "html-validate": "8.7.0",
+    "html-validate": "8.21.0",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/color-utils": "0.1.24",
+    "@tryghost/color-utils": "0.2.2",
     "@tryghost/email-events": "0.0.0",
-    "@tryghost/errors": "1.2.26",
+    "@tryghost/errors": "1.3.5",
     "@tryghost/html-to-plaintext": "0.0.0",
-    "@tryghost/kg-default-cards": "9.1.8",
-    "@tryghost/logging": "2.4.8",
-    "@tryghost/tpl": "0.1.24",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/kg-default-cards": "10.0.9",
+    "@tryghost/logging": "2.4.18",
+    "@tryghost/tpl": "0.1.32",
+    "@tryghost/validator": "0.2.14",
     "bson-objectid": "2.0.4",
     "cheerio": "0.22.0",
     "handlebars": "4.7.8",
     "juice": "9.1.0",
-    "moment-timezone": "0.5.23"
+    "moment-timezone": "0.5.45"
   }
 }
diff --git a/ghost/email-service/test/batch-sending-service.test.js b/ghost/email-service/test/batch-sending-service.test.js
index 7221ae84af8..b16634a1a48 100644
--- a/ghost/email-service/test/batch-sending-service.test.js
+++ b/ghost/email-service/test/batch-sending-service.test.js
@@ -8,11 +8,9 @@ const errors = require('@tryghost/errors');
 
 describe('Batch Sending Service', function () {
     let errorLog;
-    let warnLog;
 
     beforeEach(function () {
         errorLog = sinon.stub(logging, 'error');
-        warnLog = sinon.stub(logging, 'warn');
         sinon.stub(logging, 'info');
     });
 
@@ -284,7 +282,7 @@ describe('Batch Sending Service', function () {
                 ]
             }));
 
-            const innitialMembers = members.slice();
+            const initialMembers = members.slice();
 
             Member.getFilteredCollectionQuery = ({filter}) => {
                 // Everytime we request the members, we also create a new member, to simulate that creating batches doesn't happen in a transaction
@@ -298,6 +296,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());
                 });
@@ -328,7 +330,7 @@ describe('Batch Sending Service', function () {
                 },
                 emailSegmenter: {
                     getMemberFilterForSegment(n) {
-                        return `newsletters.id:${n.id}`;
+                        return `newsletters.id:'${n.id}'`;
                     }
                 },
                 db
@@ -359,12 +361,94 @@ describe('Batch Sending Service', function () {
             assert.equal(insertedRecipients.length, 16);
 
             // Check all recipients match initialMembers
-            assert.deepEqual(insertedRecipients.map(recipient => recipient.member_id).sort(), innitialMembers.map(member => member.id).sort());
+            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'), 16);
         });
 
+        it('Does log message to sentry if email_count is off by > 1%', async function () {
+            const Member = createModelClass({});
+            const EmailBatch = createModelClass({});
+            const newsletter = createModel({});
+
+            // Create 16 members in single line
+            const members = new Array(16).fill(0).map(i => createModel({
+                email: `example${i}@example.com`,
+                uuid: `member${i}`,
+                newsletters: [
+                    newsletter
+                ]
+            }));
+
+            Member.getFilteredCollectionQuery = ({filter}) => {
+                // Everytime we request the members, we also create a new member, to simulate that creating batches doesn't happen in a transaction
+                // These created members should be excluded
+                members.push(createModel({
+                    email: `example${members.length}@example.com`,
+                    uuid: `member${members.length}`,
+                    newsletters: [
+                        newsletter
+                    ]
+                }));
+
+                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());
+                });
+
+                // Sort all by id desc (string)
+                all.sort((a, b) => {
+                    return b.id.localeCompare(a.id);
+                });
+                return createDb({
+                    all: all.map(member => member.toJSON())
+                });
+            };
+
+            const db = createDb({});
+            const captureMessage = sinon.stub();
+
+            const service = new BatchSendingService({
+                models: {Member, EmailBatch},
+                sentry: {
+                    captureMessage
+                },
+                emailRenderer: {
+                    getSegments() {
+                        return [null];
+                    }
+                },
+                sendingService: {
+                    getMaximumRecipients() {
+                        return 5;
+                    }
+                },
+                emailSegmenter: {
+                    getMemberFilterForSegment(n) {
+                        return `newsletters.id:'${n.id}'`;
+                    }
+                },
+                db
+            });
+
+            const email = createModel({
+                email_count: 15
+            });
+
+            await service.createBatches({
+                email,
+                post: createModel({}),
+                newsletter
+            });
+
+            assert(captureMessage.calledOnce);
+        });
+
         it('works with multiple batches', async function () {
             const Member = createModelClass({});
             const EmailBatch = createModelClass({});
@@ -390,10 +474,14 @@ describe('Batch Sending Service', function () {
                 }))
             ];
 
-            const innitialMembers = members.slice();
+            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());
                 });
@@ -424,7 +512,7 @@ describe('Batch Sending Service', function () {
                 },
                 emailSegmenter: {
                     getMemberFilterForSegment(n, _, segment) {
-                        return `newsletters.id:${n.id}+(${segment})`;
+                        return `newsletters.id:'${n.id}'+(${segment})`;
                     }
                 },
                 db
@@ -446,11 +534,116 @@ describe('Batch Sending Service', function () {
             assert.equal(insertedRecipients.length, 4);
 
             // Check all recipients match initialMembers
-            assert.deepEqual(insertedRecipients.map(recipient => recipient.member_id).sort(), innitialMembers.map(member => member.id).sort());
+            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'), 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 () {
@@ -568,12 +761,19 @@ describe('Batch Sending Service', function () {
                 return Promise.resolve(callCount === 12 ? false : true);
             });
             const batches = new Array(101).fill(0).map(() => createModel({}));
+
+            /**
+             * !! WARNING !!
+             * If the error message is changed that it no longer contains the word 'partially',
+             * we'll also need the frontend logic in ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js
+             */
             await assert.rejects(service.sendBatches({
                 email: createModel({}),
                 batches,
                 post: createModel({}),
                 newsletter: createModel({})
-            }), /was only partially sent/);
+            }), /was only partially sent/); // do not change without reading the warning above
+
             sinon.assert.callCount(sendBatch, 101);
             const sendBatches = sendBatch.getCalls().map(call => call.args[0].batch);
             assert.deepEqual(sendBatches, batches);
@@ -884,7 +1084,7 @@ describe('Batch Sending Service', function () {
             assert.equal(members.length, 2);
         });
 
-        it('Truncates recipients if more than the maximum are returned in a batch', async function () {
+        it('Throws error if more than the maximum are returned in a batch', async function () {
             const EmailBatch = createModelClass({
                 findOne: {
                     id: '123_batch_id',
@@ -968,7 +1168,7 @@ describe('Batch Sending Service', function () {
             const service = new BatchSendingService({
                 models: {EmailBatch, EmailRecipient: DoubleTheEmailRecipients},
                 sendingService,
-                BEFORE_RETRY_CONFIG: {maxRetries: 10, maxTime: 2000, sleep: 1}
+                BEFORE_RETRY_CONFIG: {maxRetries: 1, maxTime: 2000, sleep: 1}
             });
 
             const result = await service.sendBatch({
@@ -980,25 +1180,11 @@ describe('Batch Sending Service', function () {
                 newsletter: createModel({})
             });
 
-            assert.equal(result, true);
-
-            sinon.assert.calledOnce(warnLog);
-            const firstLoggedWarn = warnLog.firstCall.args[0];
-            assert.match(firstLoggedWarn, /Email batch 123_batch_id has 4 members, which exceeds the maximum of 2 members per batch. Filtering by batch_id: 123_batch_id/);
-
-            sinon.assert.calledOnce(errorLog);
-            const firstLoggedError = errorLog.firstCall.args[0];
-
-            assert.match(firstLoggedError, /Email batch 123_batch_id has 3 members, which exceeds the maximum of 2. Truncating to 2/);
-
-            sinon.assert.calledOnce(sendingService.send);
-            const {members} = sendingService.send.firstCall.args[0];
-            assert.equal(members.length, 2);
+            assert.equal(result, false);
 
             sinon.assert.calledOnce(findOne);
             const batch = await findOne.firstCall.returnValue;
-            assert.equal(batch.get('status'), 'submitted');
-            assert.equal(batch.get('provider_id'), 'providerid@example.com');
+            assert.equal(batch.get('status'), 'failed');
         });
 
         it('Stops retrying after the email retry cut off time', async function () {
diff --git a/ghost/email-service/test/email-event-storage.test.js b/ghost/email-service/test/email-event-storage.test.js
index 770c06c7225..a2db2b278a4 100644
--- a/ghost/email-service/test/email-event-storage.test.js
+++ b/ghost/email-service/test/email-event-storage.test.js
@@ -456,14 +456,20 @@ describe('Email Event Storage', function () {
 
         const update = sinon.stub().resolves();
 
+        const emailSuppressionList = {
+            removeUnsubscribe: sinon.stub().resolves()
+        };
+
         const eventHandler = new EmailEventStorage({
             membersRepository: {
                 update
-            }
+            },
+            emailSuppressionList
         });
         await eventHandler.handleUnsubscribed(event);
         assert(update.calledOnce);
         assert(update.firstCall.args[0].newsletters.length === 0);
+        assert(emailSuppressionList.removeUnsubscribe.calledOnce);
     });
 
     it('Handles unsubscribe with a non-existent member', async function () {
@@ -487,6 +493,44 @@ describe('Email Event Storage', function () {
         assert(update.firstCall.args[0].newsletters.length === 0);
     });
 
+    it('Finds newsletters to keep during an unsubscribe', async function () {
+        const event = EmailUnsubscribedEvent.create({
+            email: 'example@example.com',
+            memberId: '123',
+            emailId: '456',
+            timestamp: new Date(0)
+        });
+
+        const Email = {
+            findOne: sinon.stub().resolves({
+                get: sinon.stub().returns('newsletter_1')
+            })
+        };
+
+        const membersRepository = {
+            get: sinon.stub().resolves({
+                related: sinon.stub().returns({
+                    models: [
+                        {id: 'newsletter_1'},
+                        {id: 'newsletter_2'}
+                    ]
+                })
+            })
+        };
+
+        const eventHandler = new EmailEventStorage({
+            membersRepository,
+            models: {
+                Email
+            }
+        });
+
+        const result = await eventHandler.findNewslettersToKeep(event);
+
+        assert(result.length === 1);
+        assert(result[0].id === 'newsletter_2');
+    });
+
     it('Handles complaints', async function () {
         const event = SpamComplaintEvent.create({
             email: 'example@example.com',
diff --git a/ghost/email-service/test/email-helpers.test.js b/ghost/email-service/test/email-helpers.test.js
new file mode 100644
index 00000000000..58afe2362b5
--- /dev/null
+++ b/ghost/email-service/test/email-helpers.test.js
@@ -0,0 +1,142 @@
+const assert = require('assert/strict');
+const {registerHelpers} = require('../lib/helpers/register-helpers');
+
+describe('registerHelpers', function () {
+    it('registers helpers', function () {
+        const handlebars = {
+            registerHelper: function (name, fn) {
+                this[name] = fn;
+            }
+        };
+        const labs = {
+            isSet: function () {
+                return true;
+            }
+        };
+        registerHelpers(handlebars, labs);
+
+        assert.ok(handlebars.if);
+        assert.ok(handlebars.and);
+        assert.ok(handlebars.not);
+        assert.ok(handlebars.or);
+        assert.ok(handlebars.hasFeature);
+    });
+
+    it('if helper returns true', function () {
+        const handlebars = {
+            registerHelper: function (name, fn) {
+                this[name] = fn;
+            }
+        };
+        const labs = {
+            isSet: function () {
+                return true;
+            }
+        };
+        registerHelpers(handlebars, labs);
+
+        const result = handlebars.if(true, {
+            fn: function () {
+                return true;
+            },
+            inverse: function () {
+                return false;
+            }
+        });
+
+        assert.equal(result, true);
+    });
+
+    it('if helper returns false', function () {
+        const handlebars = {
+            registerHelper: function (name, fn) {
+                this[name] = fn;
+            }
+        };
+        const labs = {
+            isSet: function () {
+                return true;
+            }
+        };
+        registerHelpers(handlebars, labs);
+
+        const result = handlebars.if(false, {
+            fn: function () {
+                return true;
+            },
+            inverse: function () {
+                return false;
+            }
+        });
+
+        assert.equal(result, false);
+    });
+
+    it('and helper returns true', function () {
+        const handlebars = {
+            registerHelper: function (name, fn) {
+                this[name] = fn;
+            }
+        };
+        const labs = {
+            isSet: function () {
+                return true;
+            }
+        };
+        registerHelpers(handlebars, labs);
+
+        const result = handlebars.and(true, true);
+
+        assert.equal(result, true);
+    });
+
+    it('hasFeature helper returns true', function () {
+        const handlebars = {
+            registerHelper: function (name, fn) {
+                this[name] = fn;
+            }
+        };
+        const labs = {
+            isSet: function () {
+                return true;
+            }
+        };
+        registerHelpers(handlebars, labs);
+
+        const result = handlebars.hasFeature('test', {
+            fn: function () {
+                return true;
+            },
+            inverse: function () {
+                return false;
+            }
+        });
+
+        assert.equal(result, true);
+    });
+
+    it('hasFeature helper returns false', function () {
+        const handlebars = {
+            registerHelper: function (name, fn) {
+                this[name] = fn;
+            }
+        };
+        const labs = {
+            isSet: function () {
+                return false;
+            }
+        };
+        registerHelpers(handlebars, labs);
+
+        const result = handlebars.hasFeature('test', {
+            fn: function () {
+                return true;
+            },
+            inverse: function () {
+                return false;
+            }
+        });
+
+        assert.equal(result, false);
+    });
+});
diff --git a/ghost/email-service/test/email-renderer.test.js b/ghost/email-service/test/email-renderer.test.js
index d46f622d1a9..0dedfae0056 100644
--- a/ghost/email-service/test/email-renderer.test.js
+++ b/ghost/email-service/test/email-renderer.test.js
@@ -6,6 +6,7 @@ const linkReplacer = require('@tryghost/link-replacer');
 const sinon = require('sinon');
 const logging = require('@tryghost/logging');
 const {HtmlValidate} = require('html-validate');
+const crypto = require('crypto');
 
 async function validateHtml(html) {
     const htmlvalidate = new HtmlValidate({
@@ -60,6 +61,10 @@ async function validateHtml(html) {
     assert.equal(report.valid, true, 'Expected valid HTML without warnings, got errors:\n' + parsedErrors.join('\n\n'));
 }
 
+const getMembersValidationKey = () => {
+    return 'members-key';
+};
+
 describe('Email renderer', function () {
     let logStub;
 
@@ -92,7 +97,8 @@ describe('Email renderer', function () {
                             return 'UTC';
                         }
                     }
-                }
+                },
+                settingsHelpers: {getMembersValidationKey}
             });
             newsletter = createModel({
                 uuid: 'newsletteruuid'
@@ -107,16 +113,20 @@ describe('Email renderer', function () {
             };
         });
 
-        it('returns an empty list of replacements if nothing is used', function () {
+        it('returns the unsubscribe header replacement by default', function () {
             const html = 'Hello world';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 0);
+            assert.equal(replacements.length, 1);
+            assert.equal(replacements[0].token.toString(), '/%%\\{list_unsubscribe\\}%%/g');
+            assert.equal(replacements[0].id, 'list_unsubscribe');
+            const memberHmac = crypto.createHmac('sha256', getMembersValidationKey()).update(member.uuid).digest('hex');
+            assert.equal(replacements[0].getValue(member), `http://example.com/subdirectory/unsubscribe/?uuid=${member.uuid}&key=${memberHmac}&newsletter=newsletteruuid`);
         });
 
         it('returns a replacement if it is used', function () {
             const html = 'Hello world %%{uuid}%%';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{uuid\\}%%/g');
             assert.equal(replacements[0].id, 'uuid');
             assert.equal(replacements[0].getValue(member), 'myuuid');
@@ -125,7 +135,7 @@ describe('Email renderer', function () {
         it('returns a replacement only once if used multiple times', function () {
             const html = 'Hello world %%{uuid}%% And %%{uuid}%%';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{uuid\\}%%/g');
             assert.equal(replacements[0].id, 'uuid');
             assert.equal(replacements[0].getValue(member), 'myuuid');
@@ -134,7 +144,7 @@ describe('Email renderer', function () {
         it('returns correct first name', function () {
             const html = 'Hello %%{first_name}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{first_name\\}%%/g');
             assert.equal(replacements[0].id, 'first_name');
             assert.equal(replacements[0].getValue(member), 'Test');
@@ -143,26 +153,17 @@ describe('Email renderer', function () {
         it('returns correct unsubscribe url', function () {
             const html = 'Hello %%{unsubscribe_url}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{unsubscribe_url\\}%%/g');
             assert.equal(replacements[0].id, 'unsubscribe_url');
-            assert.equal(replacements[0].getValue(member), `http://example.com/subdirectory/unsubscribe/?uuid=myuuid&newsletter=newsletteruuid`);
-        });
-
-        it('returns correct list-unsubscribe value', function () {
-            labsEnabled = true;
-            const html = 'Hello';
-            const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
-            assert.equal(replacements[0].token.toString(), '/%%\\{list_unsubscribe\\}%%/g');
-            assert.equal(replacements[0].id, 'list_unsubscribe');
-            assert.equal(replacements[0].getValue(member), `http://example.com/subdirectory/unsubscribe/?uuid=myuuid&newsletter=newsletteruuid`);
+            const memberHmac = crypto.createHmac('sha256', getMembersValidationKey()).update(member.uuid).digest('hex');
+            assert.equal(replacements[0].getValue(member), `http://example.com/subdirectory/unsubscribe/?uuid=${member.uuid}&key=${memberHmac}&newsletter=newsletteruuid`);
         });
 
         it('returns correct name', function () {
             const html = 'Hello %%{name}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{name\\}%%/g');
             assert.equal(replacements[0].id, 'name');
             assert.equal(replacements[0].getValue(member), 'Test User');
@@ -172,7 +173,7 @@ describe('Email renderer', function () {
             member.name = '';
             const html = 'Hello %%{name_class}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{name_class\\}%%/g');
             assert.equal(replacements[0].id, 'name_class');
             assert.equal(replacements[0].getValue(member), 'hidden');
@@ -181,7 +182,7 @@ describe('Email renderer', function () {
         it('returns empty class for available name', function () {
             const html = 'Hello %%{name_class}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{name_class\\}%%/g');
             assert.equal(replacements[0].id, 'name_class');
             assert.equal(replacements[0].getValue(member), '');
@@ -190,7 +191,7 @@ describe('Email renderer', function () {
         it('returns correct email', function () {
             const html = 'Hello %%{email}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{email\\}%%/g');
             assert.equal(replacements[0].id, 'email');
             assert.equal(replacements[0].getValue(member), 'test@example.com');
@@ -199,7 +200,7 @@ describe('Email renderer', function () {
         it('returns correct status', function () {
             const html = 'Hello %%{status}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{status\\}%%/g');
             assert.equal(replacements[0].id, 'status');
             assert.equal(replacements[0].getValue(member), 'free');
@@ -209,7 +210,7 @@ describe('Email renderer', function () {
             member.status = 'comped';
             const html = 'Hello %%{status}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{status\\}%%/g');
             assert.equal(replacements[0].id, 'status');
             assert.equal(replacements[0].getValue(member), 'complimentary');
@@ -227,7 +228,7 @@ describe('Email renderer', function () {
             ];
             const html = 'Hello %%{status}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{status\\}%%/g');
             assert.equal(replacements[0].id, 'status');
             assert.equal(replacements[0].getValue(member), 'trialing');
@@ -236,7 +237,7 @@ describe('Email renderer', function () {
         it('returns manage_account_url', function () {
             const html = 'Hello %%{manage_account_url}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{manage_account_url\\}%%/g');
             assert.equal(replacements[0].id, 'manage_account_url');
             assert.equal(replacements[0].getValue(member), 'http://example.com/subdirectory/#/portal/account');
@@ -255,7 +256,7 @@ describe('Email renderer', function () {
             ];
 
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{status_text\\}%%/g');
             assert.equal(replacements[0].id, 'status_text');
             assert.equal(replacements[0].getValue(member), 'Your free trial ends on 13 March 2050, at which time you will be charged the regular price. You can always cancel before then.');
@@ -264,7 +265,7 @@ describe('Email renderer', function () {
         it('returns correct createdAt', function () {
             const html = 'Hello %%{created_at}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{created_at\\}%%/g');
             assert.equal(replacements[0].id, 'created_at');
             assert.equal(replacements[0].getValue(member), '13 March 2023');
@@ -274,7 +275,7 @@ describe('Email renderer', function () {
             member.createdAt = null;
             const html = 'Hello %%{created_at}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{created_at\\}%%/g');
             assert.equal(replacements[0].id, 'created_at');
             assert.equal(replacements[0].getValue(member), '');
@@ -283,7 +284,7 @@ describe('Email renderer', function () {
         it('supports fallback values', function () {
             const html = 'Hey %%{first_name, "there"}%%,';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 1);
+            assert.equal(replacements.length, 2);
             assert.equal(replacements[0].token.toString(), '/%%\\{first_name, (?:"|&quot;)there(?:"|&quot;)\\}%%/g');
             assert.equal(replacements[0].id, 'first_name_2');
             assert.equal(replacements[0].getValue(member), 'Test');
@@ -295,7 +296,7 @@ describe('Email renderer', function () {
         it('supports combination of multiple fallback values', function () {
             const html = 'Hey %%{first_name, "there"}%%, %%{first_name, "member"}%% %%{first_name}%% %%{first_name, "there"}%%';
             const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
-            assert.equal(replacements.length, 3);
+            assert.equal(replacements.length, 4);
             assert.equal(replacements[0].token.toString(), '/%%\\{first_name, (?:"|&quot;)there(?:"|&quot;)\\}%%/g');
             assert.equal(replacements[0].id, 'first_name_2');
             assert.equal(replacements[0].getValue(member), 'Test');
@@ -317,6 +318,20 @@ describe('Email renderer', function () {
             // In case of empty name
             assert.equal(replacements[2].getValue({name: ''}), '');
         });
+
+        it('handles members uuid and key', function () {
+            const html = '%%{uuid}%% %%{key}%%';
+            const replacements = emailRenderer.buildReplacementDefinitions({html, newsletterUuid: newsletter.get('uuid')});
+            assert.equal(replacements.length, 3);
+            assert.equal(replacements[0].token.toString(), '/%%\\{uuid\\}%%/g');
+            assert.equal(replacements[0].id, 'uuid');
+            assert.equal(replacements[0].getValue(member), 'myuuid');
+
+            assert.equal(replacements[1].token.toString(), '/%%\\{key\\}%%/g');
+            assert.equal(replacements[1].id, 'key');
+            const memberHmac = crypto.createHmac('sha256', getMembersValidationKey()).update(member.uuid).digest('hex');
+            assert.equal(replacements[1].getValue(member), memberHmac);
+        });
     });
 
     describe('isMemberTrialing', function () {
@@ -662,6 +677,18 @@ describe('Email renderer', function () {
             let response = emailRenderer.getSubject(post);
             response.should.equal('Sample Post');
         });
+
+        it('adds [TEST] prefix for test emails', function () {
+            const post = createModel({
+                posts_meta: createModel({
+                    email_subject: ''
+                }),
+                title: 'Sample Post',
+                loaded: ['posts_meta']
+            });
+            let response = emailRenderer.getSubject(post, true);
+            response.should.equal('[TEST] Sample Post');
+        });
     });
 
     describe('getFromAddress', function () {
@@ -681,6 +708,11 @@ describe('Email renderer', function () {
             },
             labs: {
                 isSet: () => false
+            },
+            emailAddressService: {
+                getAddress(addresses) {
+                    return addresses;
+                }
             }
         });
 
@@ -723,6 +755,12 @@ describe('Email renderer', function () {
     });
 
     describe('getReplyToAddress', function () {
+        let emailAddressService = {
+            getAddress(addresses) {
+                return addresses;
+            },
+            managedEmailEnabled: true
+        };
         let emailRenderer = new EmailRenderer({
             settingsCache: {
                 get: (key) => {
@@ -741,7 +779,8 @@ describe('Email renderer', function () {
             },
             labs: {
                 isSet: () => false
-            }
+            },
+            emailAddressService
         });
 
         it('returns support address', function () {
@@ -754,14 +793,52 @@ describe('Email renderer', function () {
             response.should.equal('support@example.com');
         });
 
-        it('returns correct reply to address for newsletter', function () {
+        it('[legacy] returns correct reply to address for newsletter', function () {
+            emailAddressService.managedEmailEnabled = false;
+            const newsletter = createModel({
+                sender_email: 'ghost@example.com',
+                sender_name: 'Ghost',
+                sender_reply_to: 'newsletter'
+            });
+            const response = emailRenderer.getReplyToAddress({}, newsletter);
+            assert.equal(response, `"Ghost" <ghost@example.com>`);
+            emailAddressService.managedEmailEnabled = true;
+        });
+
+        it('returns null when set to newsletter', function () {
+            emailAddressService.managedEmailEnabled = true;
             const newsletter = createModel({
                 sender_email: 'ghost@example.com',
                 sender_name: 'Ghost',
                 sender_reply_to: 'newsletter'
             });
             const response = emailRenderer.getReplyToAddress({}, newsletter);
-            response.should.equal(`"Ghost" <ghost@example.com>`);
+            assert.equal(response, null);
+        });
+
+        it('returns correct custom reply to address', function () {
+            const newsletter = createModel({
+                sender_email: 'ghost@example.com',
+                sender_name: 'Ghost',
+                sender_reply_to: 'anything@iwant.com'
+            });
+            const response = emailRenderer.getReplyToAddress({}, newsletter);
+            assert.equal(response, 'anything@iwant.com');
+        });
+
+        it('handles removed replyto addresses', function () {
+            const newsletter = createModel({
+                sender_email: 'ghost@example.com',
+                sender_name: 'Ghost',
+                sender_reply_to: 'anything@iwant.com'
+            });
+            emailAddressService.getAddress = ({from}) => {
+                return {
+                    from
+                };
+            };
+            const response = emailRenderer.getReplyToAddress({}, newsletter);
+            assert.equal(response, null);
         });
     });
 
@@ -877,7 +954,7 @@ describe('Email renderer', function () {
 
         beforeEach(function () {
             renderedPost = '<p>Lexical Test</p><img class="is-light-background" src="test-dark" /><img class="is-dark-background" src="test-light" />';
-            labsEnabled = true;
+            labsEnabled = true; // TODO: odd default because it means we're testing the unused email-customization template
             basePost = {
                 lexical: '{}',
                 visibility: 'public',
@@ -903,8 +980,8 @@ describe('Email renderer', function () {
             });
             emailRenderer = new EmailRenderer({
                 audienceFeedbackService: {
-                    buildLink: (_uuid, _postId, score) => {
-                        return new URL('http://feedback-link.com/?score=' + encodeURIComponent(score) + '&uuid=' + encodeURIComponent(_uuid));
+                    buildLink: (_uuid, _postId, score, key) => {
+                        return new URL('http://feedback-link.com/?score=' + encodeURIComponent(score) + '&uuid=' + encodeURIComponent(_uuid) + '&key=' + encodeURIComponent(key));
                     }
                 },
                 urlUtils: {
@@ -971,7 +1048,13 @@ describe('Email renderer', function () {
                     }
                 },
                 labs: {
-                    isSet: () => labsEnabled
+                    isSet: (key) => {
+                        if (typeof labsEnabled === 'object') {
+                            return labsEnabled[key] || false;
+                        }
+
+                        return labsEnabled;
+                    }
                 }
             });
         });
@@ -997,7 +1080,7 @@ describe('Email renderer', function () {
             );
         });
 
-        it('returns feedback buttons and unsubcribe links', async function () {
+        it('returns feedback buttons and unsubscribe links', async function () {
             const post = createModel(basePost);
             const newsletter = createModel({
                 header_image: null,
@@ -1023,14 +1106,16 @@ describe('Email renderer', function () {
             // Unsubscribe button included
             response.plaintext.should.containEql('Unsubscribe [%%{unsubscribe_url}%%]');
             response.html.should.containEql('Unsubscribe');
-            response.replacements.length.should.eql(3);
+            response.replacements.length.should.eql(4);
             response.replacements.should.match([
                 {
                     id: 'uuid'
                 },
                 {
-                    id: 'unsubscribe_url',
-                    token: /%%\{unsubscribe_url\}%%/g
+                    id: 'key'
+                },
+                {
+                    id: 'unsubscribe_url'
                 },
                 {
                     id: 'list_unsubscribe'
@@ -1325,7 +1410,7 @@ describe('Email renderer', function () {
             assert.doesNotMatch(response.html, /is-dark-background/);
         });
 
-        it('replaces all links except the unsubscribe and feedback links', async function () {
+        it('replaces all links except the unsubscribe, feedback and powered by Ghost links', async function () {
             const post = createModel(basePost);
             const newsletter = createModel({
                 header_image: null,
@@ -1362,6 +1447,8 @@ describe('Email renderer', function () {
                     href.should.eql('%%{unsubscribe_url}%%');
                 } else if (href.includes('feedback-link.com')) {
                     href.should.containEql('%%{uuid}%%');
+                } else if (href.includes('https://ghost.org/?via=pbg-newsletter')) {
+                    href.should.not.containEql('tracked-link.com');
                 } else {
                     href.should.containEql('tracked-link.com');
                     href.should.containEql('m=%%{uuid}%%');
@@ -1377,21 +1464,23 @@ describe('Email renderer', function () {
                 `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fencoded-link.com%2F%3Fcode%3Dtest%26source_tracking%3Dsite`,
                 `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fexample.com%2F%3Fref%3D123%26source_tracking%3DTest%2BNewsletter%26post_tracking%3Dadded`,
                 '#',
-                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%`,
-                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%`,
-                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%`,
-                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%`,
+                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%&key=%%{key}%%`,
+                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%&key=%%{key}%%`,
+                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%&key=%%{key}%%`,
+                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%&key=%%{key}%%`,
                 `%%{unsubscribe_url}%%`,
-                `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fghost.org%2F%3Fsource_tracking%3Dsite`
+                `https://ghost.org/?via=pbg-newsletter&source_tracking=site`
             ]);
 
             // Check uuid in replacements
-            response.replacements.length.should.eql(3);
+            response.replacements.length.should.eql(4);
             response.replacements[0].id.should.eql('uuid');
             response.replacements[0].token.should.eql(/%%\{uuid\}%%/g);
-            response.replacements[1].id.should.eql('unsubscribe_url');
-            response.replacements[1].token.should.eql(/%%\{unsubscribe_url\}%%/g);
-            response.replacements[2].id.should.eql('list_unsubscribe');
+            response.replacements[1].id.should.eql('key');
+            response.replacements[1].token.should.eql(/%%\{key\}%%/g);
+            response.replacements[2].id.should.eql('unsubscribe_url');
+            response.replacements[2].token.should.eql(/%%\{unsubscribe_url\}%%/g);
+            response.replacements[3].id.should.eql('list_unsubscribe');
         });
 
         it('replaces all relative links if click tracking is disabled', async function () {
@@ -1432,12 +1521,12 @@ describe('Email renderer', function () {
                 'http://example.com/',
                 'http://example.com/#relative-test',
                 '#',
-                'http://feedback-link.com/?score=1&uuid=%%{uuid}%%',
-                'http://feedback-link.com/?score=0&uuid=%%{uuid}%%',
-                'http://feedback-link.com/?score=1&uuid=%%{uuid}%%',
-                'http://feedback-link.com/?score=0&uuid=%%{uuid}%%',
+                'http://feedback-link.com/?score=1&uuid=%%{uuid}%%&key=%%{key}%%',
+                'http://feedback-link.com/?score=0&uuid=%%{uuid}%%&key=%%{key}%%',
+                'http://feedback-link.com/?score=1&uuid=%%{uuid}%%&key=%%{key}%%',
+                'http://feedback-link.com/?score=0&uuid=%%{uuid}%%&key=%%{key}%%',
                 '%%{unsubscribe_url}%%',
-                'https://ghost.org/'
+                'https://ghost.org/?via=pbg-newsletter'
             ]);
         });
 
@@ -1474,6 +1563,8 @@ describe('Email renderer', function () {
                     href.should.eql('%%{unsubscribe_url}%%');
                 } else if (href.includes('feedback-link.com')) {
                     href.should.containEql('%%{uuid}%%');
+                } else if (href.includes('https://ghost.org/?via=pbg-newsletter')) {
+                    href.should.not.containEql('tracked-link.com');
                 } else {
                     href.should.containEql('tracked-link.com');
                     href.should.containEql('m=%%{uuid}%%');
@@ -1487,21 +1578,23 @@ describe('Email renderer', function () {
                 `http://tracked-link.com/?m=%%{uuid}%%&url=http%3A%2F%2Fexample.com%2F%3Fsource_tracking%3DTest%2BNewsletter%26post_tracking%3Dadded`,
                 `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fexternal-domain.com%2F%3Fref%3D123%26source_tracking%3Dsite`,
                 `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fexample.com%2F%3Fref%3D123%26source_tracking%3DTest%2BNewsletter%26post_tracking%3Dadded`,
-                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%`,
-                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%`,
-                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%`,
-                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%`,
+                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%&key=%%{key}%%`,
+                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%&key=%%{key}%%`,
+                `http://feedback-link.com/?score=1&uuid=%%{uuid}%%&key=%%{key}%%`,
+                `http://feedback-link.com/?score=0&uuid=%%{uuid}%%&key=%%{key}%%`,
                 `%%{unsubscribe_url}%%`,
-                `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fghost.org%2F%3Fsource_tracking%3Dsite`
+                `https://ghost.org/?via=pbg-newsletter&source_tracking=site`
             ]);
 
             // Check uuid in replacements
-            response.replacements.length.should.eql(3);
+            response.replacements.length.should.eql(4);
             response.replacements[0].id.should.eql('uuid');
             response.replacements[0].token.should.eql(/%%\{uuid\}%%/g);
-            response.replacements[1].id.should.eql('unsubscribe_url');
-            response.replacements[1].token.should.eql(/%%\{unsubscribe_url\}%%/g);
-            response.replacements[2].id.should.eql('list_unsubscribe');
+            response.replacements[1].id.should.eql('key');
+            response.replacements[1].token.should.eql(/%%\{key\}%%/g);
+            response.replacements[2].id.should.eql('unsubscribe_url');
+            response.replacements[2].token.should.eql(/%%\{unsubscribe_url\}%%/g);
+            response.replacements[3].id.should.eql('list_unsubscribe');
         });
 
         it('removes data-gh-segment and renders paywall', async function () {
@@ -1578,14 +1671,16 @@ describe('Email renderer', function () {
 
             response.html.should.containEql('Unsubscribe');
             response.html.should.containEql('http://example.com');
-            response.replacements.length.should.eql(3);
+            response.replacements.length.should.eql(4);
             response.replacements.should.match([
                 {
                     id: 'uuid'
                 },
                 {
-                    id: 'unsubscribe_url',
-                    token: /%%\{unsubscribe_url\}%%/g
+                    id: 'key'
+                },
+                {
+                    id: 'unsubscribe_url'
                 },
                 {
                     id: 'list_unsubscribe'
@@ -1696,6 +1791,72 @@ describe('Email renderer', function () {
             assert.equal(response.html.includes('width="248" height="248"'), true, 'Should not replace img height and width with auto from css');
             assert.equal(response.html.includes('width="auto" height="auto"'), false, 'Should not replace img height and width with auto from css');
         });
+
+        describe('show excerpt', function () {
+            it('is rendered when enabled and customExcerpt is present', async function () {
+                const post = createModel(Object.assign({}, basePost, {custom_excerpt: 'This is an excerpt'}));
+                const newsletter = createModel({
+                    show_post_title_section: true,
+                    show_excerpt: true
+                });
+                const segment = null;
+                const options = {};
+
+                const response = await emailRenderer.renderBody(
+                    post,
+                    newsletter,
+                    segment,
+                    options
+                );
+
+                await validateHtml(response.html);
+
+                assert.equal(response.html.match(/This is an excerpt/g).length, 2, 'Excerpt should appear twice (preheader and excerpt section)');
+            });
+
+            it('is not rendered when disabled and customExcerpt is present', async function () {
+                const post = createModel(Object.assign({}, basePost, {custom_excerpt: 'This is an excerpt'}));
+                const newsletter = createModel({
+                    show_post_title_section: true,
+                    show_excerpt: false
+                });
+                const segment = null;
+                const options = {};
+
+                const response = await emailRenderer.renderBody(
+                    post,
+                    newsletter,
+                    segment,
+                    options
+                );
+
+                await validateHtml(response.html);
+
+                assert.equal(response.html.match(/This is an excerpt/g).length, 1, 'Subtitle should only appear once (preheader, excerpt section skipped)');
+                response.html.should.not.containEql('post-excerpt-wrapper');
+            });
+
+            it('does not render when enabled and customExcerpt is not present', async function () {
+                const post = createModel(Object.assign({}, basePost, {custom_excerpt: null}));
+                const newsletter = createModel({
+                    show_post_title_section: true,
+                    show_excerpt: true
+                });
+                const segment = null;
+                const options = {};
+
+                const response = await emailRenderer.renderBody(
+                    post,
+                    newsletter,
+                    segment,
+                    options
+                );
+
+                await validateHtml(response.html);
+
+                response.html.should.not.containEql('post-excerpt-wrapper');
+            });
+        });
     });
 
     describe('getTemplateData', function () {
@@ -1926,13 +2087,31 @@ describe('Email renderer', function () {
             });
             const data = await emailRenderer.getTemplateData({post, newsletter, html, addPaywall: false});
             assert.deepEqual(data.classes, {
-                title: 'post-title post-title-serif post-title-left',
+                title: 'post-title post-title-no-excerpt post-title-serif post-title-left',
                 titleLink: 'post-title-link post-title-link-left',
                 meta: 'post-meta post-meta-left',
+                excerpt: 'post-excerpt post-excerpt-no-feature-image post-excerpt-serif-sans post-excerpt-left',
                 body: 'post-content-sans-serif'
             });
         });
 
+        it('has correct excerpt classes for serif title+body', async function () {
+            const html = '';
+            const post = createModel({
+                posts_meta: createModel({}),
+                loaded: ['posts_meta'],
+                published_at: new Date(0)
+            });
+            const newsletter = createModel({
+                title_font_category: 'serif',
+                title_alignment: 'left',
+                body_font_category: 'serif',
+                show_excerpt: true
+            });
+            const data = await emailRenderer.getTemplateData({post, newsletter, html, addPaywall: false});
+            assert.equal(data.classes.excerpt, 'post-excerpt post-excerpt-no-feature-image post-excerpt-serif-serif post-excerpt-left');
+        });
+
         it('show comment CTA is enabled if labs disabled', async function () {
             labsEnabled = false;
             settings.comments_enabled = 'all';
@@ -2081,7 +2260,7 @@ describe('Email renderer', function () {
             assert.deepEqual(data.latestPosts,
                 [
                     {
-                        excerpt: 'Super long custom excerpt. Super long custom excerpt. Super<span class="mobile-only"> long custom excerpt. Super long custom excer</span>…',
+                        excerpt: 'Super long custom excerpt. Super long custom excerpt. Super long custom excerpt. Super lo<span class="desktop-only">ng custom excerpt. Super long </span>…',
                         title: 'Test Post 1',
                         url: 'http://example.com',
                         featureImage: {
@@ -2114,42 +2293,38 @@ describe('Email renderer', function () {
     });
 
     describe('createUnsubscribeUrl', function () {
-        it('includes member uuid and newsletter id', async function () {
-            const emailRenderer = new EmailRenderer({
+        let emailRenderer;
+
+        beforeEach(function () {
+            emailRenderer = new EmailRenderer({
                 urlUtils: {
                     urlFor() {
                         return 'http://example.com/subdirectory';
                     }
+                },
+                settingsHelpers: {
+                    getMembersValidationKey
                 }
             });
+        });
+
+        it('includes member uuid and newsletter id', async function () {
             const response = await emailRenderer.createUnsubscribeUrl('memberuuid', {
                 newsletterUuid: 'newsletteruuid'
             });
-            assert.equal(response, `http://example.com/subdirectory/unsubscribe/?uuid=memberuuid&newsletter=newsletteruuid`);
+            const memberHmac = crypto.createHmac('sha256', getMembersValidationKey()).update('memberuuid').digest('hex');
+            assert.equal(response, `http://example.com/subdirectory/unsubscribe/?uuid=memberuuid&key=${memberHmac}&newsletter=newsletteruuid`);
         });
 
         it('includes comments', async function () {
-            const emailRenderer = new EmailRenderer({
-                urlUtils: {
-                    urlFor() {
-                        return 'http://example.com/subdirectory';
-                    }
-                }
-            });
             const response = await emailRenderer.createUnsubscribeUrl('memberuuid', {
                 comments: true
             });
-            assert.equal(response, `http://example.com/subdirectory/unsubscribe/?uuid=memberuuid&comments=1`);
+            const memberHmac = crypto.createHmac('sha256', getMembersValidationKey()).update('memberuuid').digest('hex');
+            assert.equal(response, `http://example.com/subdirectory/unsubscribe/?uuid=memberuuid&key=${memberHmac}&comments=1`);
         });
 
         it('works for previews', async function () {
-            const emailRenderer = new EmailRenderer({
-                urlUtils: {
-                    urlFor() {
-                        return 'http://example.com/subdirectory';
-                    }
-                }
-            });
             const response = await emailRenderer.createUnsubscribeUrl();
             assert.equal(response, `http://example.com/subdirectory/unsubscribe/?preview=1`);
         });
@@ -2165,12 +2340,12 @@ describe('Email renderer', function () {
     describe('truncateHTML', function () {
         it('works correctly', async function () {
             const emailRenderer = new EmailRenderer({});
-            assert.equal(emailRenderer.truncateHtml('This is a short one', 5, 10), 'This<span class="mobile-only"> is a</span>…');
-            assert.equal(emailRenderer.truncateHtml('This is a', 5, 10), 'This<span class="mobile-only"> is a</span><span class="hide-mobile">…</span>');
-            assert.equal(emailRenderer.truncateHtml('This', 5, 10), 'This');
+            assert.equal(emailRenderer.truncateHtml('This is a short one', 10, 5), 'This<span class="desktop-only"> is a</span>…');
+            assert.equal(emailRenderer.truncateHtml('This is a', 10, 5), 'This<span class="desktop-only"> is a</span><span class="hide-desktop">…</span>');
+            assert.equal(emailRenderer.truncateHtml('This', 10, 5), 'This');
             assert.equal(emailRenderer.truncateHtml('This is a long text', 5, 5), 'This…');
             assert.equal(emailRenderer.truncateHtml('This is a long text', 5), 'This…');
-            assert.equal(emailRenderer.truncateHtml(null, 5, 10), '');
+            assert.equal(emailRenderer.truncateHtml(null, 10, 5), '');
         });
     });
 
diff --git a/ghost/email-service/test/email-segmenter.test.js b/ghost/email-service/test/email-segmenter.test.js
index 49606ad7aa5..5df96104580 100644
--- a/ghost/email-service/test/email-segmenter.test.js
+++ b/ghost/email-service/test/email-segmenter.test.js
@@ -37,7 +37,7 @@ describe('Email segmenter', function () {
             );
             listStub.calledOnce.should.be.true();
             listStub.calledWith({
-                filter: 'newsletters.id:newsletter-123+email_disabled:0'
+                filter: 'newsletters.id:\'newsletter-123\'+email_disabled:0'
             }).should.be.true();
             response.should.eql(12);
         });
@@ -94,7 +94,7 @@ describe('Email segmenter', function () {
 
             listStub.calledOnce.should.be.true();
             listStub.calledWith({
-                filter: 'newsletters.id:newsletter-123+email_disabled:0+(labels:test)+status:-free'
+                filter: 'newsletters.id:\'newsletter-123\'+email_disabled:0+(labels:test)+status:-free'
             }).should.be.true();
             response.should.eql(12);
         });
@@ -118,7 +118,7 @@ describe('Email segmenter', function () {
 
             listStub.calledOnce.should.be.true();
             listStub.calledWith({
-                filter: 'newsletters.id:newsletter-123+email_disabled:0+(labels:test)+(status:free)'
+                filter: 'newsletters.id:\'newsletter-123\'+email_disabled:0+(labels:test)+(status:free)'
             }).should.be.true();
             response.should.eql(12);
         });
diff --git a/ghost/email-service/test/email-service.test.js b/ghost/email-service/test/email-service.test.js
index d94982a6b0a..0ce2dffd4b6 100644
--- a/ghost/email-service/test/email-service.test.js
+++ b/ghost/email-service/test/email-service.test.js
@@ -428,8 +428,10 @@ describe('Email Service', function () {
             await service.sendTestEmail(post, post.get('newsletter'), null, ['example@example.com']);
             sinon.assert.calledOnce(sendingService.send);
             const members = sendingService.send.firstCall.args[0].members;
+            const options = sendingService.send.firstCall.args[1];
             assert.equal(members.length, 1);
             assert.equal(members[0].email, 'example@example.com');
+            assert.equal(options.isTestEmail, true);
         });
     });
 });
diff --git a/ghost/event-aware-cache-wrapper/.eslintrc.js b/ghost/event-aware-cache-wrapper/.eslintrc.js
deleted file mode 100644
index c9c1bcb5226..00000000000
--- a/ghost/event-aware-cache-wrapper/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-    plugins: ['ghost'],
-    extends: [
-        'plugin:ghost/node'
-    ]
-};
diff --git a/ghost/event-aware-cache-wrapper/README.md b/ghost/event-aware-cache-wrapper/README.md
deleted file mode 100644
index d304f180c38..00000000000
--- a/ghost/event-aware-cache-wrapper/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Event Aware Cache Wrapper
-
-Cache wrapper allowing to reset the cache after certain events
-
-
-## 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/ghost/event-aware-cache-wrapper/index.js b/ghost/event-aware-cache-wrapper/index.js
deleted file mode 100644
index 9935b2737b6..00000000000
--- a/ghost/event-aware-cache-wrapper/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./lib/EventAwareCacheWrapper');
diff --git a/ghost/event-aware-cache-wrapper/lib/EventAwareCacheWrapper.js b/ghost/event-aware-cache-wrapper/lib/EventAwareCacheWrapper.js
deleted file mode 100644
index 59b73e36c73..00000000000
--- a/ghost/event-aware-cache-wrapper/lib/EventAwareCacheWrapper.js
+++ /dev/null
@@ -1,38 +0,0 @@
-class EventAwareCacheWrapper {
-    #cache;
-    /**
-     * @param {Object} deps
-     * @param {Object} deps.cache - cache instance extending adapter-base-cache
-     * @param {Object} [deps.eventRegistry] - event registry instance
-     * @param {String[]} [deps.resetEvents] - event to listen to triggering reset
-     */
-    constructor(deps) {
-        this.#cache = deps.cache;
-
-        if (deps.resetEvents && deps.eventRegistry) {
-            this.#initListeners(deps.eventRegistry, deps.resetEvents);
-        }
-    }
-
-    #initListeners(eventRegistry, eventsToResetOn) {
-        eventsToResetOn.forEach((event) => {
-            eventRegistry.on(event, () => {
-                this.reset();
-            });
-        });
-    }
-
-    async get(key) {
-        return this.#cache.get(key);
-    }
-
-    async set(key, value) {
-        return this.#cache.set(key, value);
-    }
-
-    reset() {
-        return this.#cache.reset();
-    }
-}
-
-module.exports = EventAwareCacheWrapper;
diff --git a/ghost/event-aware-cache-wrapper/package.json b/ghost/event-aware-cache-wrapper/package.json
deleted file mode 100644
index d207279f5f6..00000000000
--- a/ghost/event-aware-cache-wrapper/package.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "@tryghost/event-aware-cache-wrapper",
-  "version": "0.0.0",
-  "repository": "https://github.com/TryGhost/Ghost/tree/main/packages/event-aware-cache-wrapper",
-  "author": "Ghost Foundation",
-  "private": true,
-  "main": "index.js",
-  "scripts": {
-    "dev": "echo \"Implement me!\"",
-    "test:unit": "NODE_ENV=testing c8 --all --check-coverage --100  --reporter text --reporter cobertura -- mocha --reporter dot './test/**/*.test.js'",
-    "test": "yarn test:unit",
-    "lint:code": "eslint *.js lib/ --ext .js --cache",
-    "lint": "yarn lint:code && yarn lint:test",
-    "lint:test": "eslint -c test/.eslintrc.js test/ --ext .js --cache"
-  },
-  "files": [
-    "index.js",
-    "lib"
-  ],
-  "devDependencies": {
-    "@tryghost/adapter-cache-memory-ttl": "0.0.0",
-    "c8": "8.0.1",
-    "mocha": "10.2.0",
-    "sinon": "15.2.0"
-  },
-  "dependencies": {}
-}
diff --git a/ghost/event-aware-cache-wrapper/test/.eslintrc.js b/ghost/event-aware-cache-wrapper/test/.eslintrc.js
deleted file mode 100644
index 829b601eb0a..00000000000
--- a/ghost/event-aware-cache-wrapper/test/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-    plugins: ['ghost'],
-    extends: [
-        'plugin:ghost/test'
-    ]
-};
diff --git a/ghost/event-aware-cache-wrapper/test/EventAwareCacheWrapper.test.js b/ghost/event-aware-cache-wrapper/test/EventAwareCacheWrapper.test.js
deleted file mode 100644
index 62860eb92ab..00000000000
--- a/ghost/event-aware-cache-wrapper/test/EventAwareCacheWrapper.test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const assert = require('assert/strict');
-const InMemoryCache = require('@tryghost/adapter-cache-memory-ttl');
-
-const EventAwareCacheWrapper = require('../index');
-const {EventEmitter} = require('stream');
-
-describe('EventAwareCacheWrapper', function () {
-    it('Can initialize', function () {
-        const cache = new InMemoryCache();
-        const wrappedCache = new EventAwareCacheWrapper({
-            cache
-        });
-        assert.ok(wrappedCache);
-    });
-
-    describe('get', function () {
-        it('calls a wrapped cache with extra key', async function () {
-            const cache = new InMemoryCache();
-            const wrapper = new EventAwareCacheWrapper({
-                cache: cache
-            });
-
-            await wrapper.set('a', 'b');
-            assert.equal(await wrapper.get('a'), 'b');
-            assert.equal(await cache.get('a'), 'b');
-        });
-    });
-
-    describe('listens to reset events', function () {
-        it('resets the cache when reset event is triggered', async function () {
-            const cache = new InMemoryCache();
-
-            const eventRegistry = new EventEmitter();
-            const wrapper = new EventAwareCacheWrapper({
-                cache: cache,
-                resetEvents: ['site.changed'],
-                eventRegistry: eventRegistry
-            });
-
-            await wrapper.set('a', 'b');
-            assert.equal(await wrapper.get('a'), 'b');
-
-            eventRegistry.emit('site.changed');
-
-            assert.equal(await wrapper.get('a'), undefined);
-        });
-    });
-});
diff --git a/ghost/external-media-inliner/lib/ExternalMediaInliner.js b/ghost/external-media-inliner/lib/ExternalMediaInliner.js
index 4fb5ff69d79..b0572d01588 100644
--- a/ghost/external-media-inliner/lib/ExternalMediaInliner.js
+++ b/ghost/external-media-inliner/lib/ExternalMediaInliner.js
@@ -129,13 +129,21 @@ class ExternalMediaInliner {
         }
     }
 
-    async inlineMobiledoc(mobiledoc, domains) {
+    /**
+     * Find & inline external media from a JSON sting.
+     * This works with both Lexical & Mobiledoc, so no separate methods are needed here.
+     *
+     * @param {string} content - stringified JSON of post Lexical or Mobiledoc content
+     * @param {String[]} domains - domains to inline media from
+     * @returns {Promise<string>} - updated stringified JSON of post content
+     */
+    async inlineContent(content, domains) {
         for (const domain of domains) {
-            // NOTE: the src could end with a quote, apostrophe or double-backslash. backlashes are added to mobiledoc
+            // NOTE: the src could end with a quote, apostrophe or double-backslash. backlashes are added to content
             //       as an escape character
             const srcTerminationSymbols = `"|'|\\\\`;
             const regex = new RegExp(`(${domain}.*?)(${srcTerminationSymbols})`, 'igm');
-            const matches = mobiledoc.matchAll(regex);
+            const matches = content.matchAll(regex);
 
             for (const [,src] of matches) {
                 const response = await this.getRemoteMedia(src);
@@ -151,16 +159,16 @@ class ExternalMediaInliner {
                     if (filePath) {
                         const inlinedSrc = `__GHOST_URL__${filePath}`;
 
-                        // NOTE: does not account for duplicate images in mobiledoc
+                        // NOTE: does not account for duplicate images in content
                         //       in those cases would be processed twice
-                        mobiledoc = mobiledoc.replace(src, inlinedSrc);
+                        content = content.replace(src, inlinedSrc);
                         logging.info(`Inlined media: ${src} -> ${inlinedSrc}`);
                     }
                 }
             }
         }
 
-        return mobiledoc;
+        return content;
     }
 
     /**
@@ -250,11 +258,27 @@ class ExternalMediaInliner {
 
         for (const post of posts) {
             try {
-                const inlinedMobiledoc = await this.inlineMobiledoc(post.get('mobiledoc'), domains);
+                const mobiledocContent = post.get('mobiledoc');
+                const lexicalContent = post.get('lexical');
+
                 const updatedFields = await this.inlineFields(post, postsInilingFields, domains);
 
-                if (inlinedMobiledoc !== post.get('mobiledoc')) {
-                    updatedFields.mobiledoc = inlinedMobiledoc;
+                if (mobiledocContent) {
+                    const inlinedContent = await this.inlineContent(mobiledocContent, domains);
+
+                    // If content has changed, update the post
+                    if (inlinedContent !== mobiledocContent) {
+                        updatedFields.mobiledoc = inlinedContent;
+                    }
+                }
+
+                if (lexicalContent) {
+                    const inlinedContent = await this.inlineContent(lexicalContent, domains);
+
+                    // If content has changed, update the post
+                    if (inlinedContent !== lexicalContent) {
+                        updatedFields.lexical = inlinedContent;
+                    }
                 }
 
                 if (Object.keys(updatedFields).length > 0) {
diff --git a/ghost/external-media-inliner/test/ExternalMediaInliner.test.js b/ghost/external-media-inliner/test/ExternalMediaInliner.test.js
index 7a6ed9528ad..aeac60af68c 100644
--- a/ghost/external-media-inliner/test/ExternalMediaInliner.test.js
+++ b/ghost/external-media-inliner/test/ExternalMediaInliner.test.js
@@ -69,11 +69,13 @@ describe('ExternalMediaInliner', function () {
                 .get('/files/f/image.jpg')
                 .reply(200, GIF1x1);
 
+            const postStub = sinon.stub();
+            postStub.withArgs('mobiledoc').returns(`{"version":"0.3.1","atoms":[],"cards":[["image",{"src":"${imageURL}"}]]}`);
+            postStub.withArgs('lexical').returns(null);
+
             const postModelInstanceStub = {
                 id: 'inlined-post-id',
-                get: sinon.stub()
-                    .withArgs('mobiledoc')
-                    .returns(`{"version":"0.3.1","atoms":[],"cards":[["image",{"src":"${imageURL}"}]]}`)
+                get: postStub
             };
             postModelStub = {
                 findPage: sinon.stub().returns({
@@ -117,11 +119,13 @@ describe('ExternalMediaInliner', function () {
                 .get('/public/images/39719fcb-5af0-4764-bf8b-d375f37a09e5_1141x860')
                 .reply(200, GIF1x1);
 
+            const postStub = sinon.stub();
+            postStub.withArgs('mobiledoc').returns(`{"version":"0.3.1","atoms":[],"cards":[["html",{"html":"<img src="${imageURL}" alt="Lorem ipsum">"}]],"markups":[],"sections":[[10,0],[1,"p",[]]],"ghostVersion":"4.0"}`);
+            postStub.withArgs('lexical').returns(null);
+
             const postModelInstanceStub = {
                 id: 'inlined-post-with-htmlcard-id',
-                get: sinon.stub()
-                    .withArgs('mobiledoc')
-                    .returns(`{"version":"0.3.1","atoms":[],"cards":[["html",{"html":"<img src="${imageURL}" alt="Lorem ipsum">"}]],"markups":[],"sections":[[10,0],[1,"p",[]]],"ghostVersion":"4.0"}`)
+                get: postStub
             };
 
             postModelStub = {
@@ -161,6 +165,161 @@ describe('ExternalMediaInliner', function () {
             });
         });
 
+        it('inlines image in the post\'s lexical content', async function () {
+            const imageURL = 'https://img.stockfresh.com/files/f/image.jpg';
+            const requestMock = nock('https://img.stockfresh.com')
+                .get('/files/f/image.jpg')
+                .reply(200, GIF1x1);
+
+            const postStub = sinon.stub();
+            postStub.withArgs('mobiledoc').returns(null);
+            postStub.withArgs('lexical').returns(`{"root":{"children":[{"type":"image","version":1,"src":"${imageURL}","width":1480,"height":486,"title":"","alt":"","caption":"","cardWidth":"regular","href":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`);
+
+            const postModelInstanceStub = {
+                id: 'inlined-post-id',
+                get: postStub
+            };
+            postModelStub = {
+                findPage: sinon.stub().returns({
+                    data: [postModelInstanceStub]
+                }),
+                edit: sinon.stub().resolves()
+            };
+
+            sinon.stub(path, 'relative')
+                .withArgs('/content/images', '/content/images/unique-image.jpg')
+                .returns('unique-image.jpg');
+            const inliner = new ExternalMediaInliner({
+                PostModel: postModelStub,
+                PostMetaModel: postMetaModelStub,
+                TagModel: tagModelStub,
+                UserModel: userModelStub,
+                getMediaStorage: sinon.stub().withArgs('.jpg').returns({
+                    getTargetDir: () => '/content/images',
+                    getUniqueFileName: () => '/content/images/unique-image.jpg',
+                    saveRaw: () => '/content/images/unique-image.jpg'
+                })
+            });
+
+            await inliner.inline(['https://img.stockfresh.com']);
+
+            assert.ok(requestMock.isDone());
+            assert.ok(postModelStub.edit.calledOnce);
+            assert.ok(postModelStub.edit.calledWith({
+                lexical: '{"root":{"children":[{"type":"image","version":1,"src":"__GHOST_URL__/content/images/unique-image.jpg","width":1480,"height":486,"title":"","alt":"","caption":"","cardWidth":"regular","href":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}'
+            }, {
+                id: 'inlined-post-id',
+                context: {
+                    internal: true
+                }
+            }));
+        });
+
+        it('inlines the image from post\'s lexical containing html card', async function () {
+            const imageURL = 'https://img.stockfresh.com/files/f/image.jpg';
+            const requestMock = nock('https://img.stockfresh.com')
+                .get('/files/f/image.jpg')
+                .reply(200, GIF1x1);
+
+            const postStub = sinon.stub();
+            postStub.withArgs('mobiledoc').returns(null);
+            postStub.withArgs('lexical').returns(`{"root":{"children":[{"type":"html","version":1,"html":"<img src="${imageURL}" alt="Lorem ipsum">"}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`);
+
+            const postModelInstanceStub = {
+                id: 'inlined-post-with-htmlcard-id',
+                get: postStub
+            };
+
+            postModelStub = {
+                findPage: sinon.stub().returns({
+                    data: [postModelInstanceStub]
+                }),
+                edit: sinon.stub().resolves()
+            };
+
+            sinon.stub(path, 'relative')
+                .withArgs('/content/images', '/content/images/unique-image.jpg')
+                .returns('unique-image.jpg');
+            const inliner = new ExternalMediaInliner({
+                PostModel: postModelStub,
+                PostMetaModel: postMetaModelStub,
+                TagModel: tagModelStub,
+                UserModel: userModelStub,
+                getMediaStorage: sinon.stub().withArgs('.jpg').returns({
+                    getTargetDir: () => '/content/images',
+                    getUniqueFileName: () => '/content/images/unique-image.jpg',
+                    saveRaw: () => '/content/images/unique-image.jpg'
+                })
+            });
+
+            await inliner.inline(['https://img.stockfresh.com']);
+
+            assert.ok(requestMock.isDone());
+            assert.ok(postModelStub.edit.calledOnce);
+            assert.deepEqual(postModelStub.edit.args[0][0], {
+                lexical: `{"root":{"children":[{"type":"html","version":1,"html":"<img src="__GHOST_URL__/content/images/unique-image.jpg" alt="Lorem ipsum">"}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`
+            });
+            assert.deepEqual(postModelStub.edit.args[0][1], {
+                id: 'inlined-post-with-htmlcard-id',
+                context: {
+                    internal: true
+                }
+            });
+        });
+
+        it('inlines image in the post\'s mobiledoc & lexical content', async function () {
+            const imageURL = 'https://img.stockfresh.com/files/f/image.jpg';
+            const requestMock = nock('https://img.stockfresh.com')
+                .get('/files/f/image.jpg')
+                .reply(200, GIF1x1)
+                .get('/files/f/image.jpg')
+                .reply(200, GIF1x1);
+
+            const postStub = sinon.stub();
+            postStub.withArgs('mobiledoc').returns(`{"version":"0.3.1","atoms":[],"cards":[["image",{"src":"${imageURL}"}]]}`);
+            postStub.withArgs('lexical').returns(`{"root":{"children":[{"type":"image","version":1,"src":"${imageURL}","width":1480,"height":486,"title":"","alt":"","caption":"","cardWidth":"regular","href":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}`);
+
+            const postModelInstanceStub = {
+                id: 'inlined-post-id',
+                get: postStub
+            };
+            postModelStub = {
+                findPage: sinon.stub().returns({
+                    data: [postModelInstanceStub]
+                }),
+                edit: sinon.stub().resolves()
+            };
+
+            sinon.stub(path, 'relative')
+                .withArgs('/content/images', '/content/images/unique-image.jpg')
+                .returns('unique-image.jpg');
+            const inliner = new ExternalMediaInliner({
+                PostModel: postModelStub,
+                PostMetaModel: postMetaModelStub,
+                TagModel: tagModelStub,
+                UserModel: userModelStub,
+                getMediaStorage: sinon.stub().withArgs('.jpg').returns({
+                    getTargetDir: () => '/content/images',
+                    getUniqueFileName: () => '/content/images/unique-image.jpg',
+                    saveRaw: () => '/content/images/unique-image.jpg'
+                })
+            });
+
+            await inliner.inline(['https://img.stockfresh.com']);
+
+            assert.ok(requestMock.isDone());
+            assert.ok(postModelStub.edit.calledOnce);
+            assert.ok(postModelStub.edit.calledWith({
+                mobiledoc: '{"version":"0.3.1","atoms":[],"cards":[["image",{"src":"__GHOST_URL__/content/images/unique-image.jpg"}]]}',
+                lexical: '{"root":{"children":[{"type":"image","version":1,"src":"__GHOST_URL__/content/images/unique-image.jpg","width":1480,"height":486,"title":"","alt":"","caption":"","cardWidth":"regular","href":""}],"direction":null,"format":"","indent":0,"type":"root","version":1}}'
+            }, {
+                id: 'inlined-post-id',
+                context: {
+                    internal: true
+                }
+            }));
+        });
+
         it('logs an error when fetching an external media fails', async function () {
             const imageURL = 'https://img.stockfresh.com/files/f/image.jpg';
             const requestMock = nock('https://img.stockfresh.com')
@@ -262,11 +421,13 @@ describe('ExternalMediaInliner', function () {
                 .get('/files/f/image.jpg')
                 .reply(200, GIF1x1);
 
+            const postStub = sinon.stub();
+            postStub.withArgs('mobiledoc').returns(`{"version":"0.3.1","atoms":[],"cards":[["image",{"src":"${imageURL}"}]]}`);
+            postStub.withArgs('lexical').returns(null);
+
             postModelStub = {
                 id: 'errored-post-id',
-                get: sinon.stub()
-                    .withArgs('mobiledoc')
-                    .returns(`{"version":"0.3.1","atoms":[],"cards":[["image",{"src":"${imageURL}"}]]}`)
+                get: postStub
             };
             postModelStub = {
                 findPage: sinon.stub().returns({
diff --git a/ghost/ghost/.eslintrc.js b/ghost/ghost/.eslintrc.js
new file mode 100644
index 00000000000..fd7c5da2c96
--- /dev/null
+++ b/ghost/ghost/.eslintrc.js
@@ -0,0 +1,19 @@
+module.exports = {
+    parser: '@typescript-eslint/parser',
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/ts'
+    ],
+    rules: {
+        // disable file naming rule in favor or dotted notation e.g. `snippets.service.ts`
+        'ghost/filenames/match-exported-class': [0, null, true],
+        '@typescript-eslint/no-unused-vars': [
+            'error',
+            {
+                argsIgnorePattern: '^_',
+                varsIgnorePattern: '^_',
+                caughtErrorsIgnorePattern: '^_'
+            }
+        ]
+    }
+};
diff --git a/ghost/ghost/README.md b/ghost/ghost/README.md
new file mode 100644
index 00000000000..65ecae5e02e
--- /dev/null
+++ b/ghost/ghost/README.md
@@ -0,0 +1,21 @@
+# Ghost
+
+
+## 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/ghost/ghost/package.json b/ghost/ghost/package.json
new file mode 100644
index 00000000000..dc295d275ca
--- /dev/null
+++ b/ghost/ghost/package.json
@@ -0,0 +1,45 @@
+{
+  "name": "@tryghost/ghost",
+  "version": "0.0.0",
+  "repository": "https://github.com/TryGhost/Ghost/tree/main/packages/ghost",
+  "author": "Ghost Foundation",
+  "private": true,
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
+  "scripts": {
+    "dev": "tsc --watch --preserveWatchOutput --sourceMap",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
+    "test:unit": "NODE_ENV=testing c8 --src src --all --reporter text --reporter cobertura mocha -r ts-node/register/transpile-only './**/*.test.ts'",
+    "test": "yarn test:types && yarn test:unit",
+    "test:types": "tsc --noEmit",
+    "lint:code": "eslint src/ --ext .ts --cache",
+    "lint": "yarn lint:code"
+  },
+  "files": [
+    "build"
+  ],
+  "devDependencies": {
+    "@nestjs/testing": "10.3.10",
+    "@types/node": "20.14.8",
+    "@types/sinon": "^17.0.3",
+    "@types/supertest": "^6.0.2",
+    "c8": "8.0.1",
+    "mocha": "10.2.0",
+    "nock": "^14.0.0-beta.6",
+    "sinon": "^17.0.1",
+    "supertest": "^7.0.0",
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5"
+  },
+  "dependencies": {
+    "@nestjs/common": "10.3.10",
+    "@nestjs/core": "10.3.10",
+    "@nestjs/platform-express": "10.3.10",
+    "@tryghost/errors": "1.3.5",
+    "bson-objectid": "2.0.4",
+    "express": "4.19.2",
+    "reflect-metadata": "0.1.14",
+    "rxjs": "7.8.1"
+  }
+}
diff --git a/ghost/ghost/src/common/decorators/handle-event.decorator.ts b/ghost/ghost/src/common/decorators/handle-event.decorator.ts
new file mode 100644
index 00000000000..8d6c09b52b4
--- /dev/null
+++ b/ghost/ghost/src/common/decorators/handle-event.decorator.ts
@@ -0,0 +1,40 @@
+import {NestApplication} from '@nestjs/core';
+
+interface IEvent<T> {
+    data: T
+    timestamp: Date
+}
+
+interface IDomainEvents {
+    subscribe<T>(event: new (data: T, timestamp: Date) => IEvent<T>, fn: (_event: IEvent<T>) => void): void;
+    dispatch<T>(event: IEvent<T>): void
+}
+
+type EventRegistrationSpec<EventData, Subscriber> = {
+    Event: new (data: EventData, timestamp: Date) => IEvent<EventData>,
+    target: new (...args: unknown[]) => Subscriber,
+    methodName: string
+};
+
+const events: EventRegistrationSpec<unknown, unknown>[] = [];
+
+export function OnEvent<T>(Event: new (data: T, timestamp: Date) => IEvent<T>) {
+    return function (target: object, methodName: string) {
+        events.push({
+            Event: Event as new (data: unknown, timestamp: Date) => IEvent<T>,
+            target: target.constructor as new (...args: unknown[]) => unknown,
+            methodName
+        });
+    };
+}
+
+export function registerEvents(app: NestApplication, DomainEvents: IDomainEvents) {
+    for (const eventSpec of events) {
+        DomainEvents.subscribe(eventSpec.Event, async function (event: IEvent<unknown>) {
+            // We have to cast to `any` here because we don't know the type - but we do know that it should have the `methodName` method
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const service = await app.resolve(eventSpec.target) as any;
+            await service[eventSpec.methodName](event);
+        });
+    }
+}
diff --git a/ghost/ghost/src/common/decorators/permissions.decorator.ts b/ghost/ghost/src/common/decorators/permissions.decorator.ts
new file mode 100644
index 00000000000..f3c5cc0eb27
--- /dev/null
+++ b/ghost/ghost/src/common/decorators/permissions.decorator.ts
@@ -0,0 +1,9 @@
+import {Reflector} from '@nestjs/core';
+
+type MetaRole = 'Anon';
+type UserRole = 'Contributor' | 'Author' | 'Editor' | 'Admin' | 'Owner';
+type APIKeyRole = 'Admin Integration' | 'Ghost Explore Integration' | 'Self-Serve Migration Integration' | 'DB Backup Integration' | 'Scheduler Integration';
+
+export type Role = UserRole | APIKeyRole | MetaRole;
+
+export const Roles = Reflector.createDecorator<Role[]>();
diff --git a/ghost/ghost/src/common/entity.base.ts b/ghost/ghost/src/common/entity.base.ts
new file mode 100644
index 00000000000..8cbcc939f29
--- /dev/null
+++ b/ghost/ghost/src/common/entity.base.ts
@@ -0,0 +1,129 @@
+import {Actor} from './types/actor.type';
+import ObjectID from 'bson-objectid';
+import {now} from './helpers/date.helper';
+import {BaseEvent} from './event.base';
+
+function equals(a: unknown, b: unknown) {
+    if (a === null || b === null) {
+        return a === b;
+    }
+    if (a === undefined || b === undefined) {
+        return a === b;
+    }
+    if (typeof a === 'object' && Reflect.has(a, 'equals')) {
+        const equalsFn = Reflect.get(a, 'equals');
+        if (typeof equalsFn === 'function') {
+            return equalsFn.call(a, b);
+        }
+    }
+    return a === b;
+}
+
+type BaseEntityUpdatedXData = {
+    updatedAt: Date;
+    updatedBy: Actor;
+} | {
+    updatedAt: null;
+    updatedBy: null;
+}
+
+type BaseEntityData = {
+    id: ObjectID;
+    deleted: boolean;
+    createdAt: Date;
+    createdBy: Actor;
+} & BaseEntityUpdatedXData;
+
+type Optional<T> = {
+    [K in keyof T]?: T[K]
+};
+
+export class Entity<Data> {
+    constructor(protected attr: Data & Optional<BaseEntityData>, actor?: Actor) {
+        this.attr = attr;
+        if (!this.attr.id) {
+            this.attr.id = new ObjectID();
+        }
+        if (!this.attr.createdAt) {
+            this.attr.createdAt = now();
+        }
+        if (actor) {
+            this.actor = actor;
+        }
+        if (!this.attr.createdBy) {
+            if (this.actor) {
+                this.attr.createdBy = this.actor;
+            } else {
+                // TODO: This should maybe be system user?
+                this.attr.createdBy = {
+                    id: ObjectID.createFromHexString('d34d01d0d34d01d0d34d01d0'),
+                    type: 'user',
+                    role: 'Owner'
+                };
+            }
+        }
+        this.attr.deleted = false;
+    }
+
+    private events: BaseEvent<unknown>[] = [];
+    protected addEvent(event: BaseEvent<unknown>) {
+        this.events.push(event);
+    }
+    static getEventsToDispatch(entity: Entity<unknown>, fn: (events: BaseEvent<unknown>[]) => void) {
+        const events = entity.events;
+        entity.events = [];
+        fn(events);
+    }
+
+    private actor?: Actor | null;
+    setActor(actor: Actor) {
+        if (this.actor !== null) {
+            throw new Error(`Entity already owned by ${actor.id}`);
+        }
+        this.actor = actor;
+    }
+
+    get id() {
+        return this.attr.id as ObjectID;
+    }
+
+    get createdAt() {
+        return this.attr.createdAt;
+    }
+
+    get createdBy() {
+        return this.attr.createdBy;
+    }
+
+    get updatedAt() {
+        return this.attr.updatedAt;
+    }
+
+    get updatedBy() {
+        return this.attr.updatedBy;
+    }
+
+    get deleted() {
+        return this.attr.deleted;
+    }
+
+    delete() {
+        this.attr.deleted = true;
+    }
+
+    protected set<K extends keyof Data>(key: K, value: Data[K], actor?: Actor) {
+        if (equals(this.attr[key], value)) {
+            return;
+        }
+        (this.attr as Data)[key] = value;
+        if (actor) {
+            this.attr.updatedAt = now();
+            this.attr.updatedBy = actor;
+        } else if (this.actor) {
+            this.attr.updatedAt = now();
+            this.attr.updatedBy = this.actor;
+        } else {
+            // Maybe log a warning or smth?
+        }
+    }
+}
diff --git a/ghost/ghost/src/common/event.base.ts b/ghost/ghost/src/common/event.base.ts
new file mode 100644
index 00000000000..68a7593d7d3
--- /dev/null
+++ b/ghost/ghost/src/common/event.base.ts
@@ -0,0 +1,6 @@
+export abstract class BaseEvent<Data> {
+    constructor(
+        public readonly data: Data,
+        public readonly timestamp: Date = new Date()
+    ) {}
+}
diff --git a/ghost/ghost/src/common/helpers/date.helper.ts b/ghost/ghost/src/common/helpers/date.helper.ts
new file mode 100644
index 00000000000..5e579fc0f26
--- /dev/null
+++ b/ghost/ghost/src/common/helpers/date.helper.ts
@@ -0,0 +1,5 @@
+export function now(): Date {
+    const date = new Date();
+    date.setMilliseconds(0);
+    return date;
+}
diff --git a/ghost/ghost/src/common/libraries.defintitions.ts b/ghost/ghost/src/common/libraries.defintitions.ts
new file mode 100644
index 00000000000..409ccd55438
--- /dev/null
+++ b/ghost/ghost/src/common/libraries.defintitions.ts
@@ -0,0 +1,3 @@
+declare module '@tryghost/errors';
+declare module '@tryghost/domain-events';
+declare module '@tryghost/html-to-plaintext';
diff --git a/ghost/ghost/src/common/types/actor.type.ts b/ghost/ghost/src/common/types/actor.type.ts
new file mode 100644
index 00000000000..ec0e3ba4ec8
--- /dev/null
+++ b/ghost/ghost/src/common/types/actor.type.ts
@@ -0,0 +1,8 @@
+import ObjectID from 'bson-objectid';
+import {Role} from '../decorators/permissions.decorator';
+
+export type Actor = {
+    id: ObjectID
+    role: Role
+    type: 'user' | 'api_key'
+};
diff --git a/ghost/ghost/src/common/types/settings-cache.type.ts b/ghost/ghost/src/common/types/settings-cache.type.ts
new file mode 100644
index 00000000000..cfa10f1a472
--- /dev/null
+++ b/ghost/ghost/src/common/types/settings-cache.type.ts
@@ -0,0 +1,9 @@
+export type Settings = {
+    ghost_public_key: string;
+    ghost_private_key: string;
+    title: string;
+};
+
+export interface SettingsCache {
+    get<KeyType extends keyof Settings>(key: KeyType): Settings[KeyType];
+}
diff --git a/ghost/ghost/src/core/example/example.entity.test.ts b/ghost/ghost/src/core/example/example.entity.test.ts
new file mode 100644
index 00000000000..68a29bbd9d2
--- /dev/null
+++ b/ghost/ghost/src/core/example/example.entity.test.ts
@@ -0,0 +1,27 @@
+import assert from 'assert';
+import {Greeting} from './example.entity';
+
+describe('ExampleEntity (Greeting)', function () {
+    it('Can greet someone', function () {
+        const entity = new Greeting({
+            greeting: 'Bonjour'
+        });
+        const msg = entity.greet('Margot');
+        assert.equal(msg, 'Bonjour, Margot.');
+    });
+    it('Has a custom greeting for the recipient "world"', function () {
+        const entity = new Greeting({
+            greeting: 'Bonjour'
+        });
+        const msg = entity.greet('world');
+        assert.equal(msg, 'Hello, world!');
+    });
+    it('Can have its greeting updated', function () {
+        const entity = new Greeting({
+            greeting: 'Bonjour'
+        });
+        entity.greeting = 'Evening';
+        const msg = entity.greet('Guvner');
+        assert.equal(msg, 'Evening, Guvner.');
+    });
+});
diff --git a/ghost/ghost/src/core/example/example.entity.ts b/ghost/ghost/src/core/example/example.entity.ts
new file mode 100644
index 00000000000..382164437df
--- /dev/null
+++ b/ghost/ghost/src/core/example/example.entity.ts
@@ -0,0 +1,38 @@
+/**
+ * Entity
+ *
+ * Represents a "Business Object" in the system
+ *
+ *  - As much business logic as possible should be here
+ *  - Its interface should describe what it is and what it can do/you can do to it.
+ *  - Handles the creation of events related to the entity
+ */
+import {Entity} from '../../common/entity.base';
+import {ExampleEvent} from './example.event';
+
+type GreetingData = {
+    greeting: string
+};
+
+export class Greeting extends Entity<GreetingData> {
+    get greeting() {
+        return this.attr.greeting;
+    }
+
+    set greeting(greeting: string) {
+        this.set('greeting', greeting);
+    }
+
+    greet(recipient: string) {
+        let message;
+        if (recipient.trim() === 'world') {
+            message = 'Hello, world!';
+        } else {
+            message = `${this.greeting}, ${recipient.trim()}.`;
+        }
+        this.addEvent(ExampleEvent.create({
+            message
+        }));
+        return message;
+    }
+}
diff --git a/ghost/ghost/src/core/example/example.event.ts b/ghost/ghost/src/core/example/example.event.ts
new file mode 100644
index 00000000000..5811f62d70c
--- /dev/null
+++ b/ghost/ghost/src/core/example/example.event.ts
@@ -0,0 +1,18 @@
+/**
+ * Event
+ *
+ * Represents an "Business Event" in the system
+ *
+ * They are serialisable (only contain data)
+ */
+import {BaseEvent} from '../../common/event.base';
+
+type ExampleEventData = {
+    message: string
+};
+
+export class ExampleEvent extends BaseEvent<ExampleEventData> {
+    static create(data: ExampleEventData) {
+        return new ExampleEvent(data, new Date());
+    }
+}
diff --git a/ghost/ghost/src/core/example/example.repository.ts b/ghost/ghost/src/core/example/example.repository.ts
new file mode 100644
index 00000000000..eb46e648efe
--- /dev/null
+++ b/ghost/ghost/src/core/example/example.repository.ts
@@ -0,0 +1,13 @@
+/**
+ * Repository
+ *
+ * These define how the service can retrieve and store entities to/from persistence
+ *
+ * They should generally be derived from a shared base interface
+ */
+import {Greeting} from './example.entity';
+
+export interface ExampleRepository {
+    getOne(recipient: string): Promise<Greeting>
+    save(entity: Greeting): Promise<void>
+}
diff --git a/ghost/ghost/src/core/example/example.service.test.ts b/ghost/ghost/src/core/example/example.service.test.ts
new file mode 100644
index 00000000000..9be6ea4c87a
--- /dev/null
+++ b/ghost/ghost/src/core/example/example.service.test.ts
@@ -0,0 +1,22 @@
+import Sinon from 'sinon';
+import {ExampleService} from './example.service';
+import {Greeting} from './example.entity';
+import assert from 'assert';
+
+describe('ExampleService', function () {
+    it('Can greet a recipient and save the greeting', async function () {
+        const recipient = 'Mr Anderson';
+        const entity = new Greeting({greeting: 'Testing'});
+        const repository = {
+            getOne: Sinon.stub().resolves(entity),
+            save: Sinon.stub()
+        };
+        const service = new ExampleService(repository);
+
+        const result = await service.greet(recipient);
+
+        assert.equal(result, entity.greet(recipient));
+
+        assert(repository.save.calledWithExactly(entity));
+    });
+});
diff --git a/ghost/ghost/src/core/example/example.service.ts b/ghost/ghost/src/core/example/example.service.ts
new file mode 100644
index 00000000000..21e3a775312
--- /dev/null
+++ b/ghost/ghost/src/core/example/example.service.ts
@@ -0,0 +1,25 @@
+/**
+ * Service
+ *
+ * These implement Use Cases of the system, they should use repositories, entities and other services to coordinate these Use Cases
+ *
+ * Business logic should only go in here if it does not fall in the domain of a single entity.
+ */
+import {Inject} from '@nestjs/common';
+import {ExampleRepository} from './example.repository';
+
+export class ExampleService {
+    constructor(
+        @Inject('ExampleRepository') private readonly repository: ExampleRepository
+    ) {}
+
+    async greet(recipient: string): Promise<string> {
+        const greeting = await this.repository.getOne('Greetings');
+
+        const message = greeting.greet(recipient);
+
+        await this.repository.save(greeting);
+
+        return message;
+    }
+}
diff --git a/ghost/ghost/src/db/in-memory/example.repository.in-memory.ts b/ghost/ghost/src/db/in-memory/example.repository.in-memory.ts
new file mode 100644
index 00000000000..5fb20c817a9
--- /dev/null
+++ b/ghost/ghost/src/db/in-memory/example.repository.in-memory.ts
@@ -0,0 +1,37 @@
+/**
+ * Repository Implementation
+ *
+ * Can be in-memory, knex based, bookshelf based, redis based, whatever...
+ *
+ * No business logic
+ * No modification of Entities - they just store what they're given, or fetch what they're asked for
+ * They should dispatch and clear the events of an entity when tehy successfully persist it.
+ */
+import {Inject} from '@nestjs/common';
+import {Greeting} from '../../core/example/example.entity';
+import {ExampleRepository} from '../../core/example/example.repository';
+
+interface DomainEvents {
+    dispatch(event: unknown): void
+}
+
+export class ExampleRepositoryInMemory implements ExampleRepository {
+    constructor(
+        @Inject('DomainEvents') private readonly events: DomainEvents
+    ) {}
+
+    async getOne(greeting: string) {
+        const entity = new Greeting({
+            greeting: greeting.trim()
+        });
+        return entity;
+    }
+
+    async save(entity: Greeting) {
+        Greeting.getEventsToDispatch(entity, (events) => {
+            for (const event of events) {
+                this.events.dispatch(event);
+            }
+        });
+    }
+}
diff --git a/ghost/ghost/src/http/admin/controllers/example.controller.test.ts b/ghost/ghost/src/http/admin/controllers/example.controller.test.ts
new file mode 100644
index 00000000000..6c0a2349a92
--- /dev/null
+++ b/ghost/ghost/src/http/admin/controllers/example.controller.test.ts
@@ -0,0 +1,19 @@
+import assert from 'assert';
+import {ExampleController} from './example.controller';
+import * as sinon from 'sinon';
+import {ExampleService} from '../../../core/example/example.service';
+
+describe('ExampleController', function () {
+    describe('#read', function () {
+        it('returns the result of the greet method', async function () {
+            const service = Object.create(ExampleService.prototype);
+            service.greet = sinon.stub();
+
+            const controller = new ExampleController(service);
+
+            const result = await controller.read('egg');
+
+            assert.equal(result, service.greet.returnValues[0]);
+        });
+    });
+});
diff --git a/ghost/ghost/src/http/admin/controllers/example.controller.ts b/ghost/ghost/src/http/admin/controllers/example.controller.ts
new file mode 100644
index 00000000000..748b3af2bd1
--- /dev/null
+++ b/ghost/ghost/src/http/admin/controllers/example.controller.ts
@@ -0,0 +1,42 @@
+/**
+ * Controller
+ *
+ * These classes are responsible for wiring HTTP Requests to the Service layer.
+ * They do not contain business logic.
+ */
+
+import {
+    Controller,
+    Get,
+    Param,
+    UseGuards,
+    UseInterceptors
+} from '@nestjs/common';
+import {Roles} from '../../../common/decorators/permissions.decorator';
+import {ExampleService} from '../../../core/example/example.service';
+import {LocationHeaderInterceptor} from '../../../nestjs/interceptors/location-header.interceptor';
+import {AdminAPIAuthentication} from '../../../nestjs/guards/admin-api-authentication.guard';
+import {PermissionsGuard} from '../../../nestjs/guards/permissions.guard';
+
+@UseInterceptors(LocationHeaderInterceptor)
+@UseGuards(AdminAPIAuthentication, PermissionsGuard)
+@Controller('greetings')
+export class ExampleController {
+    constructor(private readonly service: ExampleService) {}
+
+    @Roles([
+        'Admin',
+        'Author',
+        'Contributor',
+        'Editor',
+        'Owner',
+        'Admin Integration'
+    ])
+    @Get(':recipient')
+    async read(
+        @Param('recipient') recipient: string
+    ): Promise<string> {
+        const greeting = await this.service.greet(recipient);
+        return greeting;
+    }
+}
diff --git a/ghost/ghost/src/index.ts b/ghost/ghost/src/index.ts
new file mode 100644
index 00000000000..b1cc39345aa
--- /dev/null
+++ b/ghost/ghost/src/index.ts
@@ -0,0 +1,37 @@
+import 'reflect-metadata';
+import {AppModule} from './nestjs/modules/app.module';
+import {NestApplication, NestFactory} from '@nestjs/core';
+import {registerEvents} from './common/decorators/handle-event.decorator';
+import {ClassProvider, ValueProvider} from '@nestjs/common';
+
+let _app: NestApplication;
+
+export async function create() {
+    const app = await NestFactory.create<NestApplication>(AppModule);
+    const DomainEvents = await app.resolve('DomainEvents');
+    registerEvents(app as NestApplication, DomainEvents);
+    return app;
+}
+
+export async function getApp() {
+    if (_app) {
+        return _app;
+    }
+    _app = await create();
+    await _app.init();
+    return _app;
+}
+
+export async function resolve(token: string) {
+    const app = await getApp();
+    return await app.resolve(token);
+}
+
+export function addProvider(obj: ClassProvider | ValueProvider) {
+    AppModule.providers?.push(obj);
+    AppModule.exports?.push(obj.provide);
+}
+
+export {
+    AppModule
+};
diff --git a/ghost/ghost/src/listeners/example.listener.ts b/ghost/ghost/src/listeners/example.listener.ts
new file mode 100644
index 00000000000..0f226903bf8
--- /dev/null
+++ b/ghost/ghost/src/listeners/example.listener.ts
@@ -0,0 +1,24 @@
+/**
+ * Listener
+ *
+ * Responsible for mapping events to perform actions on the service/provider layer.
+ * - "Like a Controller, but for Events not HTTP Requests"
+ */
+import {OnEvent} from '../common/decorators/handle-event.decorator';
+import {Inject} from '@nestjs/common';
+import {ExampleEvent} from '../core/example/example.event';
+
+interface Logger {
+    info(message: string): void
+}
+
+export class ExampleListener {
+    constructor(
+        @Inject('logger') private logger: Logger
+    ) {}
+
+    @OnEvent(ExampleEvent)
+    async logEvents(event: ExampleEvent) {
+        this.logger.info(`Received an event with a message: ${event.data.message}`);
+    }
+}
diff --git a/ghost/ghost/src/nestjs/filters/global-exception.filter.ts b/ghost/ghost/src/nestjs/filters/global-exception.filter.ts
new file mode 100644
index 00000000000..af8ee46ad1d
--- /dev/null
+++ b/ghost/ghost/src/nestjs/filters/global-exception.filter.ts
@@ -0,0 +1,108 @@
+import {ArgumentsHost, Catch, ExceptionFilter, Inject} from '@nestjs/common';
+import {Response} from 'express';
+
+interface GhostError extends Error {
+    statusCode?: number;
+    context?: string;
+    errorType?: string;
+    errorDetails?: string;
+    property?: string;
+    help?: string;
+    code?: string;
+    id?: string;
+    ghostErrorCode?: string;
+}
+
+@Catch()
+export class GlobalExceptionFilter implements ExceptionFilter {
+    constructor(@Inject('logger') private logger: Console) {}
+
+    catch(error: GhostError, host: ArgumentsHost) {
+        const context = host.switchToHttp();
+        const response = context.getResponse<Response>();
+
+        this.logger.error(error);
+
+        response.status(error.statusCode || 500);
+        response.json({
+            errors: [
+                {
+                    message: error.message,
+                    context: error.context || null,
+                    type: error.errorType || null,
+                    details: error.errorDetails || null,
+                    property: error.property || null,
+                    help: error.help || null,
+                    code: error.code || null,
+                    id: error.id || null,
+                    ghostErrorCode: error.ghostErrorCode || null
+                }
+            ]
+        });
+    }
+}
+
+/*
+function prepareError(err: unknown) {
+    if (Array.isArray(err)) {
+        err = err[0];
+    }
+
+    // If the error is already a GhostError, it has been handled and can be returned as-is
+    // For everything else, we do some custom handling here
+    if (errors.utils.isGhostError(err)) {
+        return err;
+    }
+
+    if (!(err instanceof Error)) {
+        return new errors.InternalServerError({
+            err: err,
+            message: tpl(messages.genericError),
+            context: err.message,
+            statusCode: err.statusCode,
+            code: 'UNEXPECTED_ERROR'
+        });
+    }
+
+    // Catch bookshelf empty errors and other 404s, and turn into a Ghost 404
+    if (
+        (err.statusCode && err.statusCode === 404) ||
+        err.message === 'EmptyResponse'
+    ) {
+        return new errors.NotFoundError({
+            err: err
+        });
+        // Catch handlebars / express-hbs errors, and render them as 400, rather than 500 errors as the server isn't broken
+    } else if (
+        isDependencyInStack('handlebars', err) ||
+        isDependencyInStack('express-hbs', err)
+    ) {
+        // Temporary handling of theme errors from handlebars
+        // @TODO remove this when #10496 is solved properly
+        err = new errors.IncrrectUsageError({
+            err: err,
+            message: err.message,
+            statusCode: err.statusCode
+        });
+        // 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,
+            message: tpl(messages.genericError),
+            context: err.message,
+            statusCode: err.statusCode,
+            code: 'UNEXPECTED_ERROR'
+        });
+    }
+}
+*/
diff --git a/ghost/ghost/src/nestjs/filters/not-found-fallthrough.filter.ts b/ghost/ghost/src/nestjs/filters/not-found-fallthrough.filter.ts
new file mode 100644
index 00000000000..ddf1cf3bccd
--- /dev/null
+++ b/ghost/ghost/src/nestjs/filters/not-found-fallthrough.filter.ts
@@ -0,0 +1,10 @@
+import {Catch, NotFoundException, ExceptionFilter, ArgumentsHost} from '@nestjs/common';
+
+@Catch(NotFoundException)
+export class NotFoundFallthroughExceptionFilter implements ExceptionFilter {
+    catch(exception: NotFoundException, host: ArgumentsHost) {
+        const ctx = host.switchToHttp();
+        const next = ctx.getNext();
+        next();
+    }
+}
diff --git a/ghost/ghost/src/nestjs/guards/admin-api-authentication.guard.ts b/ghost/ghost/src/nestjs/guards/admin-api-authentication.guard.ts
new file mode 100644
index 00000000000..89b006a984f
--- /dev/null
+++ b/ghost/ghost/src/nestjs/guards/admin-api-authentication.guard.ts
@@ -0,0 +1,102 @@
+import {
+    Injectable,
+    CanActivate,
+    ExecutionContext,
+    Inject
+} from '@nestjs/common';
+import {Request, Response} from 'express';
+import {Actor} from '../../common/types/actor.type';
+import ObjectID from 'bson-objectid';
+
+// Here we extend the express Request interface with our new type
+declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
+    namespace Express {
+        // eslint-disable-next-line no-shadow
+        export interface Request {
+            actor?: Actor
+        }
+    }
+}
+
+interface SessionService {
+    // We use any because we've not got types for bookshelf models
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    getUserForSession(req: Request, res: Response): Promise<any>
+}
+
+interface AuthenticationService {
+    // We use any because we've not got types for bookshelf models
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    authenticateWithToken(url: string, token: string, ignoreMaxAge: boolean): Promise<any>
+}
+
+@Injectable()
+export class AdminAPIAuthentication implements CanActivate {
+    constructor(
+        @Inject('SessionService') private sessionService: SessionService,
+        @Inject('AdminAuthenticationService') private authService: AuthenticationService
+    ) {}
+
+    async canActivate(context: ExecutionContext): Promise<boolean> {
+        const request = context.switchToHttp().getRequest<Request>();
+        const response = context.switchToHttp().getResponse<Response>();
+
+        const user = await this.sessionService.getUserForSession(request, response);
+
+        if (user) {
+            await this.setUserActor(user, request);
+            return true;
+        }
+
+        if (!request.headers || !request.headers.authorization) {
+            return false;
+        }
+
+        const [scheme, token] = request.headers.authorization.split(' ');
+
+        if (!/^Ghost$/i.test(scheme)) {
+            return false;
+        }
+
+        const {apiKey, user: apiUser} = await this.authService.authenticateWithToken(
+            request.originalUrl,
+            token,
+            false
+        );
+
+        if (user) {
+            await this.setUserActor(apiUser, request);
+            return true;
+        }
+
+        if (apiKey) {
+            await apiKey.related('role').fetch();
+            const json = apiKey.toJSON();
+            request.actor = {
+                id: ObjectID.createFromHexString(json.integration.id),
+                role: json.role.name,
+                type: 'api_key'
+            };
+
+            return true;
+        }
+
+        return false;
+    }
+
+    // This is `any` because again it represents a bookshelf model
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    private async setUserActor(user: any, request: Request) {
+        await user.related('roles').fetch();
+        const json = user.toJSON();
+        request.actor = {
+            // BS To work around Owner id === 1
+            id: ObjectID.createFromHexString(
+                json.id === '1' ? 'DEAD01D0DEAD01D0DEAD01D0' : json.id
+            ),
+            role: json.roles[0].name,
+            type: 'user'
+        };
+    }
+}
diff --git a/ghost/ghost/src/nestjs/guards/permissions.guard.ts b/ghost/ghost/src/nestjs/guards/permissions.guard.ts
new file mode 100644
index 00000000000..4bf374fb8ab
--- /dev/null
+++ b/ghost/ghost/src/nestjs/guards/permissions.guard.ts
@@ -0,0 +1,39 @@
+import {
+    Injectable,
+    CanActivate,
+    ExecutionContext,
+    Inject
+} from '@nestjs/common';
+import {Reflector} from '@nestjs/core';
+import {Roles} from '../../common/decorators/permissions.decorator';
+import {Request} from 'express';
+
+@Injectable()
+export class PermissionsGuard implements CanActivate {
+    constructor(@Inject(Reflector) private reflector: Reflector) {}
+
+    async canActivate(context: ExecutionContext): Promise<boolean> {
+        const roles = this.reflector.get(Roles, context.getHandler());
+        const request = context.switchToHttp().getRequest<Request>();
+
+        const role = request.actor?.role;
+
+        if (!roles) {
+            throw new Error('Missing @Roles decorator on Controller method');
+        }
+
+        if (roles.includes('Anon')) {
+            return true;
+        }
+
+        if (!role) {
+            return false;
+        }
+
+        if (roles.includes(role)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/ghost/ghost/src/nestjs/interceptors/location-header.interceptor.ts b/ghost/ghost/src/nestjs/interceptors/location-header.interceptor.ts
new file mode 100644
index 00000000000..c3e7b87ba8a
--- /dev/null
+++ b/ghost/ghost/src/nestjs/interceptors/location-header.interceptor.ts
@@ -0,0 +1,71 @@
+import {
+    Injectable,
+    NestInterceptor,
+    ExecutionContext,
+    CallHandler
+} from '@nestjs/common';
+import {Observable} from 'rxjs';
+import {tap} from 'rxjs/operators';
+import {Request, Response} from 'express';
+
+@Injectable()
+export class LocationHeaderInterceptor implements NestInterceptor {
+    intercept<T>(context: ExecutionContext, next: CallHandler): Observable<T> {
+        if (context.getType() !== 'http') {
+            return next.handle();
+        }
+        const [
+            req,
+            res
+        ]: [Request, Response] = context.getArgs();
+
+        if (req.method !== 'POST') {
+            return next.handle();
+        }
+
+        function getLocationHeader(responseData: unknown) {
+            if (typeof responseData !== 'object' || responseData === null) {
+                return;
+            }
+            const keys = Object.keys(responseData);
+            if (keys.length !== 1) {
+                return;
+            }
+
+            const data: unknown = Reflect.get(responseData, keys[0]);
+
+            if (!Array.isArray(data)) {
+                return;
+            }
+
+            if (data.length !== 1) {
+                return;
+            }
+
+            const id = data[0].id;
+
+            if (!id || typeof id !== 'string') {
+                return;
+            }
+
+            const url = new URL('https://ghost.io');
+            url.protocol = req.secure ? 'https:' : 'http:';
+            // We use `any` here because we haven't yet extended the express Request object with the vhost plugin types
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            url.host = (req as any).vhost ? (req as any).vhost.host : req.get('host');
+            url.pathname = req.path;
+            url.pathname += `${id}/`;
+
+            return url;
+        }
+
+        return next.handle().pipe(
+            tap((data) => {
+                const location = getLocationHeader(data);
+                if (location) {
+                    res.set('location', location.href);
+                }
+            })
+        );
+    }
+}
diff --git a/ghost/ghost/src/nestjs/modules/admin-api.module.ts b/ghost/ghost/src/nestjs/modules/admin-api.module.ts
new file mode 100644
index 00000000000..ce04e7517f5
--- /dev/null
+++ b/ghost/ghost/src/nestjs/modules/admin-api.module.ts
@@ -0,0 +1,17 @@
+import {Module} from '@nestjs/common';
+import {ExampleController} from '../../http/admin/controllers/example.controller';
+import {ExampleService} from '../../core/example/example.service';
+import {ExampleRepositoryInMemory} from '../../db/in-memory/example.repository.in-memory';
+
+@Module({
+    controllers: [ExampleController],
+    exports: [ExampleService],
+    providers: [
+        ExampleService,
+        {
+            provide: 'ExampleRepository',
+            useClass: ExampleRepositoryInMemory
+        }
+    ]
+})
+export class AdminAPIModule {}
diff --git a/ghost/ghost/src/nestjs/modules/app.module.ts b/ghost/ghost/src/nestjs/modules/app.module.ts
new file mode 100644
index 00000000000..25a4ba74dcc
--- /dev/null
+++ b/ghost/ghost/src/nestjs/modules/app.module.ts
@@ -0,0 +1,34 @@
+import {DynamicModule} from '@nestjs/common';
+import {APP_FILTER, RouterModule} from '@nestjs/core';
+import {AdminAPIModule} from './admin-api.module';
+import {NotFoundFallthroughExceptionFilter} from '../filters/not-found-fallthrough.filter';
+import {ExampleListener} from '../../listeners/example.listener';
+import {GlobalExceptionFilter} from '../filters/global-exception.filter';
+
+class AppModuleClass {}
+
+export const AppModule: DynamicModule = {
+    global: true,
+    module: AppModuleClass,
+    imports: [
+        RouterModule.register([
+            {
+                path: 'ghost/api/admin',
+                module: AdminAPIModule
+            }
+        ]),
+        AdminAPIModule
+    ],
+    exports: [],
+    controllers: [],
+    providers: [
+        ExampleListener,
+        {
+            provide: APP_FILTER,
+            useClass: GlobalExceptionFilter
+        }, {
+            provide: APP_FILTER,
+            useClass: NotFoundFallthroughExceptionFilter
+        }
+    ]
+};
diff --git a/ghost/ghost/test/.eslintrc.js b/ghost/ghost/test/.eslintrc.js
new file mode 100644
index 00000000000..6fe6dc1504a
--- /dev/null
+++ b/ghost/ghost/test/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+    parser: '@typescript-eslint/parser',
+    plugins: ['ghost'],
+    extends: [
+        'plugin:ghost/test'
+    ]
+};
diff --git a/ghost/ghost/tsconfig.json b/ghost/ghost/tsconfig.json
new file mode 100644
index 00000000000..cdd46042333
--- /dev/null
+++ b/ghost/ghost/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.json",
+  "include": [
+    "src/**/*"
+  ],
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "outDir": "build"
+  }
+}
diff --git a/ghost/i18n/lib/i18n.js b/ghost/i18n/lib/i18n.js
index d25d241dbd4..42aa92e6850 100644
--- a/ghost/i18n/lib/i18n.js
+++ b/ghost/i18n/lib/i18n.js
@@ -3,6 +3,7 @@ const i18next = require('i18next');
 const SUPPORTED_LOCALES = [
     'af', // Afrikaans
     'bg', // Bulgarian
+    'bs', // Bosnian
     'ca', // Catalan
     'cs', // Czech
     'da', // Danish
@@ -10,8 +11,10 @@ const SUPPORTED_LOCALES = [
     'en', // English
     'eo', // Esperanto
     'es', // Spanish
+    'fa', // Persian/Farsi
     'fi', // Finnish
     'fr', // French
+    'gd', // Gaelic (Scottish)
     'hr', // Croatian
     'hu', // Hungarian
     'id', // Indonesian
@@ -19,6 +22,7 @@ const SUPPORTED_LOCALES = [
     'it', // Italian
     'ja', // Japanese
     'ko', // Korean
+    'lt', // Lithuanian
     'mn', // Mongolian
     'ms', // Malay
     'nl', // Dutch
@@ -30,6 +34,7 @@ const SUPPORTED_LOCALES = [
     'ro', // Romanian
     'ru', // Russian
     'si', // Sinhala
+    'sk', // Slovak
     'sl', // Slovenian
     'sq', // Albanian
     'sr', // Serbian
diff --git a/ghost/i18n/locales/af/comments.json b/ghost/i18n/locales/af/comments.json
index b79db3ce16e..40954df20af 100644
--- a/ghost/i18n/locales/af/comments.json
+++ b/ghost/i18n/locales/af/comments.json
@@ -5,7 +5,7 @@
     "{{amount}} hours ago": "{{amount}} ure gelede",
     "{{amount}} minutes ago": "{{amount}} minute gelede",
     "{{amount}} months ago": "{{amount}} maande gelede",
-    "{{amount}} more": "",
+    "{{amount}} more": "{{amount}} meer",
     "{{amount}} seconds ago": "{{amount}} sekondes gelede",
     "{{amount}} weeks ago": "{{amount}} weke gelede",
     "{{amount}} years ago": "{{amount}} jaar gelede",
diff --git a/ghost/i18n/locales/af/portal.json b/ghost/i18n/locales/af/portal.json
index 1d814c046de..3c0756f1e04 100644
--- a/ghost/i18n/locales/af/portal.json
+++ b/ghost/i18n/locales/af/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dae gratis",
     "{{amount}} off": "{{amount}} afslag",
     "{{amount}} off for first {{number}} months.": "{{amount}} afslag vir die eerste {{number}} maande.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} sal nie meer e-posse ontvang wanneer iemand op u kommentaar reageer nie.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} sal nie meer hierdie nuusbrief ontvang nie.",
     "{{trialDays}} days free": "{{trialDays}} dae gratis",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "'n Aanmeldskakel is na u epos gestuur. As dit nie binne 3 minute aankom nie, moet u asseblief u spam-vouer nagaan.",
     "Account": "Rekening",
     "Account settings": "Rekening instellings",
@@ -48,11 +50,12 @@
     "Edit": "Wysig",
     "Email": "E-pos",
     "Email newsletter": "Epos nuusbrief",
-    "Email preference updated.": "E-pos instellings opgedateer.",
     "Email preferences": "E-pos instellings",
     "Emails": "E-posse",
     "Emails disabled": "E-posse afgeskakel",
     "Ends {{offerEndDate}}": "Eindig {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Fout",
     "Expires {{expiryDate}}": "Verval {{expiryDate}}",
     "Forever": "Verewig",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "As u nou kanselleer, sal u toegang hê tot {{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}}": "As u 'n korporatiewe of regerings e-posrekening het, kontak u IT-afdeling en vra hulle om e-posse van {{senderEmail}} te ontvang",
     "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.": "As u weer e-posse wil begin ontvang, is die beste volgende stap om u e-posadres op rekord te kontroleer vir enige probleme en dan weer in te skryf op die vorige skerm.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "As u nie die e-pos nuusbrief ontvang wat u op ingeteken het nie, is hier 'n paar goed om te kontroleer.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "As u nie die e-pos nuusbrief ontvang wat u op ingeteken het nie, is hier 'n paar goed om te kontroleer.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "As u al hierdie kontroles voltooi het en u steeds nie e-posse ontvang nie, kan u hulp kry deur {{supportAddress}} te kontak.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "In die geval dat 'n permanente fout ontvang word wanneer 'n nuusbrief gestuur word, sal e-posse op die rekening afgeskakel word.",
     "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.": "In u e-pos program, voeg {{senderEmail}} by u kontaklys. Dit dui aan u e-posverskaffer aan dat e-posse wat van hierdie adres gestuur word, vertrou moet word.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Minder soos hierdie",
     "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\".": "Maak seker dat e-posse nie per ongeluk in die Spam of Promosies vouers van u posbus beland nie. As dit wel is, kliek op \"Mark as not spam\" en/of \"Move to inbox\".",
     "Manage": "Bestuur",
@@ -86,19 +92,21 @@
     "Now check your email!": "Kyk nou u e-pos!",
     "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.": "As u weer ingeskryf is, en u sien steeds nie e-posse in u posbus nie, kontroleer u spam vouer. Sommige posbusverskaffers hou 'n rekord van vorige spam klagtes en sal steeds e-posse merk. As dit gebeur, merk die nuutste nuusbrief as 'Not spam' om dit terug te skuif na u primêre posbus.",
     "Permanent failure (bounce)": "Permanente fout (bounce)",
+    "Phone number": "",
     "Plan": "Plan",
     "Plan checkout was cancelled.": "Plan afreken is gekanselleer.",
     "Plan upgrade was cancelled.": "Plan opgradering is gekanselleer.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Kontak {{supportAddress}} om jou komplimentêre intekening aan te pas.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Vul asseblief die verpligte velde in",
     "Price": "Prys",
     "Re-enable emails": "Her-aktiveer eposse",
-    "Recommendations": "",
+    "Recommendations": "Aanbevelings",
     "Renews at {{price}}.": "Hernu teen {{price}}.",
     "Retry": "Probeer weer",
     "Save": "Stoor",
     "Send an email and say hi!": "Stuur 'n epos en sê hallo!",
-    "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.": "Stuur 'n e-pos na {{senderEmail}} en sê hallo. Dit kan ook help om aan u e-posverskaffer aan te dui dat e-posse na en van hierdie adres vertrou moet word.",
+    "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.": "Stuur 'n e-pos na {{senderEmail}} en sê hallo. Dit kan ook help om aan u e-posverskaffer aan te dui dat e-posse na en van hierdie adres vertrou moet word.",
     "Sending login link...": "Stuur aanmeldskakel...",
     "Sending...": "Stuur...",
     "Show all": "Wys almal",
@@ -106,6 +114,7 @@
     "Sign out": "Teken uit",
     "Sign up": "Registreer",
     "Signup error: Invalid link": "Aanmelding fout: Ongeldige skakel",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Jammer, dit het nie gewerk nie.",
     "Spam complaints": "Spam klagtes",
     "Start {{amount}}-day free trial": "Begin {{amount}}-dag gratis proeftydperk",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Sukses! U e-pos is opgedateer.",
     "Successfully unsubscribed": "Suksesvol afgemeld",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Dankie dat jy ingeteken het. Voordat jy begin lees, hieronder is 'n paar ander webwerwe wat jy dalk sal geniet.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Dankie vir die terugvoering!",
     "That didn't go to plan": "Dit het nie volgens plan verloop nie",
     "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>.": "Die epos addres wat ons vir u het is {{memberEmail}} — as dit nie korrek is nie, kan u dit opdateer in u <button>rekeninginstellings area</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Daar was 'n probleem om u terugvoering in te dien. Probeer asseblief later weer.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Hierdie webwerf is slegs op uitnodiging, kontak die eienaar vir toegang.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Om die registrasie te voltooi, kliek op die bevestigingskakel in jou inboks. As dit nie binne 3 minute aankom nie, kontroleer asseblief jou spam-vouer!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Probeer gratis vir {{amount}} dae, dan {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Ontsluit toegang tot alle nuusbriewe deur 'n betaalde intekenaar te word.",
     "Unsubscribe from all emails": "Meld af van alle e-posse",
     "Unsubscribed": "Afgemeld",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Deur van eposse af te skakel, sal nie u betaalde subskripsie van {{title}} kanselleer nie",
     "Update": "Opdateer",
     "Update your preferences": "Opdateer u voorkeure",
diff --git a/ghost/i18n/locales/ar/ghost.json b/ghost/i18n/locales/ar/ghost.json
new file mode 100644
index 00000000000..e4c9ec14b41
--- /dev/null
+++ b/ghost/i18n/locales/ar/ghost.json
@@ -0,0 +1,26 @@
+{
+    "All the best!": "مع خالص التقدير!",
+    "Complete your sign up to {{siteTitle}}!": "أكمل تسجيلك في {{siteTitle}}!",
+    "Confirm your email update for {{siteTitle}}!": "تأكيد تحديث بريدك الاكتروني لـ {{siteTitle}}!",
+    "Confirm your subscription to {{siteTitle}}": "تأكيد اشتراكك في {{siteTitle}}!",
+    "For your security, the link will expire in 24 hours time.": "لدواعي الحماية، سيتنتهي فعالية الرابط خلال اربع وعشرون ساعة.",
+    "Hey there,": "مرحبا بك،",
+    "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}}",
+    "See you soon!": "نراكم قريبا!",
+    "Sent to {{email}}": "تم الارسال الى {{email}}",
+    "Sign in to {{siteTitle}}": "تسجيل الدخول الى {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "انقر الرابط ادناه لاكمال عملية التسجيل في {{siteTitle}}, والدخول مباشرة:",
+    "Thank you for signing up to {{siteTitle}}!": "شكرا لتسجيلك في {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "شكرا لاشتراكك في {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "شكرا لاشتراكك في {{siteTitle}}. انقر الرابط ادناه لتسجيل الدخول:",
+    "This email address will not be used.": "هذا البريد الاكتروني لن يتم استخدامه.",
+    "Welcome back to {{siteTitle}}!": "مرحبا بك مرة اخرى في {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "مرحبا بك مرة اخرى! استخدم هذا الرابط لتسجيل الدخول في حساب {{siteTitle}}:",
+    "You can also copy & paste this URL into your browser:": "بامكانك ايضا نسخ ولصق هذا الرابط في متصفحك:",
+    "You will not be signed up, and no account will be created for you.": "لم يتم تسجيلك او لم بتم انشاء حساب لك.",
+    "You will not be subscribed.": "لم يتم اشتراكك.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "أنت على بعد خطوة من الاشتراك في {{siteTitle}} - برجاء تأكيد البريد الاكتروني من خلال هذا الرابط:"
+}
diff --git a/ghost/i18n/locales/ar/portal.json b/ghost/i18n/locales/ar/portal.json
new file mode 100644
index 00000000000..77a63929f78
--- /dev/null
+++ b/ghost/i18n/locales/ar/portal.json
@@ -0,0 +1,60 @@
+{
+    "{{discount}}% discount": "{{discount}}% خصم",
+    "{{trialDays}} days free": "{{trialDays}} أيام مجانية",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "رابط الدخول تم ارساله الى بريدك الاكتروني. اذا لم تتلقى الرسالة خلال 3 دقائق، برجاء التأكد من مجلد المهملات.",
+    "Account": "حسابي",
+    "Account settings": "اعدادات الحساب",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "بعد انتهاء المدة التجريبية، سيتم خصم السعر العادي للباقة التي اخترتها. بامكانك الغاء الاشتراك قبل ذلك.",
+    "Already a member?": "هل انت عضو؟",
+    "Back": "الرجوع",
+    "Back to Log in": "الرجوع الى تسجيل الدخول",
+    "Cancel subscription": "إلغاء الاشتراك",
+    "Cancellation reason": "سبب الإلغاء",
+    "Choose a different plan": "اختر اشتراك مختلف",
+    "Choose your newsletters": "اختر مجموعة بريدية مفضلة",
+    "Close": "إغلاق",
+    "Comments": "تعليق",
+    "Confirm": "تأكيد",
+    "Continue": "استمرار",
+    "Delete account": "حذف الحساب",
+    "Don't have an account?": "هل لديك حساب؟",
+    "Email": "بريد الكترني",
+    "Email preference updated.": "تم تحديث تفضيلات البريد الاكتروني",
+    "Email preferences": "تفضيلات",
+    "Emails": "البريد الاكتروني",
+    "Emails disabled": "تم تعطيل جميع بريد الاكترونية",
+    "Get help": "المساعدة",
+    "Get notified when someone replies to your comment": "استلم اشعار في حال تم الرد على تعليقك",
+    "Give feedback on this post": "شارك رأيك في هذا المنشور",
+    "Less like this": "أقل من هذا",
+    "Manage": "إدارة",
+    "Monthly": "شهري",
+    "More like this": "أكثر من هذا",
+    "Name": "الاسم",
+    "Not receiving emails?": "لم تستلم رسالة بريدية؟",
+    "Now check your email!": "الان تأكد من بريدك الاكتروني!",
+    "Price": "السعر",
+    "Re-enable emails": "اعد تفعيل رسال البريد",
+    "Retry": "اعد المحاولة",
+    "Save": "حفظ",
+    "Sending login link...": "جار ارسال رابط التسجيل...",
+    "Sending...": "جار الارسال...",
+    "Sign in": "تسجيل الدخول",
+    "Sign up": "انشاء حساب",
+    "Start {{amount}}-day free trial": "ابدأ {{amount}}-ايام تجربة مجانية",
+    "Submit feedback": "تسليم رأيك",
+    "Successfully unsubscribed": "تم الغاء الاشتراك بنجاح",
+    "Thanks for the feedback!": "شكرا لمشاركتك رأيك!",
+    "That didn't go to plan": "لم تسر الامور على ما يرام",
+    "This site is invite-only, contact the owner for access.": "هذا الموقع للمشتركين فقط، تواصل مع ادارة الموقع للحصول على اشتراك.",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "لاكمال انشاء حسابك، استخدم رابط التأكيد المرسل الى بريد. اذا لم تتلقى الرسالة خلال 3 دقائق، برجاء التأكد من مجلد المهملات.",
+    "Unsubscribe from all emails": "الغ الاشتراك من جميع الرسائل",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "الغاء اشتراك من الرسائل لا يعني إلغاء اشتراكك المدفوع في {{title}}",
+    "Update your preferences": "تحديث تفضيلاتك",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "لم نتمكن من إلغاء اشتراكك في الرسائل لانه لم يتم العثور على بريدك الاكتروني. برجاء التواصل مع ادارة الموقع.",
+    "Yearly": "سنوي",
+    "You have been successfully resubscribed": "تم اعادة اشتراكك بنجاح",
+    "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.": "لم تستلم رسالة بريدية لربما انك جعلت الرسائل مهملة او ان الرسائل لا تصل الى بريدك الذي سجلته.",
+    "Your account": "حسابك",
+    "Your input helps shape what gets published.": "آرائك تساهم في تحسين ما ينشر."
+}
diff --git a/ghost/i18n/locales/bg/comments.json b/ghost/i18n/locales/bg/comments.json
index bcb0715d9a1..818bb3cd3b3 100644
--- a/ghost/i18n/locales/bg/comments.json
+++ b/ghost/i18n/locales/bg/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": "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.": "Абонирайте се за {{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": "Основател @ Компания ООД",
+    "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": "Показване на още {{amount}} отговора",
+    "Show {{amount}} previous comments": "Показване на {{amount}} предишни коментара",
+    "Show 1 more reply": "Показване на още 1 отговор",
+    "Show 1 previous comment": "Показване на 1 предишен коментар",
+    "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/bg/portal.json b/ghost/i18n/locales/bg/portal.json
index 2e48fcdad7c..fae5c801a09 100644
--- a/ghost/i18n/locales/bg/portal.json
+++ b/ghost/i18n/locales/bg/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} дни безплатно",
     "{{amount}} off": "{{amount}} отстъпка",
     "{{amount}} off for first {{number}} months.": "{{amount}} отстъпка за първите {{number}} месеца.",
@@ -9,10 +10,11 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} повече няма да получава имейли, когато някой отговаря на ваш коментар.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} повече няма да получава този бюлетин.",
     "{{trialDays}} days free": "{{trialDays}} дни безплатен достъп",
-    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Връзка за влизане беше изпратена към пощенската Ви кутия. Ако писмото не пристигне до 3 минути, провете дали не е категоризирана като нежелано писмо.",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Изпратен Ви е имейл с препратка за влизане. Ако не пристигне до 3 минути, проверете дали не е категоризиран като нежелано писмо.",
     "Account": "Профил",
     "Account settings": "Настройки на профила Ви",
-    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "След прикючване на безплатния достъп ще бъдете таксувани според обявените цени. Можете да се откажете преди изтичането на безплатния достъп.",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "След приключване на безплатния достъп ще бъдете таксувани според обявените цени. Можете да се откажете преди изтичането на безплатния достъп.",
     "Already a member?": "Вече сте абонат на сайта?",
     "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Възникна неочаквана грешка. Моля, опитайте отново или <a>потърсете поддръжката</a> ако това се повтаря.",
     "Back": "Обратно",
@@ -48,11 +50,12 @@
     "Edit": "Редакция",
     "Email": "Имейл адрес",
     "Email newsletter": "Имейл бюлетин",
-    "Email preference updated.": "Имейл настройките са обновени.",
     "Email preferences": "Имейл настройки ",
     "Emails": "Имейли",
     "Emails disabled": "Писмата са преустновени",
     "Ends {{offerEndDate}}": "До {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Грешка",
     "Expires {{expiryDate}}": "Изтича {{expiryDate}}",
     "Forever": "Завинаги",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ако отмените абонамента си сега, ще продължите да имате достъп до {{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}}": "Ако имате корпоративен или правителствен имейл акаунт, обърнете се към ИТ отдела си и ги помолете да разрешат получаването на имейли от {{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're not receiving the email newsletter you've subscribed to, here are a 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}}.": "Ако сте извършили всички тези проверки и все още не получавате имейли, можете да се свържете с поддръжката на {{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.": "Добавете {{senderEmail}} в списъка си с контакти. Това сигнализира на вашия доставчик, че имейлите, изпратени от този адрес са надеждни.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "Управлявай",
@@ -83,13 +89,15 @@
     "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).": "Информационните бюлетини могат да бъдат деактивирани в профила ви по две причини: Предишен имейл е бил маркиран като спам или опитът за изпращане на имейл е довел до траен неуспех (отказ).",
     "Not receiving emails?": "Не получавате поща?",
-    "Now check your email!": "Провете си пощенската кутия!",
+    "Now check your email!": "Проверете си пощенската кутия!",
     "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)": "Постоянен проблем (отскок)",
+    "Phone number": "",
     "Plan": "План",
     "Plan checkout was cancelled.": "Плащането на плана е прекъснато.",
     "Plan upgrade was cancelled.": "Надграждането на плана е прекъснато.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Моля, попълнете задължителните полета",
     "Price": "Цена",
     "Re-enable emails": "Позволете отново изпращането на писма",
@@ -98,7 +106,7 @@
     "Retry": "Отново",
     "Save": "Запиши",
     "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.": "Изпратете имейл до {{senderEmail}} за здрасти. Това също може да сигнализира на вашия доставчик на ел. поща, че на имейлите до и от този адрес може да се има доверие.",
+    "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}} за здрасти. Това също може да сигнализира на вашия доставчик на ел. поща, че на имейлите до и от този адрес може да се има доверие.",
     "Sending login link...": "Изпращане на връзка за влизане...",
     "Sending...": "Изпращане...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Изход",
     "Sign up": "Регистриране",
     "Signup error: Invalid link": "Грешка при влизане: Невалиден линк",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Жалко, така не става.",
     "Spam complaints": "Оплаквания от спам",
     "Start {{amount}}-day free trial": "Започване на {{amount}}-дневен безплатен достъп.",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Чудесно! Вашият имейл е актуализиран.",
     "Successfully unsubscribed": "Успешно разабониране",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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>.": "Имейлът, който имаме за вас, е {{memberEmail}} - ако не е верен, можете да го актуализирате в областта за <button>настройки на профила си</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Имаше проблем при изпращането на обратната връзка. Моля, опитайте отново малко по-късно.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Сайтът е само с покани. Свържете се със собственика за да получите достъп.",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "За да прикючите вашата регистрация беше изпратена връзка за влизане към пощенската Ви кутия. Ако писмото не пристигне до 3 минути, провете дали не е категоризирана като нежелано писмо.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "За да приключите регистрацията, последвайте препратката в съобщението, изпратено Ви по имейл. Ако не пристигне до 3 минути, проверете дали не е категоризирано като нежелано писмо.",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Тествайте безплатно за {{amount}} дни, след това {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Отключете достъпа до всички бюлетини, като станете платен абонат.",
     "Unsubscribe from all emails": "Прекрати изпращането на всякакви писма",
     "Unsubscribed": "Неабониран",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Спирането на изпращането на писма, няма да ти прекрати абонамента и регистрацията в {{title}}",
     "Update": "Обнови",
     "Update your preferences": "Обнови твоите предпочитания/настройки",
diff --git a/ghost/i18n/locales/bs/comments.json b/ghost/i18n/locales/bs/comments.json
new file mode 100644
index 00000000000..96726a306bb
--- /dev/null
+++ b/ghost/i18n/locales/bs/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{amount}} characters left": "Preostalo {{amount}} karaktera",
+    "{{amount}} comments": "{{amount}} komentara",
+    "{{amount}} days ago": "Prije {{amount}} dana",
+    "{{amount}} hours ago": "Prije {{amount}} sati",
+    "{{amount}} minutes ago": "Prije {{amount}} minuta",
+    "{{amount}} months ago": "Prije {{amount}} mjeseci",
+    "{{amount}} more": "Još {{amount}}",
+    "{{amount}} seconds ago": "Prije {{amount}} sekundi",
+    "{{amount}} weeks ago": "Prije {{amount}} sedmica",
+    "{{amount}} years ago": "Prije {{amount}} godina",
+    "1 comment": "1 komentar",
+    "Add comment": "Dodaj komentar",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Dodaj kontekst svom komentaru, podijeli svoje ime i stručnost u svrhu kvalitetnije diskusije.",
+    "Add reply": "Objavi komentar",
+    "Already a member?": "Već si član?",
+    "Anonymous": "Anoniman",
+    "Become a member of {{publication}} to start commenting.": "Postani član portala {{publication}} za pristup diskusiji.",
+    "Become a paid member of {{publication}} to start commenting.": "Postani plaćeni član portala {{publication}} za pristup diskusiji.",
+    "Cancel": "Otkaži",
+    "Comment": "Komentar",
+    "Complete your profile": "Dovrši svoj profil",
+    "Delete": "Obriši",
+    "Deleted member": "Obrisan član",
+    "Discussion": "Diskusija",
+    "Edit": "Uredi",
+    "Edit this comment": "Uredi komentar",
+    "Edited": "Uređeno",
+    "Enter your name": "Unesi ime",
+    "Expertise": "Stručnost",
+    "Founder @ Acme Inc": "Acme Inc osnivač",
+    "Full-time parent": "Full time roditelj",
+    "Head of Marketing at Acme, Inc": "Šef marketinga u kompaniji Acme d.o.o",
+    "Hide": "Sakrij",
+    "Hide comment": "Sakrij komentar",
+    "Jamie Larson": "Vanja Larsić",
+    "Join the discussion": "Pridruži se diskusiji",
+    "Just now": "Upravo sada",
+    "Local resident": "Lokalni stanovnik",
+    "Member discussion": "Diskusija članova",
+    "Name": "Ime",
+    "Neurosurgeon": "Neurohirurg",
+    "One day ago": "Prije jedan dan",
+    "One hour ago": "Prije jedan sat",
+    "One minute ago": "Prije jedan minut",
+    "One month ago": "Prije jedan mjesec",
+    "One week ago": "Prije jednu sedmicu",
+    "One year ago": "Prije jednu godinu",
+    "Reply": "Odgovori",
+    "Reply to comment": "Odgovori na komentar",
+    "Report": "Prijavi",
+    "Report comment": "Prijavi komentar",
+    "Report this comment": "Prijavi ovaj komentar",
+    "Report this comment?": "Prijavi ovaj komentar?",
+    "Save": "Sačuvaj",
+    "Sending": "Šaljem",
+    "Sent": "Poslano",
+    "Show": "Prikaži",
+    "Show {{amount}} more replies": "Prikaži još {{amount}} odgovora",
+    "Show {{amount}} previous comments": "Prikaži prethodnih {{amount}} komentara",
+    "Show 1 more reply": "Prikaži još jedan odgovor",
+    "Show 1 previous comment": "Prikaži prethodni komentar",
+    "Show comment": "Prikaži komentar",
+    "Sign in": "Prijavi se",
+    "Sign up now": "Postani član",
+    "Start the conversation": "Započni diskusiju",
+    "This comment has been hidden.": "Ovaj komentar je sakriven.",
+    "This comment has been removed.": "Ovaj komentar je uklonjen.",
+    "Upgrade now": "Nadogradi račun sada",
+    "Yesterday": "Jučer",
+    "You want to report this comment?": "Želiš li prijaviti ovaj komentar?",
+    "Your request will be sent to the owner of this site.": "Tvoj zahtjev je poslan vlasniku stranice."
+}
diff --git a/ghost/i18n/locales/bs/ghost.json b/ghost/i18n/locales/bs/ghost.json
new file mode 100644
index 00000000000..38b85fe9e4c
--- /dev/null
+++ b/ghost/i18n/locales/bs/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Lijep pozdrav!",
+    "Complete signup for {{siteTitle}}!": "Završi prijavu za {{siteTitle}}!",
+    "Complete your sign up to {{siteTitle}}!": "Završi kreiranje računa za {{siteTitle}}!",
+    "Confirm email address": "Potvrdi Email adresu",
+    "Confirm signup": "Potvrdi kreiranje računa",
+    "Confirm your email address": "Potvrdi svoju Email adresu",
+    "Confirm your email update for {{siteTitle}}!": "Potvrdi promjenu Email adrese za {{siteTitle}}!",
+    "Confirm your subscription to {{siteTitle}}": "Potvrdi kreiranje računa na portalu {{siteTitle}}",
+    "For your security, the link will expire in 24 hours time.": "Radi tvoje sigurnosti, link je važeći 24 sata.",
+    "Hey there,": "Zdravo,",
+    "Hey there!": "Zdravo!",
+    "If you did not make this request, you can safely ignore this email.": "Ako ovaj zahtjev nije došao od tebe, možeš slobodno ignorisati ovaj email.",
+    "If you did not make this request, you can simply delete this message.": "Ako ovaj zahtjev nije došao od tebe, možeš slobodno izbrisati ovu poruku.",
+    "Please confirm your email address with this link:": "Potvrdi svoju email adresu putem slijedećeg linka:",
+    "Secure sign in link for {{siteTitle}}": "Siguran link za prijavu za {{siteTitle}}",
+    "See you soon!": "Vidimo se uskoro!",
+    "Sent to {{email}}": "Poslano na {{email}}",
+    "Sign in": "Prijavi se",
+    "Sign in to {{siteTitle}}": "Prijavi se na {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Klikni na link ispod da dovršiš kreiranje računa za {{siteTitle}} i automatsku prijavu:",
+    "Thank you for signing up to {{siteTitle}}!": "Hvala na kreiranju računa za {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "Hvala na pretplati za {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "Hvala na pretplati za {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Hvala na pretplati za {{siteTitle}}. Klikni na link ispod za automatsku prijavu:",
+    "This email address will not be used.": "Ova Email adresa neće biti korištena.",
+    "Welcome back to {{siteTitle}}!": "Prijava na {{siteTitle}} uspješna!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Koristi slijedeći link za sigurnu prijavu na tvoj {{siteTitle}} račun:",
+    "You can also copy & paste this URL into your browser:": "Također možeš kopirati i zalijepiti slijedeći URL u pretraživač:",
+    "You will not be signed up, and no account will be created for you.": "Proces registracije će biti zaustavljen i tvoj račun neće biti kreiran.",
+    "You will not be subscribed.": "Proces pretplate će biti zaustavljen.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Jedan klik te dijeli od pretplate na {{siteTitle}} — potvrdi svoju email adresu putem slijedećeg linka:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Jedan klik te dijeli od pretplate na {{siteTitle}}!"
+}
diff --git a/ghost/i18n/locales/bs/portal.json b/ghost/i18n/locales/bs/portal.json
new file mode 100644
index 00000000000..f4197b5e157
--- /dev/null
+++ b/ghost/i18n/locales/bs/portal.json
@@ -0,0 +1,173 @@
+{
+    "(save {{highestYearlyDiscount}}%)": "(uštedi {{highestYearlyDiscount}}%)",
+    "{{amount}} days free": "{{amount}} dana besplatno",
+    "{{amount}} off": "{{amount}} popusta",
+    "{{amount}} off for first {{number}} months.": "{{amount}} popusta za prvih {{number}} mjeseci.",
+    "{{amount}} off for first {{period}}.": "{{amount}} popusta za prvo {{period}}.",
+    "{{amount}} off forever.": "{{amount}} popusta zauvijek.",
+    "{{discount}}% discount": "{{discount}}% popusta",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} više neće primati {{newsletterName}} newsletter.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} više neće primati Email kada neko odgovori na tvoje komentare.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} više neće primati ovaj newsletter.",
+    "{{trialDays}} days free": "{{trialDays}} dana besplatno",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Link za prijavu poslan je na tvoju Email adresu. Ako ne stigne u roku od 3 minute, provjeri spam folder.",
+    "Account": "Račun",
+    "Account settings": "Postavke računa",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Nakon isteka besplatnog probnog perioda, bit će ti naplaćena redovna cijena za plan koji si odabrao. Možeš otkazati članarinu prije toga.",
+    "Already a member?": "Već si član?",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Došlo je do neočekivane greška. Pokušaj ponovo ili <a>kontaktiraj podršku</a> ako se greška ponovi.",
+    "Back": "Nazad",
+    "Back to Log in": "Nazad na prijavu",
+    "Billing info": "Podaci o naplati",
+    "Black Friday": "Black Friday",
+    "Cancel anytime.": "Otkaži u bilo koje vrijeme.",
+    "Cancel subscription": "Otkaži pretplatu",
+    "Cancellation reason": "Razlog otkazivanja",
+    "Change": "Promijeni",
+    "Check spam & promotions folders": "Provjeri spam folder i posebne pod-foldere",
+    "Check with your mail provider": "Provjeri s Email providerom",
+    "Choose": "Odaberi",
+    "Choose a different plan": "Odaberi drugi plan",
+    "Choose your newsletters": "Odaberi svoje newslettere",
+    "Click here to retry": "Pokušaj ponovo",
+    "Close": "Zatvori",
+    "Comments": "Komentari",
+    "Complimentary": "Besplatno",
+    "Confirm": "Potvrdi",
+    "Confirm cancellation": "Potvrdi otkazivanje",
+    "Confirm subscription": "Potvrdi pretplatu",
+    "Contact support": "Kontaktiraj podršku",
+    "Continue": "Nastavi",
+    "Continue subscription": "Produži pretplatu",
+    "Could not sign in. Login link expired.": "Nije se moguće prijaviti. Link za prijavu je istekao.",
+    "Could not update email! Invalid link.": "Nije moguće promijeniti Email! Pogrešan link.",
+    "Create a new contact": "Dodaj novi kontakt",
+    "Current plan": "Trenutni plan",
+    "Delete account": "Izbriši račun",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Greška u namjeri? Provjeri svoje postavke <button>ovdje</button>.",
+    "Don't have an account?": "Nemaš račun?",
+    "Edit": "Uredi",
+    "Email": "Email",
+    "Email newsletter": "Email newsletter",
+    "Email preferences": "Postavke Email-a",
+    "Emails": "Email adrese",
+    "Emails disabled": "Onemogućene Email adrese",
+    "Ends {{offerEndDate}}": "Završava {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "Error": "Greška",
+    "Expires {{expiryDate}}": "Ističe {{expiryDate}}",
+    "Forever": "Zauvijek",
+    "Free Trial – Ends {{trialEnd}}": "Besplatni probni period – Ističe {{trialEnd}}",
+    "Get help": "Zatraži pomoć",
+    "Get in touch for help": "Stupi u kontakt sa osobljem",
+    "Get notified when someone replies to your comment": "Primi obavijest kad neko odgovori na moj komentar",
+    "Give feedback on this post": "Ostavi feedback na ovaj članak",
+    "Help! I'm not receiving emails": "Pomoć! Ne primam Email poruke",
+    "Here are a few other sites you may enjoy.": "Evo nekoliko drugih stranica koje bi mogle biti od koristi.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Ako je newsletter označen kao spam, slanje Email poruka se automatski deaktivira za tu adresu u svrhu zaštite od novih neželjenih poruka.",
+    "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.": "Ako je pritužba na spam bila slučajna, ili želiš ponovno početi primati Email poruke, možeš se ponovno pretplatiti klikom na dugme na prethodnoj stranici.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ako otkažeš pretplatu, nastavit ćeš imati pristup 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}}": "Ako imaš korporativni ili vladin Email, obrati se svom IT kadru i zamoli ih da dopuste primanje Email poruka s adrese {{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.": "Ako želiš ponovo početi primati Email poruke, provjeri svoju Email adresu na bilo kakve probleme, a zatim se ponovo pretplati na prethodnoj stranici.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Ako ne primaš Email poruke od željenog newslettera, evo nekoliko stvari koje možeš provjeriti sada.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Ako i nakon gore navedenih provjera ne dobijaš Email poruke za željeni newsletter, kontaktiraj podršku: {{supportAddress}}.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "U slučaju da se greške prilikom slanja nastave, Email poruke će se onemogućiti na nivou računa.",
+    "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.": "Dodaj {{senderEmail}} u kontakte. To vašem pružatelju usluga e-pošte daje do znanja da je pošta sa te adrese sigurna.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
+    "Less like this": "Manje sličnog sadržaja",
+    "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\".": "Provjeri jesu li se Email poruke slučajno završile u spam folderu ili promocijama vašeg poštanskog sandučića. Ako jesu, označite ih kao sigurne i/ili ih premjestite u glavni sandučić.",
+    "Manage": "Upravljaj",
+    "Maybe later": "Možda kasnije",
+    "Memberships unavailable, contact the owner for access.": "Članstvo nije dostupno, kontaktiraj vlasnika za pristup.",
+    "Monthly": "Mjesečno",
+    "More like this": "Više poput ovoga",
+    "Name": "Ime",
+    "Need more help? Contact support": "Treba ti dodatna pomoć? Kontaktiraj podršku",
+    "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).": "Newletteri na vašem računu se mogu onemogućiti iz dva razloga: Prethodni Email označena je kao spam ili pokušaj slanja Email poruke rezultirao je greškom (došlo je do odbacivanja nakon više neuspjelih pokušaja).",
+    "Not receiving emails?": "Ne primaš Email poruke?",
+    "Now check your email!": "Provjeri svoju Email adresu!",
+    "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.": "Nakon što se ponovno pretplatite, ako još uvijek ne vidiš Email u svom inboxu, provjeri spam folder. Neki pružatelji Email usluga čuvaju zapis prethodnih pritužbi na spam i nastavit će ih označavati kao takve. Ako se to dogodi, označite najnoviji newsletter Email kao \"Nije neželjena pošta\" da biste ga vratili u primarni inbox.",
+    "Permanent failure (bounce)": "Trajna greška (odbacivanje nakon više neuspjelih pokušaja)",
+    "Phone number": "",
+    "Plan": "Plan",
+    "Plan checkout was cancelled.": "Plaćanje plana je otkazano.",
+    "Plan upgrade was cancelled.": "Ažuriranje plana je otkazano.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Kontaktiraj {{supportAddress}} za prilagođavanje besplatne pretplate.",
+    "Please enter {{fieldName}}": "",
+    "Please fill in required fields": "Popuni obavezna polja",
+    "Price": "Cijena",
+    "Re-enable emails": "Ponovno omogući Email poruke",
+    "Recommendations": "Preporuke",
+    "Renews at {{price}}.": "Obnavlja se po cijeni od {{price}}.",
+    "Retry": "Pokušaj ponovo",
+    "Save": "Spremi",
+    "Send an email and say hi!": "Pošalji Email poruku i reci zdravo!",
+    "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.": "Pošalji Email na {{senderEmail}} sa pozitivnim sadržajem. To također može pomoći u signalizaciji vašem pružatelju usluge da se Email poslan s te adrese treba označiti kao siguran.",
+    "Sending login link...": "Slanje linka za prijavu...",
+    "Sending...": "Slanje...",
+    "Show all": "Prikaži sve",
+    "Sign in": "Prijavi se",
+    "Sign out": "Odjavi se",
+    "Sign up": "Registracija",
+    "Signup error: Invalid link": "Greška pri prijavi: Neispravan link",
+    "Something went wrong, please try again later.": "",
+    "Sorry, that didn’t work.": "Žao nam je, to nije uspjelo.",
+    "Spam complaints": "Pritužbe na spam",
+    "Start {{amount}}-day free trial": "Započni {{amount}}-dnevni probni period",
+    "Starting {{startDate}}": "Početak {{startDate}}",
+    "Starting today": "Počinje danas",
+    "Submit feedback": "Pošalji povratne informacije",
+    "Subscribe": "Kreiraj račun",
+    "Subscribed": "Pretplata uspješna",
+    "Success": "Uspjeh",
+    "Success! Check your email for magic link to sign-in.": "Uspjeh! Provjeri svoju Email adresu za link za prijavu.",
+    "Success! Your account is fully activated, you now have access to all content.": "Uspjeh! Tvoj je račun aktiviran, sada imaš pristup svim sadržajima.",
+    "Success! Your email is updated.": "Uspjeh! Vaša Email adresa je promijenjena.",
+    "Successfully unsubscribed": "Odjava uspješna",
+    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Hvala na registraciji. Prije nego počneš čitati, u nastavku su slične stranice koje bi tebi mogle biti interesantne.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
+    "Thanks for the feedback!": "Hvala na povratnim informacijama!",
+    "That didn't go to plan": "To nije pošlo prema planu",
+    "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 adresa koju smo spasili za tebe je {{memberEmail}} — ako to nije tačno, možeš je promijeniti u <button>postavkama računa</button>.",
+    "There was a problem submitting your feedback. Please try again a little later.": "Došlo je do problema prilikom slanja tvojih povratnih informacija. Molimo pokušaj ponovo malo kasnije.",
+    "There was an error processing your payment. Please try again.": "",
+    "This site is invite-only, contact the owner for access.": "Ova je stranica samo na poziv, kontaktiraj vlasnika za pristup.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Za nastavak procesa registracije, klikni na potvrdni link u svom inboxu. Ako ne stigne u roku od 3 minute, provjeri spam folder!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Isprobaj besplatno {{amount}} dana, a zatim plati {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Otključaj pristup svim newsletterima tako što ćete postati plaćeni član.",
+    "Unsubscribe from all emails": "Odjava sa svih Email poruka",
+    "Unsubscribed": "Odjavljeno",
+    "Unsubscribed from all emails.": "Odjavljeno sa svih Email poruka.",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Odjava s Email poruka neće otkazati tvoju plaćenu članarinu na {{title}}",
+    "Update": "Ažuriraj",
+    "Update your preferences": "Ažuriraj svoje postavke",
+    "Verification link sent, check your inbox": "Link za potvrdu poslan, provjeri svoj inbox",
+    "Verify your email address is correct": "Provjeri je li tvoja Email adresa ispravna",
+    "View plans": "Pregledaj planove",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Nismo te mogli odjaviti jer Email nije pronađen. Molimo kontaktiraj vlasnika web stranice.",
+    "Welcome back, {{name}}!": "Dobrodošli nazad, {{name}}!",
+    "Welcome back!": "Dobrodošli nazad!",
+    "Welcome to {{siteTitle}}": "Dobrodošli na {{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.": "Kada inbox ne prihvata Email poruke, to se obično naziva bounce (odbijanje). U mnogim slučajevima, to može biti privremeno. Međutim, u nekim slučajevima, odbijena e-pošta može biti vraćena kao trajni neuspjeh kada je Email adresa neispravna ili nepostojeća.",
+    "Why has my email been disabled?": "Zašto mi je onemogućena Email adresa?",
+    "Yearly": "Godišnje",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Trenutno imaš besplatno članstvo, nadogradi na plaćenu članarinu za potpuni pristup.",
+    "You have been successfully resubscribed": "Uspješno ste ponovo postali član",
+    "You're currently not receiving emails": "Trenutno ne primate Email poruke",
+    "You're not receiving emails": "Ne primam Email poruke",
+    "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.": "Ne primaš Email poruke jer je posljednja poruka označena kao spam ili zato što poruke nisu mogle biti dostavljene na tvoj inbox iz bilo kojeg drugog razloga.",
+    "You've successfully signed in.": "Uspješna prijava.",
+    "You've successfully subscribed to": "Uspješna pretplata na",
+    "Your account": "Tvoj račun",
+    "Your input helps shape what gets published.": "Tvoj feedback pomaže pri odabiru tema koje se objavljuju.",
+    "Your subscription will expire on {{expiryDate}}": "Tvoja pretplata istieče {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Tvoja pretplata će se obnoviti {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Tvoja pretplata će započeti {{subscriptionStart}}"
+}
diff --git a/ghost/i18n/locales/bs/signup-form.json b/ghost/i18n/locales/bs/signup-form.json
new file mode 100644
index 00000000000..24b4ba84c0e
--- /dev/null
+++ b/ghost/i18n/locales/bs/signup-form.json
@@ -0,0 +1,9 @@
+{
+    "Email sent": "Email poslan",
+    "Now check your email!": "Provjeri svoju email adresu!",
+    "Please enter a valid email address": "Unesi važeću email adresu",
+    "Something went wrong, please try again.": "Desila se greška, pokušaj ponovo.",
+    "Subscribe": "Pretplati se na newsletter",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Za potvrdu registracije, klikni na link za potvrdu u svom inboxu. Ako ne stigne u roku od 3 minute, provjeri spam folder!",
+    "Your email address": "Tvoja email adresa"
+}
diff --git a/ghost/i18n/locales/ca/portal.json b/ghost/i18n/locales/ca/portal.json
index b1ba076272d..2a797052127 100644
--- a/ghost/i18n/locales/ca/portal.json
+++ b/ghost/i18n/locales/ca/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dies gratuïts",
     "{{amount}} off": "{{amount}} de descompte",
     "{{amount}} off for first {{number}} months.": "{{amount}} de descompte pels primers {{number}} mesos",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} no rebrà cap correu electrònic quan algú respongui els teus comentaris.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} ja no rebrà aquest butlletí.",
     "{{trialDays}} days free": "{{trialDays}} dies de franc",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "S'ha enviat un enllaç d'inici de sessió al teu correu electrònic. Si no t'arriba en 3 minuts, reivsa la teva carpeta de correu brossa.",
     "Account": "Compte",
     "Account settings": "Configuració del compte",
@@ -48,11 +50,12 @@
     "Edit": "Editar",
     "Email": "Correu electrònic",
     "Email newsletter": "Butlletí informatiu per correu electrònic",
-    "Email preference updated.": "Preferència del correu electrònic actualitzada",
     "Email preferences": "Preferència del correu electrònic",
     "Emails": "Correus electrònics",
     "Emails disabled": "Correus electrònics desactivats",
     "Ends {{offerEndDate}}": "Finalitza el {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Error",
     "Expires {{expiryDate}}": "Expira el {{expiryDate}}",
     "Forever": "per sempre",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Si cancel·leu la vostra subscripció ara, continuareu tenint accés fins al {{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}}": "Si teniu un compte de correu electrònic corporatiu o governamental, poseu-vos en contacte amb el vostre departament de TI i demaneu-los que permetin rebre correus electrònics de {{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.": "Si voleu començar a rebre correus electrònics de nou, els millors passos següents són comprovar si hi ha cap problema a la vostra adreça de correu electrònic al fitxer i, a continuació, feu clic a tornar a subscriure's a la pantalla anterior.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Si no rebeu el butlletí electrònic al qual us heu subscrit, aquí teniu algunes coses per comprovar.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Si no rebeu el butlletí electrònic al qual us heu subscrit, aquí teniu algunes coses per comprovar.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Si heu completat totes aquestes comprovacions i encara no rebeu correus electrònics, podeu contactar amb {{supportAddress}} per obtenir assistència.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "En cas que es rebi un error permanent en intentar enviar un butlletí, els correus electrònics es desactivaran al compte.",
     "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.": "Afegiu {{senderEmail}} al vostre client de correu electrònic a la vostra llista de contactes. Això indica al vostre proveïdor de correu que els correus electrònics enviats des d'aquesta adreça haurien de ser de confiança.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Menys com aquesta",
     "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\".": "Assegureu-vos que els correus electrònics no acabin accidentalment a les carpetes Correu brossa o Promocions de la vostra safata d'entrada. Si ho són, feu clic a \"Marca com a correu brossa\" i/o a \"Mou a la safata d'entrada\".",
     "Manage": "Gestionar",
@@ -86,10 +92,12 @@
     "Now check your email!": "Revisar ara el teu correu electrònic!",
     "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.": "Un cop us torneu a subscriure, si encara no veieu correus electrònics a la vostra safata d'entrada, comproveu la vostra carpeta de correu brossa. Alguns proveïdors de safates d'entrada mantenen un registre de les queixes de correu brossa anteriors i continuaran marcant els correus electrònics. Si això passa, marqueu el darrer butlletí com a \"No és correu brossa\". ' per tornar-lo a moure a la safata d'entrada principal.",
     "Permanent failure (bounce)": "Falla permanent (rebot)",
+    "Phone number": "",
     "Plan": "Pla",
     "Plan checkout was cancelled.": "S'ha cancel·lat el pagament del pla.",
     "Plan upgrade was cancelled.": "S'ha cancel·lat l'actualització del pla.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Poseu-vos en contacte amb {{supportAddress}} per ajustar la vostra subscripció gratuïta.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Si us plau, ompliu els camps obligatoris",
     "Price": "Preu",
     "Re-enable emails": "Torna a activar els correus electrònics",
@@ -98,7 +106,7 @@
     "Retry": "Torna-ho a provar",
     "Save": "Desa",
     "Send an email and say hi!": "Envia un correu electrònic i saluda!",
-    "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.": "Envieu un correu electrònic a {{senderEmail}} i saludeu. Això també pot ajudar a indicar al vostre proveïdor de correu que els correus electrònics d'anada i des d'aquesta adreça haurien de ser de confiança.",
+    "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.": "Envieu un correu electrònic a {{senderEmail}} i saludeu. Això també pot ajudar a indicar al vostre proveïdor de correu que els correus electrònics d'anada i des d'aquesta adreça haurien de ser de confiança.",
     "Sending login link...": "Enviant enllaç d'inici de sessió...",
     "Sending...": "Enviant",
     "Show all": "Mostrar tots",
@@ -106,6 +114,7 @@
     "Sign out": "Finalitza la sessió",
     "Sign up": "Registrar-se",
     "Signup error: Invalid link": "Error de registre: Enllaç no vàlid",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Em sap greu, pero no ha funcionat.",
     "Spam complaints": "Queixes de correu brossa",
     "Start {{amount}}-day free trial": "Comença el període de proves de {{amount}} dies",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Amb èxit! El teu correu electrònic està actualitzat.",
     "Successfully unsubscribed": "T'has donat de baixa correctament",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Gràcies per subscriure't. Abans de començar a llegir, a continuació es mostren alguns altres llocs que us poden agradar.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Gràcies pels teus comentaris!",
     "That didn't go to plan": "Això no ha anat com estava previst",
     "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>.": "'adreça electrònica que tenim per a vostè és {{memberEmail}}; si no és correcta, podeu actualitzar-la a l'<button>àrea de configuració del vostre compte</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Hi ha hagut un problema en enviar els vostres comentaris. Torneu-ho a provar una mica més tard.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Aquest llog és només per invitació, contacta amb el propietari per obtenir accés.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Per completar el registre, fes clic sobre l'enllaç de confirmació al teu correu electrònic. Si no t'arria en 3 minuts, revisa la teva carpeta de correu brossa!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Prova gratis durant {{amount}} dies i després {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Desbloqueja l'accés a tots els butlletins de notícies fent-te un subscriptor de pagament.",
     "Unsubscribe from all emails": "Cancel·la les subscripcions a tots els correus electrònics",
     "Unsubscribed": "S'ha cancel·lat la subscripció",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Cancel·lar la subscripció al teu correu electrònic no cancel·larà la teva subscripció de pagament a {{title}}",
     "Update": "Actualitza",
     "Update your preferences": "Actualitza les preferències",
diff --git a/ghost/i18n/locales/context.json b/ghost/i18n/locales/context.json
index 834450da0e0..73ac52e0f89 100644
--- a/ghost/i18n/locales/context.json
+++ b/ghost/i18n/locales/context.json
@@ -1,4 +1,6 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
+    "+1 (123) 456-7890": "Placeholder for phone number input field",
     "1 comment": "Comment count displayed above the comments section in case there is only one",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "A message displayed during signup process.",
     "Account": "A label in Portal for your account area",
@@ -61,12 +63,12 @@
     "Edited": "Text added to comments that have been edited",
     "Email": "A label for email address input",
     "Email newsletter": "Title for the email newsletter settings",
-    "Email preference updated.": "A confirmation message when email settings have been changed",
     "Email preferences": "A label for email settings",
     "Email sent": "Button text after being clicked, when an email has been sent to confirm a new subscription. Should be short.",
     "Emails": "A label for a list of emails",
     "Emails disabled": "Title for a message in portal telling members that they are not receiving emails, due to repeated delivery failures to their address",
     "Ends {{offerEndDate}}": "Label for an offer which expires",
+    "Enter your email address": "Error message when an email address is missing",
     "Enter your name": "Placeholder input when editing your name in the comments app in the expertise dialog",
     "Error": "Status indicator for a notification",
     "Expertise": "Input label when editing your expertise in the comments app",
@@ -94,10 +96,11 @@
     "If you did not make this request, you can simply delete this message.": "Footer text in signup/login emails",
     "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}}": "Paragraph in the email receiving FAQ",
     "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.": "Paragraph in the email suppression FAQ",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Paragraph in the email receiving FAQ",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Paragraph in the email receiving FAQ",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Paragraph in the email receiving FAQ",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Paragraph in the email suppression FAQ",
     "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.": "Paragraph in the email receiving FAQ",
+    "Invalid email address": "Error message when a provided email address is invalid",
     "Jamie Larson": "An unisex name of a person we use in examples",
     "Join the discussion": "Placeholder value of the comments input box",
     "Just now": "Time indication when a comment has been posted 'just now'",
@@ -124,12 +127,14 @@
     "One week ago": "Time a comment was placed",
     "One year ago": "Time a comment was placed",
     "Permanent failure (bounce)": "A section title in the email suppression FAQ",
+    "Phone number": "Label for phone number input",
     "Plan": "Label for the default subscription plan",
     "Plan checkout was cancelled.": "Notification for when a plan checkout was cancelled",
     "Plan upgrade was cancelled.": "Notification for when a plan upgrade was cancelled",
     "Please confirm your email address with this link:": "Descriptive text in signup emails, right before the button members click to confirm their address",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "A message to comped members when trying to change their subscription, but no other paid plans are available.",
     "Please enter a valid email address": "Err message when an email address is invalid",
+    "Please enter {{fieldName}}": "Error message when a required field is missing",
     "Please fill in required fields": "Error message when a required field is missing",
     "Price": "A label to indicate price of a tier",
     "Re-enable emails": "A button for members to turn-back-on emails, if they have been previously disabled as a result of delivery failures",
@@ -146,7 +151,7 @@
     "Secure sign in link for {{siteTitle}}": "The subject line of member login emails",
     "See you soon!": "A sign-off/ending to a signup email",
     "Send an email and say hi!": "A section title in email receiving FAQ",
-    "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.": "Paragraph in the email receiving FAQ",
+    "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.": "Paragraph in the email receiving FAQ",
     "Sending": "Button text when reporting a comment",
     "Sending login link...": "A loading status message when a member has just clicked to login",
     "Sending...": "A loading status message when an email is being sent",
@@ -165,6 +170,7 @@
     "Sign up": "A button to sign up",
     "Sign up now": "Button text to sign up in order to post a comment",
     "Signup error: Invalid link": "Notification text when an invalid / expired signup link is used",
+    "Something went wrong, please try again later.": "",
     "Something went wrong, please try again.": "Error message when subscribing to a newsletter fails in the signup form embed",
     "Sorry, that didn’t work.": "Title of a page when an error occured while submitting feedback",
     "Spam complaints": "A title in the email suppression FAQ",
@@ -186,19 +192,25 @@
     "Thank you for subscribing to {{siteTitle}}.": "A success message, confirming that a member has 'subscribed' to a newsletter",
     "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "A confirmation message, confirming that a member has 'subscribed' to a newsletter, and needs to click a button to continue.",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Subscription cofirmation message with notice of recommended sites",
+    "Thank you for your support": "A success message, shown in a modal after a non-member has made a tip or donation",
+    "Thank you for your support!": "A success message, shown in a notification after a member has made a tip or donation",
     "Thanks for the feedback!": "A confirmation message after submitting member feedback",
     "That didn't go to plan": "An error message indicating something went wrong",
     "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>.": "Message confirming the user's email is correct, with a button linking to the account settings page",
     "There was a problem submitting your feedback. Please try again a little later.": "An error message for when submitting feedback has failed",
+    "There was an error processing your payment. Please try again.": "",
     "This comment has been hidden.": "Text for a comment thas was hidden",
     "This comment has been removed.": "Text for a comment thas was removed",
     "This email address will not be used.": "This is in the footer of signup verification emails, and comes right after 'If you did not make this request, you can simply delete this message.'",
     "This site is invite-only, contact the owner for access.": "A message on the member login screen indicating that a site is not-open to public signups",
+    "This site is not accepting payments at the moment.": "An error message shown when a tips or donations link is opened but the site has donations disabled",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "A confirmation message displayed during the signup process, indicating that the person signing up needs to go and check their email - and reminding them to check their spam folder, too",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "A message shown in the success modal after a non-member has made a tip or donation",
     "Try free for {{amount}} days, then {{originalPrice}}.": "A label for an offer with a free trial",
     "Unlock access to all newsletters by becoming a paid subscriber.": "A message to encourage members to upgrade to a paid subscription",
     "Unsubscribe from all emails": "A button on the unsubscribe page, offering a shortcut to unsubscribe from every newsletter at the same time",
     "Unsubscribed": "Status of a newsletter which a user has not subscribed to",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Footer text on the unsubscribe screen, reminding people that this screen only cancels receiving emails. It does not cancel paid subscriptions.",
     "Update": "A button to update the billing information",
     "Update your preferences": "A button for updating member preferences in their account area",
@@ -236,6 +248,7 @@
     "Your subscription will expire on {{expiryDate}}": "A message indicating when the member's subscription will expire",
     "Your subscription will renew on {{renewalDate}}": "A message indicating when the member's subscription will be renewed",
     "Your subscription will start on {{subscriptionStart}}": "A message for trial users indicating when their subscription will start",
+    "jamie@example.com": "Placeholder for email input field",
     "{{amount}} characters left": "Characters left, shown above the input field, when editing your expertise in the comments app",
     "{{amount}} comments": "Amount of comments on a post",
     "{{amount}} days ago": "Time a comment was placed",
@@ -256,4 +269,4 @@
     "{{memberEmail}} will no longer receive this newsletter.": "A message shown when a user unsubscribes from a newsletter",
     "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "A message shown when a user unsubscribes from a newsletter",
     "{{trialDays}} days free": "A label for free trial days"
-}
\ No newline at end of file
+}
diff --git a/ghost/i18n/locales/cs/ghost.json b/ghost/i18n/locales/cs/ghost.json
index 52ea4255c89..4e01acde5e8 100644
--- a/ghost/i18n/locales/cs/ghost.json
+++ b/ghost/i18n/locales/cs/ghost.json
@@ -1,27 +1,27 @@
 {
     "All the best!": "Ať se daří!",
-    "Complete signup for {{siteTitle}}!": "",
+    "Complete signup for {{siteTitle}}!": "Dokončete registraci k {{siteTitle}}!",
     "Complete your sign up to {{siteTitle}}!": "Dokončete registraci k {{siteTitle}}!",
-    "Confirm email address": "",
-    "Confirm signup": "",
+    "Confirm email address": "Potvrďte e-mailovou adresu",
+    "Confirm signup": "Potvrďte přihlášení",
     "Confirm your email address": "",
     "Confirm your email update for {{siteTitle}}!": "Potvrďte změnu e-mailu pro {{siteTitle}}!",
     "Confirm your subscription to {{siteTitle}}": "Potvrďte odběr na {{siteTitle}}!",
     "For your security, the link will expire in 24 hours time.": "Pro vaši bezpečnost bude odkaz platný 24 hodin.",
     "Hey there,": "Ahoj,",
-    "Hey there!": "",
+    "Hey there!": "Ahoj!",
     "If you did not make this request, you can safely ignore this email.": "Pokud jste tuto žádost nezaslali, můžete tento e-mail bezpečně ignorovat.",
     "If you did not make this request, you can simply delete this message.": "Pokud jste tuto žádost nezaslali, můžete tento e-mail jednoduše smazat.",
     "Please confirm your email address with this link:": "Prosím, potvrďte svou e-mailovou adresu kliknutím na následující odkaz:",
     "Secure sign in link for {{siteTitle}}": "Bezpečný přihlašovací odkaz pro {{siteTitle}}",
     "See you soon!": "Na viděnou!",
     "Sent to {{email}}": "Odesláno na {{email}}",
-    "Sign in": "",
+    "Sign in": "Přihlásit se",
     "Sign in to {{siteTitle}}": "Přihlásit se k {{siteTitle}}",
     "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Klikněte na následující odkaz pro dokončení registrace u {{siteTitle}} a automatické přihlášení:",
     "Thank you for signing up to {{siteTitle}}!": "Děkujeme za registraci u {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}!": "Děkujeme za odběr na {{siteTitle}}!",
-    "Thank you for subscribing to {{siteTitle}}.": "",
+    "Thank you for subscribing to {{siteTitle}}.": "Děkujeme za odběr {{siteTitle}}.",
     "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Děkujeme za odběr na {{siteTitle}}. Klikněte na následující odkaz pro automatické přihlášení:",
     "This email address will not be used.": "Tato e-mailová adresa nebude použita.",
     "Welcome back to {{siteTitle}}!": "Vítejte zpět na {{siteTitle}}!",
diff --git a/ghost/i18n/locales/cs/portal.json b/ghost/i18n/locales/cs/portal.json
index 0772a1c43dc..8f16afd3b53 100644
--- a/ghost/i18n/locales/cs/portal.json
+++ b/ghost/i18n/locales/cs/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "{{trialDays}} dní zdarma",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Odkaz pro přihlášení byl odeslán do vaší e-mailové schránky. Pokud nepřijde do 3 minut, zkontrolujte prosím svou složku nevyžádaných zpráv (spam).",
     "Account": "Účet",
     "Account settings": "Nastavení účtu",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "E-mail",
     "Email newsletter": "",
-    "Email preference updated.": "Předvolby e-mailu byly aktualizovány.",
     "Email preferences": "Předvolby e-mailu",
     "Emails": "E-maily",
     "Emails disabled": "E-maily vypnuty",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Méně 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": "Spravovat",
@@ -86,10 +92,12 @@
     "Now check your email!": "Zkontrolujte svou e-mailovou 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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Cena",
     "Re-enable emails": "Znovu povolit e-maily",
@@ -98,38 +106,45 @@
     "Retry": "Zkusit znovu",
     "Save": "Uložit",
     "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 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...": "Odesílání přihlašovacího odkazu...",
     "Sending...": "Odesílání...",
     "Show all": "",
     "Sign in": "Přihlásit se",
-    "Sign out": "",
+    "Sign out": "Odhlásit se",
     "Sign up": "Registrovat se",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "Začít {{amount}}denní zkušební verzi zdarma",
     "Starting {{startDate}}": "",
     "Starting today": "",
     "Submit feedback": "Odeslat zpětnou vazbu",
-    "Subscribe": "",
-    "Subscribed": "",
+    "Subscribe": "Odebírat",
+    "Subscribed": "odebíráte",
     "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.": "",
     "Successfully unsubscribed": "Úspěšné odhlášení",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Děkujeme za zpětnou vazbu!",
     "That didn't go to plan": "Něco se nepovedlo",
     "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 an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Tento web je pouze pro pozvané, kontaktujte provozovatele pro přístup.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pro dokončení registrace klikněte na potvrzovací odkaz ve vaší e-mailové schránce. Pokud nepřijde do 3 minut, zkontrolujte prosím složku nevyžádaných zpráv (spam)!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Odhlásit se od všech e-mailů",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Odhlášení ze newsletterů nezruší váš placený odběr {{title}}",
     "Update": "",
     "Update your preferences": "Aktualizovat předvolby",
diff --git a/ghost/i18n/locales/da/comments.json b/ghost/i18n/locales/da/comments.json
index bcb0715d9a1..034d306702f 100644
--- a/ghost/i18n/locales/da/comments.json
+++ b/ghost/i18n/locales/da/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}} tegn tilbage",
+    "{{amount}} comments": "{{amount}} kommentarer",
+    "{{amount}} days ago": "{{amount}} dage siden",
+    "{{amount}} hours ago": "{{amount}} timer siden",
+    "{{amount}} minutes ago": "{{amount}} minutter siden",
+    "{{amount}} months ago": "{{amount}} måneder siden",
+    "{{amount}} more": "{{amount}} mere",
+    "{{amount}} seconds ago": "{{amount}} sekunder siden",
+    "{{amount}} weeks ago": "{{amount}} uger siden",
+    "{{amount}} years ago": "{{amount}} år siden",
+    "1 comment": "1 kommentar",
+    "Add comment": "Tilføj kommentar",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Tilføj kontekst til din kommentar, del dit navn og ekspertise for at fremme en sund diskussion.",
+    "Add reply": "Tilføj svar",
+    "Already a member?": "Allerede medlem?",
+    "Anonymous": "Anonym",
+    "Become a member of {{publication}} to start commenting.": "Bliv medlem af {{publication}} for at kunne skrive kommentarer.",
+    "Become a paid member of {{publication}} to start commenting.": "Bliv betalende medlem af {{publication}} for at kunne skrive kommentarer.",
+    "Cancel": "Annuller",
+    "Comment": "Kommentér",
+    "Complete your profile": "Færdiggør din profil",
+    "Delete": "Slet",
+    "Deleted member": "Slettet medlem",
+    "Discussion": "Diskussion",
+    "Edit": "Rediger",
+    "Edit this comment": "Rediger denne kommentar",
+    "Edited": "Redigeret",
+    "Enter your name": "Indtast dit navn",
+    "Expertise": "Ekspertise",
+    "Founder @ Acme Inc": "Grundlægger @ Acme Inc",
+    "Full-time parent": "Forældre på fuld tid",
+    "Head of Marketing at Acme, Inc": "Chef for marking hos Acme, Inc",
+    "Hide": "Skjul",
+    "Hide comment": "Skjul kommentar",
+    "Jamie Larson": "Jamie Larson",
+    "Join the discussion": "Bliv en del af diskussionen",
+    "Just now": "Lige nu",
+    "Local resident": "Lokal borger",
+    "Member discussion": "Medlemsdiskussion",
+    "Name": "Navn",
+    "Neurosurgeon": "Neurokirurg",
+    "One day ago": "En dag siden",
+    "One hour ago": "En time siden",
+    "One minute ago": "Et minut siden",
+    "One month ago": "En måned siden",
+    "One week ago": "En uge siden",
+    "One year ago": "Et år siden",
+    "Reply": "Svar",
+    "Reply to comment": "Svar på kommentar",
+    "Report": "Rapportér",
+    "Report comment": "Rapportér kommentar",
+    "Report this comment": "Rapportér denne kommentar",
+    "Report this comment?": "Rapportér denne kommentar?",
+    "Save": "Gem",
+    "Sending": "Sender",
+    "Sent": "Sendt",
+    "Show": "Vis",
+    "Show {{amount}} more replies": "Vis {{amount}} flere svar",
+    "Show {{amount}} previous comments": "Vis {{amount}} tidligere kommentarer",
+    "Show 1 more reply": "Vis 1 mere svar",
+    "Show 1 previous comment": "Vis 1 tidligere kommentar",
+    "Show comment": "Vis kommentar",
+    "Sign in": "Log ind",
+    "Sign up now": "Tilmed dig nu",
+    "Start the conversation": "Start samtalen",
+    "This comment has been hidden.": "Denne kommentar er blevet skjult.",
+    "This comment has been removed.": "Denne kommentar er blevet fjernet.",
+    "Upgrade now": "Opgrader nu",
+    "Yesterday": "I går",
+    "You want to report this comment?": "Vil du Rapportere denne kommentar?",
+    "Your request will be sent to the owner of this site.": "Din anmodning vil blive sendt til ejeren af dette site."
 }
diff --git a/ghost/i18n/locales/da/ghost.json b/ghost/i18n/locales/da/ghost.json
index bb4b06ce23c..b5e0ffb84bc 100644
--- a/ghost/i18n/locales/da/ghost.json
+++ b/ghost/i18n/locales/da/ghost.json
@@ -6,7 +6,7 @@
     "Confirm signup": "Bekræft tilmelding",
     "Confirm your email address": "Bekræft din e-mailadresse",
     "Confirm your email update for {{siteTitle}}!": "Bekræft din e-mail opdatering hos {{siteTitle}}!",
-    "Confirm your subscription to {{siteTitle}}": "Annuller dit abonnement hos {{siteTitle}}",
+    "Confirm your subscription to {{siteTitle}}": "Bekræft dit abonnement hos {{siteTitle}}",
     "For your security, the link will expire in 24 hours time.": "Af sikkerhedsmæssige årsager, vil linket udløbe om 24 timer.",
     "Hey there,": "Hejsa",
     "Hey there!": "Hejsa!",
diff --git a/ghost/i18n/locales/da/portal.json b/ghost/i18n/locales/da/portal.json
index a9695dd031b..39017bcc908 100644
--- a/ghost/i18n/locales/da/portal.json
+++ b/ghost/i18n/locales/da/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "(spar {{highestYearlyDiscount}}%)",
     "{{amount}} days free": "{{amount}} dage gratis",
     "{{amount}} off": "{{amount}} rabat",
     "{{amount}} off for first {{number}} months.": "{{amount}} rabat for de første {{number}} måneder.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} vil ikke længere modtage e-mails når nogen svarer på dine kommentarer.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} vil ikke længere modtage dette nyhedsbrev.",
     "{{trialDays}} days free": "{{trialDays}} dage gratis",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Der er blevet sendt en link til din email, du kan bruge til at logge ind med. Hvis det ikke kommer frem indenfor 3 minutter, så tjek din spam mappe.",
     "Account": "Konto",
     "Account settings": "Kontoindstillinger",
@@ -48,11 +50,12 @@
     "Edit": "Rediger",
     "Email": "E-mail",
     "Email newsletter": "E-mail nyhedsbrev",
-    "Email preference updated.": "E-mail præferencer blev opdateret.",
     "Email preferences": "E-mail præferencer",
     "Emails": "E-mails",
     "Emails disabled": "E-mails deaktiveret",
     "Ends {{offerEndDate}}": "Udløber {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Fejl",
     "Expires {{expiryDate}}": "Udløber {{expiryDate}}",
     "Forever": "For evigt",
@@ -62,21 +65,24 @@
     "Get notified when someone replies to your comment": "Bliv notificeret når nogen svarer på din kommentar",
     "Give feedback on this post": "Giv feedback til dette indlæg",
     "Help! I'm not receiving emails": "Hjælp! Jeg modtager ikke e-mails",
-    "Here are a few other sites you may enjoy.": "",
+    "Here are a few other sites you may enjoy.": "Her er et par andre sider du måske vil synes om.",
     "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Hvis et nyhedsbrev er markeret som spam, deaktiveres e-mails automatisk for den adresse så du ikke længere modtage uønskede beskeder.",
     "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.": "Hvis spamklagen var utilsigtet, eller du gerne vil begynde at modtage e-mails igen, kan du abonnere igen på e-mails ved at klikke på knappen på det forrige skærmbillede.",
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Hvis du annullere dit abonnement nu, vil du fortsat have adgang indtil {{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}}": "Hvis du har en virksomheds- eller statslig e-mailkonto, skal du kontakte din it-afdeling og bede dem om at tillade, at e-mails modtages fra {{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.": "Hvis du gerne vil begynde at modtage e-mails igen, er de bedste næste trin at tjekke din registreret e-mailadresse for eventuelle problemer og derefter klikke på gentilmeld på den forrige skærmbillede.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Hvis du ikke modtager det e-mailnyhedsbrev, du har tilmeldt dig, er der et par ting, du skal tjekke.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Hvis du ikke modtager det e-mailnyhedsbrev, du har tilmeldt dig, er der et par ting, du skal tjekke.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Hvis du har gennemført alle disse checks, og du stadig ikke modtager e-mails, kan du kontakte {{supportAddress}} for at få hjælp.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "I tilfælde af, at der modtages en permanent fejl ved forsøg på at sende et nyhedsbrev, vil e-mails blive deaktiveret på kontoen.",
     "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.": "Tilføj {{senderEmail}} til din kontaktliste i din e-mailklient. Dette signalerer til din e-mailudbyder, at e-mails sendt fra denne adresse skal være tillid til.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Mindre af 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\".": "Sørg for, at e-mails ikke ender i Spam eller Kampagner mapper i din indbakke. Hvis de gør, skal du klikke på \"Markér som ikke spam\" og/eller \"Flyt til indbakke\".",
     "Manage": "Administrer",
-    "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Maybe later": "Måske senere",
+    "Memberships unavailable, contact the owner for access.": "Medlemskaber er ikke tilgængelige. Kontakt ejeren for at få adgang.",
     "Monthly": "Månedlig",
     "More like this": "Mere af dette",
     "Name": "Navn",
@@ -86,26 +92,29 @@
     "Now check your email!": "Tjek din e-mail!",
     "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.": "Når du har tilmeldt dig igen, hvis du stadig ikke kan se e-mails i din indbakke, skal du tjekke din spam-mappe. Nogle e-mailudbydere registrerer tidligere spam-klager og vil blive ved med at markere e-mails. Hvis dette sker, skal du markere det seneste nyhedsbrev som 'Ikke spam' for at flytte det tilbage til din primære indbakke.",
     "Permanent failure (bounce)": "Permanent fejl (bounce)",
+    "Phone number": "",
     "Plan": "Abonnement",
     "Plan checkout was cancelled.": "Abonnementsbetaling blev aflyst.",
     "Plan upgrade was cancelled.": "Opgradering af abonnement blev aflyst.",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Kontakt venligst {{supportAddress}} for at ændre dit gratis abonnement.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Udfyld venligst påkrævede felter",
     "Price": "Pris",
     "Re-enable emails": "Genaktiver e-mails",
-    "Recommendations": "",
+    "Recommendations": "Anbefalinger",
     "Renews at {{price}}.": "Bliver fornyet til {{price}}.",
     "Retry": "Prøv igen",
     "Save": "Gem",
     "Send an email and say hi!": "Send en e-mail og sig hej!",
-    "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 en e-mail til {{senderEmail}} og sig hej. Dette kan også hjælpe med at signalere til din e-mailudbyder, at e-mails til og fra denne adresse skal være tillid til.",
+    "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 en e-mail til {{senderEmail}} og sig hej. Dette kan også hjælpe med at signalere til din e-mailudbyder, at e-mails til og fra denne adresse skal være tillid til.",
     "Sending login link...": "Sender link til log ind",
     "Sending...": "Sender",
-    "Show all": "",
+    "Show all": "Vis alle",
     "Sign in": "Log ind",
-    "Sign out": "",
+    "Sign out": "Log ud",
     "Sign up": "Bliv medlem",
     "Signup error: Invalid link": "Tilmeldingsfejl: Ugyldigt link",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Beklager, det virkede ikke.",
     "Spam complaints": "Spam klager",
     "Start {{amount}}-day free trial": "Start {{amount}}-dages gratis prøveperiode",
@@ -119,27 +128,33 @@
     "Success! Your account is fully activated, you now have access to all content.": "Sådan! Din konto er fuldt aktiveret, du har nu adgang til alt indhold.",
     "Success! Your email is updated.": "Sådan! Din e-mail er opdateret.",
     "Successfully unsubscribed": "Du er nu afmeldt",
-    "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.": "Tak for din tilmelding. Før du begynder at læse, er her et par andre sider du måske vil synes om.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Tak for din feedback!",
     "That didn't go to plan": "Det gik ikke helt efter planen",
     "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>.": "Den e-mailadresse, vi har på dig, er {{memberEmail}} – hvis det ikke er korrekt, kan du opdatere den i dit <button>kontoindstillingsområde</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Der opstod et problem med at sende din feedback. Prøv venligst igen lidt senere.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Denne sider kræver at du skal være inviteret. Kontakt ejeres for at få adgang.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "For at gennemføre oprettelsen af din konto, skal du klikke på bekræftelseslinket i din e-mail indbakke. Hvis det ikke kommer indenfor 3 minutter, så tjek venligst din spam mappe!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Prøv gratis i {{amount}} dage, derefter {{original Price}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Lås op for adgang til alle nyhedsbreve ved at blive en betalingsabonnent.",
     "Unsubscribe from all emails": "Afmeld alle e-mails",
     "Unsubscribed": "Afmeldt",
+    "Unsubscribed from all emails.": "Afmeldt fra alle emails.",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Du annullerer ikke dit abonnement på {{title}} ved at afmelde dig fra alle e-mails",
     "Update": "Opdater",
     "Update your preferences": "Opdater dine præferencer",
-    "Verification link sent, check your inbox": "",
+    "Verification link sent, check your inbox": "Link til bekræftelse er sendt. Tjek din indbakke.",
     "Verify your email address is correct": "Tjek om din e-mailadresse er korrekt",
     "View plans": "Se abonnementer",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Vi kunne ikke afmelde dig, da e-mailen ikke blev fundet. Kontakt venligst ejeren af siden.",
     "Welcome back, {{name}}!": "Velkommen tilbage, {{name}}!",
     "Welcome back!": "Velkommen tilbage!",
-    "Welcome to {{siteTitle}}": "",
+    "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.": "Når en indbakke ikke accepterer en e-mail, kaldes det almindeligvis en bounce. I mange tilfælde kan dette være midlertidigt. Men i nogle tilfælde kan en afvist e-mail returneres som en permanent fejl, når en e-mailadresse er ugyldig eller ikke eksisterer.",
     "Why has my email been disabled?": "Hvorfor er min e-mail blevet deaktiveret?",
     "Yearly": "Årlig",
@@ -148,8 +163,8 @@
     "You're currently not receiving emails": "Du modtager ikke e-mails i øjeblikket",
     "You're not receiving emails": "Du modtager ikke e-mails",
     "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 modtager ikke e-mails fordi du enten har markeret en af de seneste mails som spam, eller fordi e-mails ikke kunne leveres til den oplyste e-mailadresse.",
-    "You've successfully signed in.": "Du er logget ind.",
-    "You've successfully subscribed to": "",
+    "You've successfully signed in.": "Du er nu logget ind.",
+    "You've successfully subscribed to": "Du er nu tilmeldt til",
     "Your account": "Din konto",
     "Your input helps shape what gets published.": "Dit input hjælper med at forme det der bliver publiceret.",
     "Your subscription will expire on {{expiryDate}}": "Dit abonnement udløber {{expiryDate}}",
diff --git a/ghost/i18n/locales/da/signup-form.json b/ghost/i18n/locales/da/signup-form.json
index 0da80729328..089dfb8036f 100644
--- a/ghost/i18n/locales/da/signup-form.json
+++ b/ghost/i18n/locales/da/signup-form.json
@@ -4,6 +4,6 @@
     "Please enter a valid email address": "Indtast venligst en gyldig e-mailadresse",
     "Something went wrong, please try again.": "Der gik noget galt. Prøv venligst igen.",
     "Subscribe": "Tilmeld",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "For at gennemføre tilmelding, tryk på bekræftelseslinket i din indbakke. Hvis det ikke kommer frem indenfor 3 minutter, så tjek din spam mappe!",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "For at gennemføre tilmeldingen, skal du trykke på bekræftelseslinket i mailen vi har sendt til din indbakke. Hvis det ikke kommer frem indenfor 3 minutter, så tjek din spam mappe.",
     "Your email address": "Din e-mailadresse"
 }
diff --git a/ghost/i18n/locales/de-CH/comments.json b/ghost/i18n/locales/de-CH/comments.json
new file mode 100644
index 00000000000..aca409c2797
--- /dev/null
+++ b/ghost/i18n/locales/de-CH/comments.json
@@ -0,0 +1,5 @@
+{
+    "Reply": "Antworten",
+    "Show {{amount}} previous comments": "{{amount}} vorherige Kommentare anzeigen",
+    "Show 1 previous comment": "Einen vorherigen Kommentar anzeigen"
+}
diff --git a/ghost/i18n/locales/de-CH/ghost.json b/ghost/i18n/locales/de-CH/ghost.json
new file mode 100644
index 00000000000..e9055280fc1
--- /dev/null
+++ b/ghost/i18n/locales/de-CH/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Alles Gute!",
+    "Complete signup for {{siteTitle}}!": "Registrierung vervollständigen für die Seite «{{siteTitle}}».",
+    "Complete your sign up to {{siteTitle}}!": "Vervollständigen Sie Ihre Registrierung für die Seite «{{siteTitle}}»!",
+    "Confirm email address": "Bestätigen Sie Ihre E-Mail-Adresse.",
+    "Confirm signup": "Bestätigen Sie Ihre Registrierung.",
+    "Confirm your email address": "Bestätigen Sie Ihre E-Mail-Adresse.",
+    "Confirm your email update for {{siteTitle}}!": "Bestätigen Sie die Änderung Ihrer E-Mail-Adresse.",
+    "Confirm your subscription to {{siteTitle}}": "Bestätigen Sie Ihr Abo.",
+    "For your security, the link will expire in 24 hours time.": "Der Link läuft aus Sicherheitsgründen nach 24 Stunden ab.",
+    "Hey there,": "Hallo",
+    "Hey there!": "Hallo!",
+    "If you did not make this request, you can safely ignore this email.": "Sollten Sie diese E-Mail nicht angefordert haben, können Sie sie ignorieren.",
+    "If you did not make this request, you can simply delete this message.": "Sollten Sie diese E-Mail nicht angefordert haben, können Sie sie einfach löschen.",
+    "Please confirm your email address with this link:": "Bitte bestätigen Sie Ihre E-Mail-Adresse mit diesem Link:",
+    "Secure sign in link for {{siteTitle}}": "Sicherer Anmeldelink für unsere Seite «{{siteTitle}}»",
+    "See you soon!": "Bis bald!",
+    "Sent to {{email}}": "Gesendet an {{email}}",
+    "Sign in": "Einloggen",
+    "Sign in to {{siteTitle}}": "Bei «{{siteTitle}}» einloggen",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Mit dem untenstehenden Link schliessen Sie Ihre Registrierung bei «{{siteTitle}}» ab:",
+    "Thank you for signing up to {{siteTitle}}!": "Danke für Ihre Registrierung bei unserer Seite «{{siteTitle}}»!",
+    "Thank you for subscribing to {{siteTitle}}!": "Danke für Ihr Abo bei unserer Seite «{{siteTitle}}»!",
+    "Thank you for subscribing to {{siteTitle}}.": "Danke für Ihr Abo bei unserer Seite «{{siteTitle}}».",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Danke für Ihr Abo unserer Seite «{{siteTitle}}». Klicken Sie auf den folgenden Link, um automatisch eingeloggt zu werden:",
+    "This email address will not be used.": "Diese E-Mail Adresse wird nicht verwendet.",
+    "Welcome back to {{siteTitle}}!": "Willkommen zurück auf {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Willkommen zurück! Benutze diesen Link, um dich sicher bei deinem {{siteTitle}}-Konto einzuloggen:",
+    "You can also copy & paste this URL into your browser:": "Du kannst diese URL auch kopieren und in deine Browserzeile einfügen:",
+    "You will not be signed up, and no account will be created for you.": "Du wirst nicht registriert und es wird kein Konto für dich angelegt.",
+    "You will not be subscribed.": "Du wirst nicht angemeldet.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Sie sind nur noch einen Klick von einem Abo unserer Seite «{{siteTitle}}» entfernt — bitte bestätigen Sie Ihre E-Mail-Adresse mit diesem Link:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Sie sind nur einen Klick von einem Abo unserer Seite «{{siteTitle}}» entfernt!"
+}
diff --git a/ghost/i18n/locales/de-CH/portal.json b/ghost/i18n/locales/de-CH/portal.json
new file mode 100644
index 00000000000..0945d0373fa
--- /dev/null
+++ b/ghost/i18n/locales/de-CH/portal.json
@@ -0,0 +1,150 @@
+{
+    "{{amount}} days free": "{{amount}} Tage kostenfrei",
+    "{{amount}} off": "{{amount}} Rabatt",
+    "{{amount}} off for first {{number}} months.": "{{amount}} Rabatt für die ersten {{number}} Monate.",
+    "{{amount}} off for first {{period}}.": "{{amount}} Rabatt für den/das erste/n {{period}}.",
+    "{{amount}} off forever.": "{{amount}} dauerhaft günstiger.",
+    "{{discount}}% discount": "{{discount}}% Rabatt",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} wird den Newsletter {{newsletterName}} nicht länger erhalten.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} wird keine weiteren E-Mail-Benachrichtigungen für Kommentar-Antworten erhalten.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} wird diesen Newsletter nicht länger erhalten.",
+    "{{trialDays}} days free": "{{trialDays}} Tage kostenfrei",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Ein Login-Link wurde an Ihre E-Mail-Adresse gesendet. Falls die E-Mail nicht innerhalb von 3 Minuten ankommt, überprüfen Sie bitte den Spam-Ordner.",
+    "Account": "Konto",
+    "Account settings": "Konto-Einstellungen",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Wenn das kostenlose Testabo endet, bezahlen Sie den regulären Preis für den gewählten Tarif. Sie können Ihr Abonnement jederzeit kündigen.",
+    "Already a member?": "Bereits Mitglied?",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es erneut oder wenden Sie sich an unseren <a>Support</a>, falls der Fehler weiter besteht.",
+    "Back": "Zurück",
+    "Back to Log in": "Zurück zur Anmeldung",
+    "Billing info": "Abrechnungsinformationen",
+    "Black Friday": "Black Friday",
+    "Cancel anytime.": "Jederzeit kündbar.",
+    "Cancel subscription": "Abonnement kündigen",
+    "Cancellation reason": "Kündigungsgrund",
+    "Change": "Ändern",
+    "Check spam & promotions folders": "Spam- und Werbeordner prüfen",
+    "Check with your mail provider": "Erkundigen Sie sich bei Ihrem E-Mail-Anbieter",
+    "Choose": "Auswählen",
+    "Choose a different plan": "Wählen Sie einen anderen Tarif",
+    "Choose your newsletters": "Wählen Sie Ihren Newsletter",
+    "Click here to retry": "Hier klicken zum Wiederholen",
+    "Close": "Schliessen",
+    "Comments": "Kommentare",
+    "Complimentary": "Kostenlos",
+    "Confirm": "Bestätigen",
+    "Confirm cancellation": "Kündigung bestätigen",
+    "Confirm subscription": "Abonnement bestätigen",
+    "Contact support": "Support kontaktieren",
+    "Continue": "Weiter",
+    "Continue subscription": "Abonnement fortführen",
+    "Could not sign in. Login link expired.": "Anmeldung nicht möglich. Der Login-Link ist abgelaufen.",
+    "Could not update email! Invalid link.": "E-Mail-Aktualisierung fehlgeschlagen. Link nicht gültig.",
+    "Create a new contact": "Neuen Kontakt anlegen",
+    "Current plan": "Aktuelles Abo",
+    "Delete account": "Konto löschen",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "War das ein Versehen? Verwalten Sie Ihre Einstellungen <button>hier</button>.",
+    "Don't have an account?": "Noch kein Konto?",
+    "Edit": "Bearbeiten",
+    "Email": "E-Mail",
+    "Email newsletter": "E-Mail-Newsletter",
+    "Email preference updated.": "E-Mail-Einstellungen aktualisiert.",
+    "Email preferences": "E-Mail-Einstellungen",
+    "Emails": "E-Mails",
+    "Emails disabled": "E-Mails deaktiviert",
+    "Ends {{offerEndDate}}": "Endet am {{offerEndDate}}",
+    "Error": "Fehler",
+    "Expires {{expiryDate}}": "Läuft am {{expiryDate}} ab",
+    "Forever": "Für immer",
+    "Free Trial – Ends {{trialEnd}}": "Die kostenlose Testphase – endet am {{trialEnd}}",
+    "Get help": "Hilfe erhalten",
+    "Get in touch for help": "Kontaktiere uns für Unterstützung",
+    "Get notified when someone replies to your comment": "Erhalten Sie eine Benachrichtigung, wenn jemand auf Ihren Kommentar antwortet",
+    "Give feedback on this post": "Zu diesem Kommentar Feedback geben",
+    "Help! I'm not receiving emails": "Hilfe! Ich erhalte keine E-Mails",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Wenn ein Newsletter als Spam markiert wird, werden E-Mails für diese Adresse automatisch deaktiviert, um sicherzustellen, dass Sie keine unerwünschten Nachrichten mehr erhalten.",
+    "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.": "Wenn die Spam-Beschwerde versehentlich war oder Sie wieder E-Mails erhalten möchten, können Sie sich durch Klicken auf den Button auf dem vorherigen Bildschirm erneut für E-Mails anmelden.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Wenn Sie Ihr Abo jetzt kündigen, haben Sie noch Zugang bis zum {{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}}": "Wenn Sie eine Firmen- oder Regierungs-E-Mail-Adresse nutzen, wenden Sie sich bitte an Ihre IT-Abteilung und bitten Sie sie, E-Mails von {{senderEmail}} zu erlauben",
+    "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.": "Wenn Sie wieder E-Mails erhalten möchten, prüfen Sie bitte Ihre hinterlegte E-Mail-Adresse auf mögliche Tippfehler und klicken Sie anschliessend auf dem vorherigen Bildschirm auf abonnieren.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Sollten Sie den abonnierten Newsletter nicht erhalten, gibt es einige Dinge, die Sie überprüfen können.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Wenn Sie all diese Punkte erledigt haben und immer noch keine E-Mails erhalten, wenden Sie sich bitte an {{supportAddress}}.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Im Falle eines dauerhaften Fehlers beim Versuch, einen Newsletter zu senden, werden E-Mails auf dem Konto deaktiviert.",
+    "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.": "Fügen Sie {{senderEmail}} in Ihrem E-Mail-Client zu Ihren Kontakten hinzu. So signalisieren Sie Ihrem Mail-Anbieter, dass E-Mails von dieser Adresse vertrauenswürdig sind.",
+    "Less like this": "Weniger davon",
+    "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\".": "Stellen Sie sicher, dass E-Mails nicht unbeabsichtigt im Spam-Ordner. Wenn das der Fall sein sollte, klicken Sie auf  \"Kein Spam\" und/oder \"In den Posteingang bewegen\".",
+    "Manage": "Verwalten",
+    "Memberships unavailable, contact the owner for access.": "Keine Abonnements verfügbar, bitte wenden Sie sich an {{supportAddress}}, um für einen Zugang anzufragen.",
+    "Monthly": "Monatlich",
+    "More like this": "Mehr davon",
+    "Name": "Name",
+    "Need more help? Contact support": "Sie benötigen weitere Hilfe? Kontaktieren Sie den 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).": "Newsletter können aus zwei Gründen in Ihrem Konto deaktiviert werden: Eine frühere E-Mail wurde als Spam markiert oder der Versuch, eine E-Mail zu senden, führte zu einem dauerhaften Fehler (Bounce).",
+    "Not receiving emails?": "Kein E-Mail erhalten?",
+    "Now check your email!": "Überprüfen Sie bitte Ihren Posteingang.",
+    "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.": "Wenn Sie nach Ihrer Registrierung keine E-Mail von uns im Posteingang haben, überprüfen Sie Ihren Spam-Ordner. Einige E-Mail-Anbieter speichern frühere Spam-Beschwerden und kennzeichnen E-Mails weiterhin. Für diesen Fall markieren Sie den neusten Newsletter als \"Kein Spam\", um ihn in Ihren Posteingang zu verschieben.",
+    "Permanent failure (bounce)": "Permanenter Fehler (Bounce)",
+    "Plan": "Abo",
+    "Plan checkout was cancelled.": "Der Abschluss des Abos wurde abgebrochen.",
+    "Plan upgrade was cancelled.": "Das Upgrade Ihres Abos wurde abgebrochen.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Bitte kontaktieren Sie {{supportAddress}} für den Abschluss eines zusätzlichen Abos.",
+    "Please fill in required fields": "Bitte alle Pflichtfelder ausfüllen.",
+    "Price": "Preis",
+    "Re-enable emails": "E-Mails wieder aktivieren",
+    "Renews at {{price}}.": "Wird verlängert zum Preis von {{price}}.",
+    "Retry": "Nochmals versuchen",
+    "Save": "Speichern",
+    "Send an email and say hi!": "Senden Sie uns ein E-Mail und sagen Sie Hallo!",
+    "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.": "Schicken Sie uns ein E-Mail an {{senderEmail}} und sagen Sie Hallo. Das kann auch dazu beitragen, Ihrem E-Mail-Anbieter zu signalisieren, dass E-Mails an und von dieser Adresse vertrauenswürdig sind.",
+    "Sending login link...": "Login-Link wird gesendet…",
+    "Sending...": "Wird gesendet…",
+    "Sign in": "Einloggen",
+    "Sign out": "Abmelden",
+    "Sign up": "Registrieren",
+    "Signup error: Invalid link": "Fehler bei der Registrierung: Ungültiger Link.",
+    "Sorry, that didn’t work.": "Entschuldigen Sie, das hat leider nicht funktioniert.",
+    "Spam complaints": "Spam-Beschwerden",
+    "Start {{amount}}-day free trial": "Starten Sie Ihr kostenloses Probeabo für {{amount}} Tage.",
+    "Starting {{startDate}}": "Beginnt am {{startDate}}",
+    "Starting today": "Beginnt heute",
+    "Submit feedback": "Feedback senden",
+    "Subscribe": "Abonnieren",
+    "Subscribed": "Abonniert",
+    "Success": "Erfolg",
+    "Success! Check your email for magic link to sign-in.": "Super! Bitte sehen Sie in Ihrem Posteingang nach und klicken Sie auf den Link im Mail, das wir Ihnen geschickt haben, um sich anzumelden.",
+    "Success! Your account is fully activated, you now have access to all content.": "Geschafft! Ihr Konto ist nun vollständig eingerichtet und Ihr Zugang zu allen Inhalten freigeschaltet.",
+    "Success! Your email is updated.": "Ihre E-Mail-Adresse wurde erfolgreich aktualisiert.",
+    "Successfully unsubscribed": "Erfolgreich abgemeldet",
+    "Thanks for the feedback!": "Danke für das Feedback!",
+    "That didn't go to plan": "Entschuldigung, da ist etwas schief gelaufen.",
+    "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>.": "Die E-Mail-Adresse, die wir von dir haben, lautet {{memberEmail}} - wenn Sie diese ändern möchten, können Sie das in den <button>Kontoeinstellungen</button> tun.",
+    "There was a problem submitting your feedback. Please try again a little later.": "Bei der Übermittlung Ihres Feedbacks ist ein Problem aufgetreten. Bitte versuchen Sie es später nochmal.",
+    "This site is invite-only, contact the owner for access.": "Der Zugang zu diesem Inhalt ist eingeschränkt. Bitte kontaktieren Sie uns, wenn Sie Zugang wünschen.",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Um Ihre Registrierung abzuschliessen, klicken Sie auf den Bestätigungslink in dem Email, das wir Ihnen gesendet haben. Falls Sie nach drei Minuten noch keine E-Mail erhalten haben, überprüfen Sie bitte Ihren Spam-Ordner.",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Probieren Sie uns für {{amount}} Tage kostenlos aus. Danach folgt ein Abo zum Preis von {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Schalten Sie mit einem Abo den Zugang zu allen Newslettern frei.",
+    "Unsubscribe from all emails": "Von allen E-Mails abmelden",
+    "Unsubscribed": "Abgemeldet",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Wenn du dich von diesen E-Mails abmeldest, bleibt Ihr bezahltes Abo bestehen. Falls Sie Ihr Abo kündigen möchten, tun Sie das bitte separat.",
+    "Update": "Aktualisieren",
+    "Update your preferences": "Einstellungen aktualisieren",
+    "Verify your email address is correct": "Überprüfen Sie bitte, ob Ihre E-Mail-Adresse korrekt ist.",
+    "View plans": "Tarife ansehen",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Da ist etwas schief gelaufen, wir konnten Sie nicht abmelden. Bitte kontaktieren Sie {{supportAddress}}.",
+    "Welcome back, {{name}}!": "Willkommen zurück, {{name}}!",
+    "Welcome back!": "Willkommen zurück!",
+    "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.": "Wenn ein Posteingang ein E-Mail nicht annimmt, spricht man von einem Bounce. Das ist häufig ein vorübergehendes Problem (Soft Bounce). In einigen Fällen kann ein E-Mail jedoch dauerhaft abgewiesen werden, etwa wenn eine E-Mail-Adresse ungültig oder nicht vorhanden ist (Hard Bounce).",
+    "Why has my email been disabled?": "Warum wurde mein E-Mail deaktiviert?",
+    "Yearly": "Jährlich",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Sie haben ein kostenloses Abo. Wechseln Sie bitte auf ein Bezahl-Abo, um vollen Zugang zu erhalten.",
+    "You have been successfully resubscribed": "Sie haben Ihr Abo erfolgreich erneuert.",
+    "You're currently not receiving emails": "Sie erhalten aktuell keine E-Mails.",
+    "You're not receiving emails": "Sie erhalten keine E-Mails.",
+    "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.": "Sie erhalten keine E-Mails, weil Sie entweder eine kürzlich empfangene E-Mail von uns als Spam markiert haben oder weil unsere E-Mails nicht an die angegebene E-Mail-Adresse zugestellt werden konnten.",
+    "You've successfully signed in.": "Sie haben sich erfolgreich angemeldet.",
+    "Your account": "Ihr Konto",
+    "Your input helps shape what gets published.": "Ihr Beitrag kann unsere Berichterstattung beeinflussen und mitprägen.",
+    "Your subscription will expire on {{expiryDate}}": "Ihr Abo endet am {{expiryDate}}.",
+    "Your subscription will renew on {{renewalDate}}": "Ihr Abo wird am {{renewalDate}} erneuert.",
+    "Your subscription will start on {{subscriptionStart}}": "Ihr Abo startet am {{subscriptionStart}}."
+}
diff --git a/ghost/i18n/locales/de-CH/signup-form.json b/ghost/i18n/locales/de-CH/signup-form.json
new file mode 100644
index 00000000000..6ff7c387c57
--- /dev/null
+++ b/ghost/i18n/locales/de-CH/signup-form.json
@@ -0,0 +1,9 @@
+{
+    "Email sent": "E-Mail versendet",
+    "Now check your email!": "Wir haben Ihnen ein E-Mail gesendet, bitte prüfen Sie Ihr Postfach.",
+    "Please enter a valid email address": "Bitte geben Sie eine gültige E-Mail-Adresse ein.",
+    "Something went wrong, please try again.": "Etwas ist schief gelaufen. Bitte versuchen Sie es erneut.",
+    "Subscribe": "Abonnieren",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Um die Registrierung abzuschliessen, klicken Sie bitte auf den Bestätigungslink, den wir an Ihre E-Mail-Adresse gesendet haben. Falls die E-Mail nicht innerhalb von drei Minuten eintrifft, überprüfen Sie bitte Ihren Spam-Ordner.",
+    "Your email address": "Ihre E-Mail-Adresse"
+}
diff --git a/ghost/i18n/locales/de/comments.json b/ghost/i18n/locales/de/comments.json
index cbccae8238c..50f68159371 100644
--- a/ghost/i18n/locales/de/comments.json
+++ b/ghost/i18n/locales/de/comments.json
@@ -5,7 +5,7 @@
     "{{amount}} hours ago": "Vor {{amount}} Stunden",
     "{{amount}} minutes ago": "Vor {{amount}} Minuten",
     "{{amount}} months ago": "Vor {{amount}} Monaten",
-    "{{amount}} more": "",
+    "{{amount}} more": "{{amount}} weitere",
     "{{amount}} seconds ago": "Vor {{amount}} Sekunden",
     "{{amount}} weeks ago": "Vor {{amount}} Wochen",
     "{{amount}} years ago": "Vor {{amount}} Jahren",
diff --git a/ghost/i18n/locales/de/portal.json b/ghost/i18n/locales/de/portal.json
index e19b8f46eb7..636fdec1d2d 100644
--- a/ghost/i18n/locales/de/portal.json
+++ b/ghost/i18n/locales/de/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} Tage kostenfrei",
     "{{amount}} off": "{{amount}} Rabatt",
     "{{amount}} off for first {{number}} months.": "{{amount}} Rabatt für die ersten {{number}} Monate.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} wird keine weiteren E-Mail-Benachrichtigungen für Kommentar-Antworten erhalten.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} wird diesen Newsletter nicht länger erhalten.",
     "{{trialDays}} days free": "{{trialDays}} Tage kostenfrei",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Ein Login-Link wurde an deine E-Mail-Adresse gesendet. Falls die E-Mail nicht innerhalb von 3 Minuten ankommt, überprüfe bitte deinen Spam-Ordner.",
     "Account": "Konto",
     "Account settings": "Konto-Einstellungen",
@@ -48,11 +50,12 @@
     "Edit": "Bearbeiten",
     "Email": "E-Mail",
     "Email newsletter": "E-Mail-Newsletter",
-    "Email preference updated.": "E-Mail-Einstellungen aktualisiert.",
     "Email preferences": "E-Mail-Einstellungen",
     "Emails": "E-Mails",
     "Emails disabled": "E-Mails deaktiviert",
     "Ends {{offerEndDate}}": "Endet am {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Fehler",
     "Expires {{expiryDate}}": "Läuft am {{expiryDate}} ab",
     "Forever": "Für immer",
@@ -68,14 +71,17 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Wenn du dein Abonnement jetzt kündigst, hast du noch Zugang bis zum {{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}}": "Wenn du eine Firmen- oder Regierungs-E-Mail-Adresse nutzt, wende dich an deine IT-Abteilung und bitte sie, E-Mails von {{senderEmail}} zu erlauben",
     "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.": "Wenn du wieder E-Mails erhalten möchtest, solltest du deine hinterlegte E-Mail-Adresse auf Probleme zu überprüfen und dann auf dem vorherigen Bildschirm auf erneut abonnieren zu klicken.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Wenn du den Newsletter, für den du dich angemeldet hast, nicht erhältst, gibt es einige Dinge, die du überprüfen kannst.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Wenn du den Newsletter, für den du dich angemeldet hast, nicht erhältst, gibt es einige Dinge, die du überprüfen kannst.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Wenn du all diese Punkte erledigt hast und immer noch keine E-Mails erhältst, kannst du Unterstützung erhalten, indem du dich an {{supportAddress}} wendest.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Im Falle eines dauerhaften Fehlers beim Versuch, einen Newsletter zu senden, werden die E-Mails auf dem Konto deaktiviert.",
     "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.": "Füge in deinem E-Mail-Client {{senderEmail}} zu deiner Kontaktliste hinzu. Dies signalisiert deinem Mail-Anbieter, dass E-Mails von dieser Adresse vertrauenswürdig sind.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Weniger davon",
     "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\".": "Stelle sicher, dass E-Mails nicht unbeabsichtigt im Spam-Ordner deines Posteingangs landen. Wenn das der Fall sein sollte, klicke auf  \"Kein Spam\" und/oder \"In den Posteingang bewegen\".",
     "Manage": "Verwalten",
-    "Maybe later": "",
+    "Maybe later": "Vielleicht später",
     "Memberships unavailable, contact the owner for access.": "",
     "Monthly": "Monatlich",
     "More like this": "Mehr davon",
@@ -86,26 +92,29 @@
     "Now check your email!": "Überprüfe jetzt deinen Posteingang!",
     "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.": "Wenn du nach der Registrierung immer noch keine E-Mails in deinem Posteingang siehst, überprüfen deinen Spam-Ordner. Einige E-Mail-Anbieter speichern frühere Spam-Beschwerden und kennzeichnen E-Mails weiterhin. Wenn dies der Fall ist, markiere den neuesten Newsletter als \"Kein Spam\", um ihn wieder in deinen Posteingang zu verschieben.",
     "Permanent failure (bounce)": "Permanenter Fehler (Bounce)",
+    "Phone number": "",
     "Plan": "Tarif",
     "Plan checkout was cancelled.": "Der Abschluss des Tarifs wurde abgebrochen.",
     "Plan upgrade was cancelled.": "Das Upgrade deines Tarifs wurde abgebrochen.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Bitte alle Pflichtfelder ausfüllen",
     "Price": "Preis",
     "Re-enable emails": "E-Mails wieder aktivieren",
-    "Recommendations": "",
+    "Recommendations": "Empfehlungen",
     "Renews at {{price}}.": "Wird verlängert zum Preis von {{price}}.",
     "Retry": "Nochmals versuchen",
     "Save": "Speichern",
     "Send an email and say hi!": "Sende eine E-Mail und sag 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.": "Schicke eine E-Mail an {{senderEmail}} und sag Hallo. Dies kann auch dazu beitragen, deinem E-Mail-Anbieter zu signalisieren, dass E-Mails an und von dieser Adresse vertrauenswürdig sind.",
+    "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.": "Schicke eine E-Mail an {{senderEmail}} und sag Hallo. Dies kann auch dazu beitragen, deinem E-Mail-Anbieter zu signalisieren, dass E-Mails an und von dieser Adresse vertrauenswürdig sind.",
     "Sending login link...": "Login-Link senden …",
     "Sending...": "Sende …",
-    "Show all": "",
+    "Show all": "Alle anzeigen",
     "Sign in": "Einloggen",
     "Sign out": "Abmelden",
     "Sign up": "Registrieren",
     "Signup error: Invalid link": "Fehler bei der Registrierung: Ungültiger Link",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Entschuldige, das hat nicht funktioniert.",
     "Spam complaints": "Spam-Beschwerden",
     "Start {{amount}}-day free trial": "Starte dein {{amount}}-tägiges kostenfreies Testabo",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Super! Deine E-Mail wurde erfolgreich aktualisiert.",
     "Successfully unsubscribed": "Erfolgreich abgemeldet",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Danke für das Feedback!",
     "That didn't go to plan": "Das ist nicht nach Plan verlaufen",
     "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>.": "Die E-Mail-Adresse, die wir von dir haben, lautet {{memberEmail}} - wenn das nicht korrekt ist, kannst du sie in deinem <button>Kontoeinstellungen</button> aktualisieren.",
     "There was a problem submitting your feedback. Please try again a little later.": "Bei der Übermittlung deines Feedbacks ist ein Problem aufgetreten. Bitte versuche es etwas später noch einmal.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Diese Seite benötigt eine Einladung. Bitte kontaktiere den Inhaber.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Um deine Registrierung abzuschließen, klicke auf den Bestätigungslink in deinem Posteingang. Falls die E-Mail nicht innerhalb von 3 Minuten ankommt, überprüfe bitte deinen Spam-Ordner!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Kostenfreier Testzugang für {{amount}} Tage, danach {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Schalte den Zugang zu allen Newslettern frei, indem du ein zahlender Abonnent wirst.",
     "Unsubscribe from all emails": "Von allen E-Mails abmelden",
     "Unsubscribed": "Abmelden",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Wenn du dich von diesen E-Mails abmeldest, wird dein bezahltes Abonnement bei {{title}} nicht automatisch gekündigt",
     "Update": "Aktualisieren",
     "Update your preferences": "Aktualisiere deine Einstellungen",
@@ -139,7 +154,7 @@
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Wir konnten dich nicht abmelden, da die E-Mail-Adresse nicht gefunden wurde. Bitte kontaktiere den Seitenbetreiber.",
     "Welcome back, {{name}}!": "Willkommen zurück, {{name}}!",
     "Welcome back!": "Willkommen zurück!",
-    "Welcome to {{siteTitle}}": "",
+    "Welcome to {{siteTitle}}": "Willkommen bei {{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.": "Wenn ein Posteingang eine E-Mail nicht annimmt, spricht man von einem Bounce. In vielen Fällen kann dies vorübergehend sein (Soft Bounce). In einigen Fällen kann eine E-Mail jedoch als dauerhafter Fehler zurückgeschickt werden, wenn eine E-Mail-Adresse ungültig oder nicht vorhanden ist (Hard Bounce).",
     "Why has my email been disabled?": "Warum wurde meine E-Mail deaktiviert?",
     "Yearly": "Jährlich",
diff --git a/ghost/i18n/locales/el/comments.json b/ghost/i18n/locales/el/comments.json
new file mode 100644
index 00000000000..fd6d9d9caaf
--- /dev/null
+++ b/ghost/i18n/locales/el/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{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.": "Γίνετε μέλος του {{publication}} για να ξεκινήσετε να σχολιάζετε.",
+    "Become a paid member of {{publication}} to start commenting.": "Γίνετε premium μέλος του {{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": "Τζέιμι Λάρσον",
+    "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": "Εμφάνιση 1 ακόμα απάντησης",
+    "Show 1 previous comment": "Εμφάνιση 1 προηγούμενου σχολίου",
+    "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/el/ghost.json b/ghost/i18n/locales/el/ghost.json
new file mode 100644
index 00000000000..9bc08626abc
--- /dev/null
+++ b/ghost/i18n/locales/el/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Ό,τι καλύτερο!",
+    "Complete signup for {{siteTitle}}!": "Ολοκληρώστε την εγγραφή για το {{siteTitle}}!",
+    "Complete your sign up to {{siteTitle}}!": "Ολοκληρώστε την εγγραφή σας στο {{siteTitle}}!",
+    "Confirm email address": "Επιβεβαίωση διεύθυνσης email",
+    "Confirm signup": "Επιβεβαίωση εγγραφής",
+    "Confirm your email address": "Επιβεβαιώστε τη διεύθυνση email σας",
+    "Confirm your email update for {{siteTitle}}!": "Επιβεβαιώστε την ενημέρωση email για το {{siteTitle}}!",
+    "Confirm your subscription to {{siteTitle}}": "Επιβεβαιώστε την εγγραφή σας στο {{siteTitle}}",
+    "For your security, the link will expire in 24 hours time.": "Για την ασφάλειά σας, ο σύνδεσμος θα λήξει σε 24 ώρες.",
+    "Hey there,": "Γεια σας,",
+    "Hey there!": "Γεια σας!",
+    "If you did not make this request, you can safely ignore this email.": "Αν δεν κάνατε αυτό το αίτημα, μπορείτε να αγνοήσετε αυτό το email.",
+    "If you did not make this request, you can simply delete this message.": "Αν δεν κάνατε αυτό το αίτημα, μπορείτε απλά να διαγράψετε αυτό το μήνυμα.",
+    "Please confirm your email address with this link:": "Παρακαλούμε επιβεβαιώστε τη διεύθυνση email σας με αυτόν τον σύνδεσμο:",
+    "Secure sign in link for {{siteTitle}}": "Ασφαλής σύνδεσμος σύνδεσης για το {{siteTitle}}",
+    "See you soon!": "Τα λέμε σύντομα!",
+    "Sent to {{email}}": "Απεστάλη στο {{email}}",
+    "Sign in": "Σύνδεση",
+    "Sign in to {{siteTitle}}": "Συνδεθείτε στο {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Πατήστε τον παρακάτω σύνδεσμο για να ολοκληρώσετε τη διαδικασία εγγραφής στο {{siteTitle}} και να συνδεθείτε αυτόματα:",
+    "Thank you for signing up to {{siteTitle}}!": "Ευχαριστούμε που εγγραφήκατε στο {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "Ευχαριστούμε που εγγραφήκατε στο {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "Ευχαριστούμε που εγγραφήκατε στο {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Ευχαριστούμε που εγγραφήκατε στο {{siteTitle}}. Πατήστε τον παρακάτω σύνδεσμο για να συνδεθείτε αυτόματα:",
+    "This email address will not be used.": "Αυτή η διεύθυνση email δεν θα χρησιμοποιηθεί.",
+    "Welcome back to {{siteTitle}}!": "Καλώς ήρθατε ξανά στο {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Καλώς ήρθατε ξανά! Χρησιμοποιήστε αυτόν τον σύνδεσμο για να συνδεθείτε με ασφάλεια στον λογαριασμό σας στο {{siteTitle}}:",
+    "You can also copy & paste this URL into your browser:": "Μπορείτε επίσης να αντιγράψετε και να επικολλήσετε αυτό το URL στον περιηγητή σας:",
+    "You will not be signed up, and no account will be created for you.": "Δεν θα εγγραφείτε και δεν θα δημιουργηθεί λογαριασμός για εσάς.",
+    "You will not be subscribed.": "Δεν θα εγγραφείτε.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Είστε ένα πάτημα μακριά από την εγγραφή στο {{siteTitle}} — παρακαλούμε επιβεβαιώστε τη διεύθυνση email σας με αυτόν τον σύνδεσμο:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Είστε ένα πάτημα μακριά από την εγγραφή στο {{siteTitle}}!"
+}
diff --git a/ghost/i18n/locales/el/portal.json b/ghost/i18n/locales/el/portal.json
new file mode 100644
index 00000000000..80df3874c6d
--- /dev/null
+++ b/ghost/i18n/locales/el/portal.json
@@ -0,0 +1,159 @@
+{
+    "(save {{highestYearlyDiscount}}%)": "(εξοικονόμηση {{highestYearlyDiscount}}%)",
+    "{{amount}} days free": "{{amount}} ημέρες δωρεάν",
+    "{{amount}} off": "{{amount}} έκπτωση",
+    "{{amount}} off for first {{number}} months.": "{{amount}} έκπτωση για τους πρώτους {{number}} μήνες.",
+    "{{amount}} off for first {{period}}.": "{{amount}} έκπτωση για την πρώτη {{period}}.",
+    "{{amount}} off forever.": "{{amount}} έκπτωση για πάντα.",
+    "{{discount}}% discount": "{{discount}}% έκπτωση",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "Το {{memberEmail}} δεν θα λαμβάνει πλέον το ενημερωτικό δελτίο {{newsletterName}}.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "Το {{memberEmail}} δεν θα λαμβάνει πλέον email όταν κάποιος απαντά στα σχόλιά σας.",
+    "{{memberEmail}} will no longer receive this newsletter.": "Το {{memberEmail}} δεν θα λαμβάνει πλέον αυτό το ενημερωτικό δελτίο.",
+    "{{trialDays}} days free": "{{trialDays}} ημέρες δωρεάν",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Ένας σύνδεσμος σύνδεσης έχει σταλεί στα εισερχόμενά σας. Αν δεν φτάσει σε 3 λεπτά, ελέγξτε τον φάκελο ανεπιθύμητης αλληλογραφίας σας.",
+    "Account": "Λογαριασμός",
+    "Account settings": "Ρυθμίσεις λογαριασμού",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Μετά το τέλος της δωρεάν δοκιμής, θα χρεωθείτε την κανονική τιμή για το επίπεδο που έχετε επιλέξει. Μπορείτε πάντα να ακυρώσετε πριν από τότε.",
+    "Already a member?": "Ήδη μέλος;",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Παρουσιάστηκε ένα απρόβλεπτο σφάλμα. Δοκιμάστε ξανά ή <a>επικοινωνήστε με την υποστήριξη</a> εάν το σφάλμα παραμένει.",
+    "Back": "Πίσω",
+    "Back to Log in": "Επιστροφή στη σύνδεση",
+    "Billing info": "Πληροφορίες χρέωσης",
+    "Black Friday": "Black Friday",
+    "Cancel anytime.": "Ακύρωση ανά πάσα στιγμή.",
+    "Cancel subscription": "Ακύρωση συνδρομής",
+    "Cancellation reason": "Λόγος ακύρωσης",
+    "Change": "Αλλαγή",
+    "Check spam & promotions folders": "Ελέγξτε τους φακέλους ανεπιθύμητης αλληλογραφίας και προσφορών",
+    "Check with your mail provider": "Ελέγξτε με τον παροχέα email σας",
+    "Choose": "Επιλέξτε",
+    "Choose a different plan": "Επιλέξτε ένα διαφορετικό πρόγραμμα",
+    "Choose your newsletters": "Επιλέξτε τα ενημερωτικά δελτία σας",
+    "Click here to retry": "Κάντε κλικ εδώ για επανάληψη",
+    "Close": "Κλείσιμο",
+    "Comments": "Σχόλια",
+    "Complimentary": "Δωρεάν",
+    "Confirm": "Επιβεβαίωση",
+    "Confirm cancellation": "Επιβεβαίωση ακύρωσης",
+    "Confirm subscription": "Επιβεβαίωση συνδρομής",
+    "Contact support": "Επικοινωνήστε με την υποστήριξη",
+    "Continue": "Συνέχεια",
+    "Continue subscription": "Συνέχεια συνδρομής",
+    "Could not sign in. Login link expired.": "Δεν ήταν δυνατή η σύνδεση. Ο σύνδεσμος σύνδεσης έχει λήξει.",
+    "Could not update email! Invalid link.": "Δεν ήταν δυνατή η ενημέρωση του email! Μη έγκυρος σύνδεσμος.",
+    "Create a new contact": "Δημιουργήστε νέα επαφή",
+    "Current plan": "Τρέχον πρόγραμμα",
+    "Delete account": "Διαγραφή λογαριασμού",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Δεν το εννοούσατε; Διαχειριστείτε τις προτιμήσεις σας <button>εδώ</button>.",
+    "Don't have an account?": "Δεν έχετε λογαριασμό;",
+    "Edit": "Επεξεργασία",
+    "Email": "Email",
+    "Email newsletter": "Ενημερωτικό δελτίο email",
+    "Email preferences": "Προτιμήσεις email",
+    "Emails": "Emails",
+    "Emails disabled": "Τα emails είναι απενεργοποιημένα",
+    "Ends {{offerEndDate}}": "Λήγει {{offerEndDate}}",
+    "Error": "Σφάλμα",
+    "Expires {{expiryDate}}": "Λήγει {{expiryDate}}",
+    "Forever": "Για πάντα",
+    "Free Trial – Ends {{trialEnd}}": "Δωρεάν Δοκιμή – Λήγει {{trialEnd}}",
+    "Get help": "Λάβετε βοήθεια",
+    "Get in touch for help": "Επικοινωνήστε για βοήθεια",
+    "Get notified when someone replies to your comment": "Λάβετε ειδοποίηση όταν κάποιος απαντά στο σχόλιό σας",
+    "Give feedback on this post": "Δώστε ανατροφοδότηση για αυτήν την ανάρτηση",
+    "Help! I'm not receiving emails": "Βοήθεια! Δεν λαμβάνω 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.": "Αν ένα ενημερωτικό δελτίο επισημανθεί ως ανεπιθύμητο, τα emails απενεργοποιούνται αυτόματα για αυτήν τη διεύθυνση για να βεβαιωθείτε ότι δεν θα λάβετε πλέον ανεπιθύμητα μηνύματα.",
+    "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.": "Αν η αναφορά ανεπιθύμητης αλληλογραφίας ήταν κατά λάθος ή θέλετε να αρχίσετε να λαμβάνετε ξανά emails, μπορείτε να εγγραφείτε ξανά κάνοντας κλικ στο κουμπί στην προηγούμενη οθόνη.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Αν ακυρώσετε τη συνδρομή σας τώρα, θα συνεχίσετε να έχετε πρόσβαση μέχρι {{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}}": "Αν έχετε εταιρικό ή κυβερνητικό λογαριασμό email, επικοινωνήστε με το τμήμα IT και ζητήστε τους να επιτρέψουν την παραλαβή emails από {{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.": "Αν θέλετε να αρχίσετε να λαμβάνετε ξανά emails, τα καλύτερα επόμενα βήματα είναι να ελέγξετε τη διεύθυνση email που έχετε καταχωρήσει για τυχόν προβλήματα και στη συνέχεια να κάνετε κλικ στην επανεγγραφή στην προηγούμενη οθόνη.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Αν δεν λαμβάνετε το ενημερωτικό δελτίο email στο οποίο έχετε εγγραφεί, εδώ είναι μερικά πράγματα που πρέπει να ελέγξετε.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Αν έχετε ολοκληρώσει όλους αυτούς τους ελέγχους και εξακολουθείτε να μην λαμβάνετε emails, μπορείτε να επικοινωνήσετε με την υποστήριξη επικοινωνώντας με {{supportAddress}}.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Σε περίπτωση που ληφθεί μόνιμη αποτυχία κατά την αποστολή ενός ενημερωτικού δελτίου, τα emails θα απενεργοποιηθούν στον λογαριασμό.",
+    "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.": "Στον πελάτη email σας προσθέστε το {{senderEmail}} στη λίστα επαφών σας. Αυτό σηματοδοτεί στον πάροχο email σας ότι τα emails που αποστέλλονται από αυτήν τη διεύθυνση πρέπει να είναι αξιόπιστα.",
+    "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\".": "Βεβαιωθείτε ότι τα emails δεν καταλήγουν κατά λάθος στους φακέλους Ανεπιθύμητη αλληλογραφία ή Προσφορές των εισερχομένων σας. Αν είναι εκεί, κάντε κλικ στο \"Σήμανση ως μη ανεπιθύμητη αλληλογραφία\" και/ή \"Μεταφορά στα εισερχόμενα\".",
+    "Manage": "Διαχείριση",
+    "Maybe later": "Ίσως αργότερα",
+    "Memberships unavailable, contact the owner for access.": "Τα μέλη δεν είναι διαθέσιμα, επικοινωνήστε με τον ιδιοκτήτη για πρόσβαση.",
+    "Monthly": "Μηνιαία",
+    "More like this": "Περισσότερα σαν αυτό",
+    "Name": "Όνομα",
+    "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).": "Τα ενημερωτικά δελτία μπορούν να απενεργοποιηθούν στον λογαριασμό σας για δύο λόγους: Ένα προηγούμενο email επισημάνθηκε ως ανεπιθύμητο ή η προσπάθεια αποστολής email είχε ως αποτέλεσμα μόνιμη αποτυχία (αναπήδηση).",
+    "Not receiving emails?": "Δεν λαμβάνετε emails;",
+    "Now check your email!": "Τώρα ελέγξτε το email σας!",
+    "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.": "Μόλις εγγραφείτε ξανά, αν εξακολουθείτε να μην βλέπετε emails στα εισερχόμενά σας, ελέγξτε τον φάκελο ανεπιθύμητης αλληλογραφίας. Ορισμένοι πάροχοι εισερχομένων διατηρούν αρχείο προηγούμενων αναφορών ανεπιθύμητης αλληλογραφίας και θα συνεχίσουν να επισημαίνουν emails. Αν συμβεί αυτό, επισημάνετε το τελευταίο ενημερωτικό δελτίο ως 'Μη ανεπιθύμητο' για να το μετακινήσετε ξανά στα κύρια εισερχόμενά σας.",
+    "Permanent failure (bounce)": "Μόνιμη αποτυχία (αναπήδηση)",
+    "Plan": "Πρόγραμμα",
+    "Plan checkout was cancelled.": "Η πληρωμή του προγράμματος ακυρώθηκε.",
+    "Plan upgrade was cancelled.": "Η αναβάθμιση του προγράμματος ακυρώθηκε.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Επικοινωνήστε με το {{supportAddress}} για να προσαρμόσετε τη δωρεάν συνδρομή σας.",
+    "Please fill in required fields": "Συμπληρώστε τα απαιτούμενα πεδία",
+    "Price": "Τιμή",
+    "Re-enable emails": "Ενεργοποιήστε ξανά τα emails",
+    "Recommendations": "Συστάσεις",
+    "Renews at {{price}}.": "Ανανεώνεται στα {{price}}.",
+    "Retry": "Επανάληψη",
+    "Save": "Αποθήκευση",
+    "Send an email and say hi!": "Στείλτε ένα email και πείτε γεια!",
+    "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.": "Στείλτε ένα email στο {{senderEmail}} και πείτε γεια. Αυτό μπορεί επίσης να βοηθήσει να υποδείξει στον πάροχο email σας ότι τα emails προς και από αυτήν τη διεύθυνση πρέπει να είναι αξιόπιστα.",
+    "Sending login link...": "Αποστολή συνδέσμου σύνδεσης...",
+    "Sending...": "Αποστολή...",
+    "Show all": "Εμφάνιση όλων",
+    "Sign in": "Σύνδεση",
+    "Sign out": "Αποσύνδεση",
+    "Sign up": "Εγγραφή",
+    "Signup error: Invalid link": "Σφάλμα εγγραφής: Μη έγκυρος σύνδεσμος",
+    "Sorry, that didn’t work.": "Συγγνώμη, αυτό δεν λειτούργησε.",
+    "Spam complaints": "Αναφορές ανεπιθύμητης αλληλογραφίας",
+    "Start {{amount}}-day free trial": "Ξεκινήστε {{amount}}-ημερών δωρεάν δοκιμή",
+    "Starting {{startDate}}": "Έναρξη {{startDate}}",
+    "Starting today": "Ξεκινώντας σήμερα",
+    "Submit feedback": "Υποβολή σχολίων",
+    "Subscribe": "Εγγραφή",
+    "Subscribed": "Εγγεγραμμένος",
+    "Success": "Επιτυχία",
+    "Success! Check your email for magic link to sign-in.": "Επιτυχία! Ελέγξτε το email σας για να ολοκληρώσετε την εγγραφή.",
+    "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.": "Ευχαριστούμε που εγγραφήκατε. Πριν ξεκινήσετε να διαβάζετε, εδώ είναι μερικοί άλλοι ιστότοποι που μπορεί να σας αρέσουν.",
+    "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>.",
+    "There was a problem submitting your feedback. Please try again a little later.": "Παρουσιάστηκε πρόβλημα κατά την υποβολή των σχολίων σας. Δοκιμάστε ξανά αργότερα.",
+    "This site is invite-only, contact the owner for access.": "Αυτός ο ιστότοπος είναι μόνο με πρόσκληση, επικοινωνήστε με τον ιδιοκτήτη για πρόσβαση.",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Για να ολοκληρώσετε την εγγραφή, κάντε κλικ στον σύνδεσμο επιβεβαίωσης στα εισερχόμενά σας. Αν δεν φτάσει εντός 3 λεπτών, ελέγξτε τον φάκελο ανεπιθύμητης αλληλογραφίας!",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Δοκιμάστε δωρεάν για {{amount}} ημέρες, μετά {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Ξεκλειδώστε την πρόσβαση σε όλα τα ενημερωτικά δελτία, ενεργοποιόντας την premium συνδρομή.",
+    "Unsubscribe from all emails": "Διαγραφή από όλα τα emails",
+    "Unsubscribed": "Διαγραμμένος",
+    "Unsubscribed from all emails.": "Διαγραφή από όλα τα emails.",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Η διαγραφή από τα emails δεν θα ακυρώσει την premium συνδρομή σας στο {{title}}",
+    "Update": "Ενημέρωση",
+    "Update your preferences": "Ενημερώστε τις προτιμήσεις σας",
+    "Verification link sent, check your inbox": "Ο σύνδεσμος επιβεβαίωσης έχει σταλεί, ελέγξτε τα εισερχόμενά σας",
+    "Verify your email address is correct": "Επιβεβαιώστε ότι η διεύθυνση email σας είναι σωστή",
+    "View plans": "Προβολή προγραμμάτων",
+    "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}}": "Καλώς ήρθατε στο {{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.": "Όταν τα εισερχόμενα αποτυγχάνουν να αποδεχθούν ένα email, συνήθως ονομάζεται αναπήδηση. Σε πολλές περιπτώσεις, αυτό μπορεί να είναι προσωρινό. Ωστόσο, σε ορισμένες περιπτώσεις, ένα αναπηδήμένο email μπορεί να επιστραφεί ως μόνιμη αποτυχία όταν μια διεύθυνση email είναι άκυρη ή ανύπαρκτη.",
+    "Why has my email been disabled?": "Γιατί έχει απενεργοποιηθεί το email μου;",
+    "Yearly": "Ετήσια",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Αυτή τη στιγμή έχετε δωρεάν μέλος, αναβαθμίστε σε premium συνδρομή για πλήρη πρόσβαση.",
+    "You have been successfully resubscribed": "Έχετε εγγραφεί ξανά με επιτυχία",
+    "You're currently not receiving emails": "Αυτή τη στιγμή δεν λαμβάνετε emails",
+    "You're not receiving emails": "Δεν λαμβάνετε emails",
+    "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.": "Δεν λαμβάνετε emails επειδή είτε επισημάνατε ένα πρόσφατο μήνυμα ως ανεπιθύμητο είτε επειδή τα μηνύματα δεν μπόρεσαν να παραδοθούν στην παρεχόμενη διεύθυνση email σας.",
+    "You've successfully signed in.": "Έχετε συνδεθεί επιτυχώς.",
+    "You've successfully subscribed to": "Έχετε εγγραφεί επιτυχώς στο",
+    "Your account": "Ο λογαριασμός σας",
+    "Your input helps shape what gets published.": "Η συνεισφορά σας βοηθά να διαμορφωθεί το τι δημοσιεύεται.",
+    "Your subscription will expire on {{expiryDate}}": "Η συνδρομή σας θα λήξει στις {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Η συνδρομή σας θα ανανεωθεί στις {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Η συνδρομή σας θα ξεκινήσει στις {{subscriptionStart}}"
+}
diff --git a/ghost/i18n/locales/el/signup-form.json b/ghost/i18n/locales/el/signup-form.json
new file mode 100644
index 00000000000..db7f36fb73d
--- /dev/null
+++ b/ghost/i18n/locales/el/signup-form.json
@@ -0,0 +1,9 @@
+{
+    "Email sent": "Το email στάλθηκε",
+    "Now check your email!": "Τώρα ελέγξτε το email σας!",
+    "Please enter a valid email address": "Παρακαλούμε εισάγετε μια έγκυρη διεύθυνση email",
+    "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!": "Για να ολοκληρώσετε την εγγραφή, κάντε κλικ στον σύνδεσμο επιβεβαίωσης στα εισερχόμενά σας. Αν δεν φτάσει εντός 3 λεπτών, ελέγξτε τον φάκελο ανεπιθύμητης αλληλογραφίας (spam)!",
+    "Your email address": "Η διεύθυνση email σας"
+}
diff --git a/ghost/i18n/locales/en/portal.json b/ghost/i18n/locales/en/portal.json
index 822c9d51e17..148cbd36ddb 100644
--- a/ghost/i18n/locales/en/portal.json
+++ b/ghost/i18n/locales/en/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "",
     "Account": "",
     "Account settings": "",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "",
     "Email newsletter": "",
-    "Email preference updated.": "",
     "Email preferences": "",
     "Emails": "",
     "Emails disabled": "",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "",
@@ -86,10 +92,12 @@
     "Now check your email!": "",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "",
     "Re-enable emails": "",
@@ -98,7 +106,7 @@
     "Retry": "",
     "Save": "",
     "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 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...": "",
     "Sending...": "",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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>.": "",
     "There was a problem submitting your feedback. Please try again a little later.": "",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "",
     "Update": "",
     "Update your preferences": "",
diff --git a/ghost/i18n/locales/eo/portal.json b/ghost/i18n/locales/eo/portal.json
index 096e59a3759..14fe0f50b3a 100644
--- a/ghost/i18n/locales/eo/portal.json
+++ b/ghost/i18n/locales/eo/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "{{trialDays}} tagoj senpagaj",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Sendis ensalutan ligilon al via enirkesto. Se ĝi ne alvenas post 3 minutoj, nepre kontrolu vian trudmesaĝdosieron.",
     "Account": "Konto",
     "Account settings": "Kontagordoj",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "Retadreso",
     "Email newsletter": "",
-    "Email preference updated.": "Retpoŝta agordo ĝisdatigita.",
     "Email preferences": "Retpoŝtaj agordoj",
     "Emails": "Retpoŝtoj",
     "Emails disabled": "Retpoŝtoj malŝaltitaj",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Malpli tiel",
     "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": "Administru",
@@ -86,10 +92,12 @@
     "Now check your email!": "Bonvolu kontroli vian retpoŝton nun!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Kosto",
     "Re-enable emails": "Reŝalti retpoŝtojn",
@@ -98,7 +106,7 @@
     "Retry": "Reprovu",
     "Save": "Konservi",
     "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 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...": "Sendanta ensaluta ligilo...",
     "Sending...": "Sendante...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "Aliĝu",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "Komencu senpaga {{amount}}-taga provo",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Sukcese malabonita",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Dankon pro la rimarkoj!",
     "That didn't go to plan": "Tio ne iris laŭ la intenco",
     "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 an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Ĉi tiu retejo estas nur por invitiĝuloj, kontaktu la proprietulo por alireblo.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Por kompletigi aliĝon, premu la konfirman ligilon en via enirkesto. Se ĝi ne alvenas ene de 3 minutoj, kontrolu vian trudmesaĝdosieron!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Malabonu de ĉiuj retpoŝtoj",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Malabonigi de retpoŝtoj ne nuligos vian pagitan abonon al {{title}}",
     "Update": "",
     "Update your preferences": "Ĝisdatigu viajn agordojn",
diff --git a/ghost/i18n/locales/es/comments.json b/ghost/i18n/locales/es/comments.json
index 61234b9c1b9..9c135c31601 100644
--- a/ghost/i18n/locales/es/comments.json
+++ b/ghost/i18n/locales/es/comments.json
@@ -11,12 +11,12 @@
     "{{amount}} years ago": "{{amount}} años atrás",
     "1 comment": "1 comentario",
     "Add comment": "Agregar comentario",
-    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Agrega contexto a tu comentario, comparte tu nombre y experiencia para fomentar una discusión saludable",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Agrega contexto a tu comentario, comparte tu nombre y experiencia para fomentar una discusión sana",
     "Add reply": "Agregar respuesta",
     "Already a member?": "¿Ya eres miembro?",
     "Anonymous": "Anónimo",
-    "Become a member of {{publication}} to start commenting.": "Conviertete en miembro de {{publication}} para comenzar a comentar",
-    "Become a paid member of {{publication}} to start commenting.": "Conviertete en un miembro pago de {{publication}} para comenzar a comentar",
+    "Become a member of {{publication}} to start commenting.": "Hazte miembro de {{publication}} para comenzar a comentar",
+    "Become a paid member of {{publication}} to start commenting.": "Hazte miembro pago de {{publication}} para comenzar a comentar",
     "Cancel": "Cancelar",
     "Comment": "Comentar",
     "Complete your profile": "Completa tu perfil",
@@ -34,7 +34,7 @@
     "Hide": "Ocultar",
     "Hide comment": "Ocultar comentario",
     "Jamie Larson": "Jamie Larson",
-    "Join the discussion": "Se parte de la discusión",
+    "Join the discussion": "Únete a la discusión",
     "Just now": "Justo ahora",
     "Local resident": "Residente local",
     "Member discussion": "Discusión de miembros",
diff --git a/ghost/i18n/locales/es/portal.json b/ghost/i18n/locales/es/portal.json
index f4b5a47b0ae..9e3b2605170 100644
--- a/ghost/i18n/locales/es/portal.json
+++ b/ghost/i18n/locales/es/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} días gratis",
     "{{amount}} off": "{{amount}} de descuento",
     "{{amount}} off for first {{number}} months.": "{{amount}} de descuento por los primeros {{number}} meses.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} ya no recibirá correos electrónicos cuando alguien responde a tus comentarios.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} ya no recibirá este boletín.",
     "{{trialDays}} days free": "{{trialDays}} días gratis",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Se ha enviado un enlace de inicio de sesión a tu correo. Si no llega en 3 minutos, revisa tu carpeta de spam.",
     "Account": "Cuenta",
     "Account settings": "Configuración de la cuenta",
@@ -48,11 +50,12 @@
     "Edit": "Editar",
     "Email": "Correo electrónico",
     "Email newsletter": "Boletín informativo por correo electrónico",
-    "Email preference updated.": "Preferencia de correo electrónico actualizada.",
     "Email preferences": "Preferencias",
     "Emails": "Correos electrónicos",
     "Emails disabled": "Correos electrónicos desactivados",
     "Ends {{offerEndDate}}": "Termina el {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Error",
     "Expires {{expiryDate}}": "Expira el {{expiryDate}}",
     "Forever": "para siempre",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Si cancelas tu suscripción ahora, continuarás con acceso hasta el {{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}}": "Si tienes un correo electrónico corporativo o del gobierno, puedes comunicarte con el departamento de TI y solicitar que te permitan recibir correos de {{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.": "Si deseas comenzar a recibir correos electrónicos nuevamente, lo mejor es verificar tu dirección de correo electrónico registrada para detectar cualquier problema y luego hacer clic en volver a suscribirse en la pantalla anterior.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Si no estás recibiendo los boletines informativos a los que te suscribiste, estas son algunas cosas que puedes revisar.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Si no estás recibiendo los boletines informativos a los que te suscribiste, estas son algunas cosas que puedes revisar.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Si haz comprobado todo y aun así no estás recibiendo los correos electrónicos, puedes comunicarte con soporte técnico contactando a {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "En el caso de que haya un problema al intentar enviar el boletín, los correos electrónicos van a ser desabilitados en su cuenta.",
     "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.": "Añade {{senderEmail}} a tu lista de contactos. Esto le indica a tu provedor de correo electrónico que puede confiar en esta dirección de correo.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Menos como esto",
     "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\".": "Asegúrate de que los correos electrónicos no terminen accidentalmente en las carpetas de correo no deseado o promociones de su bandeja de entrada. Si lo son, haz clic en \"Marcar como no spam\" y/o \"Mover a la bandeja de entrada\".",
     "Manage": "Administrar",
@@ -86,10 +92,12 @@
     "Now check your email!": "¡Ahora revisa tu correo electrónico!",
     "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.": "Una vez que te hayas vuelto a suscribir, si aún no ves los correos electrónicos en tu bandeja de entrada, verifica tu carpeta de spam. Algunos proveedores de bandejas de entrada mantienen un registro de quejas de spam anteriores y continuarán marcando los correos electrónicos. Si esto sucede, marca el último boletín como \"No es spam\" para moverlo nuevamente a tu bandeja de entrada principal.",
     "Permanent failure (bounce)": "Fallo permanente (bounce)",
+    "Phone number": "",
     "Plan": "Plan",
     "Plan checkout was cancelled.": "El pago de plan fue cancelado.",
     "Plan upgrade was cancelled.": "La actualización de plan fue cancelada.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Por favor, ponte en contacto con {{supportAddress}} para ajustar tu suscripción gratuita.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Por favor llena los campos requeridos.",
     "Price": "Precio",
     "Re-enable emails": "Reactivar correos electrónicos",
@@ -98,7 +106,7 @@
     "Retry": "Reintentar",
     "Save": "Guardar",
     "Send an email and say hi!": "¡Envía un correo electrónico y saluda!",
-    "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.": "¡Envia un correo electrónico a {{senderEmail}} y saluda! Esto también puede ayudar a indicarle a su proveedor de correo que se debe confiar en los correos electrónicos hacia y desde esta dirección.",
+    "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.": "¡Envia un correo electrónico a {{senderEmail}} y saluda! Esto también puede ayudar a indicarle a su proveedor de correo que se debe confiar en los correos electrónicos hacia y desde esta dirección.",
     "Sending login link...": "Enviando enlace de inicio de sesión...",
     "Sending...": "Enviando...",
     "Show all": "Mostrar todo",
@@ -106,6 +114,7 @@
     "Sign out": "Cerrar sesión",
     "Sign up": "Registrarse",
     "Signup error: Invalid link": "Error de registro: Enlace inválido",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Lo siento, eso no funcionó.",
     "Spam complaints": "Quejas de spam",
     "Start {{amount}}-day free trial": "Comienza el período de prueba gratuito de {{amount}} días",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "¡Éxito! Tu correo electrónico está actualizado.",
     "Successfully unsubscribed": "Te has dado de baja correctamente",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Gracias por suscribirte. Antes de leer, aquí abajo hay otros sitios que te pueden gustar.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "¡Gracias por tus comentarios!",
     "That didn't go to plan": "Eso no salió según lo planeado",
     "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>.": "La dirección de correo electrónico que tenemos para ti es {{memberEmail}} — si no es correcta, puedes actualizarla en tu <button>área de configuración de la cuenta</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Hubo un problema al enviar tus comentarios. Vuelve a intentarlo un poco más tarde.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Este sitio es solo por invitación, contacta al propietario para obtener acceso.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Para completar el registro, haz clic en el enlace de confirmación en tu correo electrónico. Si no llega en 3 minutos, ¡revisa tu carpeta de spam!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Prueba gratis por {{amount}} dias, luego {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Desbloquea el acceso a todos los boletines convirtiéndote en un suscriptor pago.",
     "Unsubscribe from all emails": "Cancelar suscripción a todos los correos electrónicos",
     "Unsubscribed": "Dado de baja",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Cancelar la suscripción a los correos electrónicos no cancelará tu suscripción de pago a {{title}}",
     "Update": "Actualizar",
     "Update your preferences": "Actualiza tus preferencias",
@@ -143,7 +158,7 @@
     "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.": "Cuando una bandeja de entrada no acepta un correo electrónico, comúnmente se le llama rebote. En muchos casos, esto puede ser temporal. Sin embargo, en algunos casos, un correo electrónico rebotado puede devolverse como una falla permanente cuando una dirección de correo electrónico no es válida o no existe.",
     "Why has my email been disabled?": "¿Por qué mi correo electrónico ha sido desabilitado?",
     "Yearly": "Anual",
-    "You currently have a free membership, upgrade to a paid subscription for full access.": "Tienes una membresía gratuita, actualiza a una suscripción paga para obtener acceso completo.",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Tienes una membresía gratuita, actualiza a una suscripción pagada para obtener acceso completo.",
     "You have been successfully resubscribed": "Te has vuelto a suscribir con éxito",
     "You're currently not receiving emails": "Actualmente no estás recibiendo correos electrónicos",
     "You're not receiving emails": "No estás recibiendo correos electrónicos",
diff --git a/ghost/i18n/locales/fa/comments.json b/ghost/i18n/locales/fa/comments.json
new file mode 100644
index 00000000000..89bdd78c131
--- /dev/null
+++ b/ghost/i18n/locales/fa/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{amount}} characters left": "{{amount}} حرف باقی\u200cمانده است",
+    "{{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.": "به دیدگاه خود موضوعیت ببخشید و با به اشتراک\u200cگذاری نام و تخصص خود یک گفتمان سالم ایجاد کنید.",
+    "Add reply": "پاسخی بدهید",
+    "Already a member?": "عضو هستید؟",
+    "Anonymous": "ناشناس",
+    "Become a member of {{publication}} to start commenting.": "عضو وب\u200cسایت {{publication}} شوید تا مجوز ارسال دیدگاه دریافت کنید.",
+    "Become a paid member of {{publication}} to start commenting.": "حق اشتراک وب\u200cسایت {{publication}} را پرداخت کنید تا مجوز ارسال دیدگاه دریافت کنید.",
+    "Cancel": "انصراف",
+    "Comment": "دیدگاه",
+    "Complete your profile": "نمایه خود را کامل کنید",
+    "Delete": "پاک کردن",
+    "Deleted member": "حساب پاک\u200cشده",
+    "Discussion": "گفتمان",
+    "Edit": "ویرایش",
+    "Edit this comment": "ویرایش این دیدگاه",
+    "Edited": "ویرایش\u200cشده",
+    "Enter your name": "نام خود را بنویسید",
+    "Expertise": "تخصص",
+    "Founder @ Acme Inc": "مدیر عامل یک شرکت خیالی",
+    "Full-time parent": " خانه\u200cدار تمام وقت",
+    "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?": "می\u200cخواهید این دیدگاه را گزارش کنید؟",
+    "Save": "ذخیره کردن",
+    "Sending": "در حال ارسال",
+    "Sent": "ارسال شد",
+    "Show": "نمایش",
+    "Show {{amount}} more replies": "نمایش {{amount}} پاسخ بیشتر",
+    "Show {{amount}} previous comments": "نمایش {{amount}} دیدگاه قبل\u200cتر",
+    "Show 1 more reply": "نمایش یک دیدگاه بیشتر",
+    "Show 1 previous comment": "نمایش یک دیدگاه قبل\u200cتر",
+    "Show comment": "نمایش دیدگاه",
+    "Sign in": "ورود به حساب",
+    "Sign up now": "ایجاد حساب",
+    "Start the conversation": "گفت\u200cوگویی شروع کنید",
+    "This comment has been hidden.": "این دیدگاه مخفی شده است",
+    "This comment has been removed.": "این دیدگاه پاک شده است",
+    "Upgrade now": "ارتقاء دهید",
+    "Yesterday": "دیروز",
+    "You want to report this comment?": "آیا می\u200cخواهید این دیدگاه را گزارش دهید؟",
+    "Your request will be sent to the owner of this site.": "درخواست شما برای مدیر این وب\u200cسایت ارسال خواهد شد."
+}
diff --git a/ghost/i18n/locales/fa/ghost.json b/ghost/i18n/locales/fa/ghost.json
new file mode 100644
index 00000000000..810e0135697
--- /dev/null
+++ b/ghost/i18n/locales/fa/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "با آرزوی بهترین\u200cها!",
+    "Complete signup for {{siteTitle}}!": "عضویت در {{siteTitle}} را تکمیل کنید!",
+    "Complete your sign up to {{siteTitle}}!": "عضویت خود را در {{siteTitle}} تکمیل کنید!",
+    "Confirm email address": "تأیید آدرس ایمیل",
+    "Confirm signup": "تأیید عضویت",
+    "Confirm your email address": "آدرس ایمیل خود را تأیید کنید",
+    "Confirm your email update for {{siteTitle}}!": "به\u200cروزرسانی آدرس ایمیل خود را برای {{siteTitle}} تأیید کنید!",
+    "Confirm your subscription to {{siteTitle}}": "اشتراک خود را در {{siteTitle}} تأیید کنید",
+    "For your security, the link will expire in 24 hours time.": "به خاطر حفظ امنیت شما، این پیوند بعد از ۲۴ ساعت منقضی می\u200cشود. ",
+    "Hey there,": "سلام،",
+    "Hey there!": "سلام!",
+    "If you did not make this request, you can safely ignore this email.": "در صورتی که شما این درخواست را نداده\u200cاید، می\u200cتوانید با خیال راحت از آن چشم\u200cپوشی کنید.",
+    "If you did not make this request, you can simply delete this message.": "در صورتی که شما این درخواست را نداده\u200cاید، می\u200cتوانید با خیال راحت این پیام را پاک کنید.",
+    "Please confirm your email address with this link:": "خواهشمند است از طریق این پیوند آدرس ایمیل خود را تأیید کنید:",
+    "Secure sign in link for {{siteTitle}}": "پیوند امن ورود به وب\u200cسایت {{siteTitle}}",
+    "See you soon!": "به زودی می\u200cبینمت!",
+    "Sent to {{email}}": "ارسال شده به {{email}} ",
+    "Sign in": "ورود",
+    "Sign in to {{siteTitle}}": "ورود به وب\u200cسایت {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "برای تکمیل عضویت خود برای وب\u200cسایت {{siteTitle}} برروی پیوند زیر کلیک کنید، پس از آن شما به صورت خودکار وارد حساب خود خواهید شد:",
+    "Thank you for signing up to {{siteTitle}}!": "با سپاس از عضویت شما برای وب\u200cسایت {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "با سپاس از مشترک شدن شما به برای وب\u200cسایت {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "با سپاس از مشترک شدن شما به برای وب\u200cسایت {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "با سپاس از مشترک شدن شما به برای وب\u200cسایت {{siteTitle}}. برروی لینک زیر کلیک کنید تا به صورت خودکار به حساب خود وارد شوید:",
+    "This email address will not be used.": "این آدرس ایمیل جایی استفاده نخواهد شد.",
+    "Welcome back to {{siteTitle}}!": "بازگشت شما را به {{siteTitle}} خوش آمد می\u200cگوییم!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "بازگشتتان را خوش\u200cآمد می\u200cگوییم! از این پیوند برای ورود امن به حساب کاربری وب\u200cسایت {{siteTitle}} استفاده کنید:",
+    "You can also copy & paste this URL into your browser:": "همچنین می\u200cتوانید این پیوند را کپی و در مرورگر خود استفاده کنید:",
+    "You will not be signed up, and no account will be created for you.": "شما عضویتی نخواهید داشت و هیچ حسابی برای شما ایجاد نخواهد شد.",
+    "You will not be subscribed.": "شما مشترک نخواهید شد.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "شما در یک قدمی دریافت اشتراک وب\u200cسایت {{siteTitle}} هستید - خواهشمند است آدرس ایمیل خود را از طریق این لینک تأیید کنید:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "شما در یک قدمی دریافت اشتراک وب\u200cسایت {{siteTitle}} هستید!"
+}
diff --git a/ghost/i18n/locales/fa/portal.json b/ghost/i18n/locales/fa/portal.json
new file mode 100644
index 00000000000..eae65692f13
--- /dev/null
+++ b/ghost/i18n/locales/fa/portal.json
@@ -0,0 +1,173 @@
+{
+    "(save {{highestYearlyDiscount}}%)": "{{highestYearlyDiscount}}٪ تخفیف",
+    "{{amount}} days free": "{{amount}} روز رایگان",
+    "{{amount}} off": "{{amount}} تخفیف",
+    "{{amount}} off for first {{number}} months.": "{{amount}} تخفیف برای اولین {{number}} ماه.",
+    "{{amount}} off for first {{period}}.": "{{amount}} تخقیف برای اولین {{period}}.",
+    "{{amount}} off forever.": "{{amount}} تخفیف برای همیشه.",
+    "{{discount}}% discount": "{{discount}}٪ تخفیف",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "آدرس {{memberEmail}} در آینده خبرنامه\u200cی {{newsletterName}} را دریافت نخواهد کرد.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "آدرس {{memberEmail}} دیگر زمانی که کسی به کامنت شما پاسخی بدهد، ایمیلی دریافت نخواهد کرد.",
+    "{{memberEmail}} will no longer receive this newsletter.": "آدرس {{memberEmail}} دیگر این خبرنامه را دریافت نخواهد کرد.",
+    "{{trialDays}} days free": "{{trialDays}} روز رایگان",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "یک پیوند ورود برای ایمیل شما ارسال شد. در صورتی که به دست شما نرسید، پوشه اسپم خود را برررسی کنید",
+    "Account": "حساب کاربری",
+    "Account settings": "تنظیمات حساب کاربری",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "پس از این\u200cکه دوره رایکان شما پایان یابد، براساس بسته\u200cی انتخابی شما مبلغی از حساب شما برداشت می\u200cشود. شما همیشه می\u200cتوانید قبل از آن تاریخ، بسته\u200cی خود را تغییر و یا لغو کنید.",
+    "Already a member?": "عضو هستید؟",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "خطایی غیرمنتظره رخ داد. خواهشمند است که دوباره تلاش کنید و یا با <a>پشتیبانی</a> در صورتی که خطا ادامه\u200cدار بود تماس بگیرید.",
+    "Back": "بازگشت",
+    "Back to Log in": "بازگشت به برگه ورود",
+    "Billing info": "اطلاعات صورت\u200cحساب",
+    "Black Friday": "جمعه سیاه",
+    "Cancel anytime.": "در هر زمان قابل لغو است.",
+    "Cancel subscription": "لغو اشتراک",
+    "Cancellation reason": "دلیل لغو اشتراکتان چیست؟",
+    "Change": "تغییر",
+    "Check spam & promotions folders": "پوشه اسپم و یا تبلیغات خود را بررسی کنید",
+    "Check with your mail provider": "موضوع را با ارائه\u200cدهنده ایمیل خود بررسی کنید",
+    "Choose": "انتخاب",
+    "Choose a different plan": "بسته\u200cای دیگر انتخاب کنید",
+    "Choose your newsletters": "خبرنامه\u200cی خود را انتخاب کنید",
+    "Click here to retry": "برای تلاش دوباره اینجا را کلیک کنید",
+    "Close": "بستن",
+    "Comments": "دیدگاه\u200cها",
+    "Complimentary": "تعریف\u200cها",
+    "Confirm": "تأیید",
+    "Confirm cancellation": "تأیید لغو",
+    "Confirm subscription": "تأیید اشتراک",
+    "Contact support": "تماس با پشتیبانی",
+    "Continue": "ادامه دادن",
+    "Continue subscription": "ادامه اشتراک",
+    "Could not sign in. Login link expired.": "امکان ورود وجود نداشت، پیوند ورود منقضی شده است.",
+    "Could not update email! Invalid link.": "امکان به\u200cروزرسانی ایمیل وجود نداشت! پیوند اشتباه بود.",
+    "Create a new contact": "مخاطبی تازه بسازید",
+    "Current plan": "بسته\u200cی فعلی",
+    "Delete account": "پاک کردن حساب",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "آیا از این کار اطمینان دارید؟ شما می\u200cتوانید تنظیمات خود را از <button>اینجا</button> تغییر دهید.",
+    "Don't have an account?": "حساب کاربری ندارید؟",
+    "Edit": "ویرایش",
+    "Email": "ایمیل",
+    "Email newsletter": "ایمیل خبرنامه",
+    "Email preferences": "تنظیمات ایمیل",
+    "Emails": "ایمیل\u200cها",
+    "Emails disabled": "ایمیل\u200cها غیرفعال هستند",
+    "Ends {{offerEndDate}}": "در {{offerEndDate}} تمام می\u200cشود",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "Error": "خطا",
+    "Expires {{expiryDate}}": "در {{expiryDate}} منقضی می\u200cشود",
+    "Forever": "برای همیشه",
+    "Free Trial – Ends {{trialEnd}}": "دوره رایگان - بعد از {{trialEnd}} تمام می\u200cشود",
+    "Get help": "پشتیبانی بگیرید",
+    "Get in touch for help": "برای دریافت پشتیبانی تماس بگیرید",
+    "Get notified when someone replies to your comment": "زمانی که کسی به دیدگاه شما پاسخی می\u200cدهد، اعلان دریافت کنید",
+    "Give feedback on this post": "بازخوردی به این نوشته بدهید",
+    "Help! I'm not receiving emails": "کمک! من ایمیلی دریافت نمی\u200cکنم",
+    "Here are a few other sites you may enjoy.": "وب\u200cسایت\u200cهای که ممکن است شما بپسندید.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "اگر کاربری خبرنامه را به عنوان اسپم معرفی کند، ایمیل\u200cهای خبرنامه به صورت خودکار دیگر به آن آدرس ارسال نخواهند شد تا مطمئن شویم هیچ کسی ایمیل ناخواسته\u200cای دریافت نمی\u200cکند. ",
+    "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.": "در صورتی که گزارش اسپم ارسالی اتفاقی بوده، یا این که تمایل داشتید که دوباره ایمیل\u200cها را دریافت کنید، می\u200cتوانید دوباره با کلیک برروی گزینه دریافت اشتراک در برگه قبلی ایمیل\u200cها را دریافت کنید.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "در صورتی که اشتراک خود را لغو کنید تا تاریخ {{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}}": "در صورتی که از آدرس ایمیل شرکتی و یا دولتی استفاده می\u200cکنید، با بخش آی\u200cتی خود تماس بگیرید و درخواست کنید که ایمیل\u200cهای ارسالی از طرف {{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.": "در صورتی که مایل هستید که دوباره ایمیل\u200cها را دریافت کید، بهترین راه\u200cکار بررسی آدرس ایمیل خود و سپس کلیک برروی گزینه دریافت اشتراک در صفحه قبلی است.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "در صورتی که شما ایمیل خبرنامه\u200cهایی که مشترک آن\u200cها شده\u200cاید را دریافت نمی\u200cکنید، این موارد را بررسی کنید.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "در صورتی که شما تمامی این کارها را انجام داده و همچنان ایمیلی دریافت نمی\u200cکنید، می\u200cتوانید با پشتیبانی از طریق {{supportAddress}} تماس بگیرید.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "در صورتی که ارسال خبرنامه با یک خطای دائمی روبرو شود، ارسال ایمیل\u200cها برای آن حساب متوقف خواهد شد.",
+    "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.": "در برنامه\u200cی ایمیل خود آدرس {{senderEmail}} را به عنوان مخاطب ذخیره کنید. این کار باعث می\u200cشود که سرویس\u200cدهنده ایمیل شما متوجه شود که این آدرس باید مورد تأیید قرار گیرد.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
+    "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\".": "اطمینان حاصل کنید که ایمیل\u200cها به صورت اتفاقی در پوشه اسپم یا تبلیغاتی شما قرار نگرفته\u200cاند. در صورتی که آنجا باشند، برروی «اسپم نیست» و/یا «انتقال به صندوق ورودی» کلیک کنید.",
+    "Manage": "مدیریت",
+    "Maybe later": "شاید بعداً",
+    "Memberships unavailable, contact the owner for access.": "عضویت غیرقابل دسترس است، با مالک برای دسترسی تماس بگیرید.",
+    "Monthly": "ماهانه",
+    "More like this": "مواردی بیشتری مثل این نشان بده",
+    "Name": "نام",
+    "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).": "خبرنامه\u200cها ممکن است به خاطر دو دلیل برای شما غیرفعال شده باشند: ایمیلی که قبلاً برای شما ارسال شده به عنوان اسپم علامت\u200cگذاری شده باشد و یا این که با یک شکست دائمی (bounce) روبرو شده باشد.",
+    "Not receiving emails?": "ایمیلی دریافت نمی\u200cکنید؟",
+    "Now check your email!": "حالا صندوق ورودی ایمیل خود را بررسی کنید!",
+    "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.": "پس از دریافت مجدد اشتراک، در صورتی که کماکان ایمیل\u200cها را در ایمیل خود نمی\u200cبینید، پوشه اسپم را بررسی کنید. برخی از سرویس\u200cدهندگان تاریخچه گزارش اسپم را نگهداری می\u200cکنند و همچنان ایمیل\u200cها را به عنوان اسپم علامت\u200cگذاری می\u200cکنند. در صورتی که این مورد وجود داشت، ایمیل را با عنوان «اسپم نیست» علامت\u200cگذاری کنید تا آن را به صندوق ورودی انتقال دهد.",
+    "Permanent failure (bounce)": "خظای دائمی (bounce)",
+    "Phone number": "",
+    "Plan": "بسته",
+    "Plan checkout was cancelled.": "تسویه صورت\u200cحساب بسته لفو شد.",
+    "Plan upgrade was cancelled.": "ارتقاء بسته لفو شد.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "خواهشمند است که با آدرس {{supportAddress}} تماس بگیرید تا اشتراک رایگان شما را تنظیم کند.",
+    "Please enter {{fieldName}}": "",
+    "Please fill in required fields": "خواهشمند است که موارد الزامی را وارد کنید",
+    "Price": "قیمت",
+    "Re-enable emails": "فعال\u200cسازی ایمیل\u200cها",
+    "Recommendations": "پیشنهادات",
+    "Renews at {{price}}.": "با قیمت {{price}} تمدید خواهد شد.",
+    "Retry": "تلاش دوباره",
+    "Save": "ذخیره",
+    "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.": "ایمیلی به آدرس {{senderEmail}} بفرستید و بنویسید سلام. این کار باعث می\u200cشود که سرویس\u200cدهنده ایمیل شما متوجه شود که این آدرس باید مورد تأیید قرار گیرد.",
+    "Sending login link...": "در حال ارسال پیوند ورود...",
+    "Sending...": "در حال ارسال...",
+    "Show all": "نمایش همه",
+    "Sign in": "ورود",
+    "Sign out": "بیرون رفتن",
+    "Sign up": "ثبت نام",
+    "Signup error: Invalid link": "خطای ثبت نام: پیوند معتبر نیست",
+    "Something went wrong, please try again later.": "",
+    "Sorry, that didn’t work.": "پوزش می\u200cخواهیم، آن کار انجام نشد.",
+    "Spam complaints": "گزارش\u200cهای اسپم",
+    "Start {{amount}}-day free trial": "شروع {{amount}} روز دوره رایگان",
+    "Starting {{startDate}}": "شروع از {{startDate}}",
+    "Starting today": "شروع از امروز",
+    "Submit 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.": "انجام شد! حساب کاربری شما به طور کامل فعال شد، شما حالا می\u200cتوانید به تمام محتواها دسترسی داشته باشید.",
+    "Success! Your email is updated.": "انجام شد! ایمیل شما به روز شد.",
+    "Successfully unsubscribed": "لغو اشتراک با موفقیت انجام شد",
+    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "با سپاس از اشتراک شما. پیش از این که شروع به خواندن کنید چند وب\u200cسایت دیگر که ممکن است آن\u200cها را بپسندید در زیر برای شما قرار گرفته\u200cاند.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
+    "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>.": "آدرس ایمیلی که ما از شما داریم {{memberEmail}} است - اگر که این آدرس درست نیست می\u200cتوانید در <button>قسمت تنظیمات حساب کاربری</button> آن را به\u200cروز کنید.",
+    "There was a problem submitting your feedback. Please try again a little later.": "خطائی در زمان ثبت بازخورد شما اتفاق افتاد. خواهشمند است دوباره تلاش کنید.",
+    "There was an error processing your payment. Please try again.": "",
+    "This site is invite-only, contact the owner for access.": "دسترسی به این وب\u200cسایت نیازمند دعوت\u200cنامه است، با مالک آن برای دریافت دسترسی تماس بگیرید.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "برای تکمیل ثبت نام، برروی پیوند تأیید در صندوق ورودی ایمیل خود کلیک کنید. در صورتی که به دست شما نرسید، پوشه اسپم خود را برررسی کنید!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "برای {{amount}} روز به صورت رایگان امتحان کنید، سپس با قیمت {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "با دریافت اشتراک پولی به شما دسترسی به تمامی خبرنامه\u200cها داده می\u200cشود.",
+    "Unsubscribe from all emails": "لغو اشتراک دریافت تمامی ایمیل\u200cها",
+    "Unsubscribed": "اشتراک لغو شد",
+    "Unsubscribed from all emails.": "اشتراک تمامی ایمیل\u200cها لغو شد.",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "لغو دریافت ایمیل\u200cها باعث لغو اشتراک پولی شما از {{title}} نخواهد شد.",
+    "Update": "به\u200cروزرسانی",
+    "Update your preferences": "به\u200cروزرسانی تنظیمات شما",
+    "Verification link sent, check your inbox": "پیوند تأیید برای شما ارسال شد، ایمیل خود را بررسی کنید",
+    "Verify your email address is correct": "تأیید کنید که آدرس ایمیل شما درست است",
+    "View plans": "نمایش بسته\u200cها",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "لغو اشتراک شما به دلیل این که آدرس ایمیل شما پیدا نشد، انجام نشد. خواهشمند است با مالک وب\u200cسایت تماس بگیرید.",
+    "Welcome back, {{name}}!": "{{name}} عزیز، خوش برگشتی!",
+    "Welcome back!": "خوش برگشتید!",
+    "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.": "زمانی که یک صندوق ایمیل از قبول پیام سر باز می\u200cزند به آن معمولا bounce می\u200cگویند. در بسیاری از موارد این موضوع موقتی است و رفع می\u200cشود. اما در برخی موارد، این خطا دائمی می\u200cشود و معمولاً به این خاطر است که آدرس اشتباه بوده و یا وجود ندارد.",
+    "Why has my email been disabled?": "چرا آدرس ایمیل من غیرفعال شده است؟",
+    "Yearly": "سالانه",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "شما در حال حاضر از بسته رایگان استفاده می\u200cکنید، حساب خود را به یک اشتراک پولی برای دریافت دسترسی کامل ارتقاء دهید.",
+    "You have been successfully resubscribed": "شما با موفقیت دوباره مشترک شدید",
+    "You're currently not receiving emails": "شما در حال حاضر هیچ ایمیلی دریافت نمی\u200cکنید",
+    "You're not receiving emails": "شما هیچ ایمیلی دریافت نمی\u200cکنید",
+    "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.": "شما به خاطر این که آخرین ایمیلی که دریافت کرده\u200cاید به عنوان اسپم علامت\u200cگذاری شده است و یا این که مشکلی برای تحویل ایمیل به آدرسی که وارد کرده\u200cاید وجود دارد، ایمیلی دریافت نمی\u200cکنید.",
+    "You've successfully signed in.": "شما با موفقیت وارد شدید.",
+    "You've successfully subscribed to": "شما با موفقیت مشترک این موارد شدید:",
+    "Your account": "حساب کاربری شما",
+    "Your input helps shape what gets published.": "تلاش شما به آنچه که منتشر می\u200cشود، شکل می\u200cدهد.",
+    "Your subscription will expire on {{expiryDate}}": "اشتراک شما در تاریخ {{expiryDate}} منقضی می\u200cشود",
+    "Your subscription will renew on {{renewalDate}}": "اشتراک شما در تاریخ {{renewalDate}} تمدید می\u200cشود",
+    "Your subscription will start on {{subscriptionStart}}": "اشتراک شما از تاریخ {{subscriptionStart}} شروع می\u200cشود"
+}
diff --git a/ghost/i18n/locales/fa/signup-form.json b/ghost/i18n/locales/fa/signup-form.json
new file mode 100644
index 00000000000..d217c1160ea
--- /dev/null
+++ b/ghost/i18n/locales/fa/signup-form.json
@@ -0,0 +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": "آدرس ایمیل شما"
+}
diff --git a/ghost/i18n/locales/fi/comments.json b/ghost/i18n/locales/fi/comments.json
index bcb0715d9a1..9c52565d2ba 100644
--- a/ghost/i18n/locales/fi/comments.json
+++ b/ghost/i18n/locales/fi/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": "",
+    "{{amount}} characters left": "{{amount}} merkkiä jäljellä",
+    "{{amount}} comments": "{{amount}} kommenttia",
+    "{{amount}} days ago": "{{amount}} päivää sitten",
+    "{{amount}} hours ago": "{{amount}} tuntia sitten",
+    "{{amount}} minutes ago": "{{amount}} minuuttia sitten",
+    "{{amount}} months ago": "{{amount}} kuukautta sitten",
+    "{{amount}} more": "{{amount}} vielä lisää",
+    "{{amount}} seconds ago": "{{amount}} sekuntia sitten",
+    "{{amount}} weeks ago": "{{amount}} viikkoa sitten",
+    "{{amount}} years ago": "{{amount}} vuotta sitten",
+    "1 comment": "1 kommentti",
+    "Add comment": "Lisää kommentti",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Lisää sisältöä kommenttiisi, jaa nimesi ja osaamisesi saadaksesi aikaan tervettä keskustelua",
+    "Add reply": "Lisää vastaus",
+    "Already a member?": "Oletko jo jäsen?",
+    "Anonymous": "Anonyymi",
+    "Become a member of {{publication}} to start commenting.": "Ala {{publication}} jäseneksi pystyäksesi kommentoimaan",
+    "Become a paid member of {{publication}} to start commenting.": "Ota maksullinen jäsenyys sivulle {{publication}}, jotta pystyt kommentoimaan",
+    "Cancel": "Peruuta",
+    "Comment": "Kommentti",
+    "Complete your profile": "Täydennä profiilisi",
+    "Delete": "Poista",
+    "Deleted member": "Poista jäsen",
+    "Discussion": "Keskustelu",
+    "Edit": "Editoi",
+    "Edit this comment": "Editoi tätä kommenttia",
+    "Edited": "Editoitu",
+    "Enter your name": "Syötä nimesi",
+    "Expertise": "Osaaminen",
     "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.": ""
+    "Full-time parent": "Kokoaikainen vanhempi",
+    "Head of Marketing at Acme, Inc": "Markkinointijohtaja",
+    "Hide": "Piilota",
+    "Hide comment": "Piilota kommentti",
+    "Jamie Larson": "Jamie Larson",
+    "Join the discussion": "Liity keskusteluun",
+    "Just now": "Juuri nyt",
+    "Local resident": "Paikallinen",
+    "Member discussion": "Jäsenten keskustelu",
+    "Name": "Nimi",
+    "Neurosurgeon": "Neurokirurgi",
+    "One day ago": "Päivä sitten",
+    "One hour ago": "Tunti sitten",
+    "One minute ago": "Minuutti sitten",
+    "One month ago": "Kuukausi sitten",
+    "One week ago": "Viikko sitten",
+    "One year ago": "Vuosi sitten",
+    "Reply": "Vastaa",
+    "Reply to comment": "Vastaa kommenttiin",
+    "Report": "Ilmianna",
+    "Report comment": "Ilmianna kommentti",
+    "Report this comment": "Ilmianna tämä kommentti",
+    "Report this comment?": "Haluatko ilmiantaa tämän kommentin?",
+    "Save": "Tallenna",
+    "Sending": "Lähetetään",
+    "Sent": "Lähetetty",
+    "Show": "Näytä",
+    "Show {{amount}} more replies": "Näytä {{amount}} vastausta lisää ",
+    "Show {{amount}} previous comments": "Näytä {{amount}} edellistä kommenttia",
+    "Show 1 more reply": "Näytä 1 vastaus lisää",
+    "Show 1 previous comment": "Näytä edellinen kommentti",
+    "Show comment": "Näytä kommentti",
+    "Sign in": "Kirjaudu sisään",
+    "Sign up now": "Rekisteröidy nyt",
+    "Start the conversation": "Aloita keskustelu",
+    "This comment has been hidden.": "Tämä kommentti on piilotettu",
+    "This comment has been removed.": "Tämä kommentti on poistettu",
+    "Upgrade now": "Korota nyt",
+    "Yesterday": "Eilen",
+    "You want to report this comment?": "Haluatko ilmiantaa tämän kommentin?",
+    "Your request will be sent to the owner of this site.": "Sinun pyyntösi lähetetään sivun omistajalle"
 }
diff --git a/ghost/i18n/locales/fi/portal.json b/ghost/i18n/locales/fi/portal.json
index ace6d133042..dcf1ac54f34 100644
--- a/ghost/i18n/locales/fi/portal.json
+++ b/ghost/i18n/locales/fi/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} päivää ilmaiseksi",
     "{{amount}} off": "{{amount}} pois",
     "{{amount}} off for first {{number}} months.": "{{amount}} pois ensimmäisestä {{number}} kuukaudesta",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} ei lähetetä enää jatkossa sähköpostia jos joku vastaa kommenttiisi.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} ei enää lähetetä tätä uutiskirjettä.",
     "{{trialDays}} days free": "{{trialDays}} päivää ilmaiseksi",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Kirjautumislinkki on lähetetty sähköpostiisi. Jos se ei tule 3 minuutin kuluessa, muista katsoa spam-kansiosi.",
     "Account": "Oma tili",
     "Account settings": "Tilin asetukset",
@@ -48,11 +50,12 @@
     "Edit": "Muokkaa",
     "Email": "Sähköposti",
     "Email newsletter": "Uutiskirje sähköpostiin",
-    "Email preference updated.": "Sähköpostiasetukset päivitetty",
     "Email preferences": "Sähköpostiasetukset",
     "Emails": "Sähköpostit",
     "Emails disabled": "Sähköpostit pois käytöstä",
     "Ends {{offerEndDate}}": "Loppuu {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Virhe",
     "Expires {{expiryDate}}": "Vanhenee {{expiryDate}}",
     "Forever": "Ikuisesti",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Jos haluat perua tilauksesi nyt, sinulla on vielä oikeus materiaaliin {{periodEnd}} asti",
     "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}}": "Jos sinulla on yritys- tai valtion sähköposti, pyydä IT-osastoa hyväksymään sähköpostit lähettäjältä {{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.": "Jos haluat saada taas sähköposteja, paras tapa jatkaa on tarkistaa sähköpostiosoitteesi ja sitten klikata uudelleen uutiskirjeeseen osallistumista edellisellä sivulla.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Jos et saa uutiskirjettä sähköpostiisi, tässä on muutama asia tarkistettavaksi:",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Jos et saa uutiskirjettä sähköpostiisi, tässä on muutama asia tarkistettavaksi:",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Jos et vieläkään saa uutiskirjeitä, ota yhteyttä {{supportAddress}}",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Jos uutiskirjeen lähetyksessä tapahtuu pysyvä ongelma, sähköpostien lähetys keskeytetään.",
     "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.": "Sähköpostiasetuksissasi lisää {{senderEmail}} kontakteihisi. Tämä antaa viestin sähköpostitarjoajalle, että viestit tästä osoitteesta ovat hyväksyttäviä.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Vähemmän tämän kaltaisia",
     "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\".": "Varmista, että sähköpostit eivät mene Spam- tai roskapostikansioihin, Jos näin käy, klikkaa \"Mark as not spam\" ja/tai \"Move to inbox\".",
     "Manage": "Hallitse",
@@ -86,10 +92,12 @@
     "Now check your email!": "Nyt tarkista sähköpostisi",
     "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.": "Kun olet tilannut sähköpostit uudelleen ja et vieläkään saa posteja, katso ensimmäiseksi spam-kansio. Jotkut tarjoajat pitävät listaa ennen merkityistä viesteistä ja estävät niitä jatkossakin. Jos näin tapahtuu, merkitse viesti Not Spam ja siirrä se postilaatikkoosi.",
     "Permanent failure (bounce)": "Pysyvä virhe (bounce)",
+    "Phone number": "",
     "Plan": "Tilaus",
     "Plan checkout was cancelled.": "Tilauksen checkout on peruttu",
     "Plan upgrade was cancelled.": "Tilauksen korotus on peruttu",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Täytä tarvittavat kentät",
     "Price": "Hinta",
     "Re-enable emails": "Uudelleen hyväksy sähköpostit",
@@ -98,7 +106,7 @@
     "Retry": "Kokeile uudestaan",
     "Save": "Tallenna",
     "Send an email and say hi!": "Lähetä sähköposti ja sano moi!",
-    "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.": "Lähetä sähköposti osoitteeseen {{senderEmail}} ja sano hei. Tämä viestii tarjoajalle, että osoite on hyväksytty.",
+    "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.": "Lähetä sähköposti osoitteeseen {{senderEmail}} ja sano hei. Tämä viestii tarjoajalle, että osoite on hyväksytty.",
     "Sending login link...": "Lähetetään kirjautumislinkkiä...",
     "Sending...": "Lähetetään...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Kirjaudu ulos",
     "Sign up": "Rekisteröidy",
     "Signup error: Invalid link": "Virhe rekisteröinnissä: Linkki ei toimi",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Anteeksi, tämä ei onnistunut",
     "Spam complaints": "Spam-valitukset",
     "Start {{amount}}-day free trial": "Aloita {{amount}}-päivän kokeilu",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Onnistui! Sähköpostisi on päivitetty",
     "Successfully unsubscribed": "Tilauksen peruutus onnistui",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Kiitos palautteestasi!",
     "That didn't go to plan": "Tämä ei mennyt suunnitelmien mukaan",
     "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.": "Meillä oli ongelma palautteesi lähetyksen kanssa. Kokeleithan myöhemmin uudestaan.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Tämä sivu on vain kutsutuille, ota yhteyttä omistajaan saadaksesi pääsyoikeuden.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Viimeistelläksesi rekisteröitymisen, klikkaa vahvistuslinkkiä sähköpostissasi. Jos sitä ei saavu 3 minuutin kuluessa, tarkista roskapostikansiosi!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Kokeile ilmaiseksi {{amount}} päivää, sen jälkeen hinta on {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Avaa pääsy kaikkiin uutiskirjeisiin maksullisella tilauksella.",
     "Unsubscribe from all emails": "Peruuta kaikki sähköpostit",
     "Unsubscribed": "Tilaus peruutettu",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Sähköpostien peruuttaminen ei peruuta maksullista tilaustasi {{title}}",
     "Update": "Päivitä",
     "Update your preferences": "Päivitä asetuksesi",
diff --git a/ghost/i18n/locales/fr/comments.json b/ghost/i18n/locales/fr/comments.json
index 394f6102172..ae84d6b5765 100644
--- a/ghost/i18n/locales/fr/comments.json
+++ b/ghost/i18n/locales/fr/comments.json
@@ -5,13 +5,13 @@
     "{{amount}} hours ago": "il y a {{amount}} heures",
     "{{amount}} minutes ago": "il y a {{amount}} minutes",
     "{{amount}} months ago": "il y a {{amount}} mois",
-    "{{amount}} more": "",
+    "{{amount}} more": "{{amount}} supplémentaire(s)",
     "{{amount}} seconds ago": "il y a {{amount}} secondes",
     "{{amount}} weeks ago": "il y a {{amount}} semaines",
     "{{amount}} years ago": "il y a {{amount}} ans",
     "1 comment": "1 commentaire",
     "Add comment": "Ajoutez un commentaire",
-    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Ajoutez du contexte à votre commentaire, partagez votre nom et votre expertise pour favoriser une discussion saine.",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Ajoutez un contexte à votre commentaire. Partagez votre nom et vos compétences pour favoriser une discussion saine.",
     "Add reply": "Ajoutez une réponse",
     "Already a member?": "Déjà membre ?",
     "Anonymous": "Anonyme",
@@ -27,7 +27,7 @@
     "Edit this comment": "Modifier ce commentaire",
     "Edited": "Modifié",
     "Enter your name": "Entrez votre nom",
-    "Expertise": "Expertise",
+    "Expertise": "Compétences",
     "Founder @ Acme Inc": "Fondateur @ Acme Inc",
     "Full-time parent": "Parent à plein temps",
     "Head of Marketing at Acme, Inc": "Responsable du marketing chez Acme, Inc",
@@ -51,7 +51,7 @@
     "Report": "Signaler",
     "Report comment": "Signalez le commentaire",
     "Report this comment": "Signalez ce commentaire",
-    "Report this comment?": "Signale ce commentaire ?",
+    "Report this comment?": "Signaler ce commentaire ?",
     "Save": "Enregistrer",
     "Sending": "Envoi en cours",
     "Sent": "Envoyé",
@@ -66,8 +66,8 @@
     "Start the conversation": "Commencer la conversation",
     "This comment has been hidden.": "Ce commentaire a été masqué.",
     "This comment has been removed.": "Ce commentaire a été supprimé.",
-    "Upgrade now": "Mettez à jour maintenant",
+    "Upgrade now": "Mettre à jour maintenant",
     "Yesterday": "Hier",
-    "You want to report this comment?": "Vous souhaitez signaler ce commentaire ?",
-    "Your request will be sent to the owner of this site.": "Votre demande sera envoyée au propriétaire de ce site."
+    "You want to report this comment?": "Souhaitez-vous signaler ce commentaire ?",
+    "Your request will be sent to the owner of this site.": "Votre demande sera transférée au propriétaire de ce site."
 }
diff --git a/ghost/i18n/locales/fr/ghost.json b/ghost/i18n/locales/fr/ghost.json
index 8c84c7a81f6..ce0b52f8ad9 100644
--- a/ghost/i18n/locales/fr/ghost.json
+++ b/ghost/i18n/locales/fr/ghost.json
@@ -1,34 +1,34 @@
 {
-    "All the best!": "Bien à vous !",
+    "All the best!": "Bien à vous.",
     "Complete signup for {{siteTitle}}!": "Finalisez votre inscription à {{siteTitle}} !",
-    "Complete your sign up to {{siteTitle}}!": "Finalisez votre inscription à {{siteTitle}}",
-    "Confirm email address": "Confirmez votre adresse email",
+    "Complete your sign up to {{siteTitle}}!": "Finalisez votre inscription à {{siteTitle}} !",
+    "Confirm email address": "Confirmer l'adresse email",
     "Confirm signup": "Confirmer l'inscription",
     "Confirm your email address": "Confirmez votre adresse email",
-    "Confirm your email update for {{siteTitle}}!": "Confirmez votre adresse email pour {{siteTitle}}",
+    "Confirm your email update for {{siteTitle}}!": "Confirmez votre adresse email pour {{siteTitle}} !",
     "Confirm your subscription to {{siteTitle}}": "Confirmez votre abonnement à {{siteTitle}}",
     "For your security, the link will expire in 24 hours time.": "Pour des raisons de sécurité, le lien expirera dans 24 heures.",
     "Hey there,": "Bonjour,",
     "Hey there!": "Bonjour !",
-    "If you did not make this request, you can safely ignore this email.": "Si vous n’êtes pas à l'origine de cette demande, vous pouvez ignorer cet e-mail.",
-    "If you did not make this request, you can simply delete this message.": "Si vous n’êtes pas à l'origine de cette demande, vous pouvez supprimer cet e-mail.",
-    "Please confirm your email address with this link:": "Confirmez votre adresse e-mail avec ce lien :",
+    "If you did not make this request, you can safely ignore this email.": "Si vous n’êtes pas à l'origine de cette demande, vous pouvez ignorer cet email.",
+    "If you did not make this request, you can simply delete this message.": "Si vous n’êtes pas à l'origine de cette demande, vous pouvez supprimer cet email.",
+    "Please confirm your email address with this link:": "Veuillez confirmez votre adresse email en cliquant ce lien :",
     "Secure sign in link for {{siteTitle}}": "Lien sécurisé de connexion pour {{siteTitle}}",
     "See you soon!": "À bientôt !",
     "Sent to {{email}}": "Envoyé à {{email}}",
     "Sign in": "Se connecter",
     "Sign in to {{siteTitle}}": "Se connecter à {{siteTitle}}",
-    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Cliquez sur le lien ci-dessous pour compléter votre inscription à {{siteTitle}} et vous connecter automatiquement :",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Cliquez le lien ci-dessous pour compléter votre inscription à {{siteTitle}} et être connecté automatiquement :",
     "Thank you for signing up to {{siteTitle}}!": "Merci pour votre inscription à {{siteTitle}} !",
     "Thank you for subscribing to {{siteTitle}}!": "Merci pour votre abonnement à {{siteTitle}} !",
     "Thank you for subscribing to {{siteTitle}}.": "Merci pour votre abonnement à {{siteTitle}}.",
-    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Merci pour votre abonnement à {{siteTitle}}. Cliquez sur le lien ci-dessous pour vous connecter automatiquement :",
-    "This email address will not be used.": "Cette adresse e-mail ne sera pas utilisée.",
-    "Welcome back to {{siteTitle}}!": "Bienvenue de retour chez {{siteTitle}} !",
-    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Bon retour parmi nous ! Utilisez ce lien pour vous connecter en toute sécurité à votre compte {{siteTitle}} :",
-    "You can also copy & paste this URL into your browser:": "Vous pouvez aussi copier et coller cette URL dans votre navigateur :",
-    "You will not be signed up, and no account will be created for you.": "Vous ne serez pas inscrit et aucun compte ne sera créé pour vous.",
-    "You will not be subscribed.": "Vous ne serez pas abonné.",
-    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Plus qu’une étape pour vous abonner à {{siteTitle}} — confirmez votre adresse e-mail avec ce lien :",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Merci pour votre abonnement à {{siteTitle}}. Cliquez le lien ci-dessous pour être connecté automatiquement :",
+    "This email address will not be used.": "Cette adresse email ne sera pas utilisée.",
+    "Welcome back to {{siteTitle}}!": "Heureux de vous revoir sur {{siteTitle}} !",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Quel plaisir de vous revoir ! Utilisez ce lien pour vous connecter en toute sécurité à votre compte {{siteTitle}} :",
+    "You can also copy & paste this URL into your browser:": "Vous pouvez aussi copier-coller cette URL dans votre navigateur :",
+    "You will not be signed up, and no account will be created for you.": "Vous ne serez pas inscrit-e et aucun compte ne sera créé pour vous.",
+    "You will not be subscribed.": "Vous ne serez pas abonné-e.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Plus qu’une étape pour vous abonner à {{siteTitle}} — confirmez votre adresse email avec ce lien :",
     "You're one tap away from subscribing to {{siteTitle}}!": "Plus qu’une étape pour vous abonner à {{siteTitle}} !"
 }
diff --git a/ghost/i18n/locales/fr/portal.json b/ghost/i18n/locales/fr/portal.json
index 0088e71e451..810b63bd301 100644
--- a/ghost/i18n/locales/fr/portal.json
+++ b/ghost/i18n/locales/fr/portal.json
@@ -1,33 +1,35 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "(économiser {{highestYearlyDiscount}}%)",
     "{{amount}} days free": "{{amount}} jours gratuits",
     "{{amount}} off": "{{amount}} de réduction",
     "{{amount}} off for first {{number}} months.": "{{amount}} de réduction pour les {{number}} premiers mois.",
-    "{{amount}} off for first {{period}}.": "{{amount}} de réduction pour le/la premier/ère {{period}}.",
+    "{{amount}} off for first {{period}}.": "{{amount}} de réduction pendant 1 {{period}}.",
     "{{amount}} off forever.": "{{amount}} de réduction permanente.",
     "{{discount}}% discount": "{{discount}}% de réduction",
     "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} ne recevra plus la newsletter {{newsletterName}}.",
-    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} ne recevra plus d'e-mails lorsque quelqu'un répond à vos commentaires.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} ne recevra plus d'emails lorsque quelqu'un répond à vos commentaires.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} ne recevra plus cette newsletter.",
     "{{trialDays}} days free": "{{trialDays}} jours gratuits",
-    "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 lien de connexion a été envoyé dans votre boîte de réception. S’il n’arrive pas dans les 3 minutes, vérifiez votre dossier spam.",
+    "+1 (123) 456-7890": "",
+    "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 lien de connexion a été envoyé dans votre boîte de réception. S’il n’arrive pas dans les 3 minutes, vérifiez votre dossier d'indésirables.",
     "Account": "Compte",
-    "Account settings": "Paramètres du compte",
-    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "À la fin de la période d’essai gratuite, le prix normal de l’abonnement choisi sera facturé. Vous pouvez toujours annuler d’ici là.",
+    "Account settings": "Paramètres de compte",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "À la fin de la période d’essai gratuite, le prix normal de l’abonnement choisi sera facturé. Vous pourrez toujours l'annuler d’ici là.",
     "Already a member?": "Déjà membre ?",
-    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Une erreur inattendue s'est produite. Veuillez réessayer ou <a>contacter le support</a> si l'erreur persiste.",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Une erreur inattendue s'est produite. Veuillez réessayer ou <a>écrire à l'assistance</a> si l'erreur persiste.",
     "Back": "Retour",
     "Back to Log in": "Retour à Connexion",
-    "Billing info": "Informations sur la facturation",
+    "Billing info": "Informations de facturation",
     "Black Friday": "Black Friday",
     "Cancel anytime.": "Annuler à tout moment.",
     "Cancel subscription": "Annuler l’abonnement",
     "Cancellation reason": "Raison de l’annulation",
     "Change": "Changer",
-    "Check spam & promotions folders": "Vérifiez les dossiers de spam et de promotion",
-    "Check with your mail provider": "Vérifiez auprès de votre fournisseur d'e-mail",
+    "Check spam & promotions folders": "Vérifiez les dossiers d'indésirables et de promotion",
+    "Check with your mail provider": "Vérifiez auprès de votre fournisseur d'email",
     "Choose": "Choisir",
     "Choose a different plan": "Choisir un autre abonnement",
-    "Choose your newsletters": "Choisir les newsletters",
+    "Choose your newsletters": "Choisir vos newsletters",
     "Click here to retry": "Cliquez ici pour réessayer",
     "Close": "Fermer",
     "Comments": "Commentaires",
@@ -35,121 +37,134 @@
     "Confirm": "Confirmer",
     "Confirm cancellation": "Confirmer l'annulation",
     "Confirm subscription": "Confirmer l'abonnement",
-    "Contact support": "Contacter le support",
+    "Contact support": "Écrire à l'assistance",
     "Continue": "Continuer",
-    "Continue subscription": "Continuer l'abonnement",
+    "Continue subscription": "Poursuivre l'abonnement",
     "Could not sign in. Login link expired.": "Impossible de se connecter. Le lien de connexion a expiré.",
-    "Could not update email! Invalid link.": "Impossible de mettre à jour l'e-mail ! Lien invalide.",
+    "Could not update email! Invalid link.": "Impossible de mettre à jour l'email ! Le lien est invalide.",
     "Create a new contact": "Créer un nouveau contact",
     "Current plan": "Abonnement actuel",
     "Delete account": "Supprimer le compte",
-    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Vous ne vouliez pas faire ça ? Gérez vos préférences <button>ici</button>.",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Vous ne vouliez pas faire cela ? Gérez vos préférences <button>ici</button>.",
     "Don't have an account?": "Vous n’avez pas encore de compte ?",
     "Edit": "Modifier",
-    "Email": "E-mail",
-    "Email newsletter": "E-mail de la newsletter",
-    "Email preference updated.": "Préférences d’e-mail mises à jour.",
-    "Email preferences": "Préférences d’e-mail",
-    "Emails": "E-mails",
-    "Emails disabled": "E-mails désactivés",
+    "Email": "Email",
+    "Email newsletter": "Email de la newsletter",
+    "Email preferences": "Préférences email",
+    "Emails": "Emails",
+    "Emails disabled": "Emails désactivés",
     "Ends {{offerEndDate}}": "Se termine le {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Erreur",
     "Expires {{expiryDate}}": "Expire le {{expiryDate}}",
     "Forever": "Permanent",
     "Free Trial – Ends {{trialEnd}}": "Essai gratuit - Se termine le {{trialEnd}}",
     "Get help": "Obtenir de l’aide",
-    "Get in touch for help": "Contactez-nous pour obtenir de l'aide",
+    "Get in touch for help": "Écrivez-nous pour obtenir de l'aide",
     "Get notified when someone replies to your comment": "Recevez une notification lorsque quelqu’un répond à votre commentaire",
     "Give feedback on this post": "Donnez votre avis sur cet article",
-    "Help! I'm not receiving emails": "À l'aide ! Je ne reçois pas d'e-mails",
-    "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.": "Si une newsletter est signalée comme étant du spam, les e-mails sont automatiquement désactivés pour cette adresse afin que vous ne receviez plus de messages indésirables.",
-    "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.": "Si le signalement spam était accidentel, ou si vous voulez de nouveau recevoir les e-mails, vous pouvez vous réinscrire aux e-mails en cliquant sur le bouton sur la page précédente.",
-    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Si vous annulez votre abonnement maintenant, vous continuerez à y avoir accès jusqu'au {{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}}": "Si vous avez un compte e-mail d'entreprise ou gouvernenmental, contactez votre service informatique et demandez leur d'autoriser les e-mails provenant de {{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.": "Si vous voulez à nouveau recevoir les e-mails, la meilleure chose à faire est de vérifier votre toute erreur liée à l'adresse e-mail renseignée, puis de cliquer sur réinscription sur la page précédente.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Si vous ne recevez pas la newsletter par e-mail à laquelle vous vous êtes abonné, voici quelques points à vérifier.",
-    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Si vous avez complété toutes ces étapes et ne recevez toujours pas d'e-mails, vous pouvez nous contacter à {{supportAddress}} pour obtenir de l'aide.",
-    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Si une erreur persistante est reçue lors de la tentative d'envoi de la newsletter, les e-mails seront désactivés pour le compte.",
-    "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.": "Dans votre client de messagerie, ajoutez {{senderEmail}} à votre liste de contacts. Cela signale à votre fournisseur de messagerie que les e-mails provenant de cette adresse doivent être considérés comme dignes de confiance.",
-    "Less like this": "Moins de contenu similaire",
-    "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\".": "Assurez-vous que les e-mails ne finissent pas accidentellement dans le dossier Spam ou Promotions de votre boîte de réception. Si c'est le cas, cliquez sur \"Marquer en tant que non-indésirable\" et/ou \"Déplacer vers la boîte de réception\".",
+    "Help! I'm not receiving emails": "À l'aide ! Je ne reçois pas d'emails",
+    "Here are a few other sites you may enjoy.": "Voici d'autres sites qui pourraient vous intéresser.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Si une newsletter est signalée comme spam, les emails provenant de cette adresse seront automatiquement désactivés afin que vous ne receviez plus de messages indésirables.",
+    "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.": "Si le signalement spam était accidentel ou que vous souhaitiez de nouveau recevoir les newsletters, vous pourrez vous réinscrire en cliquant sur le bouton de la page précédente.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Si vous annulez votre abonnement maintenant, vous pourrez encore y accéder jusqu'au {{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}}": "Si vous avez un compte email commercial ou gouvernenmental, demandez à votre service informatique d'autoriser les emails provenant de {{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.": "Si vous souhaitiez à nouveau recevoir les emails, le mieux serait de vérifier toute erreur sur le compte de l'adresse email renseignée, puis de cliquer Réinscription sur la page précédente.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Si vous ne recevez pas la newsletter à l'adresse indiquée, voici quelques points à vérifier.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Si vous avez complété toutes ces étapes et ne recevez toujours pas d'emails, veuillez nous écrire à {{supportAddress}} pour obtenir de l'aide.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Si une erreur persistante est reçue lors de la tentative d'envoi de la newsletter, les e-mails seront désactivés pour ce compte.",
+    "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.": "Dans votre client de messagerie, ajoutez {{senderEmail}} à votre liste de contacts. Cela signalera à votre fournisseur de messagerie que les emails provenant de cette adresse doivent être considérés dignes de confiance.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
+    "Less like this": "Moins de contenus similaires",
+    "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\".": "Assurez-vous que les emails ne finissent pas accidentellement dans le dossier Indésirables ou Promotions de votre boîte de réception. Si c'était le cas, cliquez sur \"Marquer en tant que désirable\" et/ou \"Déplacer vers la boîte de réception\".",
     "Manage": "Gérer",
-    "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Maybe later": "Peut-être plus tard",
+    "Memberships unavailable, contact the owner for access.": "Abonnements non disponibles. Veuillez prendre contact avec le propriétaire pour y accéder.",
     "Monthly": "Mensuel",
-    "More like this": "Plus de contenu similaire",
+    "More like this": "Davantage de contenus similaires",
     "Name": "Nom",
-    "Need more help? Contact support": "Besoin d'aide? Contactez le 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).": "Les newsletters peuvent être désactivés pour votre compte pour deux raisons : un précédent e-mail a été marqué en tant que spam, ou une tentative d'envoi d'e-mail a résulté en une erreur persistante (renvoi).",
-    "Not receiving emails?": "Vous n’avez pas reçu d’e-mails ?",
-    "Now check your email!": "Veuillez maintenant vérifier votre boite de réception.",
-    "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.": "Une fois réinscrit, si vous ne voyez toujours pas d'e-mails dans votre boîte de réception, vérifiez votre dossier spam. Certains fournisseurs garde en mémoire les précédents signalements spams et continue de marquer les e-mails comme tels. Si tel est le cas, marquez la dernière newsletter comme 'non-indésirable' et déplacez-là vers votre boîte de réception.",
+    "Need more help? Contact support": "Besoin d'aide? Écrivez à l'assistance",
+    "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).": "Les newsletters peuvent être désactivées de votre compte pour deux raisons : un précédent email a été marqué indésirable ou une tentative d'envoi d'email a entrapiné en une erreur persistante (renvoi).",
+    "Not receiving emails?": "Vous n’avez pas reçu d’emails ?",
+    "Now check your email!": "Veuillez vérifier votre boîte de réception.",
+    "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.": "Après vote résinscription, si vous ne voyez toujours pas d'emails dans votre boîte de réception, veuillez vérifier votre dossier d'indésirables. Certains fournisseurs gardent en mémoire les précédents signalements et continuent de marquer ces emails comme indésirables. Si tel était le cas, veuillez signaler la dernière newsletter comme 'désirable' et placez-la dans votre boîte de réception.",
     "Permanent failure (bounce)": "Erreur persistante (renvoi)",
+    "Phone number": "",
     "Plan": "Abonnement",
     "Plan checkout was cancelled.": "Le paiement de l'abonnement a été annulé.",
     "Plan upgrade was cancelled.": "La mise à niveau de l'abonnement a été annulée.",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Veuillez écrire à {{supportAddress}} pour réctifier votre abonnement gratuit.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Veuillez remplir les champs requis",
     "Price": "Prix",
-    "Re-enable emails": "Ré-activer les e-mails",
-    "Recommendations": "",
+    "Re-enable emails": "Réactiver les emails",
+    "Recommendations": "Suggestions",
     "Renews at {{price}}.": "Renouvellement pour {{price}}.",
-    "Retry": "Réesayer",
+    "Retry": "Réessayer",
     "Save": "Sauvegarder",
-    "Send an email and say hi!": "Envoyez un e-mail et dites bonjour !",
-    "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.": "Envoyez un e-mail à {{senderEmail}} et dites bonjour ! Cela devrait également signaler à votre fournisseur de messagerie que les e-mails depuis/vers cette adresse doivent être considérés comme dignes de confiance.",
+    "Send an email and say hi!": "Envoyez un email et dites bonjour !",
+    "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.": "Envoyez un email à {{senderEmail}} et dites-lui bonjour ! Cela devrait signaler à votre fournisseur de messagerie que les échanges avec cette adresse peuvent être considérés dignes de confiance.",
     "Sending login link...": "Envoi du lien de connexion…",
-    "Sending...": "Envoi…",
-    "Show all": "",
+    "Sending...": "Envoi en cours…",
+    "Show all": "Tout afficher",
     "Sign in": "Se connecter",
     "Sign out": "Se déconnecter",
     "Sign up": "S’inscrire",
-    "Signup error: Invalid link": "Erreur d'inscription : lien invalide",
+    "Signup error: Invalid link": "Erreur lors de l'inscription : le lien est invalide",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Désolé, cela n'a pas fonctionné.",
-    "Spam complaints": "Signalements pour spam",
+    "Spam complaints": "Signalements d'indésirables",
     "Start {{amount}}-day free trial": "Commencer l’essai gratuit de {{amount}} jours",
     "Starting {{startDate}}": "À partir du {{startDate}}",
     "Starting today": "À partir d'aujourd'hui",
     "Submit feedback": "Envoyez votre avis",
     "Subscribe": "S'abonner",
-    "Subscribed": "Abonné(e)",
-    "Success": "Succès",
-    "Success! Check your email for magic link to sign-in.": "Succès ! Vérifiez votre boîte de réception pour le lien de connexion.",
-    "Success! Your account is fully activated, you now have access to all content.": "Succès ! Votre compte est entièrement activé, et vous avez désormais accès à tout le contenu.",
-    "Success! Your email is updated.": "Succès ! Votre adresse e-mail a été mise à jour.",
+    "Subscribed": "Abonné-e",
+    "Success": "Réussi",
+    "Success! Check your email for magic link to sign-in.": "C'est fait ! Vérifiez votre boîte de réception pour le lien de connexion.",
+    "Success! Your account is fully activated, you now have access to all content.": "Ça y est ! Votre compte est entièrement activé et vous avez désormais accès à tout le contenu.",
+    "Success! Your email is updated.": "Votre adresse email a bien été mise à jour.",
     "Successfully unsubscribed": "Désabonnement réussi",
-    "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.": "Merci pour votre abonnement. Avant de commencer à lire, voici quelques sites qui pourraient vous intéresser.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Merci pour votre avis !",
     "That didn't go to plan": "Cela n’a pas fonctionné comme prévu",
-    "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>.": "L'adresse e-mail qui vous est associée est {{memberEmail}} — Si celle-ci est incorrecte, vous pouvez la modifier dans votre <button>espace paramètres de compte</button>",
+    "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>.": "L'adresse email qui nous a été indiquée est {{memberEmail}} — Si celle-ci est incorrecte, vous pourrez la modifier dans <button>Paramètres de compte</button>",
     "There was a problem submitting your feedback. Please try again a little later.": "Un problème est survenu lors de la soumission de votre commentaire. Veuillez réessayer un peu plus tard.",
-    "This site is invite-only, contact the owner for access.": "Ce site est réservé aux invités, contactez le propriétaire pour y accéder.",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pour confirmer votre inscription, cliquez sur le lien de confirmation envoyé dans votre boite de réception. S’il ne vous parvient pas dans les 3 minutes, vérifiez votre dossier spam.",
+    "There was an error processing your payment. Please try again.": "",
+    "This site is invite-only, contact the owner for access.": "Ce site est réservé aux invités. Veuillez écrire au propriétaire pour en demander l'accès.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pour confirmer votre inscription, veuillez cliquer le lien de confirmation dans l'email que vous allez recevoir. S’il ne vous parvient pas dans les 3 minutes, vérifiez votre dossier d'indésirables.",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Essayez gratuitement pendant {{amount}} jours, puis {{originalPrice}}.",
-    "Unlock access to all newsletters by becoming a paid subscriber.": "Débloquez l'accès à toutes les newsletters en devenant un abonné payant.",
-    "Unsubscribe from all emails": "Se désinscrire de tous les e-mails",
-    "Unsubscribed": "Désabonné(e)",
-    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "La désinscription des e-mails n’annulera pas votre abonnement payant à {{title}}",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Débloquez l'accès à toutes les newsletters en souscrivant un abonnement payant.",
+    "Unsubscribe from all emails": "Se désabonner de tous les emails",
+    "Unsubscribed": "Désabonné-e",
+    "Unsubscribed from all emails.": "Se désabonner de tous les emails",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Le désabonnement aux emails n’annulera pas votre abonnement payant à {{title}}",
     "Update": "Mise à jour",
-    "Update your preferences": "Mettez à jour vos préférences",
-    "Verification link sent, check your inbox": "",
-    "Verify your email address is correct": "Vérifiez que votre adresse e-mail est correcte",
-    "View plans": "Voir les abonnements",
-    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "La désinscription n’a pas fonctionné car votre adresse e-mail n’a pas été trouvée. Veuillez contacter le propriétaire du site.",
-    "Welcome back, {{name}}!": "Bon retour parmi nous, {{name}} !",
-    "Welcome back!": "Bon retour parmi nous !",
-    "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.": "Lorsqu'une boîte de réception n'accepte pas un e-mail, on parle communément d'un renvoi. Dans beaucoup de cas, cela peut être temporaire. Cependant, dans certains cas, un e-mail renvoyé peut être accompagné d'une erreur persistante, lorsqu'une adresse e-mail est invalide ou inexistante.",
-    "Why has my email been disabled?": "Pourquoi mon e-mail a-t-il été désactivé ?",
+    "Update your preferences": "Mettre à jour vos préférences",
+    "Verification link sent, check your inbox": "Lien de confirmation envoyé. Veuillez vérifier votre boîte de réception.",
+    "Verify your email address is correct": "Veuillez vérifiez que votre adresse email est bien correcte",
+    "View plans": "Consulter les abonnements",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "La désinscription n’a pas fonctionné car votre adresse email n’a pas été trouvée. Veuillez prendre contact avec propriétaire du site.",
+    "Welcome back, {{name}}!": "Content de vous revoir, {{name}} !",
+    "Welcome back!": "Quel plaisir de vous revoir !",
+    "Welcome to {{siteTitle}}": "Bienvenue sur {{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.": "Lorsqu'une boîte de réception n'accepte pas un -mail, on parle communément d'un renvoi. Souvent, cela peut être temporaire. Cependant, dans certains cas, cet email peut être accompagné d'une erreur persistante lorsque l'adresse e-mail est invalide ou inexistante.",
+    "Why has my email been disabled?": "Pourquoi mon email a-t-il été désactivé ?",
     "Yearly": "Annuel",
-    "You currently have a free membership, upgrade to a paid subscription for full access.": "Vous avez actuellement un abonnement gratuit, passez à un abonnement payant pour un accès complet.",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Vous avez actuellement un abonnement gratuit. Passez à un abonnement payant pour un accès complet.",
     "You have been successfully resubscribed": "Vous avez été réinscrit avec succès",
-    "You're currently not receiving emails": "Vous ne recevez actuellement pas d'e-mails",
-    "You're not receiving emails": "Vous ne recevez pas d'e-mails",
-    "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.": "Vous ne recevez pas d’e-mails parce que vous avez marqué un message récent comme spam, ou parce que les messages n’ont pas pu être livrés à l’adresse e-mail que vous aviez indiquée.",
+    "You're currently not receiving emails": "Vous ne recevez actuellement pas d'emails",
+    "You're not receiving emails": "Vous ne recevez pas d'emails",
+    "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.": "Vous ne recevez pas d’emails car vous avez probablement signalé un email récent comme indésirable ou parce que les emails n’ont pas pu être livrés à l’adresse que vous avez indiquée.",
     "You've successfully signed in.": "Vous vous êtes connecté avec succès.",
-    "You've successfully subscribed to": "",
+    "You've successfully subscribed to": "Vous vous êtes abonné à",
     "Your account": "Votre compte",
     "Your input helps shape what gets published.": "Votre avis aide à améliorer ce qui est publié.",
     "Your subscription will expire on {{expiryDate}}": "Votre abonnement expirera le {{expiryDate}}",
diff --git a/ghost/i18n/locales/fr/signup-form.json b/ghost/i18n/locales/fr/signup-form.json
index 34af562d844..f1868425e64 100644
--- a/ghost/i18n/locales/fr/signup-form.json
+++ b/ghost/i18n/locales/fr/signup-form.json
@@ -1,9 +1,9 @@
 {
-    "Email sent": "E-mail envoyé",
-    "Now check your email!": "Maintenant, vérifiez votre boîte de réception !",
-    "Please enter a valid email address": "Veuillez renseigner une adresse e-mail valide",
-    "Something went wrong, please try again.": "Un problème est survenu, veuillez réessayer.",
+    "Email sent": "Email envoyé",
+    "Now check your email!": "Veuillez consulter votre boîte de réception.",
+    "Please enter a valid email address": "Veuillez renseigner une adresse email valide",
+    "Something went wrong, please try again.": "Un problème est survenu. Veuillez réessayer.",
     "Subscribe": "S'abonner",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pour terminer l'inscription, cliquez sur le lien de confirmation dans votre boîte de réception. S'il n'arrive pas dans les 3 minutes, vérifiez votre dossier de spam !",
-    "Your email address": "Votre adresse e-mail"
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Pour terminer l'inscription, cliquez sur le lien de confirmation dans l'email qui vient de vous être adressé. S'il n'arrive pas dans les 3 minutes, vérifiez votre dossier d'indésirables !",
+    "Your email address": "Votre adresse email"
 }
diff --git a/ghost/i18n/locales/gd/comments.json b/ghost/i18n/locales/gd/comments.json
new file mode 100644
index 00000000000..58d31b529d8
--- /dev/null
+++ b/ghost/i18n/locales/gd/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{amount}} characters left": "caractaran air fhàgail: {{amount}}",
+    "{{amount}} comments": "beachdan: {{amount}}",
+    "{{amount}} days ago": "o chionn {{amount}}l",
+    "{{amount}} hours ago": "o chionn {{amount}}u",
+    "{{amount}} minutes ago": "o chionn {{amount}}m",
+    "{{amount}} months ago": "o chionn {{amount}}m",
+    "{{amount}} more": "{{amount}} a bharrachd",
+    "{{amount}} seconds ago": "o chionn {{amount}}d",
+    "{{amount}} weeks ago": "o chionn {{amount}}s",
+    "{{amount}} years ago": "o chionn {{amount}}b",
+    "1 comment": "1 bheachd",
+    "Add comment": "Fàg beachd air",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Cuir co-theacsa ris a' bheachd agad, cuir d' ainm is sàr-eòlas ris gus deasbad fallain a brosnachadh.",
+    "Add reply": "Cuir freagairt ris",
+    "Already a member?": "’Eil thu nad bhall mar-thà?",
+    "Anonymous": "Gun ainm",
+    "Become a member of {{publication}} to start commenting.": "Clàraich nad bhall an làrach-lìn, {{publication}}, gus beachd fhàgail air.",
+    "Become a paid member of {{publication}} to start commenting.": "Clàraich nad bhall phrìomhach an làrach-lìn, {{publication}}, gus beachd fhàgail air.",
+    "Cancel": "Sguir dheth",
+    "Comment": "Beachd",
+    "Complete your profile": "Lìon a-steach a' phròifil agad",
+    "Delete": "Sguab às",
+    "Deleted member": "Ball air a sguabadh às",
+    "Discussion": "Deasbad",
+    "Edit": "Deasaich",
+    "Edit this comment": "Deasaich am beachd seo",
+    "Edited": "Air a dheasachad",
+    "Enter your name": "Cuir a-steach d’ ainm",
+    "Expertise": "Sàr-eòlas",
+    "Founder @ Acme Inc": "Neach-stèidheachaidh @ Acme Inc",
+    "Full-time parent": "Pàrant làn-ùine",
+    "Head of Marketing at Acme, Inc": "Àrd-cheann Margaidheachd aig Acme, Inc",
+    "Hide": "Cuir am falach",
+    "Hide comment": "Cuir am beachd am falach",
+    "Jamie Larson": "Seamaidh Larson",
+    "Join the discussion": "Gabh pàirt san deasbad",
+    "Just now": "An-dràsta",
+    "Local resident": "Neach-còmhnaidh ionadail",
+    "Member discussion": "Deasbad",
+    "Name": "Ainm",
+    "Neurosurgeon": "Niùro-làmh-lèigh",
+    "One day ago": "O chionn latha",
+    "One hour ago": "O chionn uair a thìde",
+    "One minute ago": "O chionn mionaid",
+    "One month ago": "O chionn mìos",
+    "One week ago": "O chionn seachdain",
+    "One year ago": "O chionn bliadhna",
+    "Reply": "Cuir freagairt",
+    "Reply to comment": "Cuir freagaist ri beachd",
+    "Report": "Dèan aithris air",
+    "Report comment": "Dèan aithris air beachd",
+    "Report this comment": "Dèan aithris air a’ bheachd seo",
+    "Report this comment?": "’Eil thu airson aithris a dhèanamh air a’ bheachd seo?",
+    "Save": "Sabhail",
+    "Sending": "’Ga chur",
+    "Sent": "Air a chur",
+    "Show": "Seall",
+    "Show {{amount}} more replies": "An àireamh de bheachdan a bharrachd a chìthear: {{amount}}",
+    "Show {{amount}} previous comments": "An àireamh de bheachdan roimhe a chìthear: {{amount}}",
+    "Show 1 more reply": "Seall beachd a bharrachd",
+    "Show 1 previous comment": "Seall am beachd roimhe",
+    "Show comment": "Seall am beachd",
+    "Sign in": "Clàraich a-steach",
+    "Sign up now": "Clàraich a-nis",
+    "Start the conversation": "Tòisich an deasbad",
+    "This comment has been hidden.": "Chaidh am beachd seo a chur am falach.",
+    "This comment has been removed.": "Chaidh am beachd seo a sguabadh às.",
+    "Upgrade now": "Àrdaich a-nis",
+    "Yesterday": "An-dè",
+    "You want to report this comment?": "A bheil thu airson aithris a dhèanamh air a’ bheachd seo?",
+    "Your request will be sent to the owner of this site.": "Thèid an iarrtas agad a chur gu neach-seilbh an làrach-lìn seo."
+}
diff --git a/ghost/i18n/locales/gd/ghost.json b/ghost/i18n/locales/gd/ghost.json
new file mode 100644
index 00000000000..b4312d2d1ca
--- /dev/null
+++ b/ghost/i18n/locales/gd/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Meal do shlàinte!",
+    "Complete signup for {{siteTitle}}!": "Coilean an clàradh ris an làrach-lìn, {{siteTitle}}!",
+    "Complete your sign up to {{siteTitle}}!": "Coilean an clàradh agad ris an làrach-lìn, {{siteTitle}}!",
+    "Confirm email address": "Dearbhaich am post-d",
+    "Confirm signup": "Dearbhaich an clàradh",
+    "Confirm your email address": "Dearbhaich am post-d agad",
+    "Confirm your email update for {{siteTitle}}!": "Dearbhaich gu bheil thu airson am post a chleachdas tu air {{siteTitle}} ùrachadh!",
+    "Confirm your subscription to {{siteTitle}}": "Deabhaich gu bheil thu airson fo-sgìobhadh ri ùrachaidhean bho {{siteTitle}}",
+    "For your security, the link will expire in 24 hours time.": "Cha mair an ceangal nas fhaide na 24 uair a thìde.",
+    "Hey there,": "Halò,",
+    "Hey there!": "Halò!",
+    "If you did not make this request, you can safely ignore this email.": "Faodaidh tu leigeil seachad air a' phost-d seo mura dh'iarr thu e.",
+    "If you did not make this request, you can simply delete this message.": "Faodaidh tu am post-d sguabadh às mura dh'iarr thu e.",
+    "Please confirm your email address with this link:": "Dearbhaich am post-d agad leis a' cheangal seo:",
+    "Secure sign in link for {{siteTitle}}": "Ceangal tèarainte airson clàradh a-steach ris an làrach-lìn, {{siteTitle}}",
+    "See you soon!": "Tìoraidh an-dràsta!",
+    "Sent to {{email}}": "Cuir gu {{email}}",
+    "Sign in": "Clàraich a-steach",
+    "Sign in to {{siteTitle}}": "Clàraich a-steach dhan làrach-lìn, {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Dèan briog air a' cheangal gu h-ìosal gus dearbhadh gu bheil thu airson cunntas a chlàradh air an làrach-lìn, {{siteTitle}}, agus thèid do chlàradh a-steach gu fèin-obrachail",
+    "Thank you for signing up to {{siteTitle}}!": "Mòran taing airson cunntas a chlàradh air an làrach-lìn, {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "Mòran taing airson fo-sgrìobhadh ris an làrach-lìn, {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "Mòran taing airson fo-sgrìobhadh ris an làrach-lìn, {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Mòran taing airson fo-sgrìobhadh ris an làrach-lìn, {{siteTitle}}. Dèan briog air a' cheangal gu h-ìosal gus clàradh a-steach:",
+    "This email address will not be used.": "Cha tèid am post-d seo a chleachdadh.",
+    "Welcome back to {{siteTitle}}!": "Fàilte air ais dhan làrach-lìn, {{siteTitle}}",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Fàilte air ais! Cleachd an ceangail seo gus clàradh a-steach dhan chunntas agad air an làrach-lìn, {{siteTitle}}:",
+    "You can also copy & paste this URL into your browser:": "Dèan leth-bhreac air a' cheangal seo, agus 's urrainn dhut a chur a-steach dhan bhrabhsair agad:",
+    "You will not be signed up, and no account will be created for you.": "Cha clàraich thu cunntas.",
+    "You will not be subscribed.": "Cha fo-sgrìobh thu.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Chan eil ach aon cheum ri dhol a-nis gus fo-sgrìobhadh ris an làrach-lìn, {{siteTitle}}, dearbhaich am post-d agad leis a' cheangal seo:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Chan eil ach aon cheum ri dhol a-nis gus fo-sgrìobhadh ris an làrach-lìn, {{siteTitle}}!"
+}
diff --git a/ghost/i18n/locales/gd/portal.json b/ghost/i18n/locales/gd/portal.json
new file mode 100644
index 00000000000..6e11b42370b
--- /dev/null
+++ b/ghost/i18n/locales/gd/portal.json
@@ -0,0 +1,173 @@
+{
+    "(save {{highestYearlyDiscount}}%)": "",
+    "{{amount}} days free": "{{amount}}l an-asgaidh",
+    "{{amount}} off": "{{amount}} dheth",
+    "{{amount}} off for first {{number}} months.": "{{amount}} dheth fad {{number}}m",
+    "{{amount}} off for first {{period}}.": "{{amount}} dheth fad a’ chiad {{period}}",
+    "{{amount}} off forever.": "{{amount}} dheth gu bràth",
+    "{{discount}}% discount": "lasachadh {{discount}}%",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "Chan fhaigh {{memberEmail}} a’ chuairt-litir, {{newsletterName}} tuilleadh.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "Chan fhaigh {{memberEmail}} post-d nuair a bhios freagairtean ùra ann.",
+    "{{memberEmail}} will no longer receive this newsletter.": "Chan fhaigh {{memberEmail}} a’ chuairt-litir seo tuilleadh.",
+    "{{trialDays}} days free": "{{trialDays}}l an-asgaidh",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Chaidh ceangal a chur dhan phost-d agad. Thoir sùil air a’ phasgan spama mura faigh thu taobh a-staigh 3 mionaidean e.",
+    "Account": "Cunntas",
+    "Account settings": "Roghainnean",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Bidh agad ri pàigheadh nuair a dh’fhalbhachas an ùine air an tionndadh triail agad. Faodaidh tu ga sguir dheth ron a shin ge-tà.",
+    "Already a member?": "’Eil thu nad bhall mar-thà?",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Thachair mearachd. Feuch a-rithist, no <a>leig fios dhan sgioba-taice</a>.",
+    "Back": "Air air",
+    "Back to Log in": "Thill gus clàradh a-steach",
+    "Billing info": "Fiosrachadh bileachaidh",
+    "Black Friday": "Black Friday",
+    "Cancel anytime.": "Sguir dheth uair sam bith",
+    "Cancel subscription": "Sguir dhen fo-sgrìobhadh",
+    "Cancellation reason": "Adbhar airson sguir dheth",
+    "Change": "Atharraich",
+    "Check spam & promotions folders": "Thoir sùil air a’ phasgan spama / margaidheachd agad",
+    "Check with your mail provider": "Faighnich air solaraiche a’ phuist-d agad",
+    "Choose": "Tagh",
+    "Choose a different plan": "Tagh plana eile",
+    "Choose your newsletters": "Tagh na cuairt-litrichean agad",
+    "Click here to retry": "Briog an seo gus feuchainn a-rithist",
+    "Close": "Dùin",
+    "Comments": "Beachdan",
+    "Complimentary": "An-asgaidh",
+    "Confirm": "Dearbhaich",
+    "Confirm cancellation": "Deabhaich gu bheil thu airson sguir dheth",
+    "Confirm subscription": "Dearbhaich am fo-sgrìobhadh",
+    "Contact support": "Leig fios dhan sgioba-taice",
+    "Continue": "Lèan ort",
+    "Continue subscription": "Cùm am fo-sgrìobhadh a’ dol",
+    "Could not sign in. Login link expired.": "Chan urrainn dhut clàradh a-steach. Dh’fhalbh an ùine air a’ cheangal a lean thu.",
+    "Could not update email! Invalid link.": "Cha do ghabh am post-d ùrachadh! Ceangal mì-dhligheach",
+    "Create a new contact": "Cruthaich neach-aithne ùr",
+    "Current plan": "Am plana làithreach",
+    "Delete account": "Sguab às an cunntas",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "An robh thu airson seo a dhèanamh? Rianaich <button>na roghainnean agad</button>.",
+    "Don't have an account?": "Nach eil cunntas agad?",
+    "Edit": "Deasaich",
+    "Email": "Post-d",
+    "Email newsletter": "Cuairt-litir",
+    "Email preferences": "Roghainnean puist-d",
+    "Emails": "Puist-d",
+    "Emails disabled": "Puist-d à comas",
+    "Ends {{offerEndDate}}": "Falbhaidh an ùine air: {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "Error": "Mearachd",
+    "Expires {{expiryDate}}": "Falbhaidh an ùine air: {{expiryDate}}",
+    "Forever": "Gu bràth",
+    "Free Trial – Ends {{trialEnd}}": "Falbhaidh an ùine air an tionndadh triail an-asgadh: {{trialEnd}}",
+    "Get help": "Iarr cobhair",
+    "Get in touch for help": "Iarr cobhair",
+    "Get notified when someone replies to your comment": "Faigh brath nuair a bhios freagairtean ùra ris a’ bheachd agad",
+    "Give feedback on this post": "Fàg beachd air a’ phost seo",
+    "Help! I'm not receiving emails": "Cuidich mi! Chan eil mi a’ faighinn puist-d",
+    "Here are a few other sites you may enjoy.": "Seo agad grunn làraichean-lìn eile a dh’fhaodadh a bhith còrdadh riut.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Ma chomharras tu post-d mar spama, thèid bacadh a chur air an seòladh gu fèin-ghluasadach gus dèanamh cinnteach nach faigh thu puist-d a bharrachd nach eil thu ag iarraidh.",
+    "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.": "Ma tha thu airson puist-d fhaighinn a-rithist, faodaidh tu fo-sgrìobhadh a-rithist le bhith a’ briogadh air a’ cheangail air an duilleag roimhe.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ma chuireas tu stad air a’ bhallrachd agad, bidh cothrom inntrididh agad air gu ruige: {{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}}": "Ma tha post-d corparra agad, dh’fhaodadh gu bheil agad ri innse dhan sgioba IT agad puist-d bho {{senderEmail}} a cheadachadh.",
+    "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.": "Ma tha thu airson puist-d fhaighinn a-rithist, faodaidh tu fo-sgrìobhadh a-rithist le bhith a’ briogadh air a’ cheangail air an duilleag roimhe.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Thoir sùil air na rudan na leanas mura h-eil thu a’ faighinn puist-d.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Leig fios gu {{supportAddress}} mura h-eil thu a’ faighinn puist-d an dèidh sùil a thoirt air na rudan seo.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Thèid puist-d a chur à comas ma thacras mearachd seasmhach.",
+    "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.": "Cuir {{senderEmail}} ri liosta nan luchd-aithne agad agus cuidichidh seo le bhith ag innse don t-solaraiche puist-d agad gur e seòladh post-d earbsach a tha seo.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
+    "Less like this": "Nas lugha mar seo",
+    "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\".": "Dh’fhaodadh gu bheil puist-d a’ dol dhan phasgan spama / margaidheachd agad. Ma tha, Comharraich \"nach e spama\" a th’ annta no briog air \"gluais dhan bhogsa a-steach\".",
+    "Manage": "Rianaich",
+    "Maybe later": "’S mathaid an ceann greis",
+    "Memberships unavailable, contact the owner for access.": "Leig fios dhan rianaire airson cothrom fhaighinn air na ballrachdan.",
+    "Monthly": "Gach mìos",
+    "More like this": "Barrachd mar seo",
+    "Name": "Ainm",
+    "Need more help? Contact support": "’Eil thu feumach air barrachd chobhair? Leig fios dhan sgioba-taice",
+    "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).": "Dh’fhaodadh gu bheil cuairt-litrichean à comas air sgàth ’s gun deach post-d roimhe a chomharradh mar spama, no air sgàth ’s nach do ghabh e a lìbhreachadh.",
+    "Not receiving emails?": "Nach eil thu a’ faighinn puist-d?",
+    "Now check your email!": "Thoir sùil air a’ phost-d agad",
+    "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.": "Thoir sùil air a’ phasgan spama agad mura faigh thu puist-d aon uair ’s gu bheil thu air fo-sgrìobhadh a-rithist. Cumaidh cuid de sholaraichean puist de chlàr de sheann ghearanan spama agus ma dh’fhaoidte gu bheil iad fhathast gan comharradh mar spama. Comharraich \"nach e spama\" a th’ annta gus an gluasad air ais dhan bhogsa a-steach agad.",
+    "Permanent failure (bounce)": "Fàilleadh maireannach",
+    "Phone number": "",
+    "Plan": "Plana",
+    "Plan checkout was cancelled.": "Chaidh an t-ordugh a chur dheth.",
+    "Plan upgrade was cancelled.": "Chaidh an t-àrdachadh a chur dheth.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Leig fios gu {{supportAddress}} gus am fo-sgrìobhadh an-asgaidh a atharrachadh.",
+    "Please enter {{fieldName}}": "",
+    "Please fill in required fields": "Lìon a-steach na raointean riatanach",
+    "Price": "Prìs",
+    "Re-enable emails": "Cuir an comas puist-d a-rithist",
+    "Recommendations": "Mòlaidhean",
+    "Renews at {{price}}.": "Prìs ath-nuadhachaidh: {{price}}",
+    "Retry": "Feuch a-rithist",
+    "Save": "Sàbhail",
+    "Send an email and say hi!": "Cuir post-d is can halò!",
+    "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.": "Cuir post-d gu {{senderEmail}} is can halò. Cuidichidh seo le bhith ag innse don t-solaraiche puist-d agad gur e seòladh post-d earbsach a tha seo.",
+    "Sending login link...": "A’ cur ceangal clàraidh a-steach...",
+    "Sending...": "’Ga chur...",
+    "Show all": "Seall na h-uile",
+    "Sign in": "Clàraich a-steach",
+    "Sign out": "Clàraich a-mach",
+    "Sign up": "Clàraich",
+    "Signup error: Invalid link": "Mearachd: Ceangal mì-dhligheach",
+    "Something went wrong, please try again later.": "",
+    "Sorry, that didn’t work.": "Duilich, cha do dh’obraich sin.",
+    "Spam complaints": "Gearanan spama",
+    "Start {{amount}}-day free trial": "Cleachd tionndadh triail fad {{amount}}l",
+    "Starting {{startDate}}": "A’ tòiseachadh: {{startDate}}",
+    "Starting today": "A’ tòiseachadh an-diugh",
+    "Submit feedback": "Fàg beachd air",
+    "Subscribe": "Fo-sgrìobh",
+    "Subscribed": "Air fho-sgrìobhadh",
+    "Success": "Dèanta",
+    "Success! Check your email for magic link to sign-in.": "Dèanta! Thoir sùil air a’ phost-d agad airson a’ cheangal clàraidh a-steach.",
+    "Success! Your account is fully activated, you now have access to all content.": "Dèanta! Chaidh an cunntas agad a chur an gnìomh agus tha cothrom-inntrigidh agad air a h-uile rud a-nis.",
+    "Success! Your email is updated.": "Dèanta! Chaidh am post-d agad ùrachadh.",
+    "Successfully unsubscribed": "Chan eil thu a’ fo-sgrìobhadh tuilleadh.",
+    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Tapadh leat airson fo-sgrìobhadh. Tha grunn làraich eil gu h-ìosal a dh’fhaodadh a bhith còrdadh riut.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
+    "Thanks for the feedback!": "Mòran taing airson leigeil fios.",
+    "That didn't go to plan": "Cha deach sin mar bu chòir",
+    "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>.": "’S e {{memberEmaill}} am post-d a th’ againn dhut - faodaidh tu a cheartachadh anns na <button>roghainnean</button> agad.",
+    "There was a problem submitting your feedback. Please try again a little later.": "Chaidh rudeigin ceàrr. Feuch a-rithist an ceann greis",
+    "There was an error processing your payment. Please try again.": "",
+    "This site is invite-only, contact the owner for access.": "Feumar cuireadh airson an làrach-lìn seo, leig fios dhan rianaire ma tha thu ag iarraidh cothrom-inntrigidh.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Dèan briog air a’ cheangal dearbhaidh a chaidh a chur dhan phost-d agad gus crìoch a chur an an clàradh agad. Thoir sùil air a’ phasgan spama mura faigh thu taobh a-staigh 3 mionaidean e.",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "An-asgaidh airson {{amount}}l, agus {{originalPrice}} an dèidh sin ",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Tig nad bhall phaighte gus cothrom fhaighinn air na cuairt-litrichean gu lèir.",
+    "Unsubscribe from all emails": "Na fo-sgrìobh ri puist-d tuilleadh",
+    "Unsubscribed": "Chan fhaigh thu puist-d tuilleadh",
+    "Unsubscribed from all emails.": "",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Cuiridh seo stad air puist-d, cha cuir e stad air na tha thu a’ paigheadh airson a bhallrachd agad.",
+    "Update": "Ùraich",
+    "Update your preferences": "Ùraich na roghainnean agad",
+    "Verification link sent, check your inbox": "Chaidh ceangal dearbhaidh a chur, thoir sùil air a’ phost-d agad",
+    "Verify your email address is correct": "Dearbhaidh gu bheil a’ phost-d agad ceart",
+    "View plans": "Seall na planaichean",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Cha deach am post-d a lorg. Leig fios dhan rianaire.",
+    "Welcome back, {{name}}!": "Fàilte air ais, {{name}}",
+    "Welcome back!": "Fàilte air ais!",
+    "Welcome to {{siteTitle}}": "Fàilte dhan làrach-lìn, {{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.": "Dh’fhaodadh gur e mearachd sealach a tha seo, no dh’fhaodadh gur e post-d mì-dhligheach a th’ ann.",
+    "Why has my email been disabled?": "Carson a chaidh am post-d agam a chur à comas?",
+    "Yearly": "Gach bliadhna",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Tha ballrachd an-asgaidh agad an-dràsta, àrdaich gu ballrachd pàighte airson cothrom-inntrigidh air a h-uile rud.",
+    "You have been successfully resubscribed": "Fo-sgrìobh thu a-rithist",
+    "You're currently not receiving emails": "Chan eil thu a’ faighinn puist-d an-dràsta",
+    "You're not receiving emails": "Chan eil thu a’ faighinn puist-d",
+    "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.": "Chan eil thu a’ faighinn puist-d air sgàth ’s gu bheil thu air brath a chomharradh mar spama o chionn ghoirid, no air sgàth ’s nach gabh brathan a chur dhan a’ phost-d a thug thu seachad.",
+    "You've successfully signed in.": "Chlàraich thu a-steach gu soirbheachail.",
+    "You've successfully subscribed to": "Fo-sgrìobh thu gu soirbheachail gu",
+    "Your account": "An cunntas agad",
+    "Your input helps shape what gets published.": "Bheir na beachdan agad buaidh air na foillseachaidhean ri teachd.",
+    "Your subscription will expire on {{expiryDate}}": "Falbhaidh an ùine air am fo-sgrìobhadh agad: {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Ath-nuadhaichidh am fo-sgrìobhadh agad: {{expiryDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Tòisichidh am fo-sgrìobhadh agad: {{expiryDate}}"
+}
diff --git a/ghost/i18n/locales/gd/signup-form.json b/ghost/i18n/locales/gd/signup-form.json
new file mode 100644
index 00000000000..8f480e7cc2f
--- /dev/null
+++ b/ghost/i18n/locales/gd/signup-form.json
@@ -0,0 +1,9 @@
+{
+    "Email sent": "Chaidh am post-d a chur",
+    "Now check your email!": "Thoir sùil air a' phost-d agad!",
+    "Please enter a valid email address": "Cuir a-steach post-d dligheach",
+    "Something went wrong, please try again.": "Chaidh rudeigin ceàrr, feuch a-rithist.",
+    "Subscribe": "Fo-sgrìobh",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Dèan briog air a' cheangal dearbhaidh a chaidh a chur dhan phost-d agad. Mura nochd e taobh a-steach 3 mionaidean, thoir sùil air a' phasgan spama agad!",
+    "Your email address": "Am post-d agad"
+}
diff --git a/ghost/i18n/locales/hr/portal.json b/ghost/i18n/locales/hr/portal.json
index 9cc1643a8c0..564095b855b 100644
--- a/ghost/i18n/locales/hr/portal.json
+++ b/ghost/i18n/locales/hr/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dana besplatno",
     "{{amount}} off": "Snižena cijena {{amount}}",
     "{{amount}} off for first {{number}} months.": "Snižena cijena {{amount}} za prvih {{number}} mjeseci",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} više neće primati e-poštu kada netko odgovori na vaš komentar.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} više neće primati ovaj newsletter.",
     "{{trialDays}} days free": "{{trialDays}} dana besplatno",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Link za prijavu je poslan na Vašu adresu e-pošte. Ako poruku niste dobili za 3 minute, provjerite spam folder",
     "Account": "Vaš račun",
     "Account settings": "Podešavanje vašeg računa",
@@ -48,11 +50,12 @@
     "Edit": "Uredi",
     "Email": "E-pošta",
     "Email newsletter": "Newsletter e-poštom",
-    "Email preference updated.": "Postavke e-pošte su ažurirane.",
     "Email preferences": "Postavke e-pošte",
     "Emails": "E-pošta",
     "Emails disabled": "Isključena e-pošta",
     "Ends {{offerEndDate}}": "Završava {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Greška",
     "Expires {{expiryDate}}": "Ističe {{expiryDate}}",
     "Forever": "Zauvijek",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ako otkažete vašu pretplatu sada, zadržat će te pristup 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}}": "Ako imate korporativni ili državni račun e-pošte, obratite se svom IT odjelu i zamolite ih da dopuste primanje e-pošte od {{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.": "Ako želite ponovno početi primati e-poštu, najbolji sljedeći korak je provjeriti postoje li problemi na vašoj adresi e-pošte, a zatim kliknuti na ponovnu pretplatu na prethodnom ekranu.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Ako ne primate newsletter na adresu e-pošte kojom ste se pretplatili, evo nekoliko stvari koje trebate provjeriti.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Ako ne primate newsletter na adresu e-pošte kojom ste se pretplatili, evo nekoliko stvari koje trebate provjeriti.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Ako ste dovršili sve ove provjere, a još uvijek ne primate e-poštu, možete se obratiti za podršku na {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "U slučaju kontinuiranog neusplešnog slanja newslettera na vašu adresu e-pošte, slanje newslettera će biti onemogućeno za vaš račun.",
     "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.": "U svom klijentu e-pošte dodajte {{senderEmail}} na svoj popis kontakata. Ovo signalizira vašem davatelju usluga e-pošte da porukama koje su poslane s ove adrese treba vjerovati.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Manje sadržaja poput ovoga",
     "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\".": "Pobrinite se da e-poruke slučajno ne završe u mapi Spam ili Promocije u vašoj pristigloj pošti. Ako jesu, kliknite \"Označi da nije neželjena pošta\" i/ili \"Premjesti u pristiglu poštu\".",
     "Manage": "Upravljanje",
@@ -86,10 +92,12 @@
     "Now check your email!": "Provjerite vašu e-poštu!",
     "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.": "Nakon što se ponovno pretplatite, ako i dalje ne vidite e-poštu u svojoj pristigloj pošti, provjerite mapu neželjene pošte. Neki pružatelji usluga e-pošte vode evidenciju prethodnih pritužbi na neželjenu poštu i nastavit će označavati e-poštu. Ako se to dogodi, označite najnoviji newsletter kao \"Nije neželjena pošta\" da biste ga vratili u svoju primarnu pristiglu poštu.",
     "Permanent failure (bounce)": "Trajni kvar (odbijanje isporuke)",
+    "Phone number": "",
     "Plan": "Plan pretplate",
     "Plan checkout was cancelled.": "Checkout plana pretplate je prekinut.",
     "Plan upgrade was cancelled.": "Nadogradnja plana pretplate je prekinuta.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Molimo vas kontaktirajte {{supportAddress}} za prilagodbu vaše besplatne pretplate.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Molimo vas da ispunite obvezna polja",
     "Price": "Cijena",
     "Re-enable emails": "Ponovo omogući slanje e-pošte",
@@ -98,7 +106,7 @@
     "Retry": "Pokušaj opet",
     "Save": "Spremi",
     "Send an email and say hi!": "Pošalji e-poštu i reci bok!",
-    "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.": "Pošalji e-poruku na {{senderEmail}} i reci bok. Ovo također može pomoći vašem pružatelju usluga e-pošte da vjeruje e-pošti koja dolazi i odlazi s ove adrese.",
+    "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.": "Pošalji e-poruku na {{senderEmail}} i reci bok. Ovo također može pomoći vašem pružatelju usluga e-pošte da vjeruje e-pošti koja dolazi i odlazi s ove adrese.",
     "Sending login link...": "Link za prijavu se šalje...",
     "Sending...": "Slanje...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Odjava",
     "Sign up": "Registracija",
     "Signup error: Invalid link": "Greška prilikom prijave. Neispravan link",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Žao nam je, to nije uspjelo.",
     "Spam complaints": "Pritužbe za neželjenu e-poštu",
     "Start {{amount}}-day free trial": "Aktiviraj besplatni probni period od {{amount}} dana",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Uspjeh! Vaš račun e-pošte je ažuriran.",
     "Successfully unsubscribed": "Uspješna odjava",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Hvala na povratnim informacijama!",
     "That didn't go to plan": "Nešto je pošlo po zlu",
     "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 e-pošte vašeg računa je {{memberEmail}} - ako to nije točno, možete ga ažurirati u <button>postavkama računa</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Došlo je do problema sa slanjem vaše poruke. Pokušajte ponovno malo kasnije.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Ove stranice su samo za članove, kontaktirajte vlasnika kako biste dobili pristup.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Kliknite na link za završetak registracije. Ako poruku niste dobili za 3 minute, provjerite spam folder!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Probajte besplatno na {{amount}} dana, zatim {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Otključajte pristup svim newsletterima plaćanjem pretplate.",
     "Unsubscribe from all emails": "Otkažite primanje svih poruka e-poštom",
     "Unsubscribed": "Otkazani ste",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Otkazivanjem primanja poruka e-pošte nećete otkazati Vašu pretplatu na {{title}}",
     "Update": "Ažuriranje",
     "Update your preferences": "Ažurirajte vaše postavke",
diff --git a/ghost/i18n/locales/hu/portal.json b/ghost/i18n/locales/hu/portal.json
index 8ab90f06d1b..6fd16e8dca6 100644
--- a/ghost/i18n/locales/hu/portal.json
+++ b/ghost/i18n/locales/hu/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} napig ingyen",
     "{{amount}} off": "{{amount}} kedvezmény",
     "{{amount}} off for first {{number}} months.": "{{amount}} kedvezmény az első {{number}} hónapig.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "A(z) {{memberEmail}} cím már nem fog kapni email-eket ha valaki válaszol a hozzászólásaira.",
     "{{memberEmail}} will no longer receive this newsletter.": "A(z) {{memberEmail}} cím már nem fogja megkapni ezt a hírlevelet",
     "{{trialDays}} days free": "{{trialDays}} nap ingyen",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "A bejelentkezéshez szükséges linket elküldtük a megadott email címre. Ha nem érkezne meg 3 percen belül, kérjük ellenőrizze a spam mappát!",
     "Account": "Fiók",
     "Account settings": "Fiók beállítások",
@@ -48,11 +50,12 @@
     "Edit": "Szerkesztés",
     "Email": "Email",
     "Email newsletter": "Hírlevél",
-    "Email preference updated.": "Email beállítások elmentve",
     "Email preferences": "Email beállítások",
     "Emails": "Email-ek",
     "Emails disabled": "Email-ek kikapcsolva",
     "Ends {{offerEndDate}}": "Ajánlat vége: {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Hiba",
     "Expires {{expiryDate}}": "Lejárat: ",
     "Forever": "Örökké",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ha most mondja le a feliratkozását, továbbra is hozzáfér eddig: {{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}}": "Ha céges vagy kormányzati email fiókja van, akkor lépjen kapcsolatba a fiók-adminisztrátorral, hogy engedélyezze az email-ek fogadását az alábbi email címről: {{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.": "A újra szeretne email-eket kapni, kérjük ellenőrizze az email címét és kattintson az újra feliratkozásra az előző képernyőn.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Íme pár dolog amit ellenőrizhet, ha nem kap email-eket.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Íme pár dolog amit ellenőrizhet, ha nem kap email-eket.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Ha a fenti lehetőségeket ellenőrizte és továbbra sem kap email-eket, kérjük lépjen kapcsolatba velünk az alábbi email címen: {{supportAddress}}",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Amennyiben tartós hiba lép fel egy hírlevél küldése közben, az e-mailek letiltásra kerülnek a fiókon.",
     "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.": "Az e-mail kliensben adja hozzá {{senderEmail}}-t a kapcsolatai listához. Ez jelezni fogja az e-mail szolgáltatónak, hogy az ezen a címről érkező e-maileket megbízhatónak kell tekinteni.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Kevesebb ilyet",
     "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\".": "Győződjön meg róla, hogy az e-mailek véletlenül nem kerülnek-e a Spam vagy Promóciók mappába az email fiókjában. Ha igen, kattintson a 'Nem spam' és/vagy az 'Áthelyezés a beérkezők közé' lehetőségekre.",
     "Manage": "Kezelés",
@@ -86,10 +92,12 @@
     "Now check your email!": "Ellenőrizze az postafiókját",
     "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.": "Miután újra feliratkozott, ha még mindig nem látja az e-maileket a beérkező mappájában, ellenőrizze a spam mappát. Néhány email szolgáltató nyilvántartást vezet korábbi spam panaszokról, és továbbra is megjelölheti az e-maileket. Ha ez megtörténik, a legújabb hírlevelet jelölje meg 'Nem spamként', hogy visszakerüljön a fő beérkező mappájába.",
     "Permanent failure (bounce)": "Tartós hiba (visszapattanás)",
+    "Phone number": "",
     "Plan": "Csomag",
     "Plan checkout was cancelled.": "A csomag fizetési folyamat megszakadt",
     "Plan upgrade was cancelled.": "A csomag frissítése megszakadt",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Ajándék csomagok módosításáért kérjük lépjen kapcsolatba velünk az alábbi email címen: {{supportAddress}}",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Kérjük töltse ki az összes mezőt",
     "Price": "Ár",
     "Re-enable emails": "Email-ek aktiválása",
@@ -98,7 +106,7 @@
     "Retry": "Újra",
     "Save": "Mentés",
     "Send an email and say hi!": "Küldjön egy email-t",
-    "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.": "Küldjön egy e-mailt a következő címre: {{senderEmail}}. Ez is segíthet jelezni az e-mail szolgáltatónak, hogy az e-maileket ezen a címen megbízhatónak kell tekinteni.",
+    "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.": "Küldjön egy e-mailt a következő címre: {{senderEmail}}. Ez is segíthet jelezni az e-mail szolgáltatónak, hogy az e-maileket ezen a címen megbízhatónak kell tekinteni.",
     "Sending login link...": "Bejelenkezési link küldése...",
     "Sending...": "Küldés...",
     "Show all": "Az összes mutatása",
@@ -106,6 +114,7 @@
     "Sign out": "Kijelentkezés",
     "Sign up": "Regisztráció",
     "Signup error: Invalid link": "Regisztrációs hiba: érvénytelen link",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Sajnáljuk, ez nem működött.",
     "Spam complaints": "Spam panaszok",
     "Start {{amount}}-day free trial": "{{amount}} napos próbaidőszak kezdése",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Siker! Az email-jét frissítettük.",
     "Successfully unsubscribed": "Sikeres leiratkozás",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Köszönjük a visszajelzést",
     "That didn't go to plan": "Hiba történt",
     "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>.": "Az Ön nálunk regisztrált e-mail címe: {{memberEmail}} — ha ez nem helyes, frissítheti a fiókbeállításoknál.",
     "There was a problem submitting your feedback. Please try again a little later.": "Probléma volt a visszajelzés beküldésével. Kérjük, próbálja újra kicsit később.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "A website csak meghívóval látogatható. Meghívóért lépjen kapcsolatba az oldal tulajdonosával!",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "A regisztráció befejezéséhez kérjük kattintson az email-ben kapott linkre. Ha a link nem érkezne meg 3 percen belül kérjük ellenőrizze a spam mappát.",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Próbálja ki ingyen {{amount}} napig, utána {{originalPrice}}",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Előfizetéssel hozzáférhet minden hírlevélhez!",
     "Unsubscribe from all emails": "Leiratkozás minden email-ről",
     "Unsubscribed": "Sikeres leiratkozás",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Az email-ről történő leiratkozás nem szűnteti meg a fiókját",
     "Update": "Frissítés",
     "Update your preferences": "Beállítások mentése",
diff --git a/ghost/i18n/locales/id/comments.json b/ghost/i18n/locales/id/comments.json
index df1909e8d35..ca4f25eac12 100644
--- a/ghost/i18n/locales/id/comments.json
+++ b/ghost/i18n/locales/id/comments.json
@@ -5,7 +5,7 @@
     "{{amount}} hours ago": "{{amount}} jam yang lalu",
     "{{amount}} minutes ago": "{{amount}} menit yang lalu",
     "{{amount}} months ago": "{{amount}} bulan yang lalu",
-    "{{amount}} more": "",
+    "{{amount}} more": "{{amount}} lagi",
     "{{amount}} seconds ago": "{{amount}} detik yang lalu",
     "{{amount}} weeks ago": "{{amount}} minggu yang lalu",
     "{{amount}} years ago": "{{amount}} tahun yang lalu",
@@ -30,7 +30,7 @@
     "Expertise": "Keahlian",
     "Founder @ Acme Inc": "Founder @ Acme Inc",
     "Full-time parent": "Orang tua penuh waktu",
-    "Head of Marketing at Acme, Inc": "Kepala Pemasaran di Acme, Inc",
+    "Head of Marketing at Acme, Inc": "Direktur Pemasaran di Acme, Inc",
     "Hide": "Sembunyikan",
     "Hide comment": "Sembunyikan komentar",
     "Jamie Larson": "Jamie Larson",
@@ -66,8 +66,8 @@
     "Start the conversation": "Mulai percakapan",
     "This comment has been hidden.": "Komentar ini telah disembunyikan.",
     "This comment has been removed.": "Komentar ini telah dihapus.",
-    "Upgrade now": "Tingkatkan sekarang",
+    "Upgrade now": "Daftar sekarang",
     "Yesterday": "Kemarin",
     "You want to report this comment?": "Anda ingin melaporkan komentar ini?",
-    "Your request will be sent to the owner of this site.": "Permintaan Anda akan dikirimkan kepada pemilik situs ini."
+    "Your request will be sent to the owner of this site.": "Permintaan Anda akan dikirim kepada pemilik situs ini."
 }
diff --git a/ghost/i18n/locales/id/ghost.json b/ghost/i18n/locales/id/ghost.json
index ab29715b50c..c678ef429c1 100644
--- a/ghost/i18n/locales/id/ghost.json
+++ b/ghost/i18n/locales/id/ghost.json
@@ -6,19 +6,19 @@
     "Confirm signup": "Konfirmasi pendaftaran",
     "Confirm your email address": "Konfirmasi alamat email Anda",
     "Confirm your email update for {{siteTitle}}!": "Konfirmasikan pembaruan email Anda pada {{siteTitle}}!",
-    "Confirm your subscription to {{siteTitle}}": "Konfirmasikan langganan Anda ke {{siteTitle}}!",
-    "For your security, the link will expire in 24 hours time.": "Demi keamanan Anda, tautan akan kedaluwarsa dalam waktu 24 jam.",
-    "Hey there,": "Hei yang di sana,",
-    "Hey there!": "Hei yang di sana!",
-    "If you did not make this request, you can safely ignore this email.": "Jika Anda tidak mengajukan permintaan ini, Anda dapat dengan aman mengabaikan email ini.",
-    "If you did not make this request, you can simply delete this message.": "Jika Anda tidak mengajukan permintaan ini, Anda dapat menghapus pesan ini.",
-    "Please confirm your email address with this link:": "Harap konfirmasi alamat email Anda dengan tautan ini:",
+    "Confirm your subscription to {{siteTitle}}": "Konfirmasi langganan Anda ke {{siteTitle}}",
+    "For your security, the link will expire in 24 hours time.": "Demi keamanan Anda, tautan ini akan kedaluwarsa dalam waktu 24 jam.",
+    "Hey there,": "Halo,",
+    "Hey there!": "Halo!",
+    "If you did not make this request, you can safely ignore this email.": "Jika Anda tidak melakukan permintaan ini, Anda dapat dengan aman mengabaikan email ini.",
+    "If you did not make this request, you can simply delete this message.": "Jika Anda tidak melakukan permintaan ini, Anda dapat menghapus pesan ini.",
+    "Please confirm your email address with this link:": "Harap konfirmasikan alamat email Anda dengan tautan ini:",
     "Secure sign in link for {{siteTitle}}": "Tautan masuk yang aman untuk {{siteTitle}}",
     "See you soon!": "Sampai jumpa lagi!",
     "Sent to {{email}}": "Dikirim ke {{email}}",
     "Sign in": "Masuk",
     "Sign in to {{siteTitle}}": "Masuk ke {{siteTitle}}",
-    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Ketuk tautan di bawah ini untuk menyelesaikan proses pendaftaran pada {{siteTitle}}, dan masuk secara otomatis",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Ketuk tautan di bawah ini untuk menyelesaikan proses pendaftaran pada {{siteTitle}}, dan masuk secara otomatis:",
     "Thank you for signing up to {{siteTitle}}!": "Terima kasih telah mendaftar ke {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}!": "Terima kasih telah berlangganan ke {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}.": "Terima kasih telah berlangganan ke {{siteTitle}}.",
@@ -27,8 +27,8 @@
     "Welcome back to {{siteTitle}}!": "Selamat datang kembali di {{siteTitle}}!",
     "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Selamat datang kembali! Gunakan tautan ini untuk masuk dengan aman ke akun {{siteTitle}} Anda:",
     "You can also copy & paste this URL into your browser:": "Anda juga dapat menyalin & menempelkan URL ini ke browser Anda:",
-    "You will not be signed up, and no account will be created for you.": "Anda tidak akan terdaftar, dan tidak akan ada akun yang dibuat untuk Anda.",
+    "You will not be signed up, and no account will be created for you.": "Anda tidak akan didaftarkan, dan tidak ada akun yang akan dibuat untuk Anda.",
     "You will not be subscribed.": "Anda tidak akan berlangganan.",
-    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Anda hanya perlu satu ketukan untuk berlangganan ke {{siteTitle}} — harap konfirmasikan alamat email Anda dengan tautan ini:",
-    "You're one tap away from subscribing to {{siteTitle}}!": "Anda hanya perlu satu ketukan untuk berlangganan ke {{siteTitle}}!"
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Anda hanya perlu satu kali ketuk untuk berlangganan ke {{siteTitle}} — harap konfirmasikan alamat email Anda dengan tautan ini:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Anda hanya perlu satu kali ketuk untuk berlangganan ke {{siteTitle}}!"
 }
diff --git a/ghost/i18n/locales/id/portal.json b/ghost/i18n/locales/id/portal.json
index f39d3c09dca..284bd3d627b 100644
--- a/ghost/i18n/locales/id/portal.json
+++ b/ghost/i18n/locales/id/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "(hemat {{highestYearlyDiscount}}%)",
     "{{amount}} days free": "Gratis {{amount}} hari",
     "{{amount}} off": "Diskon {{amount}}",
     "{{amount}} off for first {{number}} months.": "Diskon {{amount}} untuk {{number}} bulan pertama.",
@@ -6,18 +7,19 @@
     "{{amount}} off forever.": "Diskon {{amount}} selamanya.",
     "{{discount}}% discount": "Diskon {{discount}}%",
     "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} tidak akan menerima buletin {{newsletterName}} lagi.",
-    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} tidak akan lagi menerima email ketika seseorang membalas komentar Anda.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} tidak akan menerima email lagi ketika seseorang membalas komentar Anda.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} tidak akan menerima buletin ini lagi.",
     "{{trialDays}} days free": "Gratis {{trialDays}} hari",
-    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Tautan masuk telah dikirimkan ke kotak masuk Anda. Jika tidak diterima dalam waktu 3 menit, pastikan untuk memeriksa folder spam Anda.",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Tautan masuk telah dikirim ke kotak masuk Anda. Jika tidak diterima dalam waktu 3 menit, pastikan untuk memeriksa folder spam Anda.",
     "Account": "Akun",
     "Account settings": "Pengaturan akun",
-    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Setelah percobaan gratis berakhir, Anda akan dikenai biaya harga normal untuk tingkatan yang Anda pilih. Anda selalu dapat membatalkannya sebelum itu.",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Setelah percobaan gratis berakhir, Anda akan dikenai harga normal untuk tingkatan yang dipilih. Anda selalu dapat membatalkannya sebelum masa percobaan gratis berakhir.",
     "Already a member?": "Sudah menjadi anggota?",
-    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Terjadi kesalahan tak terduga. Harap coba lagi atau <a>hubungi layanan dukungan</a> jika kesalahan tetap berlanjut.",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Terjadi kesalahan tak terduga. Harap coba lagi atau <a>hubungi layanan dukungan</a> jika kesalahan masih berlanjut.",
     "Back": "Kembali",
-    "Back to Log in": "Kembali ke Masuk",
-    "Billing info": "Info pembayaran",
+    "Back to Log in": "Kembali ke Halaman Masuk",
+    "Billing info": "Informasi tagihan",
     "Black Friday": "Black Friday",
     "Cancel anytime.": "Batalkan kapan saja.",
     "Cancel subscription": "Batalkan langganan",
@@ -38,7 +40,7 @@
     "Contact support": "Hubungi layanan dukungan",
     "Continue": "Lanjutkan",
     "Continue subscription": "Lanjutkan berlangganan",
-    "Could not sign in. Login link expired.": "Tidak dapat masuk. Tautan untuk masuk telah kedaluwarsa.",
+    "Could not sign in. Login link expired.": "Tidak dapat masuk. Tautan masuk telah kedaluwarsa.",
     "Could not update email! Invalid link.": "Tidak dapat memperbarui email! Tautan tidak valid.",
     "Create a new contact": "Buat kontak baru",
     "Current plan": "Paket saat ini",
@@ -48,13 +50,14 @@
     "Edit": "Edit",
     "Email": "Email",
     "Email newsletter": "Buletin email",
-    "Email preference updated.": "Preferensi email diperbarui.",
     "Email preferences": "Preferensi email.",
     "Emails": "Email",
     "Emails disabled": "Email dinonaktifkan",
     "Ends {{offerEndDate}}": "Berakhir {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Eror",
-    "Expires {{expiryDate}}": "kedaluwarsa {{expiryDate}}",
+    "Expires {{expiryDate}}": "Kedaluwarsa {{expiryDate}}",
     "Forever": "Selamanya",
     "Free Trial – Ends {{trialEnd}}": "Percobaan Gratis – Berakhir {{trialEnd}}",
     "Get help": "Dapatkan bantuan",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Jika Anda membatalkan langganan sekarang, Anda akan tetap memiliki akses hingga {{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}}": "Jika Anda memiliki akun email perusahaan atau pemerintah, hubungi departemen IT Anda dan mintalah mereka untuk mengizinkan pengiriman email dari {{senderEmail}} diterima.",
     "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.": "Jika Anda ingin mulai menerima email lagi, langkah-langkah terbaik selanjutnya adalah memeriksa alamat email Anda pada data yang tersimpan untuk memastikan tidak ada masalah, kemudian klik tombol 'berlangganan kembali' pada layar sebelumnya.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Jika Anda tidak menerima buletin email langganan Anda, berikut adalah beberapa hal yang perlu diperiksa.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Jika Anda tidak menerima buletin email langganan Anda, berikut adalah beberapa hal yang perlu diperiksa.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Jika Anda telah melakukan semua pemeriksaan tersebut dan masih belum menerima email, Anda dapat menghubungi kami melalui kontak {{supportAddress}} untuk mendapatkan bantuan.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Jika terjadi kegagalan permanen saat mencoba mengirim buletin, email akan dinonaktifkan pada akun tersebut.",
     "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.": "Pada klien email Anda, tambahkan {{senderEmail}} ke daftar kontak Anda. Hal ini akan memberikan sinyal kepada layanan email Anda bahwa email yang dikirim dari alamat ini harus dipercaya.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Kurangi yang seperti ini",
     "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\".": "Pastikan email tidak berakhir di kotak masuk Spam atau Promosi Anda secara tidak sengaja. Jika ya, klik \"Tandai sebagai bukan spam\" dan/atau \"Pindahkan ke kotak masuk\".",
     "Manage": "Kelola",
@@ -86,10 +92,12 @@
     "Now check your email!": "Sekarang periksa email Anda!",
     "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.": "Setelah berlangganan kembali, jika Anda masih tidak melihat email di kotak masuk Anda, periksa folder spam. Beberapa penyedia layanan kotak masuk menyimpan catatan keluhan spam sebelumnya dan akan terus menandai email tersebut. Jika hal ini terjadi, tandai buletin terbaru sebagai 'Bukan spam' untuk memindahkannya kembali ke kotak masuk utama Anda.",
     "Permanent failure (bounce)": "Kegagalan permanen (bounce)",
+    "Phone number": "",
     "Plan": "Paket",
     "Plan checkout was cancelled.": "Pembayaran paket dibatalkan.",
     "Plan upgrade was cancelled.": "Peningkatan paket dibatalkan.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Harap hubungi {{supportAddress}} untuk mengubah langganan gratis Anda.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Harap isi kolom yang wajib diisi",
     "Price": "Harga",
     "Re-enable emails": "Aktifkan kembali email",
@@ -98,7 +106,7 @@
     "Retry": "Coba lagi",
     "Save": "Simpan",
     "Send an email and say hi!": "Kirimkan email dan ucapan hai!",
-    "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.": "Kirim email ke {{senderEmail}} dan ucapan halo. Hal ini juga dapat membantu memberi sinyal kepada penyedia layanan email Anda bahwa email yang dikirim ke dan dari alamat ini harus dipercaya.",
+    "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.": "Kirim email ke {{senderEmail}} dan ucapan halo. Hal ini juga dapat membantu memberi sinyal kepada penyedia layanan email Anda bahwa email yang dikirim ke dan dari alamat ini harus dipercaya.",
     "Sending login link...": "Mengirim tautan masuk...",
     "Sending...": "Mengirim...",
     "Show all": "Tampilkan semua",
@@ -106,6 +114,7 @@
     "Sign out": "Keluar",
     "Sign up": "Daftar",
     "Signup error: Invalid link": "Kesalahan pendaftaran: Tautan tidak valid",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Maaf, itu tidak berhasil.",
     "Spam complaints": "Keluhan spam",
     "Start {{amount}}-day free trial": "Mulai percobaan gratis selama {{amount}} hari",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Berhasil! Email Anda telah diperbarui.",
     "Successfully unsubscribed": "Berhasil berhenti berlangganan",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Terima kasih telah berlangganan. Sebelum Anda mulai membaca, berikut adalah beberapa situs lain yang mungkin akan Anda nikmati.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Terima kasih atas masukannya!",
     "That didn't go to plan": "Itu tidak berjalan sesuai rencana",
     "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>.": "Alamat email Anda yang kami miliki adalah {{memberEmail}} — jika itu tidak benar, Anda dapat memperbarui di <button>area pengaturan akun</button> Anda.",
     "There was a problem submitting your feedback. Please try again a little later.": "Terjadi masalah saat mengirimkan masukan Anda. Coba lagi nanti.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Situs ini hanya untuk yang diundang, hubungi pemiliknya untuk mendapatkan akses.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Untuk menyelesaikan pendaftaran, klik tautan konfirmasi di kotak masuk Anda. Jika tidak diterima dalam waktu 3 menit, pastikan untuk memeriksa folder spam Anda!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Coba gratis selama {{amount}} hari, kemudian {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Buka akses ke semua buletin dengan menjadi pelanggan berbayar.",
     "Unsubscribe from all emails": "Berhenti berlangganan dari semua email",
     "Unsubscribed": "Tidak berlangganan",
+    "Unsubscribed from all emails.": "Telah berhenti berlangganan dari semua email.",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Berhenti berlangganan dari email tidak akan membatalkan langganan berbayar Anda ke {{title}}",
     "Update": "Perbarui",
     "Update your preferences": "Perbarui preferensi Anda",
diff --git a/ghost/i18n/locales/is/portal.json b/ghost/i18n/locales/is/portal.json
index d2ef7043250..4bc8351aede 100644
--- a/ghost/i18n/locales/is/portal.json
+++ b/ghost/i18n/locales/is/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dagar án endurgjalds",
     "{{amount}} off": "{{amount}} afsláttur",
     "{{amount}} off for first {{number}} months.": "{{amount}} afsláttur fyrstu {{number}} mánuðina.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} fær framvegis ekki tölvupóst þegar einhver svarar ummælum þínum.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} fær framvegis ekki þetta fréttabréf.",
     "{{trialDays}} days free": "dagar án endurgjalds",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Innskráningarhlekkur hefur verið sendur á netfangið þitt. Ef hann er ekki kominn innan 3ja mínútna skaltu athuga spam-möppuna.",
     "Account": "Aðgangur",
     "Account settings": "Aðgangsstillingar",
@@ -48,11 +50,12 @@
     "Edit": "Breyta",
     "Email": "Netfang",
     "Email newsletter": "Fréttabréf",
-    "Email preference updated.": "Stillingum netfangsins breytt",
     "Email preferences": "Stillingar netfangs",
     "Emails": "Netföng",
     "Emails disabled": "Netföng gerð óvirk",
     "Ends {{offerEndDate}}": "Lýkur {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Villa",
     "Expires {{expiryDate}}": "Rennur út {{expiryDate}}",
     "Forever": "Að eilífu",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ef þú segir upp áskriftinni núna muntu áfram hafa aðgang fram til {{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}}": "Ef þú ert með aðgang í nafni fyrirtækis eða ríkisstofnunar geturðu haft samband við upplýsingatæknideildina og beðið hana um að leyfa viðtöku tölvupósta frá {{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.": "Ef þú vilt fá tölvupósta að nýju er nærtækast að athuga hvort netfangið sé í lagi og smella síðan á endurnýja áskrift í glugganum á undan.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Ef þú færð ekki fréttabréfið sem þú ert í áskrift að þá eru hér nokkur atriði sem hægt er að skoða:",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Ef þú færð ekki fréttabréfið sem þú ert í áskrift að þá eru hér nokkur atriði sem hægt er að skoða:",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Ef þú hefur skoðað öll þess atriði og færð enn ekki tölvupósta geturðu haft samband við {{supportAddress}}",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Ef varanleg villa kemur upp við sendingu tölvupósta verða þeir gerðir óvirkir.",
     "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.": "Bættu {{senderEmail}} við listann yfir tengiliði í tölvupósthólfinu. Það gefur þjónustuveitandanum merki um að tölvupóstum frá þessu netfangi sé treystandi.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Minna af þessu tagi",
     "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\".": "Gakktu úr skugga um að tölvupóstanir endi ekki í möppum fyrir ruslpósta eða kynningarefni. Ef svo er skaltu smella á \"Mark as not spam\" og/eða \"Move to inbox\"",
     "Manage": "Stjórna",
@@ -86,10 +92,12 @@
     "Now check your email!": "Athugaðu nú tölvupósthólfið þitt!",
     "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.": "Ef þú sérð ekki tölvupósta eftir að hafa endurvakið áskrift, athugaðu spam-möppuna. Enn kunna að vera skráðar kvartanir um ruslpóst og tölvupóstarnir því flokkaður á þann veg. Ef svo er skaltu merkja síðasta fréttabréf sem 'Not spam' og færa yfir í aðalpósthólfið.",
     "Permanent failure (bounce)": "Varanleg villa",
+    "Phone number": "",
     "Plan": "Áskriftarleið",
     "Plan checkout was cancelled.": "Hætt var við kaup á áskrift",
     "Plan upgrade was cancelled.": "Hætt var við breytingu á áskriftarleið",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Vinsamlegast hafið samband við {{supportAddress}} til að breyta kaupbætisáskrift.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Vinsamlegast fyllið í nauðsynlega reiti",
     "Price": "Verð",
     "Re-enable emails": "Fá tölvupósta að nýju",
@@ -98,7 +106,7 @@
     "Retry": "Reyna aftur",
     "Save": "Vista",
     "Send an email and say hi!": "Sendu tölvupóst og segðu hæ!",
-    "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.": "Sendu tölvupóst á {{senderEmail}} og segðu halló. Þetta gefur einnig tölvupóstþjónustunni merki um að póstum til og frá þessu netfangi sé treystandi.",
+    "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.": "Sendu tölvupóst á {{senderEmail}} og segðu halló. Þetta gefur einnig tölvupóstþjónustunni merki um að póstum til og frá þessu netfangi sé treystandi.",
     "Sending login link...": "Sendi innskráningarhlekk",
     "Sending...": "Sending í vinnslu",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Útskráning",
     "Sign up": "Nýskráning",
     "Signup error: Invalid link": "Villa við nýskráningu: Ógildur hlekkur",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Þetta virkaði því miður ekki.",
     "Spam complaints": "Kvartanir um ruslpóst",
     "Start {{amount}}-day free trial": "Hefja {{amount}}-daga prufutímabil",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Þetta heppnaðist! Breyting á netfangi hefur tekið gildi.",
     "Successfully unsubscribed": "Uppsögn heppnaðist",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Takk fyrir endurgjöfina!",
     "That didn't go to plan": "Þetta fór ekki samkvæmt áætlun",
     "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>.": "Netfangið sem þú ert skráður fyrir er {{memberEmail}} — ef það er rangt geturðu breytt því í <button>aðgangsstillingum</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Villa kom upp við sendingu athugasemdar. Vinsamlegast reynið aftur örlítið síðar.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Aðgangur krefst boðsmiða, hafið samband við eiganda síðunnar til að fá aðgang.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Til að ljúka nýskráningu skaltu smella á staðfestingarhlekkinn sem var sendur á netfangið þitt. Ef hann er ekki kominn innan 3 mínútna skaltu athuga spam-möppuna.",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Prófaðu í {{amount}} daga án endurgjalds og síðan fyrir {{originalPrice}}",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Fáðu aðgang að öllum fréttabréfum með því að gerast áskrifandi.",
     "Unsubscribe from all emails": "Segja upp öllum tölvupóstum",
     "Unsubscribed": "Ekki í áskrift",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Uppsögn tölvupósta felur ekki í sér uppsögn áskriftar að {{title}}",
     "Update": "Uppfæra",
     "Update your preferences": "Breyta vali",
diff --git a/ghost/i18n/locales/it/comments.json b/ghost/i18n/locales/it/comments.json
index 6b0d73cb6a2..cd9dce7be42 100644
--- a/ghost/i18n/locales/it/comments.json
+++ b/ghost/i18n/locales/it/comments.json
@@ -5,7 +5,7 @@
     "{{amount}} hours ago": "{{amount}} ore fa",
     "{{amount}} minutes ago": "{{amount}} minuti fa",
     "{{amount}} months ago": "{{amount}} mesi fa",
-    "{{amount}} more": "",
+    "{{amount}} more": "{{amount}} in più",
     "{{amount}} seconds ago": "{{amount}} secondi fa",
     "{{amount}} weeks ago": "{{amount}} settimane fa",
     "{{amount}} years ago": "{{amount}} anni fa",
diff --git a/ghost/i18n/locales/it/ghost.json b/ghost/i18n/locales/it/ghost.json
index db3d5ae9e52..9e6d4f02cc5 100644
--- a/ghost/i18n/locales/it/ghost.json
+++ b/ghost/i18n/locales/it/ghost.json
@@ -4,7 +4,7 @@
     "Complete your sign up to {{siteTitle}}!": "Completa la tua iscrizione a {{siteTitle}}!",
     "Confirm email address": "Conferma indirizzo email",
     "Confirm signup": "Conferma iscrizione",
-    "Confirm your email address": "Conferma il tuo inidirizzo email",
+    "Confirm your email address": "Conferma il tuo indirizzo email",
     "Confirm your email update for {{siteTitle}}!": "Conferma l'aggiornamento della tua email per {{siteTitle}}!",
     "Confirm your subscription to {{siteTitle}}": "Conferma il tuo abbonamento a {{siteTitle}}",
     "For your security, the link will expire in 24 hours time.": "Per la tua sicurezza, il link scadrà tra 24 ore.",
@@ -13,7 +13,7 @@
     "If you did not make this request, you can safely ignore this email.": "Se non hai effettuato tu questa richiesta, puoi tranquillamente ignorare questa email.",
     "If you did not make this request, you can simply delete this message.": "Se non hai effettuato tu questa richiesta, puoi semplicemente cancellare questo messaggio.",
     "Please confirm your email address with this link:": "Conferma il tuo indirizzo email a questo link:",
-    "Secure sign in link for {{siteTitle}}": "Link di accesso sicuro a {{siteTitle}}",
+    "Secure sign in link for {{siteTitle}}": "Link per l'accesso sicuro a {{siteTitle}}",
     "See you soon!": "A presto!",
     "Sent to {{email}}": "Inviata a {{email}}",
     "Sign in": "Accedi",
@@ -27,7 +27,7 @@
     "Welcome back to {{siteTitle}}!": "Bentornato su {{siteTitle}}!",
     "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Bentornato! Usa questo link per accedere in sicurezza al tuo account su {{siteTitle}}:",
     "You can also copy & paste this URL into your browser:": "Puoi anche copiare ed incollare questo indirizzo direttamente nel tuo browser:",
-    "You will not be signed up, and no account will be created for you.": "Non verrai registrato e non verrà creato alcun account a tuo nome.",
+    "You will not be signed up, and no account will be created for you.": "Non verrai iscritto e non verrà creato alcun account a tuo nome.",
     "You will not be subscribed.": "Non verrai abbonato.",
     "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Sei ad un passo dall'abbonamento a {{siteTitle}} — conferma la tua email a questo link:",
     "You're one tap away from subscribing to {{siteTitle}}!": "Sei ad un passo dall'abbonamento a {{siteTitle}}!"
diff --git a/ghost/i18n/locales/it/portal.json b/ghost/i18n/locales/it/portal.json
index c980b389b01..80f5b921296 100644
--- a/ghost/i18n/locales/it/portal.json
+++ b/ghost/i18n/locales/it/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} giorni gratis",
     "{{amount}} off": "{{amount}} in meno",
     "{{amount}} off for first {{number}} months.": "{{amount}} in meno per i primi {{number}} mesi.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "Non riceverà più email a {{memberEmail}} quando qualcuno risponde ai tuoi commenti.",
     "{{memberEmail}} will no longer receive this newsletter.": "La newsletter non verrà più inviata a {{memberEmail}}.",
     "{{trialDays}} days free": "{{trialDays}} giorni gratis",
+    "+1 (123) 456-7890": "",
     "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 di accesso è stato inviato alla tua casella di posta. Se non lo ricevi entro 3 minuti, controlla nello spam.",
     "Account": "Account",
     "Account settings": "Impostazioni account",
@@ -48,11 +50,12 @@
     "Edit": "Modifica",
     "Email": "Email",
     "Email newsletter": "Newsletter",
-    "Email preference updated.": "Preferenze email aggiornate.",
     "Email preferences": "Preferenze email",
     "Emails": "Email",
     "Emails disabled": "Email disattivate",
     "Ends {{offerEndDate}}": "Finisce il {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Errore",
     "Expires {{expiryDate}}": "Scade il {{offerEndDate}}",
     "Forever": "Per sempre",
@@ -68,14 +71,17 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Se annulli ora il tuo abbonamento, continuerai ad avere accesso fino al {{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}}": "Se possiedi un account email aziendale o governativo, contatta il reparto IT e chiedi di consentire la ricezione delle email da parte di {{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.": "Se desideri ricevere nuovamente le email, la cosa migliore da fare è controllare che non ci siano problemi con il tuo indirizzo di posta e poi cliccare su \"Reiscriviti\" nella schermata precedente.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Se non ricevi la newsletter a cui sei iscritto, ecco alcuni passaggi da controllare.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Se non ricevi la newsletter a cui sei iscritto, ecco alcuni passaggi da controllare.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Se avete completato tutti i passaggi e ancora non ricevete nessuna email, potete contattare l'assistenza a {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Nel caso in cui si verifichi un fallimento permanente durante l'invio di una newsletter, le email saranno disabilitate per quell'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.": "Nel tuo client di posta aggiungi {{senderEmail}} ai tuoi contatti. Questo fa si che il tuo provider riconosca l'indirizzo come attendibile.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Meno come questo",
     "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\".": "Assicurati che le email non finiscano per sbaglio nello spam. Se ve ne sono, clicca su \"Segnala come non spam\" e/o \"Sposta nella cartella Posta in arrivo\".",
     "Manage": "Gestisci",
-    "Maybe later": "",
+    "Maybe later": "Magari più tardi",
     "Memberships unavailable, contact the owner for access.": "Iscrizione non disponibile, contatta il proprietario per accedere.",
     "Monthly": "Mensile",
     "More like this": "Più come questo",
@@ -86,10 +92,12 @@
     "Now check your email!": "Ora controlla la tua email!",
     "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.": "Se ancora non vedi le email una volta reiscritto, controlla nello spam. Alcuni provider tengono nota dei reclami e continuano a segnalare le email. Se questo dovesse succedere, segnala l'ultima email ricevuta come \"non spam\" e spostala nella tua posta in arrivo.",
     "Permanent failure (bounce)": "Fallimento permanente (rimbalzo)",
+    "Phone number": "",
     "Plan": "Piano",
     "Plan checkout was cancelled.": "Il pagamento del piano è stato annullato.",
     "Plan upgrade was cancelled.": "L'aggiornamento del piano è stato annullato.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Si prega di contattare {{supportAddress}} per modificare l'abbonamento gratuito.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Si prega di compilare i campi obbligatori",
     "Price": "Prezzo",
     "Re-enable emails": "Riattiva le email",
@@ -98,7 +106,7 @@
     "Retry": "Riprova",
     "Save": "Salva",
     "Send an email and say hi!": "Invia un'email di saluti!",
-    "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.": "Invia un'email di saluti a {{senderEmail}}. Questo potrebbe aiutare a segnalare al tuo provider che le email da e verso questo indirizzo possono essere considerate attendibili.",
+    "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.": "Invia un'email di saluti a {{senderEmail}}. Questo potrebbe aiutare a segnalare al tuo provider che le email da e verso questo indirizzo possono essere considerate attendibili.",
     "Sending login link...": "Invio link di accesso...",
     "Sending...": "Invio...",
     "Show all": "Mostra tutti",
@@ -106,6 +114,7 @@
     "Sign out": "Esci",
     "Sign up": "Iscriviti",
     "Signup error: Invalid link": "Errore di accesso: link invalido",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Mi dispiace, non ha funzionato.",
     "Spam complaints": "Reclami per spam",
     "Start {{amount}}-day free trial": "Inizia i {{amount}} giorni di prova gratuita",
@@ -119,17 +128,23 @@
     "Success! Your account is fully activated, you now have access to all content.": "Fatto! Il tuo account è stato attivato, ora hai accesso a tutti i contenuti.",
     "Success! Your email is updated.": "Fatto! La tua email è stata aggiornata.",
     "Successfully unsubscribed": "Disiscrizione effettuata con successo",
-    "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.": "Grazie per esserti iscritto. Prima della lettura, ecco alcuni siti che potrebbero interessarti.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Grazie per il feedback!",
     "That didn't go to plan": "Questo non era previsto",
     "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>.": "L'indirizzo email registrato è {{memberEmail}} — se non è corretto, puoi modificarlo nelle tue <button>impostazioni dell'account</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "C'è stato un errore durante l'invio del tuo feedback. Si prega di riprovare più tardi.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Questo sito è accessibile solo su invito, contatta il proprietario per poter accedere.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Per completare l'iscrizione, clicca il link di conferma inviato alla tua email. Se non lo ricevi entro 3 minuti, controlla nello spam!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Prova gratis per {{amount}} giorni, poi {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Abbonati per sbloccare l'accesso a tutte le newsletter.",
     "Unsubscribe from all emails": "Disiscriviti da tutte le email",
     "Unsubscribed": "Disiscritto",
+    "Unsubscribed from all emails.": "Disiscritto da tutte le email",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "La disiscrizione dalle email non annullerà l'abbonamento a {{title}}",
     "Update": "Aggiorna",
     "Update your preferences": "Aggiorna le tue preferenze",
diff --git a/ghost/i18n/locales/it/signup-form.json b/ghost/i18n/locales/it/signup-form.json
index 1eeadf1d03e..78218eb1311 100644
--- a/ghost/i18n/locales/it/signup-form.json
+++ b/ghost/i18n/locales/it/signup-form.json
@@ -2,7 +2,7 @@
     "Email sent": "Email inviata",
     "Now check your email!": "Ora controlla la tua email!",
     "Please enter a valid email address": "Inserisci un indirizzo email valido",
-    "Something went wrong, please try again.": "Qualcosa è andato storto, si prega di riprovare.",
+    "Something went wrong, please try again.": "Qualcosa è andato storto, per favore riprova",
     "Subscribe": "Abbonati",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Per completare l'iscrizione, clicca il link di conferma inviato alla tua email. Se non lo ricevi entro 3 minuti, controlla nello spam!",
     "Your email address": "Il tuo indirizzo email"
diff --git a/ghost/i18n/locales/ja/comments.json b/ghost/i18n/locales/ja/comments.json
index bcb0715d9a1..e2b8858c1e7 100644
--- a/ghost/i18n/locales/ja/comments.json
+++ b/ghost/i18n/locales/ja/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": "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.": "{{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": "ジェイミー・ラーソン",
+    "Join the discussion": "議論に参加する",
+    "Just now": "今すぐ参加する",
+    "Local resident": "地元住民",
+    "Member discussion": "メンバーによる議論",
+    "Name": "名前",
+    "Neurosurgeon": "脳神経外科医",
+    "One day ago": "1日前",
+    "One hour ago": "1時間前",
+    "One minute ago": "1分前",
+    "One month ago": "1ヶ月前",
+    "One week ago": "1週間前",
+    "One year ago": "1年前",
+    "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": "返信をもう1つ表示する",
+    "Show 1 previous comment": "1つ前のコメントを表示する",
+    "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/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/ja/portal.json b/ghost/i18n/locales/ja/portal.json
index 5918830420f..86a35c41b27 100644
--- a/ghost/i18n/locales/ja/portal.json
+++ b/ghost/i18n/locales/ja/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "({{highestYearlyDiscount}}%OFF)",
     "{{amount}} days free": "{{amount}}日間無料",
     "{{amount}} off": "{{amount}}オフ",
     "{{amount}} off for first {{number}} months.": "最初の{{number}}ヶ月間{{amount}}オフ",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "誰かがあなたのコメントに返信しても、{{memberEmail}} はメールを受信しません。",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} はこのニュースレターを受信しなくなります。",
     "{{trialDays}} days free": "{{trialDays}}日間無料",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "ログインリンクが受信箱に送信されました。3分以内にメールが届かない場合は、迷惑メールのフォルダーをご確認ください。",
     "Account": "アカウント",
     "Account settings": "アカウント設定",
@@ -48,11 +50,12 @@
     "Edit": "編集",
     "Email": "メール",
     "Email newsletter": "ニュースレターのメール",
-    "Email preference updated.": "メールの設定が更新されました。",
     "Email preferences": "メールの設定",
     "Emails": "メール",
     "Emails disabled": "メールが無効になっています",
     "Ends {{offerEndDate}}": "{{offerEndDate}}まで",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "エラー",
     "Expires {{expiryDate}}": "{{expiryDate}}まで有効",
     "Forever": "永久",
@@ -62,21 +65,24 @@
     "Get notified when someone replies to your comment": "誰かがあなたのコメントに返信したときに通知を受ける",
     "Give feedback on this post": "この投稿にフィードバックを提供する",
     "Help! I'm not receiving emails": "助けてください！メールが受信できません",
-    "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.": "ニュースレターがスパムとして判定された場合、そのアドレスではメールが自動的に無効になり、望ましくないメッセージを受け取らないようになります。",
     "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}}までアクセスできます。",
     "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}}": "企業または政府のメールアカウントをお持ちの場合は、IT部門に連絡し、{{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're not receiving the email newsletter you've subscribed to, here are a 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}}.": "これらの項目を全て満たしてもメールがまだ受け取れない場合は、{{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.": "メールクライアントで{{senderEmail}}を連絡先リストに追加してください。これにより、メールプロバイダーにこのアドレスから送信されたメールを信頼するように伝えることができます。",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "名前",
@@ -86,26 +92,29 @@
     "Now check your email!": "メールを確認してください",
     "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)": "永続的な障害",
+    "Phone number": "",
     "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 enter {{fieldName}}": "",
     "Please fill in required fields": "必須項目に入力してください",
     "Price": "価格",
     "Re-enable emails": "メールを再有効化する",
-    "Recommendations": "",
+    "Recommendations": "おすすめ",
     "Renews at {{price}}.": "{{price}}で更新されます。",
     "Retry": "再試行",
     "Save": "保存",
     "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.": "{{senderEmail}}にメールを送ると、メールプロバイダーに対して、このアドレスとのやり取りは信頼できるものだと知らせることができます。",
+    "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}}にメールを送ると、メールプロバイダーに対して、このアドレスとのやり取りは信頼できるものだと知らせることができます。",
     "Sending login link...": "ログイン先リンクを送信しています...",
     "Sending...": "送信しています...",
-    "Show all": "",
+    "Show all": "すべてを表示",
     "Sign in": "ログイン",
     "Sign out": "ログアウト",
     "Sign up": "新規登録",
     "Signup error: Invalid link": "エラー： 無効なリンク",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "申し訳ありませんが、うまくいきませんでした。",
     "Spam complaints": "スパムに関する苦情",
     "Start {{amount}}-day free trial": "{{amount}}日間の無料トライアルを開始する",
@@ -119,27 +128,33 @@
     "Success! Your account is fully activated, you now have access to all content.": "成功しました！アカウントが完全にアクティブ化されました。これですべてのコンテンツにアクセスできます。",
     "Success! Your email is updated.": "成功しました！メールアドレスが更新されました。",
     "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.": "購読ありがとうございます。お楽しみになる前に、以下のサイトもおすすめです。",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "フィードバックありがとうございます！",
-    "That didn't go to plan": "",
+    "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>.": "メールアドレスは{{memberEmail}}です。もし正しくない場合は、<button>アカウント設定</button>で更新することができます。",
     "There was a problem submitting your feedback. Please try again a little later.": "フィードバックの送信中に問題が発生しました。しばらくしてからもう一度お試しください。",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "このサイトは招待制です。アクセスするにはオーナーに連絡してください。",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "新規登録を完了するには、受信トレイの確認リンクをクリックしてください。3分経っても届かない場合は、スパムフォルダを確認してください。",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "{{amount}}日間無料でお試しください、その後は{{originalPrice}}です。",
     "Unlock access to all newsletters by becoming a paid subscriber.": "有料の購読者になることで、すべてのニュースレターへのアクセスが可能になります。",
     "Unsubscribe from all emails": "すべてのメールの購読解除",
     "Unsubscribed": "購読解除されました",
+    "Unsubscribed from all emails.": "すべてのメールの購読を解除する。",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "メールの購読を解除しても、{{title}}への有料購読はキャンセルされません",
     "Update": "更新",
     "Update your preferences": "設定を更新する",
-    "Verification link sent, check your inbox": "",
+    "Verification link sent, check your inbox": "確認のためのリンクを送りましたので、受信トレイをチェックしてください",
     "Verify your email address is correct": "メールアドレスが正しいかどうか確認してください",
     "View plans": "プランを表示",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "メールアドレスが見つからなかったため、購読解除できませんでした。サイトのオーナーに連絡してください。",
     "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?": "なぜメールが無効になったのか？",
     "Yearly": "年額",
@@ -149,7 +164,7 @@
     "You're not receiving emails": "メールを受信していません",
     "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.": "最近のメッセージをスパムとして判定したか、提供されたメールアドレスに配信できなかったため、メールを受信していません。",
     "You've successfully signed in.": "ログインに成功しました",
-    "You've successfully subscribed to": "",
+    "You've successfully subscribed to": "の購読に成功しました",
     "Your account": "あなたのアカウント",
     "Your input helps shape what gets published.": "あなたの感想を今後の内容の参考にさせていただきます。",
     "Your subscription will expire on {{expiryDate}}": "あなたの購読は{{expiryDate}}に期限切れになります。",
diff --git a/ghost/i18n/locales/ko/comments.json b/ghost/i18n/locales/ko/comments.json
index 7c0e9972db2..7acf4a38ada 100644
--- a/ghost/i18n/locales/ko/comments.json
+++ b/ghost/i18n/locales/ko/comments.json
@@ -15,18 +15,18 @@
     "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}}의 유료회원이 되어주세요.",
+    "Become a member of {{publication}} to start commenting.": "{{publication}}의 회원이 되어 댓글을 작성해 주세요.",
+    "Become a paid member of {{publication}} to start commenting.": "{{publication}}의 유료 회원이 되어 댓글을 작성해 주세요.",
     "Cancel": "취소",
     "Comment": "댓글",
-    "Complete your profile": "프로필을 완성하세요",
+    "Complete your profile": "프로필을 완성해 주세요",
     "Delete": "삭제",
     "Deleted member": "삭제된 회원",
     "Discussion": "댓글",
     "Edit": "수정",
     "Edit this comment": "댓글 수정",
     "Edited": "수정됨",
-    "Enter your name": "이름을 입력하세요",
+    "Enter your name": "이름을 입력해 주세요",
     "Expertise": "전문분야",
     "Founder @ Acme Inc": "",
     "Full-time parent": "",
@@ -34,7 +34,7 @@
     "Hide": "숨기기",
     "Hide comment": "댓글 숨기기",
     "Jamie Larson": "",
-    "Join the discussion": "댓글에 참여하세요",
+    "Join the discussion": "댓글에 참여해 주세요",
     "Just now": "방금 전",
     "Local resident": "",
     "Member discussion": "회원들의 댓글",
@@ -62,12 +62,12 @@
     "Show 1 previous comment": "1개의 이전 댓글 보기",
     "Show comment": "댓글 보기",
     "Sign in": "로그인",
-    "Sign up now": "지금 회원가입 하세요",
-    "Start the conversation": "댓글을 작성해주세요",
-    "This comment has been hidden.": "숨김처리 된 댓글입니다.",
-    "This comment has been removed.": "삭제 된 댓글입니다.",
-    "Upgrade now": "지금 업그레이드 하세요",
+    "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.": "운영자에게 요구사항이 전달되었습니다."
+    "Your request will be sent to the owner of this site.": "운영자에게 요구사항이 전달되었어요."
 }
diff --git a/ghost/i18n/locales/ko/ghost.json b/ghost/i18n/locales/ko/ghost.json
index 68d36f49685..f5476ebd1a9 100644
--- a/ghost/i18n/locales/ko/ghost.json
+++ b/ghost/i18n/locales/ko/ghost.json
@@ -1,34 +1,34 @@
 {
-    "All the best!": "모든 것이 잘 되기를 바랍니다!",
-    "Complete signup for {{siteTitle}}!": "{{siteTitle}}에 가입을 완료하세요!",
-    "Complete your sign up to {{siteTitle}}!": "{{siteTitle}}에 가입을 완료하세요!",
-    "Confirm email address": "이메일을 확인하세요",
-    "Confirm signup": "회원가입을 확인하세요",
-    "Confirm your email address": "이메일을 확인하세요",
-    "Confirm your email update for {{siteTitle}}!": "{{siteTitle}}의 이메일 업데이트를 확인하세요!",
-    "Confirm your subscription to {{siteTitle}}": "{{siteTitle}}의 구독을 확인하세요.",
-    "For your security, the link will expire in 24 hours time.": "보안을 위해 링크는 24시간 후에 만료됩니다.",
+    "All the best!": "모든 것이 잘 되기를 바라요!",
+    "Complete signup for {{siteTitle}}!": "{{siteTitle}} 가입을 완료해 주세요!",
+    "Complete your sign up to {{siteTitle}}!": "회원님의 {{siteTitle}} 가입을 완료해 주세요!",
+    "Confirm email address": "이메일을 확인해 주세요",
+    "Confirm signup": "회원가입을 확인해 주세요",
+    "Confirm your email address": "이메일을 확인해 주세요",
+    "Confirm your email update for {{siteTitle}}!": "{{siteTitle}}의 이메일 업데이트를 확인해 주세요!",
+    "Confirm your subscription to {{siteTitle}}": "{{siteTitle}}의 구독을 확인해 주세요.",
+    "For your security, the link will expire in 24 hours time.": "보안을 위해 링크는 24시간 후에 만료돼요.",
     "Hey there,": "안녕하세요,",
     "Hey there!": "안녕하세요!",
-    "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}}의 안전한 로그인 링크입니다.",
+    "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}}의 안전한 로그인 링크예요.",
     "See you soon!": "곧 다시 만나요!",
-    "Sent to {{email}}": "{{email}}으로 전송되었습니다.",
+    "Sent to {{email}}": "{{email}}으로 전송되었어요.",
     "Sign in": "로그인",
-    "Sign in to {{siteTitle}}": "{{siteTitle}}에 로그인하세요.",
-    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "{{siteTitle}}의 가입을 완료하고, 자동으로 로그인하려면 아래 링크를 탭해주세요:",
-    "Thank you for signing up to {{siteTitle}}!": "{{siteTitle}}에 가입해 주셔서 감사합니다!",
-    "Thank you for subscribing to {{siteTitle}}!": "{{siteTitle}} 구독해 주셔서 감사드립니다!",
-    "Thank you for subscribing to {{siteTitle}}.": "{{siteTitle}} 구독해 주셔서 감사드립니다.",
-    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "{{siteTitle}} 구독에 감사드립니다. 아래 링크를 탭하여 자동으로 로그인하세요:",
-    "This email address will not be used.": "이 이메일 주소는 사용되지 않을 것입니다.",
-    "Welcome back to {{siteTitle}}!": "{{siteTitle}}에 다시 오신 것을 환영합니다!",
-    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "안전한 로그인을 위해 다음 링크를 사용하여 {{siteTitle}} 계정에 로그인하세요:",
-    "You can also copy & paste this URL into your browser:": "또는 이 URL을 웹 브라우저에 복사하여 사용할 수 있습니다.",
-    "You will not be signed up, and no account will be created for you.": "가입되지 않으며 계정도 생성되지 않습니다.",
-    "You will not be subscribed.": "구독되지 않을 것입니다.",
-    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "탭하시면 {{siteTitle}} 구독이 완료됩니다! 이 링크를 사용하여 이메일 주소를 확인해주세요.",
-    "You're one tap away from subscribing to {{siteTitle}}!": "탭하시면 {{siteTitle}} 구독이 완료됩니다!"
+    "Sign in to {{siteTitle}}": "{{siteTitle}}에 로그인 해주세요.",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "{{siteTitle}}의 가입을 완료하고, 자동으로 로그인하려면 아래 링크를 탭해 주세요:",
+    "Thank you for signing up to {{siteTitle}}!": "{{siteTitle}}에 가입 감사해요!",
+    "Thank you for subscribing to {{siteTitle}}!": "{{siteTitle}} 구독 감사해요!",
+    "Thank you for subscribing to {{siteTitle}}.": "{{siteTitle}} 구독 감사해요.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "{{siteTitle}} 구독에 감사해요. 아래 링크를 탭하여 자동으로 로그인해 주세요:",
+    "This email address will not be used.": "이 이메일 주소는 사용하지 않을게요.",
+    "Welcome back to {{siteTitle}}!": "{{siteTitle}}에 다시 오신 것을 환영해요!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "다시 오신 것을 환영해요! 안전한 로그인을 위해 다음 링크를 사용하여 {{siteTitle}} 계정에 로그인해 주세요:",
+    "You can also copy & paste this URL into your browser:": "또는 이 URL을 웹 브라우저에 복사하셔도 돼요.",
+    "You will not be signed up, and no account will be created for you.": "가입되지 않으며 계정도 생성되지 않아요.",
+    "You will not be subscribed.": "구독되지 않을 것이에요.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "탭하시면 {{siteTitle}} 구독이 완료돼요! 이 링크를 사용하여 이메일 주소를 확인해 주세요.",
+    "You're one tap away from subscribing to {{siteTitle}}!": "탭하시면 {{siteTitle}} 구독이 완료돼요!"
 }
diff --git a/ghost/i18n/locales/ko/portal.json b/ghost/i18n/locales/ko/portal.json
index 3f903807b79..d96f67232b5 100644
--- a/ghost/i18n/locales/ko/portal.json
+++ b/ghost/i18n/locales/ko/portal.json
@@ -1,34 +1,36 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "({{highestYearlyDiscount}}% 절약)",
     "{{amount}} days free": "{{amount}}일 무료",
     "{{amount}} off": "{{amount}} 할인",
-    "{{amount}} off for first {{number}} months.": "첫 {{number}}개월 {{amount}} 할인",
-    "{{amount}} off for first {{period}}.": "첫 {{period}} {{amount}} 할인",
-    "{{amount}} off forever.": "{{amount}} 영원히 할인",
+    "{{amount}} off for first {{number}} months.": "첫 {{number}}개월 {{amount}} 할인.",
+    "{{amount}} off for first {{period}}.": "첫 {{period}} {{amount}} 할인.",
+    "{{amount}} off forever.": "{{amount}} 영원히 할인.",
     "{{discount}}% discount": "{{discount}}% 할인",
-    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}}은(는) {{newsletterName}} 뉴스레터를 더 이상 받지 않습니다.",
-    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}}은(는) 다른 사람이 댓글에 답변할 때 이메일을 더 이상 받지 않습니다.",
-    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}}은(는) 이 뉴스레터를 더 이상 받지 않습니다.",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}}님은 {{newsletterName}} 뉴스레터를 더 이상 받지 않으실 것이에요.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}}님은 다른 사람이 댓글에 답변할 때 이메일을 더 이상 받지 않으실 것이에요.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}}님은 이 뉴스레터를 더 이상 수신하지 않으실 것이에요.",
     "{{trialDays}} days free": "{{trialDays}}일 무료",
-    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "로그인 링크가 이메일로 전송되었습니다. 3분 내에 도착하지 않으면 스팸 폴더를 확인해주세요.",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "로그인 링크가 이메일로 전송되었어요. 3분 내에 도착하지 않으면 스팸 폴더를 확인해 주세요.",
     "Account": "계정",
     "Account settings": "계정 설정",
-    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "무료 체험이 종료되면 선택한 요금제의 정상 가격이 청구됩니다. 그 전에 언제든지 취소할 수 있습니다.",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "무료 체험이 종료되면 선택한 요금제의 정상 가격이 청구돼요. 그 전에 언제든지 취소할 수 있어요.",
     "Already a member?": "이미 회원이신가요?",
-    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "예기치 않은 오류가 발생했습니다. 계속해서 오류가 발생하면 다시 시도하거나 <a>지원팀에 문의</a>해주세요.",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "예기치 않은 오류가 발생했어요. 계속해서 오류가 발생하면 다시 시도하거나 <a>지원팀에 문의</a>해 주세요.",
     "Back": "뒤로",
     "Back to Log in": "로그인으로 돌아가기",
     "Billing info": "결제 정보",
     "Black Friday": "블랙 프라이데이",
-    "Cancel anytime.": "언제든지 취소할 수 있습니다.",
+    "Cancel anytime.": "언제든지 취소할 수 있어요.",
     "Cancel subscription": "구독 취소",
     "Cancellation reason": "취소 사유",
     "Change": "변경",
-    "Check spam & promotions folders": "스팸 & 프로모션 폴더 확인하세요",
-    "Check with your mail provider": "메일 제공업체에 문의하세요",
+    "Check spam & promotions folders": "스팸 & 프로모션 폴더를 확인해 주세요",
+    "Check with your mail provider": "메일 제공업체에 문의해 주세요",
     "Choose": "선택",
     "Choose a different plan": "다른 요금제 선택",
     "Choose your newsletters": "뉴스레터 선택",
-    "Click here to retry": "다시 시도하려면 여기를 클릭하세요",
+    "Click here to retry": "다시 시도하려면 여기를 클릭해 주세요",
     "Close": "닫기",
     "Comments": "댓글",
     "Complimentary": "무료",
@@ -38,75 +40,82 @@
     "Contact support": "지원팀에 문의",
     "Continue": "계속",
     "Continue subscription": "구독 계속",
-    "Could not sign in. Login link expired.": "로그인할 수 없습니다. 로그인 링크가 만료되었습니다.",
-    "Could not update email! Invalid link.": "이메일을 업데이트할 수 없습니다! 잘못된 링크입니다.",
+    "Could not sign in. Login link expired.": "로그인할 수 없어요. 로그인 링크가 만료되었어요.",
+    "Could not update email! Invalid link.": "이메일을 업데이트할 수 없어요! 잘못된 링크이에요.",
     "Create a new contact": "새 연락처 만들기",
     "Current plan": "현재 요금제",
     "Delete account": "계정 삭제",
-    "Didn't mean to do this? Manage your preferences <button>here</button>.": "의도치 않았나요? 기본 설정을 <button>여기</button>에서 관리할 수 있습니다.",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "의도치 않았나요? 기본 설정을 <button>여기</button>에서 관리할 수 있어요.",
     "Don't have an account?": "계정이 없으신가요?",
     "Edit": "편집",
     "Email": "이메일",
     "Email newsletter": "이메일 뉴스레터",
-    "Email preference updated.": "이메일 기본 설정이 업데이트되었습니다.",
     "Email preferences": "이메일 설정",
     "Emails": "이메일",
     "Emails disabled": "이메일 사용 중지됨",
-    "Ends {{offerEndDate}}": "{{offerEndDate}}에 종료됩니다",
+    "Ends {{offerEndDate}}": "{{offerEndDate}}에 종료돼요",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "오류",
-    "Expires {{expiryDate}}": "{{expiryDate}}에 만료됩니다",
+    "Expires {{expiryDate}}": "{{expiryDate}}에 만료돼요",
     "Forever": "영원히",
-    "Free Trial – Ends {{trialEnd}}": "무료 체험 – {{trialEnd}}에 종료됩니다",
-    "Get help": "도움말 받기",
-    "Get in touch for help": "도움말을 받으려면 연락하세요",
+    "Free Trial – Ends {{trialEnd}}": "무료 체험 – {{trialEnd}}에 종료돼요",
+    "Get help": "도움 요청",
+    "Get in touch for help": "도움말을 받으려면 연락해 주세요",
     "Get notified when someone replies to your comment": "댓글에 대한 답변이 올라오면 알림 받기",
-    "Give feedback on this post": "이 게시물에 대한 의견 제공하기",
-    "Help! I'm not receiving emails": "도와주세요! 이메일을 받지 못하고 있습니다",
+    "Give feedback on this post": "이 게시물에 대한 의견 말하기",
+    "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 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}}": "만약 회사나 정부 이메일 계정을 사용하고 있다면, IT 부서에 연락하여 {{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}}.": "이 모든 확인을 완료했는데도 이메일을 받지 못하고 있다면, {{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.": "이메일 클라이언트에서 {{senderEmail}}을 연락처 목록에 추가하세요. 이렇게 하면 메일 제공업체에게 이 주소에서 보낸 이메일을 신뢰해야 한다는 신호를 보냅니다.",
+    "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}}": "만약 회사나 정부 이메일 계정을 사용하고 있다면, IT 부서에 연락하여 {{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 a 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}}.": "이 모든 확인을 완료했는데도 이메일을 받지 못하고 있다면, {{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.": "이메일 클라이언트에서 {{senderEmail}}을 연락처 목록에 추가해 주세요. 이렇게 하면 메일 제공업체에게 이 주소에서 보낸 이메일을 신뢰해야 한다는 신호를 보낼 수 있어요.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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\".": "이메일이 스팸이나 프로모션 폴더에 실수로 들어가지 않도록 하세요. 만약 들어가 있다면 \"스팸이 아님\" 또는 \"받은 편지함으로 이동\"을 클릭하세요.",
+    "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.": "",
     "Monthly": "월간",
     "More like this": "비슷한 게시물 더 보기",
     "Name": "이름",
-    "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": "더 많은 도움이 필요하신가요? 지원팀에 문의해 주세요",
+    "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?": "이메일을 받지 못하고 계신가요?",
-    "Now check your email!": "지금 이메일을 확인해주세요!",
-    "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.": "다시 구독한 후에도 받은 편지함에 이메일이 표시되지 않는다면 스팸 폴더를 확인하세요. 일부 받은 편지함 제공업체는 이전 스팸 신고 기록을 유지하고 계속해서 이메일을 표시합니다. 이런 경우 최신 뉴스레터를 '스팸이 아님'으로 표시하여 기본 받은 편지함으로 이동시키세요.",
+    "Now check your email!": "지금 이메일을 확인해 주세요!",
+    "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)": "영구적인 실패(바운스)",
+    "Phone number": "",
     "Plan": "플랜",
-    "Plan checkout was cancelled.": "플랜 결제가 취소되었습니다.",
-    "Plan upgrade was cancelled.": "플랜 업그레이드가 취소되었습니다.",
+    "Plan checkout was cancelled.": "플랜 결제가 취소되었어요.",
+    "Plan upgrade was cancelled.": "플랜 업그레이드가 취소되었어요.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
-    "Please fill in required fields": "필수 항목을 입력하세요",
+    "Please enter {{fieldName}}": "",
+    "Please fill in required fields": "필수 항목을 입력해 주세요",
     "Price": "가격",
     "Re-enable emails": "이메일 재활성화",
     "Recommendations": "",
-    "Renews at {{price}}.": "{{price}}에 갱신됩니다.",
+    "Renews at {{price}}.": "{{price}}에 갱신돼요.",
     "Retry": "다시 시도",
     "Save": "저장",
     "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.": "{{senderEmail}}에게 이메일을 보내 인사를 건네보세요. 이렇게 하면 메일 제공업체에게 이 주소로부터 이메일을 신뢰해야 한다는 신호를 보냅니다.",
+    "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}}에게 이메일을 보내 인사를 건네보세요. 이렇게 하면 메일 제공업체에게 이 주소로부터 이메일을 신뢰해야 한다는 신호를 보낼 수 있어요.",
     "Sending login link...": "로그인 링크 전송 중...",
     "Sending...": "전송 중...",
     "Show all": "",
     "Sign in": "로그인",
     "Sign out": "로그아웃",
-    "Sign up": "가입하기",
+    "Sign up": "가입",
     "Signup error: Invalid link": "가입 오류: 잘못된 링크",
-    "Sorry, that didn’t work.": "죄송합니다. 작동하지 않았습니다.",
+    "Something went wrong, please try again later.": "",
+    "Sorry, that didn’t work.": "죄송해요. 작동하지 않았어요.",
     "Spam complaints": "스팸 신고",
     "Start {{amount}}-day free trial": "{{amount}}일 동안의 무료 체험 시작",
     "Starting {{startDate}}": "{{startDate}}부터 시작",
@@ -115,44 +124,50 @@
     "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.": "성공! 이메일이 업데이트되었습니다.",
-    "Successfully unsubscribed": "구독이 성공적으로 취소되었습니다",
+    "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.": "성공! 이메일이 업데이트되었어요.",
+    "Successfully unsubscribed": "구독이 성공적으로 취소되었어요",
     "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>.": "회원님의 이메일 주소는 {{memberEmail}}입니다. 이 주소가 맞지 않다면 <button>계정 설정 영역</button>에서 업데이트할 수 있습니다.",
-    "There was a problem submitting your feedback. Please try again a little later.": "의견을 제출하는 중에 문제가 발생했습니다. 잠시 후 다시 시도하세요.",
-    "This site is invite-only, contact the owner for access.": "위 사이트는 초대된 사용자만 사용이 가능합니다. 접근을 위해서는 관리자에게 연락하세요.",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "가입을 완료하려면 이메일의 확인 링크를 클릭하세요. 3분 이내에 도착하지 않으면 스팸 폴더를 확인해주세요!",
-    "Try free for {{amount}} days, then {{originalPrice}}.": "{{amount}}일 동안 무료로 사용한 후 {{originalPrice}}로 결제하세요.",
-    "Unlock access to all newsletters by becoming a paid subscriber.": "유료 구독자가 되어 모든 뉴스레터에 접근하세요.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
+    "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>.": "회원님의 이메일 주소는 {{memberEmail}}이에요. 이 주소가 맞지 않다면 <button>계정 설정 영역</button>에서 업데이트할 수 있어요.",
+    "There was a problem submitting your feedback. Please try again a little later.": "의견을 제출하는 중에 문제가 발생했어요. 잠시 후 다시 시도해 주세요.",
+    "There was an error processing your payment. Please try again.": "",
+    "This site is invite-only, contact the owner for access.": "위 사이트는 초대된 사용자만 사용이 가능해요. 접근을 위해서는 관리자에게 연락해 주세요.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "가입을 완료하려면 이메일의 확인 링크를 클릭해 주세요. 3분 이내에 도착하지 않으면 스팸 폴더를 확인해 주세요!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "{{amount}}일 동안 무료로 사용한 후 {{originalPrice}}로 결제해 주세요.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "유료 구독자가 되어 모든 뉴스레터에 접근해 주세요.",
     "Unsubscribe from all emails": "모든 이메일 구독 취소",
     "Unsubscribed": "구독 취소 완료",
-    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "이메일 구독 취소는 {{title}}에 대한 유료 구독을 취소하지 않습니다",
+    "Unsubscribed from all emails.": "",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "이메일 구독 취소는 {{title}}에 대한 유료 구독을 취소하지 않어요",
     "Update": "업데이트",
     "Update your preferences": "설정 업데이트",
     "Verification link sent, check your inbox": "",
-    "Verify your email address is correct": "이메일 주소가 올바른지 확인하세요",
+    "Verify your email address is correct": "이메일 주소가 올바른지 확인해 주세요",
     "View plans": "플랜 보기",
-    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "이메일 주소를 찾을 수 없어 구독을 취소할 수 없습니다. 사이트 관리자에게 문의하세요.",
-    "Welcome back, {{name}}!": "{{name}}님, 다시 돌아오신 것을 환영합니다!",
-    "Welcome back!": "다시 돌아오신 것을 환영합니다!",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "이메일 주소를 찾을 수 없어 구독을 취소할 수 없어요. 사이트 관리자에게 문의해 주세요.",
+    "Welcome back, {{name}}!": "{{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.": "받는 편지함이 이메일을 받지 못하는 경우 이를 바운스(bounce)라고 합니다. 이는 일시적인 경우가 많지만, 이메일 주소가 잘못되었거나 존재하지 않는 경우 영구적인 실패로 반환될 수도 있습니다.",
+    "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.": "받는 편지함이 이메일을 받지 못하는 경우 이를 바운스(bounce)라고 해요. 이는 일시적인 경우가 많지만, 이메일 주소가 잘못되었거나 존재하지 않는 경우 영구적인 실패로 반환될 수도 있어요.",
     "Why has my email been disabled?": "왜 이메일이 비활성화되었나요?",
     "Yearly": "연간",
-    "You currently have a free membership, upgrade to a paid subscription for full access.": "현재 무료 멤버십을 사용 중입니다. 유료 구독으로 업그레이드하여 모든 콘텐츠에 접근하세요.",
-    "You have been successfully resubscribed": "성공적으로 재구독되었습니다",
-    "You're currently not receiving emails": "현재 이메일을 받지 않고 계십니다",
-    "You're not receiving emails": "이메일을 받지 않고 계십니다",
-    "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.": "최근 메시지를 스팸으로 표시했거나 메시지를 제공된 이메일 주소로 전달할 수 없어 이메일을 받지 못하고 계십니다.",
-    "You've successfully signed in.": "성공적으로 로그인되었습니다.",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "현재 무료 멤버십을 사용 중이에요. 유료 구독으로 업그레이드하면 모든 콘텐츠에 접근하실 수 있어요.",
+    "You have been successfully resubscribed": "성공적으로 재구독되었어요",
+    "You're currently not receiving emails": "현재 이메일을 받지 않고 계세요",
+    "You're not receiving emails": "이메일을 받지 않고 계세요",
+    "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.": "최근 메시지를 스팸으로 표시했거나 메시지를 제공된 이메일 주소로 전달할 수 없어 이메일을 받지 못하고 계세요.",
+    "You've successfully signed in.": "성공적으로 로그인되었어요.",
     "You've successfully subscribed to": "",
     "Your account": "계정",
-    "Your input helps shape what gets published.": "회원님의 의견은 게시물을 제작하는 것에 큰 도움이 됩니다.",
-    "Your subscription will expire on {{expiryDate}}": "회원님의 구독은 {{expiryDate}}에 만료됩니다",
-    "Your subscription will renew on {{renewalDate}}": "회원님의 구독은 {{renewalDate}}에 갱신됩니다",
-    "Your subscription will start on {{subscriptionStart}}": "회원님의 구독은 {{subscriptionStart}}에 시작됩니다"
+    "Your input helps shape what gets published.": "회원님의 의견은 게시물을 제작하는 것에 큰 도움이 돼요.",
+    "Your subscription will expire on {{expiryDate}}": "회원님의 구독은 {{expiryDate}}에 만료돼요",
+    "Your subscription will renew on {{renewalDate}}": "회원님의 구독은 {{renewalDate}}에 갱신돼요",
+    "Your subscription will start on {{subscriptionStart}}": "회원님의 구독은 {{subscriptionStart}}에 시작돼요"
 }
diff --git a/ghost/i18n/locales/ko/signup-form.json b/ghost/i18n/locales/ko/signup-form.json
index 6eae6c17e5f..02d4cec4e83 100644
--- a/ghost/i18n/locales/ko/signup-form.json
+++ b/ghost/i18n/locales/ko/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!": "가입을 완료하려면 받은 편지함의 확인 링크를 클릭하세요. 3분 이내에 도착하지 않으면 스팸 폴더를 확인하세요!",
+    "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/lt/comments.json b/ghost/i18n/locales/lt/comments.json
new file mode 100644
index 00000000000..d75807027b9
--- /dev/null
+++ b/ghost/i18n/locales/lt/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{amount}} characters left": "{{amount}} likę simboliai",
+    "{{amount}} comments": "{{amount}} komentarai",
+    "{{amount}} days ago": "Prieš {{amount}} d.",
+    "{{amount}} hours ago": "Prieš {{amount}} val. ",
+    "{{amount}} minutes ago": "Prieš {{amount}} min.",
+    "{{amount}} months ago": "Prieš {{amount}} mėn.",
+    "{{amount}} more": "{{amount}} daugiau",
+    "{{amount}} seconds ago": "Prieš {{amount}} sek.",
+    "{{amount}} weeks ago": "Prieš {{amount}} sav.",
+    "{{amount}} years ago": "Prieš {{amount}} m.",
+    "1 comment": "1 komentaras",
+    "Add comment": "Rašyti komentarą",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Papildykite savo komentarą, prisistatykite ir pasidalinkite savo turimomis žiniomis, kad paskatintumėte prasmingą diskusiją.",
+    "Add reply": "Atsakyti",
+    "Already a member?": "Jau turite paskyrą?",
+    "Anonymous": "Anoniminis",
+    "Become a member of {{publication}} to start commenting.": "Užsiregistruokite {{publication}}, kad galėtumėte komentuoti.",
+    "Become a paid member of {{publication}} to start commenting.": "Tapkite {{publication}} prenumeratoriumi, kad galėtumėte komentuoti.",
+    "Cancel": "Atšaukti",
+    "Comment": "Komentuoti",
+    "Complete your profile": "Pabaikite kurti savo profilį!",
+    "Delete": "Ištrinti",
+    "Deleted member": "Pašalintas narys",
+    "Discussion": "Diskusija",
+    "Edit": "Redaguoti",
+    "Edit this comment": "Redaguoti šį komentarą",
+    "Edited": "Redaguotas",
+    "Enter your name": "Įrašykite savo vardą",
+    "Expertise": "Specializacija",
+    "Founder @ Acme Inc": "Istorikas",
+    "Full-time parent": "Vaiką prižiūrintis tėvas",
+    "Head of Marketing at Acme, Inc": "Tyrinėtojas",
+    "Hide": "Paslėpti",
+    "Hide comment": "Paslėpti komentarą",
+    "Jamie Larson": "Vardenis Pavardenis",
+    "Join the discussion": "Prisijunkite prie diskusijos",
+    "Just now": "Ką tik",
+    "Local resident": "Vietinis gyventojas",
+    "Member discussion": "Komentarai",
+    "Name": "Vardas",
+    "Neurosurgeon": "Neurochirurgas",
+    "One day ago": "Prieš dieną",
+    "One hour ago": "Prieš valandą",
+    "One minute ago": "Prieš minutę",
+    "One month ago": "Prieš mėnesį",
+    "One week ago": "Prieš savaitę",
+    "One year ago": "Prieš metus",
+    "Reply": "Atsakyti",
+    "Reply to comment": "Atsakyti į komentarą",
+    "Report": "Pranešti",
+    "Report comment": "Pranešti apie komentarą",
+    "Report this comment": "Pranešti apie šį komentarą",
+    "Report this comment?": "Pranešti apie šį komentarą?",
+    "Save": "Išsaugoti",
+    "Sending": "Siunčiama",
+    "Sent": "Išsiųsta",
+    "Show": "Rodyti",
+    "Show {{amount}} more replies": "Rodyti daugiau atsakymų ({{amount}})",
+    "Show {{amount}} previous comments": "Rodyti ankstesnius komentarus ({{amount}})",
+    "Show 1 more reply": "Rodyti dar 1 atsakymą",
+    "Show 1 previous comment": "Rodyti ankstesnį komentarą",
+    "Show comment": "Rodyti komentarą",
+    "Sign in": "Prisijungti",
+    "Sign up now": "Registruotis",
+    "Start the conversation": "Parašykite pirmąjį komentarą",
+    "This comment has been hidden.": "Šis komentaras buvo paslėptas.",
+    "This comment has been removed.": "Šis komentaras buvo pašalintas.",
+    "Upgrade now": "Prenumeruokite",
+    "Yesterday": "Vakar",
+    "You want to report this comment?": "Ar norite pranešti apie šį komentarą?",
+    "Your request will be sent to the owner of this site.": "Jūsų pranešimas bus išsiųstas svetainės savininkui."
+}
diff --git a/ghost/i18n/locales/lt/ghost.json b/ghost/i18n/locales/lt/ghost.json
new file mode 100644
index 00000000000..fca04d8525e
--- /dev/null
+++ b/ghost/i18n/locales/lt/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Viso geriausio!",
+    "Complete signup for {{siteTitle}}!": "Užbaikite registraciją svetainėje {{siteTitle}}!",
+    "Complete your sign up to {{siteTitle}}!": "Užbaikite savo registraciją svetainėje {{siteTitle}}!",
+    "Confirm email address": "Patvirtinti el. pašto adresą",
+    "Confirm signup": "Patvirtinti regsitraciją",
+    "Confirm your email address": "Patvirtinkite savo el. pašto adresą",
+    "Confirm your email update for {{siteTitle}}!": "Patvirtinkite savo el. pašto adresą svetainei {{siteTitle}}!",
+    "Confirm your subscription to {{siteTitle}}": "Patvirtinkite {{siteTitle}} prenumeratą",
+    "For your security, the link will expire in 24 hours time.": "Dėl jūsų saugumo, nuoroda nustos galioti po 24 valandų.",
+    "Hey there,": "Sveiki,",
+    "Hey there!": "Sveiki!",
+    "If you did not make this request, you can safely ignore this email.": "Jei šios užklausos nepateikėte, galite ignoruoti šį el. laišką. ",
+    "If you did not make this request, you can simply delete this message.": "Jei šios užklausos nepateikėte, galite saugiai pašalinti šį el. laišką.",
+    "Please confirm your email address with this link:": "Patvirtinkite savo el. pašto adresą su šia nuoroda:",
+    "Secure sign in link for {{siteTitle}}": "Saugi prisijungimo nuoroda į {{siteTitle}}",
+    "See you soon!": "Iki pasimatymo!",
+    "Sent to {{email}}": "Išsiųsta į {{email}}",
+    "Sign in": "Prisijungti",
+    "Sign in to {{siteTitle}}": "Prisijungti prie {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Bakstelėkite toliau pateiktą nuorodą, kad užbaigtumėte registracijos prie {{siteTitle}} procesą ir būtumėte automatiškai prijungti:",
+    "Thank you for signing up to {{siteTitle}}!": "Ačiū, kad registravotės {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "Ačiū, kad prenumeravote {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "Ačiū, kad prenumeravote {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Ačiū, kad registravotės {{siteTitle}}. Spauskite nuorodą žemiau, kad prisijungtumėte.",
+    "This email address will not be used.": "Šis el. pašto adresas nebus panaudotas.",
+    "Welcome back to {{siteTitle}}!": "Sveiki sugrįžę į {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Sveiki sugrįžę! Naudokitės šia nuoroda norėdami saugiai prisijungti prie savo {{siteTitle}} paskyros:",
+    "You can also copy & paste this URL into your browser:": "Taip pat galite nukopijuoti ir įklijuoti šį adresą į naują langą savo naršyklėje.",
+    "You will not be signed up, and no account will be created for you.": "Jūs nebūsite priregistruotas ir jokia paskyra nebus jums sukurta.",
+    "You will not be subscribed.": "Jūs netapsite prenumeratoriumi.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Esate per vieną paspaudimą nuo {{siteTitle}} prenumeratos - patvirtinkite savo el. pašto adresą su šia nuoroda:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Esate per vieną paspaudimą nuo {{siteTitle}} prenumeratos!"
+}
diff --git a/ghost/i18n/locales/lt/portal.json b/ghost/i18n/locales/lt/portal.json
new file mode 100644
index 00000000000..6814572d0d7
--- /dev/null
+++ b/ghost/i18n/locales/lt/portal.json
@@ -0,0 +1,173 @@
+{
+    "(save {{highestYearlyDiscount}}%)": "(Sutaupyk {{highestYearlyDiscount}}%)",
+    "{{amount}} days free": "{{amount}} d. nemokamai",
+    "{{amount}} off": "{{amount}} mažiau",
+    "{{amount}} off for first {{number}} months.": "{{amount}} pigiau pirmiems {{number}} mėnesiams.",
+    "{{amount}} off for first {{period}}.": "{{amount}} pigiau pirmam {{period}}",
+    "{{amount}} off forever.": "{{amount}} mažiau visam laikui.",
+    "{{discount}}% discount": "{{discount}}% nuolaida",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "Į {{memberEmail}} nuo šiol nebebus siunčiamas {{newsletterName}} naujienlaiškis.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "Į {{memberEmail}} nuo šiol nebebus siunčiami pranešimai apie naujus atsakymus į jūsų komentarą.",
+    "{{memberEmail}} will no longer receive this newsletter.": "Į {{memberEmail}} nuo šiol nebebus siunčiamas naujienlaiškis.",
+    "{{trialDays}} days free": "{{trialDays}} d. nemokamai",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Prisijungimo nuoroda buvo išsiųsta į jūsų el. pašto dėžutę. Jei laiškas neatkeliauja per 3 minutes, patikrinkite šlamšto (spam) aplanką.",
+    "Account": "Paskyra",
+    "Account settings": "Paskyros nustatymai",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Pasibaigus nemokamam bandomajam laikotarpiui, bus nuskaičiuota įprasta pasirinkto prenumeratos tipo kaina. Bet kuriuo metu galite atšaukti prenumeratą.",
+    "Already a member?": "Jau turite paskyrą?",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Įvyko klaida. Bandykite dar kartą arba <a>susisiekite su palaikymo komanda</a>, jei klaida išlieka.",
+    "Back": "Atgal",
+    "Back to Log in": "Sugrįžti į prisijungimą",
+    "Billing info": "Atsiskaitymo informacija",
+    "Black Friday": "Juodasis penktadienis",
+    "Cancel anytime.": "Atšaukite bet kuriuo metu.",
+    "Cancel subscription": "Atšaukti prenumeratą",
+    "Cancellation reason": "Prenumeratos atšaukimo priežastis",
+    "Change": "Pakeisti",
+    "Check spam & promotions folders": "Patikrinkite šlamšto (spam) ir reklamos aplankus",
+    "Check with your mail provider": "Pasitarkite su savo el. pašto paslaugų teikėju",
+    "Choose": "Pasirinkite",
+    "Choose a different plan": "Pasirinkite kitą planą",
+    "Choose your newsletters": "Pasirinkite norimus naujienlaiškius",
+    "Click here to retry": "Spauskite čia, kad pakartotumėte",
+    "Close": "Uždaryti",
+    "Comments": "Komentarai",
+    "Complimentary": "Nemokamas",
+    "Confirm": "Patvirtinti",
+    "Confirm cancellation": "Patvirtinti atšaukimą",
+    "Confirm subscription": "Patvirtinti prenumeratą",
+    "Contact support": "Susisiekti su pagalba",
+    "Continue": "Tęsti",
+    "Continue subscription": "Pratęsti prenumeratą",
+    "Could not sign in. Login link expired.": "Nepavyko prijungti. Prisijungimo nuoroda nebegalioja.",
+    "Could not update email! Invalid link.": "Nepavyko atnaujinti el. pašto adreso! Negaliojanti nuoroda.",
+    "Create a new contact": "Sukurti naują kontaktą",
+    "Current plan": "Dabartinis planas",
+    "Delete account": "Ištrinti paskyrą",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Neplanavote to daryti? Galite keisti nustatymus <button>čia</button>.",
+    "Don't have an account?": "Dar neturite paskyros?",
+    "Edit": "Redaguoti",
+    "Email": "El. paštas",
+    "Email newsletter": "Naujienlaiškis el. paštu",
+    "Email preferences": "El. pašto nustatymai",
+    "Emails": "Laiškai",
+    "Emails disabled": "El. laiškai deaktyvuoti",
+    "Ends {{offerEndDate}}": "Baigiasi {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "Error": "Klaida",
+    "Expires {{expiryDate}}": "Nustoja galioti {{expiryDate}}",
+    "Forever": "Neribotam laikui",
+    "Free Trial – Ends {{trialEnd}}": "Nemokamas bandomasis laikotarpis – Baigiasi {{trialEnd}}",
+    "Get help": "Gauti pagalbos",
+    "Get in touch for help": "Susisiekti dėl pagalbos",
+    "Get notified when someone replies to your comment": "Gaukite pranešimą, kai kas nors atsakys į jūsų komentarą",
+    "Give feedback on this post": "Įvertinkite šį straipsnį",
+    "Help! I'm not receiving emails": "Pagalbos! Negaunu el. laiškų",
+    "Here are a few other sites you may enjoy.": "Tai keletas kitų svetainių, kurios jums gali patikti.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Jei naujienlaiškis pažymėtas kaip šlamštas, el. laiškai automatiškai išjungiami tam el. pašto adresui, siekiant užtikrinti, kad nebegautumėte jokių nepageidaujamų pranešimų.",
+    "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.": "Jei el. laiškus kaip šlamštą pažymėjote netyčia arba norite vėl juos gauti, galite iš naujo prenumeruoti naujienlaiškį spustelėdami mygtuką ankstesniame ekrane.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Jei prenumeratą nutrauksite dabar, vis dar galėsite ja naudotis iki {{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}}": "Jei turite įmonės ar vyriausybės el. pašto paskyrą, susisiekite su IT skyriumi ir paprašykite leisti gauti el. laiškus iš {{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.": "Jei norite vėl gauti el. laiškus, būtų geriausia patikrinti įvestą el. pašto adresą ir ankstesniame ekrane spustelėti prenumeruoti.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Jei negaunate el. paštu naujienlaiškio, kurį užsiprenumeravote, štai keli dalykai, kuriuos reikia patikrinti.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Jei atlikote visas šias patikras ir vis tiek negaunate el. laiškų, bandykite kreiptis pagalbos: {{supportAddress}}",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Jei nuolatos nepavyks išsiųsti naujienlaiškio, siuntimas šiai paskyrai bus išjungtas",
+    "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.": "El. pašto programoje pridėkite {{senderEmail}} į savo kontaktų sąrašą. Tai parodys jūsų el. pašto paslaugų teikėjui, kad šiuo adresu siunčiami el. laiškai turėtų būti patikimi.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
+    "Less like this": "Mažiau tokių, kaip šis",
+    "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\".": "Įsitikinkite, kad el. laiškai netyčia nepatenka į pašto dėžutės aplankus „Šlamštas“ arba „Reklamos“. Jei taip įvyko, spustelėkite \"Žymėti kaip ne šlamštą\" ir (arba) \"Perkelti į gautuosius\".",
+    "Manage": "Tvarkyti",
+    "Maybe later": "Galbūt vėliau",
+    "Memberships unavailable, contact the owner for access.": "Narystės negalimos, susisiekite su savininku dėl prieigos.",
+    "Monthly": "Mėnesinis",
+    "More like this": "Daugiau tokių, kaip šis",
+    "Name": "Vardas",
+    "Need more help? Contact support": "Reikia daugiau pagalbos? Susisiekite",
+    "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).": "Naujienlaiškiai gali būti išjungti paskyroje dėl dviejų priežasčių: ankstesnis el. laiškas buvo pažymėtas kaip šlamštas arba bandymai išsiųsti el. laišką buvo nuolatos atmetami.",
+    "Not receiving emails?": "Negaunate el. laiškų?",
+    "Now check your email!": "Dabar patikrinkite savo el. paštą",
+    "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.": "Jei užsiprenumeravę iš naujo nematote el. laiškų gautuosiuose, patikrinkite šlamšto aplanką. Kai kurie el. paslaugų teikėjai registruoja ankstesnius laiškų žymėjimus dėl šlamšto ir toliau juos žymi. Jei taip atsitiks, pažymėkite naujausią gautą laišką kaip „Ne šlamštą“, kad grąžintumėte jį į pagrindinių gautųjų sąrašą.",
+    "Permanent failure (bounce)": "Nuolatinis atmetimas",
+    "Phone number": "",
+    "Plan": "Planas",
+    "Plan checkout was cancelled.": "Plano apmokėjimas buvo atšauktas.",
+    "Plan upgrade was cancelled.": "Plano pagerinimas buvo atšauktas.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Prašome susisiekti {{supportAddress}}, norėdami koreguoti savo nemokamą prenumeratą.",
+    "Please enter {{fieldName}}": "",
+    "Please fill in required fields": "Užpildykite visus privalomus laukus",
+    "Price": "Kaina",
+    "Re-enable emails": "Iš naujo įjungti el. laiškus",
+    "Recommendations": "Rekomendacijos",
+    "Renews at {{price}}.": "Atsinaujins už",
+    "Retry": "Kartoti",
+    "Save": "Išsaugoti",
+    "Send an email and say hi!": "Siųskite el. laišką ir pasisveikinkite!",
+    "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.": "Nusiųskite el. laišką adresu {{senderEmail}} ir pasisveikinkite. Tai taip pat gali padėti jūsų pašto paslaugų teikėjui pranešti, kad šiuo adresu siunčiami el. laiškai turėtų būti patikimi.",
+    "Sending login link...": "Siunčiama prisijungimo nuoroda...",
+    "Sending...": "Siunčiama...",
+    "Show all": "Rodyti viską",
+    "Sign in": "Prisijungti",
+    "Sign out": "Atsijungti",
+    "Sign up": "Registruotis",
+    "Signup error: Invalid link": "Registracijos klaida: negaliojanti nuoroda",
+    "Something went wrong, please try again later.": "",
+    "Sorry, that didn’t work.": "Atsiprašome, nepavyko.",
+    "Spam complaints": "Skundai dėl šlamšto",
+    "Start {{amount}}-day free trial": "Pradėti {{amount}}-dienų nemokamą bandomąją versiją",
+    "Starting {{startDate}}": "Prasidės {{startDate}}",
+    "Starting today": "Prasideda šiandien",
+    "Submit feedback": "Pateikti atsiliepimą",
+    "Subscribe": "Prenumeruoti",
+    "Subscribed": "Užsiprenumeruota",
+    "Success": "Viskas pavyko",
+    "Success! Check your email for magic link to sign-in.": "Viskas pavyko! Dabar savo el. pašto dėžutėje ieškokite specialios nuorodos prisijungimui. ",
+    "Success! Your account is fully activated, you now have access to all content.": "Pavyko! Jūsų paskyra pilnai aktyvuota, nuo šiol turite prieigą prie specialaus turinio.",
+    "Success! Your email is updated.": "Pavyko! Jūsų el. pašto adresas atnaujintas.",
+    "Successfully unsubscribed": "Prenumerata sėkmingai atšaukta",
+    "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Ačiū, kad užsiprenumeravote. Prieš pradėdami skaityti, peržvelkite ir keletą kitų svetainių, kurios jums gali patikti.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
+    "Thanks for the feedback!": "Ačiū už atsiliepimą!",
+    "That didn't go to plan": "Kažkas nepavyko",
+    "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>.": "Nustatytas El. pašto adresas yra {{memberEmail}} – jei jis neteisingas, galite jį atnaujinti <button>paskyros nustatymuose</button>.",
+    "There was a problem submitting your feedback. Please try again a little later.": "Pateikiant atsiliepimą iškilo problema. Bandykite dar kartą vėliau.",
+    "There was an error processing your payment. Please try again.": "",
+    "This site is invite-only, contact the owner for access.": "Ši svetainė pasiekiama tik su pakvietimu, susisiekite su savininku dėl prieigos. ",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Jei norite užbaigti registraciją, gautame el. laiške spustelėkite patvirtinimo nuorodą. Jei laiško negaunate per 3 minutes, patikrinkite šlamšto (spam) aplanką!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Išbandykite {{amount}} d. nemokamai, vėliau {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Gaukite prieigą prie visų naujienlaiškių įsigiję mokamą prenumeratą.",
+    "Unsubscribe from all emails": "Atšaukti visas laiškų prenumeratas.",
+    "Unsubscribed": "Nebeprenumeruojama",
+    "Unsubscribed from all emails.": "Atšauktos visų laiškų prenumeratos.",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Naujienlaiškio prenumeratos atšaukimas nenutrauks jūsų įsigytos mokamos {{title}} prenumeratos",
+    "Update": "Atnaujinti",
+    "Update your preferences": "Atnaujinti nustatymus",
+    "Verification link sent, check your inbox": "Patvirtinimo nuoroda išsiųsta, patikrinkite savo el. pašto dėžutę",
+    "Verify your email address is correct": "Įsitikinkite, jog jūsų el pašto adresas yra teisingas",
+    "View plans": "Peržiūrėti planus",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Nepavyko atšaukti laiškų prenumeratos, nes nepavyko rasti jūsų el. pašto adreso sistemoje. Susisiekite su svetainės savininku. ",
+    "Welcome back, {{name}}!": "Sveiki sugrįžę, {{name}}!",
+    "Welcome back!": "Sveiki sugrįžę!",
+    "Welcome to {{siteTitle}}": "Sveiki apsilankę {{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.": "Kai el. pašto dėžutė nepriima el. laiško, tai paprastai vadinama atmetimu. Daugeliu atvejų tai gali būti laikina. Tačiau kai kuriais atvejais atšauktas el. laiškas gali būti grąžintas kaip pasikartojantis gedimas, kai el. pašto adresas neteisingas arba neegzistuoja.",
+    "Why has my email been disabled?": "Kodėl mano el. paštas buvo deaktyvuotas?",
+    "Yearly": "Metinis",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Jūsų narystė šiuo metu yra nemokama. Norėdami turėti pilną prieigą įsigykite mokamą prenumeratą.",
+    "You have been successfully resubscribed": "Jūs sėkmingai atkūrėte prenumeratą",
+    "You're currently not receiving emails": "Jūs šiuo metu negaunate el. laiškų",
+    "You're not receiving emails": "Jūs negaunate el. laiškų",
+    "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.": "Jūs šiuo metu negaunate el. laiškų, nes pažymėjote naujausią laišką kaip šlamštą arba dėl to, kad nepavyko išsiųsti pranešimų jūsų nurodytu el. pašto adresu.",
+    "You've successfully signed in.": "Sėkmingai prisijungėte.",
+    "You've successfully subscribed to": "Sėkmingai užsiprenumeravote",
+    "Your account": "Jūsų paskyra",
+    "Your input helps shape what gets published.": "Jūsų indėlis padeda kurti tai, kas yra viešinama.",
+    "Your subscription will expire on {{expiryDate}}": "Jūsų prenumerata baigsis {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Jūsų prenumerata atsinaujins {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Jūsų prenumerata prasidės {{subscriptionStart}}"
+}
diff --git a/ghost/i18n/locales/lt/signup-form.json b/ghost/i18n/locales/lt/signup-form.json
new file mode 100644
index 00000000000..4e7d6840d23
--- /dev/null
+++ b/ghost/i18n/locales/lt/signup-form.json
@@ -0,0 +1,9 @@
+{
+    "Email sent": "El. laiškas išsiųstas",
+    "Now check your email!": "Dabar patikrinkite savo el. paštą!",
+    "Please enter a valid email address": "Įveskite teisingą el. pašto adresą",
+    "Something went wrong, please try again.": "Kažkas ne taip, bandykite dar kartą.",
+    "Subscribe": "Prenumeruokite naujienlaiškį",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Norėdami užbaigti registraciją, spustelėkite patvirtinimo nuorodą gautame el. laiške. Jei laiško negaunate per 3 minutes, patikrinkite šlamšto (spam) aplanką!",
+    "Your email address": "Jūsų el. pašto adresas"
+}
diff --git a/ghost/i18n/locales/mk/comments.json b/ghost/i18n/locales/mk/comments.json
new file mode 100644
index 00000000000..03bc9ee6fc9
--- /dev/null
+++ b/ghost/i18n/locales/mk/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{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.": "Станете член на {{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": "Основач @ Примерна Компанија",
+    "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": "Покажи уште {{amount}} одговори",
+    "Show {{amount}} previous comments": "Покажи {{amount}} претходни коментари",
+    "Show 1 more reply": "Покажи уште 1 одговор",
+    "Show 1 previous comment": "Покажи 1 претходен коментар",
+    "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/mk/ghost.json b/ghost/i18n/locales/mk/ghost.json
new file mode 100644
index 00000000000..633d547a942
--- /dev/null
+++ b/ghost/i18n/locales/mk/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Сѐ најдобро!",
+    "Complete signup for {{siteTitle}}!": "Завршете ја регистрацијата за {{siteTitle}}!",
+    "Complete your sign up to {{siteTitle}}!": "Завршете ја регистрацијата на {{siteTitle}}!",
+    "Confirm email address": "Потврдете email адреса",
+    "Confirm signup": "Потврдете регистрација",
+    "Confirm your email address": "Потврдете ја вашата email адреса",
+    "Confirm your email update for {{siteTitle}}!": "Потврдете го ажурирањето на вашиот email за {{siteTitle}}!",
+    "Confirm your subscription to {{siteTitle}}": "Потврдете ја вашата претплата на {{siteTitle}}!",
+    "For your security, the link will expire in 24 hours time.": "Поради безбедност, линкот ќе истече во рок од 24 часа.",
+    "Hey there,": "Здраво",
+    "Hey there!": "Здраво!",
+    "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:": "Потврдете ја вашата email адреса со овој линк:",
+    "Secure sign in link for {{siteTitle}}": "Безбеден линк за најава на {{siteTitle}}",
+    "See you soon!": "Ќе се видиме наскоро!",
+    "Sent to {{email}}": "Испратете на {{email}}",
+    "Sign in": "Најава",
+    "Sign in to {{siteTitle}}": "Најавете се на {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Кликнете на линкот подолу за да ја завршите регистрацијата за {{siteTitle}}. Ќе бидете автоматски најавени.",
+    "Thank you for signing up to {{siteTitle}}!": "Ви благодариме за регистрацијата на {{siteTitle}}",
+    "Thank you for subscribing to {{siteTitle}}!": "Ви благодариме за претплатата на {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "Ви благодариме за претплатата на {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Ви благодариме за претплатата на {{siteTitle}}. Кликнете на линкот за автоматска најава:",
+    "This email address will not be used.": "Оваа email адреса нема да биде употребена.",
+    "Welcome back to {{siteTitle}}!": "Добредојдовте назад на {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Добредојдовте назад! Искористете го овој линк за безбедно да се најавите на вашата сметка за {{siteTitle}}:",
+    "You can also copy & paste this URL into your browser:": "Исто така можете да го копирате и залепите овој линк во вашиот прелистувач.",
+    "You will not be signed up, and no account will be created for you.": "Вие нема да бидете регистрирани и нема да се создаде сметка за вас.",
+    "You will not be subscribed.": "Вие нема да бидете претплатени.",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Вие сте на само еден клик до претплатување на {{siteTitle}} - потврдете ја вашата email адреса со овој линк:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "Вие сте на само еден клик до претплатување на {{siteTitle}}!"
+}
diff --git a/ghost/i18n/locales/mk/portal.json b/ghost/i18n/locales/mk/portal.json
new file mode 100644
index 00000000000..da03650d777
--- /dev/null
+++ b/ghost/i18n/locales/mk/portal.json
@@ -0,0 +1,159 @@
+{
+    "(save {{highestYearlyDiscount}}%)": "(заштеди {{highestYearlyDiscount}}%)",
+    "{{amount}} days free": "{{amount}} бесплатни денови",
+    "{{amount}} off": "{{amount}} помалку",
+    "{{amount}} off for first {{number}} months.": "{{amount}} помалку за првите {{number}} месеци.",
+    "{{amount}} off for first {{period}}.": "{{amount}} помалку за првиот {{period}}.",
+    "{{amount}} off forever.": "{{amount}} помалку, засекогаш.",
+    "{{discount}}% discount": "{{discount}}% попуст",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "Билтенот за {{newsletterName}} нема веќе да се доставува на {{memberEmail}}.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} нема веќе да добива пораки кога некој ќе одговори на вашиот коментар.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} нема веќе да го добива овој билтен.",
+    "{{trialDays}} days free": "{{trialDays}} денови бесплатно",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Линк за најава беше испратен кон вашиот email. Ако не пристигне за повеќе од 3 минути, проверете во спам.",
+    "Account": "Сметка",
+    "Account settings": "Поставки",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Откако пробниот период ќе истече, ќе ви биде наплатена регуларната цена за пакетот кој сте го избрале. Секогаш можете да откажете претходно.",
+    "Already a member?": "Веќе сте член",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Настана неочекувана грешка. Ве молиме обидете се повторно или <a>контактирајте ја подршката</a> ако грешката се повторува.",
+    "Back": "Назад",
+    "Back to Log in": "Назад кон најава",
+    "Billing info": "Информации за наплата",
+    "Black Friday": "Црн петок",
+    "Cancel anytime.": "Откажете било кога.",
+    "Cancel subscription": "Откажете претплата",
+    "Cancellation reason": "Причина за откажување",
+    "Change": "Променете",
+    "Check spam & promotions folders": "Проверете спам и промотивни папки",
+    "Check with your mail provider": "Проверете со вашиот mail сервис",
+    "Choose": "Изберете",
+    "Choose a different plan": "Изберете друг пакет",
+    "Choose your newsletters": "Изберете ги вашите билтени",
+    "Click here to retry": "Кликнете тука за да се обидите повторно",
+    "Close": "Затворете",
+    "Comments": "Коментари",
+    "Complimentary": "Дополнителен",
+    "Confirm": "Потврдете",
+    "Confirm cancellation": "Потврдете откажување",
+    "Confirm subscription": "Потврдете претплата",
+    "Contact support": "Контактирајте подршка",
+    "Continue": "Продолжете",
+    "Continue subscription": "Продолжете ја претплатата",
+    "Could not sign in. Login link expired.": "Не можете да се најавите. Линкот за најава истече.",
+    "Could not update email! Invalid link.": "Не може да се промени email адресата! Линкот е невалиден.",
+    "Create a new contact": "Создајте нов контакт",
+    "Current plan": "Моментален пакет",
+    "Delete account": "Избришете сметка",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Не мислевте да го сторите ова? Променете ги вашите поставки <button>тука</button>.",
+    "Don't have an account?": "Немате сметка?",
+    "Edit": "Променете",
+    "Email": "Email",
+    "Email newsletter": "Email билтен",
+    "Email preferences": "Email поставки",
+    "Emails": "Електронски пошти",
+    "Emails disabled": "Оневозможени електронски пошти",
+    "Ends {{offerEndDate}}": "Завршува на {{offerEndDate}}",
+    "Error": "Грешка",
+    "Expires {{expiryDate}}": "Истекува на {{expiryDate}}",
+    "Forever": "Засекогаш",
+    "Free Trial – Ends {{trialEnd}}": "Пробниот период - Истекува на {{trialEnd}}",
+    "Get help": "Побарајте помош",
+    "Get in touch for help": "Стапете во контакт за помош",
+    "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.": "Овие се неколку други страници кои може да ви се допаднат.",
+    "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 пораките се автоматски оневозможени за таа 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}}.",
+    "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}}": "Ако имате службена или владина email сметка, контактирајте ги надлежните во вашиот ИТ оддел и побарајте им да ви овозможат примање на пораки од {{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.": "Доколку сакате да добивате пораки повторно, најдобри наредни чекори се да ја проверите вашата email адреса за евентуални проблеми и потоа претплатете се повторно на претходниот екран.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a 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}}.": "Доколку сте ги завршиле сите овие проверки и сè уште не добивате пораки, контактирајте на {{supportAddress}} за да добиете подршка.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Во случај кога настане траен неуспех при обид за испраќање на билтен, email пораките ќе бидат оневозможени за сметката.",
+    "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.": "Додајте го {{senderEmail}} во листата на контакти од вашиот email сервис додајте. Ова ќе му сигналира на вашиот email сервис дека пораките добиени од оваа email адреса треба да бидат прифатени.",
+    "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\".": "Осигурајте се дека пораките не завршуваат несакано во папките за спам или промоции од вашиот email. Доколку тоа се случува, обележете ги дека не се спам и префрлете ги во главното поштенско сандаче.",
+    "Manage": "Управувајте",
+    "Maybe later": "Можеби подоцна",
+    "Memberships unavailable, contact the owner for access.": "Зачленувањето не е достапно. За пристап контактирајте го сопственикот.",
+    "Monthly": "Месечно",
+    "More like this": "Повеќе како ова",
+    "Name": "Име",
+    "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).": "Билтените можат да бидат оневозможени за вашата сметка поради две причини: претходна порака била обележана како спам, или обидот за исппраќање на порака резултирал со траен неуспех (отскокнување).",
+    "Not receiving emails?": "Не добивате пораки?",
+    "Now check your email!": "Сега проверете ги пораките1",
+    "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.": "Ве молиме контактирајте на {{supportAddress}} за прилагодување на вашата додатна претплата.",
+    "Please fill in required fields": "Ве молиме пополнете ги задолжителните полиња",
+    "Price": "Цена",
+    "Re-enable emails": "Овозможете пораки",
+    "Recommendations": "Препораки",
+    "Renews at {{price}}.": "Обновувањето е {{price}}.",
+    "Retry": "Обидете се повторно",
+    "Save": "Зачувајте",
+    "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.": "Испратете порака кон {{senderEmail}} и кажете здраво. Исто така, ова може да му сигналира на вашиот email сервис дека пораките кон и од оваа адреса треба да се овозможени.",
+    "Sending login link...": "Испраќање на линкот за најава...",
+    "Sending...": "Испраќање...",
+    "Show all": "Прикажете сè",
+    "Sign in": "Најавете се",
+    "Sign out": "Одјавете се",
+    "Sign up": "Регистрирајте се",
+    "Signup error: Invalid link": "Грешка при регистрација: Невалиден линк",
+    "Sorry, that didn’t work.": "Се извинуваме, тоа не проработи.",
+    "Spam complaints": "Поплаки за спам",
+    "Start {{amount}}-day free trial": "Започнете {{amount}} дневен пробен период",
+    "Starting {{startDate}}": "Започнува на {{startDate}}",
+    "Starting today": "Започнува денес",
+    "Submit feedback": "Испратете забелешка",
+    "Subscribe": "Претплатете се",
+    "Subscribed": "Претплатено",
+    "Success": "Успех",
+    "Success! Check your email for magic link to sign-in.": "Успех! Проверете го вашиот email за линк за најава.",
+    "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.": "Ви благодариме за претплатувањето. Пред да започнете со читање, подолу се неколку други страници кои може да ви се допаднат.",
+    "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> на сметката.",
+    "There was a problem submitting your feedback. Please try again a little later.": "Настана проблем при испраќање на вашата забелешка. Обидете се повторно малку подоцна.",
+    "This site is invite-only, contact the owner for access.": "Оваа страница е достапна само со покана. За пристап контактирајте го сопственикот.",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "За да ја завршите регистрацијата, кликнете на линкот за потврда испратен на вашата email адреса. Ако не пристигне во рок од 3 минути, проверте во спам!",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Пробајте бесплатно за {{amount}} денови, потоа по цена од {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Добијте пристап до сите билтени преку платена претплата.",
+    "Unsubscribe from all emails": "Отпишете се од сите пораки",
+    "Unsubscribed": "Отпишано",
+    "Unsubscribed from all emails.": "Отпишани од сите пораки.",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Отпишувањето од пораките нема да ја откаже платената претплата на {{title}}",
+    "Update": "Ажурирај",
+    "Update your preferences": "Ажурирајте ги поставките",
+    "Verification link sent, check your inbox": "Линкот за потврда беше испратен. Проверете го вашиот email.",
+    "Verify your email address is correct": "Потврете дека вашата email адреса е точна",
+    "View plans": "Видете пакети",
+    "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}}": "Добредојдовте на {{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.": "Кога email адреса не успева да добие порака, тоа се нарекува отскокнување. Во повеќе случаи, ова може да биде привремено. Но, во некои случаи, отскокнувањето може да биде вратено како траен неуспех кога email адресата е невалидна или непостоечка.",
+    "Why has my email been disabled?": "Зошто мојата email адреса беше оневозможена?",
+    "Yearly": "Годишно",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Моментално имате бесплатно членство. Надградете на платена претплата за целосен пристап.",
+    "You have been successfully resubscribed": "Бевте успешно претплатени повторно",
+    "You're currently not receiving emails": "Моментално не добивате пораки",
+    "You're not receiving emails": "Не добивате пораки",
+    "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.": "Не добивате пораки бидејќи вие ја обележавте некоја од последните пораки како спам, или бидејќи пораките не можат да бидат доставени на адресата која ја доставивте.",
+    "You've successfully signed in.": "Успешно се најавивте.",
+    "You've successfully subscribed to": "Успешно се претплативте на",
+    "Your account": "Вашата сметка",
+    "Your input helps shape what gets published.": "Вашиот прилог помага да се оформи она кое ќе биде објавувано.",
+    "Your subscription will expire on {{expiryDate}}": "Вашата претплата ќе истече на {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Вашата претплата ќе биде обновена на {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Вашата претплата ќе започне на {subscriptionStart}}"
+}
diff --git a/ghost/i18n/locales/mk/signup-form.json b/ghost/i18n/locales/mk/signup-form.json
new file mode 100644
index 00000000000..97a913a855c
--- /dev/null
+++ b/ghost/i18n/locales/mk/signup-form.json
@@ -0,0 +1,9 @@
+{
+    "Email sent": "Пораката е испратена",
+    "Now check your email!": "Сега проверете го вашиот email!",
+    "Please enter a valid email address": "Внесете валидна email адреса",
+    "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!": "За да ја завршите регистрацијата, кликнете на потврдниот линк од пораката во вашето поштенско сандаче. Ако не пристигне за повеќе од 3 минути, проверете во спам.",
+    "Your email address": "Вашата email адреса"
+}
diff --git a/ghost/i18n/locales/mn/portal.json b/ghost/i18n/locales/mn/portal.json
index 289bd87058d..5dda0619238 100644
--- a/ghost/i18n/locales/mn/portal.json
+++ b/ghost/i18n/locales/mn/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "{{trialDays}} өдөр үнэгүй",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Таны имэйл рүү нэвтрэх холбоосыг илгээлээ. Хэрвээ 3 минутын дотор ирэхгүй бол спамаа шалгана уу.",
     "Account": "Бүртгэл",
     "Account settings": "Бүртгэлийн тохиргоо",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "Имэйл",
     "Email newsletter": "",
-    "Email preference updated.": "Имэйлийн тохиргоо шинэчлэгдлээ.",
     "Email preferences": "Имэйлийн тохиргоо",
     "Emails": "Имэйлүүд",
     "Emails disabled": "Имэйлийг идэхгүй болгосон",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "Удирдах",
@@ -86,10 +92,12 @@
     "Now check your email!": "Одоо имэйлээ шалгана уу!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Үнэ",
     "Re-enable emails": "Имэйлийг дахин идэвхжүүлэх",
@@ -98,7 +106,7 @@
     "Retry": "Дахин оролдох",
     "Save": "Хадгалах",
     "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 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...": "Нэвтрэх холбоосыг илгээж байна...",
     "Sending...": "Илгээж байна...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "Бүртгүүлэх",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "{{amount}} өдрийн үнэгүй туршилтыг эхлүүлэх",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Захиалгыг амжилттай цуцаллаа",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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>.": "",
     "There was a problem submitting your feedback. Please try again a little later.": "",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Энэхүү сайт руу зөвхөн урилгаар нэвтрэх боломжтой тул та админд нь хандана уу.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Тан руу илгээсэн баталгаажуулах холбоос дээр дарж бүртгэлээ дуусгана уу. Хэрвээ 3 минутын дотор ирэхгүй бол спамаа шалгана уу!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Бүх имэйлийг зогсоох",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Имэйлийг зогсоосон ч таны {{title}} төлбөртэй захиалга цуцлагдахгүй",
     "Update": "",
     "Update your preferences": "Тохиргоогоо шинэчлэх",
diff --git a/ghost/i18n/locales/ms/portal.json b/ghost/i18n/locales/ms/portal.json
index c00b3a67c05..a9766971059 100644
--- a/ghost/i18n/locales/ms/portal.json
+++ b/ghost/i18n/locales/ms/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "Percuma {{amount}} hari",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "{{amount}} potongan untuk {{number}} bulan pertama.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} tidak akan menerima email apabila seseorang membalas komen anda.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} tidak akan menerima newsletter ini lagi.",
     "{{trialDays}} days free": "Percuma {{trialDays}} hari",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Pautan log masuk telah dihantar ke peti masuk anda. Jika ia tidak sampai dalam masa 3 minit, pastikan anda menyemak folder spam anda.",
     "Account": "Akaun",
     "Account settings": "Tetapan akaun",
@@ -48,11 +50,12 @@
     "Edit": "Sunting",
     "Email": "E-mel",
     "Email newsletter": "Newsletter e-mel",
-    "Email preference updated.": "Emel pilihan dikemas kini.",
     "Email preferences": "Emel pilihan",
     "Emails": "E-mel",
     "Emails disabled": "E-mel dilumpuhkan",
     "Ends {{offerEndDate}}": "Tamat pada {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Ralat",
     "Expires {{expiryDate}}": "Luput pada {{expiryDate}}",
     "Forever": "Selamanya",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Jika anda membatalkan langganan anda sekarang, anda akan terus mendapat akses sehingga {{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}}": "Jika anda mempunyai akaun e-mel korporat atau kerajaan, hubungi jabatan IT anda dan minta mereka membenarkan e-mel diterima daripada {{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.": "Jika anda ingin mula menerima e-mel semula, langkah terbaik seterusnya ialah menyemak alamat e-mel anda pada fail untuk sebarang isu dan kemudian klik langgan semula pada skrin sebelumnya.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Jika anda tidak menerima newsletter e-mel yang anda langgan, berikut adalah beberapa perkara untuk diperiksa.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Jika anda tidak menerima newsletter e-mel yang anda langgan, berikut adalah beberapa perkara untuk diperiksa.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Jika anda telah menyelesaikan semua semakan ini dan anda masih tidak menerima e-mel, anda boleh menghubungi untuk mendapatkan sokongan dengan menghubungi {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Sekiranya kegagalan kekal diterima semasa cuba menghantar newsletter, e-mel akan dilumpuhkan pada akaun.",
     "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.": "Dalam klien e-mel anda tambah {{senderEmail}} pada senarai kenalan anda. Ini memberi isyarat kepada pembekal mel anda bahawa e-mel yang dihantar dari alamat ini harus dipercayai.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Kurang macam ni",
     "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\".": "Pastikan e-mel tidak tiba-tiba masuk ke dalam folder Spam atau Promosi peti masuk anda. Jika ya, klik pada \"Tandakan sebagai bukan spam\" dan/atau \"Alih ke peti masuk\".",
     "Manage": "Urus",
@@ -86,10 +92,12 @@
     "Now check your email!": "Semak e-mel anda sekarang!",
     "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.": "Setelah melanggan semula, jika anda masih tidak melihat e-mel dalam peti masuk anda, semak folder spam anda. Sesetengah pembekal peti masuk menyimpan rekod aduan spam sebelumnya dan akan terus membenderakan e-mel. Jika ini berlaku, tandakan surat berita terkini sebagai 'Bukan spam' untuk mengalihkannya kembali ke peti masuk utama anda.",
     "Permanent failure (bounce)": "Kegagalan kekal (bounce)",
+    "Phone number": "",
     "Plan": "Pelan",
     "Plan checkout was cancelled.": "Daftar keluar pelan telah dibatalkan.",
     "Plan upgrade was cancelled.": "Naik taraf pelan telah dibatalkan.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Sila isikan medan yang diperlukan",
     "Price": "Harga",
     "Re-enable emails": "Membolehkan semula e-mel",
@@ -98,7 +106,7 @@
     "Retry": "Cuba semula",
     "Save": "Simpan",
     "Send an email and say hi!": "Hantar e-mel dan katakan hai!",
-    "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.": "Hantar e-mel kepada {{senderEmail}} dan katakan hai. Ini juga boleh membantu memberi isyarat kepada pembekal mel anda bahawa e-mel ke dan dari alamat ini harus dipercayai.",
+    "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.": "Hantar e-mel kepada {{senderEmail}} dan katakan hai. Ini juga boleh membantu memberi isyarat kepada pembekal mel anda bahawa e-mel ke dan dari alamat ini harus dipercayai.",
     "Sending login link...": "Menghantar pautan log masuk...",
     "Sending...": "Menghantar...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Log keluar",
     "Sign up": "Daftar",
     "Signup error: Invalid link": "Ralat daftar: Pautan tidak sah",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Maaf, itu tidak berfungsi.",
     "Spam complaints": "Aduan spam",
     "Start {{amount}}-day free trial": "Mulakan percubaan percuma {{amount}} hari",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Berjaya! E-mel anda dikemas kini.",
     "Successfully unsubscribed": "Pemberhentian langganan berjaya",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Terima kasih atas maklum balas!",
     "That didn't go to plan": "Itu tidak berjalan sesuai dengan rancangan",
     "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>.": "Alamat e-mel yang kami miliki untuk anda adalah {{memberEmail}} — jika itu tidak betul, anda boleh mengemas kini di <button>ruang tetapan akaun</button> anda.",
     "There was a problem submitting your feedback. Please try again a little later.": "Terdapat masalah menghantar maklum balas anda. Sila cuba sebentar lagi.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Laman web ini hanya untuk jemputan, hubungi pemilik untuk akses.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Untuk melengkapkan pendaftaran, klik pautan pengesahan di peti masuk anda. Jika ia tidak tiba dalam masa 3 minit, semak folder spam anda!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Cuba secara percuma selama {{amount}} hari, kemudian {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Buka akses ke semua newsletter dengan menjadi pelanggan berbayar.",
     "Unsubscribe from all emails": "Berhenti langganan dari semua e-mel",
     "Unsubscribed": "Langganan diberhentikan",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Memberhentikan langganan dari e-mel tidak akan membatalkan langganan berbayar anda ke {{title}}",
     "Update": "Kemas kini",
     "Update your preferences": "Kemas kini keutamaan anda",
diff --git a/ghost/i18n/locales/nl/portal.json b/ghost/i18n/locales/nl/portal.json
index 264f6a45f13..7103f4c5882 100644
--- a/ghost/i18n/locales/nl/portal.json
+++ b/ghost/i18n/locales/nl/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dagen gratis",
     "{{amount}} off": "{{amount}} korting",
     "{{amount}} off for first {{number}} months.": "{{amount}} korting voor de eerste {{number}} maanden.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "{{trialDays}} dagen gratis",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Je hebt een email met een login link ontvangen. Check je spamfolder als hij niet binnen de 3 minuten aankomt.",
     "Account": "Account",
     "Account settings": "Gegevens",
@@ -48,11 +50,12 @@
     "Edit": "Bewerken",
     "Email": "E-mail",
     "Email newsletter": "Nieuwsbrief",
-    "Email preference updated.": "E-mailinstellingen aanpassen",
     "Email preferences": "E-mailinstellingen",
     "Emails": "E-mails",
     "Emails disabled": "E-mails zijn uitgeschakeld",
     "Ends {{offerEndDate}}": "Eindigt op {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Fout",
     "Expires {{expiryDate}}": "Verloopt op {{expiryDate}}",
     "Forever": "Voor altijd",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Minder hiervan",
     "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": "Beheer",
@@ -86,10 +92,12 @@
     "Now check your email!": "Check nu je e-mail!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Prijs",
     "Re-enable emails": "E-mails weer inschakelen",
@@ -98,7 +106,7 @@
     "Retry": "Opnieuw proberen",
     "Save": "Opslaan",
     "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 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...": "Inloglink versturen...",
     "Sending...": "Versturen...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Uitloggen",
     "Sign up": "Registreren",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "Start gratis je {{amount}}-daagse proefperiode",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Succesvol uitgeschreven",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Bedankt voor je feedback!",
     "That didn't go to plan": "Er ging iets mis",
     "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 an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Deze site is alleen toegankelijk op uitnodiging, neem contact op met de eigenaar.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Klik op de bevestigingslink in de e-mail om je registratie af te ronden. Check ook je spamfolder als hij niet binnen de 3 minuten aankomt.",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Uitschrijven voor alles",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Je betaalde abonnement voor {{title}} wordt niet geannuleerd als je je uitschrijft voor e-mails",
     "Update": "",
     "Update your preferences": "Voorkeuren aanpassen",
diff --git a/ghost/i18n/locales/nn/portal.json b/ghost/i18n/locales/nn/portal.json
index 4547482d520..9575bf48e47 100644
--- a/ghost/i18n/locales/nn/portal.json
+++ b/ghost/i18n/locales/nn/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dagar gratis",
     "{{amount}} off": "avslag",
     "{{amount}} off for first {{number}} months.": "{{amount}} dei første {{number}} månadane.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} vil ikkje lenger motta e-post når nokon svarar på kommentarar.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} vil ikkje lenger motta dette nyheitsbrevet.",
     "{{trialDays}} days free": "{{trialDays}} dagar gratis",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Ei innlogginslenke har blitt sendt til innboksen din. Sjekk søppelposten din om lenka ikkje kjem innan 3 minutt.",
     "Account": "Brukar",
     "Account settings": "Brukarinnstillingar",
@@ -48,11 +50,12 @@
     "Edit": "Endra",
     "Email": "E-post",
     "Email newsletter": "E-post nyheitsbrev",
-    "Email preference updated.": "E-post preferansane dine er oppdatert.",
     "Email preferences": "E-post preferansar.",
     "Emails": "E-postar.",
     "Emails disabled": "E-postar skrudd av",
     "Ends {{offerEndDate}}": "Sluttar {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Feil",
     "Expires {{expiryDate}}": "Går ut {{expiryDate}}",
     "Forever": "For evig",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Vis du avslutter abonnementet no, vil du framleis ha tilgang fram til {{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}}": "Viss du har har e-post hos ein bedrift kan du spørra IT-avdelinga om dei kan tillata e-postar frå {{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.": "Viss du vil få e-postar igjen, er det enklaste å sjekka e-postadressa du har gitt oss for feil, og så abonnera igjen ved å klikka resubscribe på førre skjerm.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Viss du ikkje mottar nyheitsbrevet du har abonnert på, kan du prøva dette. ",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Viss du ikkje mottar nyheitsbrevet du har abonnert på, kan du prøva dette. ",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Viss du har fullført desse stega og framleis ikkje får nyheitsbrev, kan du ta kontakt med oss på {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "I tilfelle ein permanent feil mottas ved forøsk på å senda eit nyheitsbrev vil e-poster bli deaktivert på kontoen.",
     "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.": "Legg til {{senderEmail}} til e-posten din si kontaktliste. Dette signaliserer til leverandøren din at e-poster frå denne adressa er til å stola på.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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\".": "Pass på at e-postane ikkje ender opp i spam-mappa. Viss dei gjer, marker dei anten som \"Dette er ikkje spam\" og/eller \"Flytt til innboks\".",
     "Manage": "Innstillinger",
@@ -86,10 +92,12 @@
     "Now check your email!": "Sjekk e-posten 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.": "Sjekk spam-mappa di om du framleis ikkje ser e-postane etter å ha abonnert på ny. Nokon e-postleverandørar kan flagga e-postar som spam basert på tidlegare e-postar. Viss dette skjer, marker den siste du mottok i spam-mappa som 'ikkje spam' og flytt tilbake til innboksen din.",
     "Permanent failure (bounce)": "Permanent feil",
+    "Phone number": "",
     "Plan": "Abonnement",
     "Plan checkout was cancelled.": "Betaling kansellert.",
     "Plan upgrade was cancelled.": "Oppgradering kansellert.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Ver gilde og fyll inn dei obligatoriske felta",
     "Price": "Pris",
     "Re-enable emails": "Aktiver e-postar på ny",
@@ -98,7 +106,7 @@
     "Retry": "Prøv på ny",
     "Save": "Lagra",
     "Send an email and say hi!": "Send ein e-post og sei 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.": "Send ein e-post til {{senderEmail}} og sei hallo. Dette kan også hjelpa å signalisera for leverandøren at denne e-postadressa er trygg.",
+    "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 ein e-post til {{senderEmail}} og sei hallo. Dette kan også hjelpa å signalisera for leverandøren at denne e-postadressa er trygg.",
     "Sending login link...": "Sender innloggingslenke...",
     "Sending...": "Sender...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Logg ut",
     "Sign up": "Registrer deg",
     "Signup error: Invalid link": "Registreringsfeil: Ugyldig lenke",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Beklagar, det verka ikkje.",
     "Spam complaints": "Spamklagar",
     "Start {{amount}}-day free trial": "Start {{amount}}-dagar gratis prøveperiode",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Vellykka! E-posten din er oppdatert.",
     "Successfully unsubscribed": "Vellykka kansellering.",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Takk for tilbakemeldingen!",
     "That didn't go to plan": "Det gjekk ikkje etter planen",
     "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>.": "E-postadressa me har på deg er {{memberEmail}} – viss det ikkje er riktig, kan du oppdatera i <button>brukarinnstillingane</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Det var eit problem med å senda tilbakemeldinga di. Vennligst prøv igjen litt seinare.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Denne sida er kun for inviterte, ta kontakt med eigaren for tilgang.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Klikk på bekreftelseslenka i innboksen din for å fullføra registreringa. Sjekk spam-mappa di om lenka ikkje har kome innan 3 minutt.",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Prøv gratis i {{amount}} dagar, deretter {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Få tilgang til alle nyheitsbreva med å bli ein betalande abonnent.",
     "Unsubscribe from all emails": "Slutt å motta e-postar",
     "Unsubscribed": "Abonnement avslutta",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Å avslutta e-postabonnementa vil ikkje kansellera det betalta abonnementet ditt til {{title}}",
     "Update": "Oppdater",
     "Update your preferences": "Oppdater preferansane dine",
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..d7fb7ecb25c 100644
--- a/ghost/i18n/locales/no/portal.json
+++ b/ghost/i18n/locales/no/portal.json
@@ -1,158 +1,173 @@
 {
-    "{{amount}} days free": "",
-    "{{amount}} off": "",
-    "{{amount}} off for first {{number}} months.": "",
-    "{{amount}} off for first {{period}}.": "",
-    "{{amount}} off forever.": "",
+    "(save {{highestYearlyDiscount}}%)": "",
+    "{{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",
+    "+1 (123) 456-7890": "",
     "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 preference updated.": "Innstillinger for epost oppdatert",
+    "Email newsletter": "Epostbasert nyhetsbrev",
     "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}}",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "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}}.": "",
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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)",
+    "Phone number": "",
+    "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 enter {{fieldName}}": "",
+    "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 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!": "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",
+    "Something went wrong, please try again later.": "",
+    "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.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Denne siten er kun fo inviterte. Kontakt eieren for invitasjon.",
+    "This site is not accepting payments at the moment.": "",
     "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!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "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",
+    "Unsubscribed from all emails.": "",
     "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}}"
 }
diff --git a/ghost/i18n/locales/pl/comments.json b/ghost/i18n/locales/pl/comments.json
index bcb0715d9a1..650ea02f736 100644
--- a/ghost/i18n/locales/pl/comments.json
+++ b/ghost/i18n/locales/pl/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": "",
+    "{{amount}} characters left": "Pozostało {{amount}} znaków",
+    "{{amount}} comments": "{{amount}} komentarzy",
+    "{{amount}} days ago": "{{amount}} dni temu",
+    "{{amount}} hours ago": "{{amount}} godzin temu",
+    "{{amount}} minutes ago": "{{amount}} minut temu",
+    "{{amount}} months ago": "{{amount}} miesięcy temu",
+    "{{amount}} more": "{{amount}} więcej",
+    "{{amount}} seconds ago": "{{amount}} sekund temu",
+    "{{amount}} weeks ago": "{{amount}} tygodni temu",
+    "{{amount}} years ago": "{{amount}} lat temu",
+    "1 comment": "1 komentarz",
+    "Add comment": "Dodaj komentarz",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Dodaj więcej informacji do Twojego komentarza, następnie udostępnij proszę Twoje imię i doświadczenie w celu wzbogacenia jakości dyskusji.",
+    "Add reply": "Dodaj odpowiedź",
+    "Already a member?": "Posiadasz już konto?",
+    "Anonymous": "Anonimowy",
+    "Become a member of {{publication}} to start commenting.": "Dołącz do społeczności {{publication}}, by zacząć komentować.",
+    "Become a paid member of {{publication}} to start commenting.": "Dołącz do płatnej społeczności {{publication}}, by zacząć komentować.",
+    "Cancel": "Anuluj",
+    "Comment": "Skomentuj",
+    "Complete your profile": "Skompletuj Twój profil",
+    "Delete": "Usuń",
+    "Deleted member": "Usunięte konto",
+    "Discussion": "Dyskusja",
+    "Edit": "Edytuj",
+    "Edit this comment": "Edytuj komentarz",
+    "Edited": "Edytowano",
+    "Enter your name": "Podaj Twoje imię",
+    "Expertise": "Doświadczenie",
+    "Founder @ Acme Inc": "Founder @ Acme Inc",
     "Full-time parent": "",
-    "Head of Marketing at Acme, Inc": "",
-    "Hide": "",
-    "Hide comment": "",
-    "Jamie Larson": "",
-    "Join the discussion": "",
-    "Just now": "",
+    "Head of Marketing at Acme, Inc": "Head of Marketing at Acme, Inc",
+    "Hide": "Ukryj",
+    "Hide comment": "Ukryj komentarz",
+    "Jamie Larson": "Jamie Larson",
+    "Join the discussion": "Dołącz do dyskusji",
+    "Just now": "Przed chwilą",
     "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.": ""
+    "Member discussion": "Członek dyskusji",
+    "Name": "Imię",
+    "Neurosurgeon": "Neurochirurg",
+    "One day ago": "Dzień temu",
+    "One hour ago": "Godzinę temu",
+    "One minute ago": "Minutę temu",
+    "One month ago": "Miesiąc temu",
+    "One week ago": "Tydzień temu",
+    "One year ago": "Rok temu",
+    "Reply": "Odpowiedz",
+    "Reply to comment": "Napisz odpowiedź do komentarza",
+    "Report": "Zgłoś",
+    "Report comment": "Zgłoś komentarz",
+    "Report this comment": "Zgłoś ten komentarz",
+    "Report this comment?": "Czy chcesz zgłosić ten komentarz?",
+    "Save": "Zapisz",
+    "Sending": "Wysyłanie",
+    "Sent": "Wysłano",
+    "Show": "Pokza",
+    "Show {{amount}} more replies": "Pokaż {{amount}} kolejnych odpowiedzi",
+    "Show {{amount}} previous comments": "Pokaż {{amount}} poprzednich komentarzy",
+    "Show 1 more reply": "Pokaż następną odpowiedź",
+    "Show 1 previous comment": "Pokaż poprzedni komentarz",
+    "Show comment": "Pokaż komentarz",
+    "Sign in": "Zaloguj się",
+    "Sign up now": "Zarejestruj się",
+    "Start the conversation": "Rozpocznij dyskusję",
+    "This comment has been hidden.": "Komentarz został ukryty.",
+    "This comment has been removed.": "Komentarz został usunięty.",
+    "Upgrade now": "Ulepsz teraz",
+    "Yesterday": "Wczoraj",
+    "You want to report this comment?": "Czy chcesz zgłosić ten komentarz?",
+    "Your request will be sent to the owner of this site.": "Twoje zgłoszenie zostało przesłane do administratora strony."
 }
diff --git a/ghost/i18n/locales/pl/ghost.json b/ghost/i18n/locales/pl/ghost.json
index 83516f86c30..542f5ec5d09 100644
--- a/ghost/i18n/locales/pl/ghost.json
+++ b/ghost/i18n/locales/pl/ghost.json
@@ -1,34 +1,34 @@
 {
     "All the best!": "Wszystkiego dobrego!",
-    "Complete signup for {{siteTitle}}!": "Dokończ rejestrację do {{siteTitle}}",
+    "Complete signup for {{siteTitle}}!": "Dokończ rejestrację do {{siteTitle}}!",
     "Complete your sign up to {{siteTitle}}!": "Dokończ swoją rejestrację do {{siteTitle}}!",
     "Confirm email address": "Potwierdź adres email",
     "Confirm signup": "Potwierdź rejestrację",
     "Confirm your email address": "Potwierdź swój adres email",
     "Confirm your email update for {{siteTitle}}!": "Potwierdź zmianę adresu email do {{siteTitle}}!",
     "Confirm your subscription to {{siteTitle}}": "Potwierdź swoją subskrypcję do {{siteTitle}}!",
-    "For your security, the link will expire in 24 hours time.": "Dla bezpieczeństwa link wygaśnie po 24 godzinach.",
+    "For your security, the link will expire in 24 hours time.": "Dla Twojego bezpieczeństwa link wygaśnie po 24 godzinach.",
     "Hey there,": "Cześć,",
     "Hey there!": "Cześć!",
-    "If you did not make this request, you can safely ignore this email.": "Jeśli to nie ty wysłałeś tę prośbę, możesz bezpiecznie zignorować ten email.",
-    "If you did not make this request, you can simply delete this message.": "Jeśli to nie ty wysłałeś tę prośbę, możesz po prostu skasować ten email.",
-    "Please confirm your email address with this link:": "Potwierdź proszę swój adres email klikając w ten link:",
+    "If you did not make this request, you can safely ignore this email.": "Jeśli to nie Ty wysłałeś tę prośbę, możesz bezpiecznie zignorować ten email.",
+    "If you did not make this request, you can simply delete this message.": "Jeśli to nie Ty wysłałeś tę prośbę, możesz po prostu skasować ten email.",
+    "Please confirm your email address with this link:": "Potwierdź proszę swój adres email, klikając w ten link:",
     "Secure sign in link for {{siteTitle}}": "Bezpieczny link logowania do {{siteTitle}}",
     "See you soon!": "Do zobaczenia!",
     "Sent to {{email}}": "Wysłano do {{email}}",
     "Sign in": "Zaloguj się",
     "Sign in to {{siteTitle}}": "Zaloguj się do {{siteTitle}}",
-    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Kliknij w link poniżej aby dokończyć proces rejestracji do {{siteTitle}} i zostać automatycznie zalogowanym:",
-    "Thank you for signing up to {{siteTitle}}!": "Dziękujemy za rejestrację do {{siteTitle}}!",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Kliknij w link poniżej, aby dokończyć proces rejestracji do {{siteTitle}}:",
+    "Thank you for signing up to {{siteTitle}}!": "Dziękujemy za rejestrację w {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}!": "Dziękujemy za zapisanie się do {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}.": "Dziękujemy za zapisanie się do {{siteTitle}}.",
-    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Dziękujemy za zapisanie się do {{siteTitle}}. Kliknij w link poniżej aby zostać automatycznie zalogowanym:",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Dziękujemy za zapisanie się do {{siteTitle}}. Kliknij w link poniżej, aby zostać zalogowanym:",
     "This email address will not be used.": "Ten adres email nie będzie więcej używany.",
-    "Welcome back to {{siteTitle}}!": "Witaj ponownie na {{siteTitle}}!",
-    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Witaj ponownie! Użyj tego linku aby się bezpiecznie zalogować do swojego konta na {{siteTitle}}:",
-    "You can also copy & paste this URL into your browser:": "Możesz też skopiować i wkleić ten adres URL w swojej przeglądarce internetowej:",
-    "You will not be signed up, and no account will be created for you.": "Nie zostaniesz zarejestrowany i twoje konto nie zostanie utworzone.",
+    "Welcome back to {{siteTitle}}!": "Witaj ponownie w serwisie {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "Witaj ponownie! Użyj tego linku, aby się bezpiecznie zalogować do swojego konta w serwisie {{siteTitle}}:",
+    "You can also copy & paste this URL into your browser:": "Możesz również skopiować i wkleić ten adres URL w swojej przeglądarce internetowej:",
+    "You will not be signed up, and no account will be created for you.": "Nie zostaniesz zarejestrowany i Twoje konto nie zostanie utworzone.",
     "You will not be subscribed.": "Nie zostaniesz zapisany.",
-    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Jesteś jedno kliknięcie od zapisania się do {{siteTitle}} - potwierdź proszę swój adres email tym linkiem:",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Jesteś jedno kliknięcie od zapisania się do {{siteTitle}} - potwierdź proszę adres email tym linkiem:",
     "You're one tap away from subscribing to {{siteTitle}}!": "Jesteś jedno kliknięcie od zapisania się do {{siteTitle}}!"
 }
diff --git a/ghost/i18n/locales/pl/portal.json b/ghost/i18n/locales/pl/portal.json
index e741b62e8de..4f8d0035c61 100644
--- a/ghost/i18n/locales/pl/portal.json
+++ b/ghost/i18n/locales/pl/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dni za darmo",
     "{{amount}} off": "Rabat {{amount}}",
     "{{amount}} off for first {{number}} months.": "Rabat {{amount}} na pierwsze {{number}} miesiące.",
@@ -7,24 +8,25 @@
     "{{discount}}% discount": "Rabat {{discount}}%",
     "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} nie będzie już otrzymywać newslettera {{newsletterName}}.",
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} nie będzie już otrzymywać wiadomości, gdy ktoś odpowie na Twój komentarz.",
-    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} nie będzie już otrzymywać tego newslettera.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} nie będzie już otrzymywać newslettera.",
     "{{trialDays}} days free": "{{trialDays}} darmowych dni",
-    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Link do logowania został wysłany do twojej skrzynki odbiorczej. Jeśli nie dotrze w ciągu 3 minut, sprawdź swój folder spamu.",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Link do logowania został wysłany do Twojej skrzynki odbiorczej. Jeśli nie dotrze w ciągu 3 minut, sprawdź folder spam.",
     "Account": "Konto",
     "Account settings": "Ustawienia konta",
-    "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 zakończeniu okresu próbnego zostanie naliczona regularna opłata za wybrany poziom subskrypcji. Zawsze możesz anulować subskrypcję zanim to nastąpi.",
+    "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 zakończeniu okresu próbnego zostanie naliczona regularna opłata za wybrany poziom subskrypcji. Pamiętaj, że możesz anulować subskrypcję zanim to nastąpi.",
     "Already a member?": "Masz już konto?",
-    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Wystąpił nieoczekiwany błąd. Spróbuj ponownie lub <a>skontaktuj z pomocą techniczną</a> jeśli błąd będzie nadal występował.",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "Wystąpił nieoczekiwany błąd. Spróbuj ponownie lub jeśli błąd będzie nadal występował, to <a>skontaktuj z pomocą techniczną</a>.",
     "Back": "Wstecz",
     "Back to Log in": "Wróć do logowania",
     "Billing info": "Informacje rozliczeniowe",
     "Black Friday": "Black Friday",
-    "Cancel anytime.": "Anuluj w dowolnej chwili.",
+    "Cancel anytime.": "Anuluj w dowolnym momencie.",
     "Cancel subscription": "Anuluj subskrypcję",
     "Cancellation reason": "Powód anulowania",
     "Change": "Zmień",
     "Check spam & promotions folders": "Sprawdź foldery spamu i promocji",
-    "Check with your mail provider": "Skontaktuj się z dostawcą poczty",
+    "Check with your mail provider": "Skontaktuj się z dostawcą poczty elektronicznej",
     "Choose": "Wybierz",
     "Choose a different plan": "Wybierz inny plan",
     "Choose your newsletters": "Wybierz swoje newslettery",
@@ -38,8 +40,8 @@
     "Contact support": "Kontakt z pomocą techniczną",
     "Continue": "Kontynuuj",
     "Continue subscription": "Kontynuuj subskrypcję",
-    "Could not sign in. Login link expired.": "Nie można się zalogować. Link do logowania wygasł.",
-    "Could not update email! Invalid link.": "Nie można zaktualizować adresu email! Nieprawidłowy link.",
+    "Could not sign in. Login link expired.": "Nie można się zalogować, ponieważ link do logowania wygasł.",
+    "Could not update email! Invalid link.": "Nie można zaktualizować adresu email, ponieważ link jest nieprawidłowy.",
     "Create a new contact": "Utwórz nowy kontakt",
     "Current plan": "Obecny plan",
     "Delete account": "Skasuj konto",
@@ -48,35 +50,39 @@
     "Edit": "Edytuj",
     "Email": "Email",
     "Email newsletter": "Newsletter email",
-    "Email preference updated.": "Ustawienia email zaktualizowane",
     "Email preferences": "Ustawienia email",
     "Emails": "Emaile",
     "Emails disabled": "Wysyłanie emaili zablokowane",
     "Ends {{offerEndDate}}": "Kończy się {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Błąd",
     "Expires {{expiryDate}}": "Wygasa {{expiryDate}}",
     "Forever": "Na zawsze",
     "Free Trial – Ends {{trialEnd}}": "Bezpłatny okres próbny - Koniec {{trialEnd}}",
     "Get help": "Uzyskaj pomoc",
     "Get in touch for help": "Skontaktuj się, aby uzyskać pomoc",
-    "Get notified when someone replies to your comment": "Otrzymaj powiadomienie gdy ktoś odpowie na twój komentarz",
+    "Get notified when someone replies to your comment": "Otrzymaj powiadomienie, gdy ktoś odpowie na Twój komentarz",
     "Give feedback on this post": "Oceń ten wpis",
-    "Help! I'm not receiving emails": "Pomocy! Nie otrzymuję emaili",
-    "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.": "Jeśli newsletter zostanie oznaczony jako spam, wiadomości email są automatycznie wyłączane dla tego adresu, aby upewnić się, że nie otrzymujesz już żadnych niechcianych wiadomości.",
+    "Help! I'm not receiving emails": "Pomocy! Nie otrzymuję wiadomości e-mail",
+    "Here are a few other sites you may enjoy.": "Oto kilka innych witryn, które mogą Ci się spodobać.",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Jeśli newsletter zostanie oznaczony przez Ciebie jako spam, przesyłanie dalszych wiadomości email jest wyłączane dla tego adresu.",
     "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.": "Jeśli skarga dotycząca spamu była przypadkowa lub chcesz ponownie zacząć otrzymywać wiadomości, możesz raz jeszcze zasubskrybować, klikając przycisk na poprzednim ekranie.",
-    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Jeśli anulujesz subskrypcję teraz, będziesz mieć do niej dostęp 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}}": "Jeśli masz firmowe lub rządowe konto emial, skontaktuj się z działem IT i poproś o zezwolenie na odbieranie wiadomości od {{senderEmail}}",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Jeśli anulujesz subskrypcję teraz, będziesz mieć do niej dostęp 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}}": "Jeśli masz firmowy adres e-mail lub konto w domenie publicznej, skontaktuj się z działem IT i poproś o zezwolenie na odbieranie wiadomości od {{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.": "Jeśli chcesz ponownie zacząć otrzymywać wiadomości, najlepiej sprawdź poprawność swojego adres email, a następnie kliknij przycisk ponownej subskrypcji na poprzednim ekranie.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Jeśli nie otrzymujesz subskrybowanego newsletter, oto kilka rzeczy do sprawdzenia.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Jeśli nie otrzymujesz subskrybowanego newslettera, oto kilka rzeczy do sprawdzenia.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Jeśli wykonałeś wszystkie te czynności i nadal nie otrzymujesz wiadomości, możesz skontaktować się z pomocą techniczną pod tym adresem {{supportAddress}}.",
-    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "W przypadku trwałego niepowodzenia podczas próby wysłania newslettera wiadomości email zostaną wyłączone na koncie.",
-    "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.": "W kliencie poczty dodaj {{senderEmail}} do listy kontaktów. Sygnalizuje to dostawcy poczty, że wiadomości wysyłane z tego adresu powinny być zaufane.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "W przypadku trwałych problemów podczas wysłania newslettera, wiadomości email zostaną wyłączone na koncie.",
+    "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.": "W kliencie poczty dodaj {{senderEmail}} do listy kontaktów. Sygnalizuje to dostawcę poczty, że wiadomości wysyłane z tego adresu powinny być zweryfikowane.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Mniej podobnych",
-    "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\".": "Upewnij się, że emaile nie trafiają przypadkowo do folderów Spam lub Promocje w skrzynce odbiorczej. Jeśli tak jest, kliknij na \"Oznacz jako nie spam\" i/lub \"Przenieś do skrzynki odbiorczej\".",
+    "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\".": "Upewnij się, że emaile nie trafiają przypadkowo do folderów spam w skrzynce odbiorczej. Jeśli tak jest, kliknij na \"Oznacz jako nie spam\" i/lub \"Przenieś do skrzynki odbiorczej\".",
     "Manage": "Zarządzaj",
-    "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Maybe later": "Może później",
+    "Memberships unavailable, contact the owner for access.": "Dostęp niemożliwy, skontaktuj się z właścielem strony w celu uzyskania dostępu.",
     "Monthly": "Miesięcznie",
     "More like this": "Więcej podobnych",
     "Name": "Imię",
@@ -86,26 +92,29 @@
     "Now check your email!": "Teraz sprawdź swoją pocztę!",
     "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)": "Trwała awaria (odesłanie emaila",
+    "Phone number": "",
     "Plan": "Plan",
     "Plan checkout was cancelled.": "Opłata za plan została anulowana.",
     "Plan upgrade was cancelled.": "Aktualizacja planu została anulowana.",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Wyśli maila pod adres {{supportAddress}} aby dostosować bezpłatną subskrypcję.",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Wyślij maila pod adres {{supportAddress}}, aby dostosować bezpłatną subskrypcję.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Wypełnij wymagane pola",
     "Price": "Cena",
     "Re-enable emails": "Włącz ponownie emaile",
-    "Recommendations": "",
+    "Recommendations": "Rekomendacje",
     "Renews at {{price}}.": "Odnowi się w cenie {{price}}.",
     "Retry": "Powtórz",
     "Save": "Zapisz",
     "Send an email and say hi!": "Wyślij email i przywitaj się!",
-    "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.": "Wyślij email na adres {{senderEmail}} i przywitaj się. Może to również pomóc w zasygnalizowaniu dostawcy poczty, że wiadomości email wysyłane z i na ten adres powinny być zaufane.",
+    "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.": "Wyślij email na adres {{senderEmail}} i przywitaj się. Może to również pomóc w zasygnalizowaniu dostawcy poczty, że wiadomości email wysyłane z i na ten adres powinny być zaufane.",
     "Sending login link...": "Wysyłanie linku do logowania...",
     "Sending...": "Wysyłanie...",
-    "Show all": "",
+    "Show all": "Pokaż wszystko",
     "Sign in": "Zaloguj się",
     "Sign out": "Wyloguj się",
     "Sign up": "Zarejestruj się",
     "Signup error: Invalid link": "Błąd rejestracji: Nieprawidłowy link",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Przepraszamy, to nie zadziałało.",
     "Spam complaints": "Skargi dotyczące spamu",
     "Start {{amount}}-day free trial": "Rozpocznij {{amount}}-dniowy okres próbny",
@@ -119,35 +128,41 @@
     "Success! Your account is fully activated, you now have access to all content.": "Sukces! Twoje konto zostało w pełni aktywowane, masz teraz dostęp do serwisu.",
     "Success! Your email is updated.": "Sukces! Twój email został zaktualizowany.",
     "Successfully unsubscribed": "Wypisanie udane",
-    "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.": "Dziękujemy za subskrypcję. Zanim zaczniesz czytać, poniżej znajduje się kilka innych witryn, które mogą Ci się spodobać.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Dziękujemy za ocenę!",
     "That didn't go to plan": "Coś poszło nie tak",
     "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>.": "Adres email, który mamy to {{memberEmail}} — jeśli nie jest poprawny, możesz go zaktualizować w swoich <button>ustawieniach konta</button>.",
-    "There was a problem submitting your feedback. Please try again a little later.": "Wystąpił problem z przesłaniem opinii. Spróbuj ponownie nieco później.",
-    "This site is invite-only, contact the owner for access.": "Ta strona jest tylko na zaproszenie. Skontaktuj się z właścicielem, aby uzyskać dostęp.",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Aby dokończyć rejestrację, kliknij w link przesłany na twoją skrzynkę pocztową. Jeśli nie dotrze  w ciągu 3 minut, sprawdź folder spamu!",
-    "Try free for {{amount}} days, then {{originalPrice}}.": "Wypróbuj za darmo przez {{amount}} dnia, później {{originalPrice}}.",
-    "Unlock access to all newsletters by becoming a paid subscriber.": "Odblokuj dostęp do wszystkich biuletynów, zostając płatnym subskrybentem.",
+    "There was a problem submitting your feedback. Please try again a little later.": "Wystąpił problem z przesyłaniem opinii. Spróbuj ponownie nieco później.",
+    "There was an error processing your payment. Please try again.": "",
+    "This site is invite-only, contact the owner for access.": "Ta strona posiada zamknięty dostęp. Skontaktuj się z właścicielem, aby uzyskać dostęp.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Aby dokończyć rejestrację, kliknij w link przesłany na twoją skrzynkę pocztową. Jeśli nie dotrze w ciągu 3 minut, sprawdź folder spamu!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "Wypróbuj za darmo przez {{amount}} dni, później {{originalPrice}}.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Zostań płatnym subskrybentem i odblokuj dostęp do wszystkich biuletynów.",
     "Unsubscribe from all emails": "Wypisz się w wszystkich emaili",
     "Unsubscribed": "Niezasubskrybowany",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Wypisanie się z otrzymywania emaili nie powoduje anulowania płatnej subskrypcji {{title}}",
     "Update": "Zaktualizuj",
     "Update your preferences": "Zaktualizuj preferencje",
-    "Verification link sent, check your inbox": "",
+    "Verification link sent, check your inbox": "Link weryfikacyjny został wysłany. Sprawdź skrzynkę odbiorczą.",
     "Verify your email address is correct": "Sprawdź, czy Twój email jest poprawny",
     "View plans": "Zobacz plany",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Nie udało się wypisać, bo nie znaleziono adresu email. Skontaktuj się w właścicielem strony.",
     "Welcome back, {{name}}!": "Witamy ponownie, {{name}}!",
     "Welcome back!": "Witamy ponownie!",
-    "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.": "Gdy skrzynka odbiorcza nie akceptuje wiadomości email, jest to powszechnie nazywane odrzuceniem. W wielu przypadkach może to być tymczasowe. Jednak w niektórych przypadkach odesłana email może zostać zwrócony jako trwałe niepowodzenie, gdy adres jest nieprawidłowy lub nie istnieje.",
+    "Welcome to {{siteTitle}}": "Witaj w {{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.": "Zdarza się, że skrzynka odbiorcza nie akceptuje wiadomości e-mail. W wielu przypadkach może to być tymczasowe, jednak w niektórych przypadkach, szczegolnie gdy adres jest nieprawidłowy lub nie istnieje, ma to charakter trwały.",
     "Why has my email been disabled?": "Dlaczego mój email został zablokowany?",
     "Yearly": "Rocznie",
     "You currently have a free membership, upgrade to a paid subscription for full access.": "Obecnie posiadasz bezpłatny plan, uaktualnij do płatnej subskrypcji, aby uzyskać pełny dostęp",
     "You have been successfully resubscribed": "Zostałeś ponownie zapisany",
     "You're currently not receiving emails": "Obecnie nie otrzymujesz emaili",
     "You're not receiving emails": "Nie otrzymujesz emaili",
-    "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.": "Nie otrzymujesz email, ponieważ oznaczyłeś ostatnią wiadomość jako spam lub nie udało się dostarczyć wiadomości na podany adres 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.": "Nie otrzymujesz email, ponieważ oznaczono przez Ciebie ostatnią wiadomość jako spam lub nie udało się dostarczyć wiadomości na podany adres email.",
     "You've successfully signed in.": "Logowanie powiodło się.",
     "You've successfully subscribed to": "Pomyślnie zasubskrybowano",
     "Your account": "Twoje konto",
diff --git a/ghost/i18n/locales/pl/signup-form.json b/ghost/i18n/locales/pl/signup-form.json
index e2393e7377c..1183fa650ed 100644
--- a/ghost/i18n/locales/pl/signup-form.json
+++ b/ghost/i18n/locales/pl/signup-form.json
@@ -3,7 +3,7 @@
     "Now check your email!": "Teraz sprawdź swoją pocztę!",
     "Please enter a valid email address": "Wpisz prawidłowy adres email",
     "Something went wrong, please try again.": "Coś poszło nie tak, spróbuj ponownie.",
-    "Subscribe": "Zasubskrybuj",
+    "Subscribe": "Subskrybuj",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Aby dokończyć rejestrację, kliknij link, który został wysłany na podany email. Jeśli link nie dotrze w ciągu 3 minut, sprawdź folder spamu!",
     "Your email address": "Twój adres email"
 }
diff --git a/ghost/i18n/locales/pt-BR/portal.json b/ghost/i18n/locales/pt-BR/portal.json
index 2c0c6405aff..d2cb691548a 100644
--- a/ghost/i18n/locales/pt-BR/portal.json
+++ b/ghost/i18n/locales/pt-BR/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "(poupe {{highestYearlyDiscount}}%)",
     "{{amount}} days free": "{{amount}} dias grátis",
     "{{amount}} off": "{{amount}} de desconto",
     "{{amount}} off for first {{number}} months.": "{{amount}} de desconto nos primeiros {{number}} meses.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} não receberá mais e-mails quando alguém responder seus comentários.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} não receberá mais esta newsletter.",
     "{{trialDays}} days free": "{{trialDays}} dias grátis",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Um link de acesso foi enviado para o seu e-mail. Se a mensagem não chegar dentro de 3 minutos, verifique sua pasta de spam.",
     "Account": "Conta",
     "Account settings": "Configurações de conta",
@@ -48,11 +50,12 @@
     "Edit": "Editar",
     "Email": "E-mail",
     "Email newsletter": "Newsletter por e-mail",
-    "Email preference updated.": "Preferências de e-mail atualizadas.",
     "Email preferences": "Preferências de e-mail",
     "Emails": "E-mails",
     "Emails disabled": "E-mails desativados",
     "Ends {{offerEndDate}}": "Termina em {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Erro",
     "Expires {{expiryDate}}": "Expira em {{expiryDate}}",
     "Forever": "Para sempre",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Se você cancelar sua inscrição agora, continuará tendo acesso até {{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}}": "Se você tiver uma conta de e-mail corporativa ou governamental, entre em contato com o departamento de TI e peça para permitir que os e-mails sejam recebidos de {{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.": "Se você deseja começar a receber e-mails novamente, os próximos passos são verificar seu endereço de e-mail no arquivo para verificar se há problemas e, em seguida, clicar em se inscrever novamente na tela anterior.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Se você não estiver recebendo a newsletter por e-mail à qual se inscreveu, verifique algumas coisas.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Se você não estiver recebendo a newsletter por e-mail à qual se inscreveu, verifique algumas coisas.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Se você concluiu todas essas verificações e ainda não está recebendo e-mails, pode entrar em contato para obter suporte entrando em contato com {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "No caso de uma falha permanente ser recebida ao tentar enviar uma newsletter, os e-mails serão desativados na conta.",
     "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.": "No seu cliente de e-mail, adicione {{senderEmail}} à sua lista de contatos. Isso sinaliza ao seu provedor de e-mail que os e-mails enviados deste endereço devem ser confiáveis.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Menos como este",
     "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\".": "Verifique se os e-mails não estão indo parar acidentalmente nas pastas Spam ou Promoções da sua caixa de entrada. Se estiverem, clique em \"Marcar como não spam\" e/ou \"Mover para a caixa de entrada\".",
     "Manage": "Gerenciar",
@@ -86,10 +92,12 @@
     "Now check your email!": "Agora veja seu e-mail!",
     "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.": "Depois de se inscrever novamente, se você ainda não vir e-mails na sua caixa de entrada, verifique sua pasta de spam. Alguns provedores de caixa de entrada mantêm um registro de reclamações anteriores de spam e continuarão a sinalizar e-mails. Se isso acontecer, marque a newsletter mais recente como 'Não é spam' para movê-la de volta para sua caixa de entrada principal.",
     "Permanent failure (bounce)": "Falha permanente (bounce)",
+    "Phone number": "",
     "Plan": "Plano",
     "Plan checkout was cancelled.": "Plano de checkout foi cancelado.",
     "Plan upgrade was cancelled.": "Upgrade de plano foi cancelado.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Entre em contato com {{supportAddress}} para ajustar sua assinatura.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Preencha os campos obrigatórios",
     "Price": "Preço",
     "Re-enable emails": "Reativar e-mails",
@@ -98,7 +106,7 @@
     "Retry": "Tentar de novo",
     "Save": "Salvar",
     "Send an email and say hi!": "Envie um e-mail e diga oi!",
-    "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.": "Envie um e-mail para {{senderEmail}} e diga olá. Isso também pode ajudar a sinalizar ao seu provedor de e-mail que os e-mails de e para este endereço devem ser confiáveis.",
+    "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.": "Envie um e-mail para {{senderEmail}} e diga olá. Isso também pode ajudar a sinalizar ao seu provedor de e-mail que os e-mails de e para este endereço devem ser confiáveis.",
     "Sending login link...": "Enviando link de acesso...",
     "Sending...": "Enviando...",
     "Show all": "Mostre tudo",
@@ -106,6 +114,7 @@
     "Sign out": "Sair",
     "Sign up": "Cadastrar",
     "Signup error: Invalid link": "Erro de inscrição: link inválido",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Desculpe, isso não funcionou.",
     "Spam complaints": "Reclamações de spam",
     "Start {{amount}}-day free trial": "Começar teste grátis de {{amount}} dias",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Sucesso! Seu e-mail foi atualizado.",
     "Successfully unsubscribed": "Inscrição cancelada com sucesso",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "Obrigado por se inscrever. Antes de começar a ler, abaixo estão alguns outros sites que você pode gostar.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Obrigado pela avaliação!",
     "That didn't go to plan": "Algo não saiu como planejado",
     "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>.": "O endereço de e-mail que temos para você é {{memberEmail}} — se isso não estiver correto, você pode atualizá-lo na sua <button>área de configurações da conta</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Houve um problema ao enviar sua avaliação. Tente novamente mais tarde.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Este site é apenas para convidados. Contate o proprietário para obter acesso.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Para completar o cadastro, clique no link de confirmação enviado para sua caixa de entrada. Se o link não chegar dentro de 3 minutos, confira a pasta de spam!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Experimente grátis por {{amount}} dias, depois {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Desbloqueie o acesso a todas as newsletters se tornando um assinante pago.",
     "Unsubscribe from all emails": "Cancelar inscrição em todos os e-mails",
     "Unsubscribed": "Cancelado",
+    "Unsubscribed from all emails.": "Cancelada a inscrição de todos os e-mails.",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Cancelar a inscrição nos e-mails não cancelará sua assinatura paga em {{title}}",
     "Update": "atualizar",
     "Update your preferences": "Atualizar preferências",
diff --git a/ghost/i18n/locales/pt/portal.json b/ghost/i18n/locales/pt/portal.json
index a04e9322345..bfd714fdcf3 100644
--- a/ghost/i18n/locales/pt/portal.json
+++ b/ghost/i18n/locales/pt/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dias gratuitos",
     "{{amount}} off": "Desconto de {{amount}}",
     "{{amount}} off for first {{number}} months.": "Desconto de {{amount}} nos primeiros {{number}} meses.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} deixará de receber emails quando alguém responder aos seus comentários.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} deixará de receber esta newsletter.",
     "{{trialDays}} days free": "{{trialDays}} dias grátis",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Um link de acesso foi enviado para o teu email. Se o email não chegar dentro de 3 minutos, verifica a pasta de spam/lixo do teu email.",
     "Account": "Conta",
     "Account settings": "Definições de conta",
@@ -48,11 +50,12 @@
     "Edit": "Editar",
     "Email": "Email",
     "Email newsletter": "",
-    "Email preference updated.": "Preferências de email atualizadas.",
     "Email preferences": "Preferências de email",
     "Emails": "Emails",
     "Emails disabled": "Email desativado",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Erro",
     "Expires {{expiryDate}}": "Expira {{expiryDate}}",
     "Forever": "Para sempre",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Se cancelar a sua subscrição agora, continuará a ter acesso até {{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}}": "Se tem uma conta de email corporativa ou governamental, contacte o seu departamento de TI e peça-lhes para permitir a receção de emails de {{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.": "Se gostaria de começar a receber emails novamente, os próximos passos são verificar o seu endereço de email registado para verificar se há algum problema e, em seguida, clicar para voltar a subscrever na tela anterior.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Se não está a receber a newsletter por email a que subscreveu, aqui estão algumas coisas a verificar.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Se não está a receber a newsletter por email a que subscreveu, aqui estão algumas coisas a verificar.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Se completou todas estas verificações e ainda não está a receber emails, pode contactar {{supportAddress}} para obter apoio.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "No caso de uma falha permanente ser recebida ao tentar enviar uma newsletter, os emails serão desativados na conta.",
     "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.": "No seu cliente de email, adicione {{senderEmail}} à sua lista de contactos. Isso indica ao seu fornecedor de email que os emails enviados a partir deste endereço devem ser confiáveis.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Menos como este",
     "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\".": "Certifique-se de que os emails não estão a acabar acidentalmente nas pastas de Spam ou Promoções da sua caixa de entrada. Se estiverem, clique em \"Marcar como não spam\" e/ou \"Mover para a caixa de entrada\".",
     "Manage": "Gerir",
@@ -86,10 +92,12 @@
     "Now check your email!": "Verifica o teu email agora!",
     "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.": "Depois de se inscrever novamente, se você ainda não vir emails na sua caixa de entrada, verifique sua pasta de spam. Alguns provedores de caixa de entrada mantêm um registro de reclamações anteriores de spam e continuarão a sinalizar Emails. Se isso acontecer, marque a newsletter mais recente como 'Não é spam' para movê-la de volta para sua caixa de entrada principal.",
     "Permanent failure (bounce)": "Falha permanente (bounce)",
+    "Phone number": "",
     "Plan": "Plano",
     "Plan checkout was cancelled.": "Plano de checkout foi cancelado.",
     "Plan upgrade was cancelled.": "Melhoria de plano foi cancelado.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Preencha os campos obrigatórios",
     "Price": "Preço",
     "Re-enable emails": "Reativar emails",
@@ -98,7 +106,7 @@
     "Retry": "Tentar novamente",
     "Save": "Guardar",
     "Send an email and say hi!": "Envie um email e diga olá!",
-    "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.": "Envie um email para {{senderEmail}} e diga olá. Isso também pode ajudar a sinalizar ao seu provedor de email que os emails de e para este endereço devem ser confiáveis.",
+    "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.": "Envie um email para {{senderEmail}} e diga olá. Isso também pode ajudar a sinalizar ao seu provedor de email que os emails de e para este endereço devem ser confiáveis.",
     "Sending login link...": "A enviar ligação de acesso...",
     "Sending...": "A enviar...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Sair",
     "Sign up": "Registar",
     "Signup error: Invalid link": "Erro de inscrição: ligação inválida",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Desculpe, isso não funcionou.",
     "Spam complaints": "Reclamações de spam",
     "Start {{amount}}-day free trial": "Iniciar teste grátis de {{amount}} dias",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Sucesso! Seu email foi atualizado.",
     "Successfully unsubscribed": "Subscrição cancelada com sucesso",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Obrigado pela avaliação!",
     "That didn't go to plan": "Algo não correu como planeado",
     "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>.": "O endereço de email que temos para você é {{memberEmail}} — se isso não estiver correto, você pode atualizá-lo na sua <button>área de configurações da conta</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Houve um problema ao enviar sua avaliação. Tente novamente mais tarde.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "O acesso a este site é feito apenas por convite. Contate o proprietário para obter acesso.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Para completar o registo, clique no link de confirmação enviado para sua caixa de entrada. Se não o receberes detro de 3 minutos, verifica a pasta de spam!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Experimente grátis por {{amount}} dias, depois {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Desbloqueie o acesso a todas as newsletters se tornando um assinante pago.",
     "Unsubscribe from all emails": "Cancelar subscrição de todos os emails",
     "Unsubscribed": "Subscrição cancelada",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Cancelar a subscrição dos emails não cancelará sua assinatura paga em {{title}}",
     "Update": "Atualizar",
     "Update your preferences": "Atualizar as tuas preferências",
diff --git a/ghost/i18n/locales/ro/comments.json b/ghost/i18n/locales/ro/comments.json
index bcb0715d9a1..9338e2da96e 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 membrii",
+    "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..050f35c66a6 100644
--- a/ghost/i18n/locales/ro/portal.json
+++ b/ghost/i18n/locales/ro/portal.json
@@ -1,158 +1,173 @@
 {
-    "{{amount}} days free": "",
-    "{{amount}} off": "",
-    "{{amount}} off for first {{number}} months.": "",
-    "{{amount}} off for first {{period}}.": "",
-    "{{amount}} off forever.": "",
+    "(save {{highestYearlyDiscount}}%)": "",
+    "{{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",
+    "+1 (123) 456-7890": "",
     "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 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}}",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "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 a 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.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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)",
+    "Phone number": "",
+    "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 enter {{fieldName}}": "",
+    "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",
+    "Something went wrong, please try again later.": "",
+    "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ă.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Acest site este disponibil doar pe bază de invitație, contactează proprietarul pentru acces.",
+    "This site is not accepting payments at the moment.": "",
     "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.": "",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "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",
+    "Unsubscribed from all emails.": "",
     "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..0a115dab644 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": "",
-    "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": "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.": "Присоединяйтесь к {{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",
+    "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": "Показать {{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/ghost.json b/ghost/i18n/locales/ru/ghost.json
index bae21b749df..12d50eefe91 100644
--- a/ghost/i18n/locales/ru/ghost.json
+++ b/ghost/i18n/locales/ru/ghost.json
@@ -1,27 +1,27 @@
 {
     "All the best!": "Всего хорошего!",
-    "Complete signup for {{siteTitle}}!": "",
+    "Complete signup for {{siteTitle}}!": "Завершите регистрацию на {{siteTitle}}!",
     "Complete your sign up to {{siteTitle}}!": "Завершите регистрацию на {{siteTitle}}!",
-    "Confirm email address": "",
-    "Confirm signup": "",
-    "Confirm your email address": "",
+    "Confirm email address": "Подтвердите email адрес",
+    "Confirm signup": "Подтвердите регистрацию",
+    "Confirm your email address": "Подтвердите ваш email адрес",
     "Confirm your email update for {{siteTitle}}!": "Подтвердите обновление email на {{siteTitle}}!",
     "Confirm your subscription to {{siteTitle}}": "Подтвердите подписку на {{siteTitle}}",
     "For your security, the link will expire in 24 hours time.": "Для вашей безопасности ссылка действительна в течение 24 часов.",
     "Hey there,": "Привет,",
-    "Hey there!": "",
+    "Hey there!": "Привет!",
     "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}}",
     "See you soon!": "До встречи!",
     "Sent to {{email}}": "Отправлено на {{email}}",
-    "Sign in": "",
+    "Sign in": "Войти",
     "Sign in to {{siteTitle}}": "Войти на {{siteTitle}}",
     "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "Нажмите на ссылку ниже, чтобы завершить процесс регистрации на {{siteTitle}} и автоматически войти:",
     "Thank you for signing up to {{siteTitle}}!": "Спасибо за регистрацию на {{siteTitle}}!",
     "Thank you for subscribing to {{siteTitle}}!": "Спасибо за подписку на {{siteTitle}}!",
-    "Thank you for subscribing to {{siteTitle}}.": "",
+    "Thank you for subscribing to {{siteTitle}}.": "Спасибо за подписку на {{siteTitle}}.",
     "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "Спасибо за подписку на {{siteTitle}}. Нажмите на ссылку ниже, чтобы автоматически войти:",
     "This email address will not be used.": "Этот email не будет использоваться.",
     "Welcome back to {{siteTitle}}!": "Добро пожаловать на {{siteTitle}}!",
@@ -30,5 +30,5 @@
     "You will not be signed up, and no account will be created for you.": "Вы не будете зарегистрированы, и для вас не будет создан аккаунт.",
     "You will not be subscribed.": "Вы не будете подписаны.",
     "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "Вы в одном клике от подписки на {{siteTitle}} — пожалуйста, подтвердите свой адрес электронной почты с помощью этой ссылки:",
-    "You're one tap away from subscribing to {{siteTitle}}!": ""
+    "You're one tap away from subscribing to {{siteTitle}}!": "Вы в одном клике от подписки на {{siteTitle}}!"
 }
diff --git a/ghost/i18n/locales/ru/portal.json b/ghost/i18n/locales/ru/portal.json
index 678bd88e465..fad543edb9b 100644
--- a/ghost/i18n/locales/ru/portal.json
+++ b/ghost/i18n/locales/ru/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "{{trialDays}} дня(-ей) бесплатно",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Ссылка для входа была отправлена вам на email. Если письмо долго не приходит, проверьте папку Спам.",
     "Account": "Аккаунт",
     "Account settings": "Настройки аккаунта",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "Email",
     "Email newsletter": "",
-    "Email preference updated.": "Настройки электронной почты обновлены.",
     "Email preferences": "Настройки электронной почты",
     "Emails": "Письма",
     "Emails disabled": "Письма отключены",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "Управление",
@@ -86,10 +92,12 @@
     "Now check your email!": "Теперь проверьте свою электронную почту!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Цена",
     "Re-enable emails": "Снова включить письма",
@@ -98,7 +106,7 @@
     "Retry": "Повторить попытку",
     "Save": "Сохранить",
     "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 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...": "Отправка ссылки для входа...",
     "Sending...": "Отправка...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "Зарегистрироваться",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "Начать {{amount}}-дневный пробный период",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Подписка успешно отменена",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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>.": "",
     "There was a problem submitting your feedback. Please try again a little later.": "",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Этот сайт доступен только по приглашениям, свяжитесь с владельцем для получения доступа.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Чтобы завершить регистрацию, нажмите на ссылку подтверждения в вашем почтовом ящике. Если она не придет в течение 3 минут, проверьте папку Спам!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Отписаться от всех писем",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Отключение рассылки не отменит вашу платную подписку на {{title}}",
     "Update": "",
     "Update your preferences": "Обновить настройки",
diff --git a/ghost/i18n/locales/ru/signup-form.json b/ghost/i18n/locales/ru/signup-form.json
index cc957d9d0d1..37f36ca3d95 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.": "",
-    "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": "Письмо отправлено",
+    "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!": "Чтобы завершить регистрацию, нажмите на ссылку подтверждения в письме. Если письмо не пришло в течение 3 минут, проверьте папку «Спам»!",
+    "Your email address": "Ваша электронная почта"
 }
diff --git a/ghost/i18n/locales/si/portal.json b/ghost/i18n/locales/si/portal.json
index 5a4cd3bf8b0..f749c535e1b 100644
--- a/ghost/i18n/locales/si/portal.json
+++ b/ghost/i18n/locales/si/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "දින {{amount}} ක් නොමිලයේ",
     "{{amount}} off": "{{amount}} ක වට්ටමක්",
     "{{amount}} off for first {{number}} months.": "පළමු මාස {{number}} සඳහා {{amount}} ක වට්ටමක්",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "ඔබගේ comments සඳහා කිසිවෙකු reply කළ විට {{memberEmail}} වෙත තවදුරටත් email මඟින් දැනුම්දීමක් නොකෙරෙනු ඇත.",
     "{{memberEmail}} will no longer receive this newsletter.": "මෙම newsletter එක {{memberEmail}} වෙත තවදුරටත් නොලැබෙනු ඇත.",
     "{{trialDays}} days free": "දින {{trialDays}} ක් දක්වා නොමිලේ",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "වෙබ් අඩවියට පිවිසීම සඳහා link එකක් ඔබගේ email ලිපිනය වෙත යවා ඇත. එය විනාඩි 3ක් ඇතුළත නොපැමිණියේ නම් spam ෆෝල්ඩරය පරීක්ෂා කරන්න.",
     "Account": "ගිණුම",
     "Account settings": "ගිණුම් සැකසුම්",
@@ -48,11 +50,12 @@
     "Edit": "Edit කරන්න",
     "Email": "Email",
     "Email newsletter": "Email newsletter",
-    "Email preference updated.": "Email preference update කරන ලදී.",
     "Email preferences": "Email preferences",
     "Emails": "ඊමේල්",
     "Emails disabled": "Emails නවත්වා ඇත",
     "Ends {{offerEndDate}}": "{{offerEndDate}} දී අවසන් වනු ඇත",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Error එකක්",
     "Expires {{expiryDate}}": "{{expiryDate}} දින අවසන් වෙයි",
     "Forever": "හැමදාටම",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "ඔබගේ subscription එක මෙම මොහොතේ cancel කළහොත්, {{periodEnd}} දක්වා ඔබ\u200dගේ access නොවෙනස්ව පවතිනු ඇත.",
     "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}}": "ඔබ ව්\u200dයාපාරික හෝ රාජ්\u200dයය email ලිපිනයක් භාවිතා කරන්නේ නම්, {{senderEmail}} ලිපිනයෙන් එන emails allow කරන ලෙස ඔබගේ IT department එකට දැනුම් දීමට කටයුතු කරන්න.",
     "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.": "ඔබ නැවත emails ලබාගැනීමට කැමති නම්, වඩාත්ම සුදුසු මීළඟ පියවර වන්නේ \u200dඔබ භාවිතා කරන email ලිපිනයෙහි යම්කිසි ගැටළුවක් ඇත්දැයි පරීක්ෂා කිරීමෙන් අනතුරුව, පෙර screen එක හරහා resubscribe මත click කිරීමයි.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "ඔබ subscribe කළ newsletters ඔබට නොලැබෙන්නේ නම්, මේ දේවල් පරීක්ෂා කර බලන්න.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "ඔබ subscribe කළ newsletters ඔබට නොලැබෙන්නේ නම්, මේ දේවල් පරීක්ෂා කර බලන්න.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "මෙහි සඳහන් සියළුම දේ පරීක්ෂා කිරීමෙන් අනතුරුවත් ඔබට emails නොලැබෙන්නේ නම්, {{supportAddress}} සම්බන්ධ කරගනිමින් සහාය ඉල්ලා සිටින්න.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Newsletter එකක් යැවීමේ අවස්ථාවකදී permanent failure එකක් වාර්ථා වුවහොත්, මෙම ගිණුමෙහි emails අක්\u200dරීය කෙරෙනු ඇත.",
     "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.": "ඔබගේ email client එකෙහි contact list එකට {{senderEmail}} ලිපිනය add කරගන්න. මෙම ලිපිනය හරහා ලැබෙන emails විශ්වාසදායී බව මේ හරහා ඔබගේ emailසේවා සපයන්නාට සංඥා කෙරෙනු ඇත.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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\".": "Spam හෝ inbox එකෙහි ඇති Promotions folder වලට emails අත්වැරදීමකින් හෝ ළඟා වන්නේ ද යන්න සහතික කරගන්න. එසේ වන්නේ නම්, \"Mark as not spam\" සහ/හෝ \"Move to inbox\" යන්නෙහි click කරන්න.",
     "Manage": "කළමනාකරණය කරන්න",
@@ -86,10 +92,12 @@
     "Now check your email!": "දැන් ඔබගේ email එක පරික්ෂා කරන්න!",
     "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.": "නැවත subscribe කළ විටත් ඔබගේ inbox එකට email ලැබෙන්නේ නැතිනම්, spam folder එක පරීක්ෂා කරන්න. ඇතැම් සේවා සපයන්නන් මීට පෙර spam සම්බන්ධව ලැබුණු පැමිණිලි පාදක කරගෙන තවදුරටත් emails spam ලෙස ලකුණු කරනු ලබනවා. එසේ වී ඇත්නම්,  අලුතින්ම ලැබුණු newsletter එක ඔබගේ primary inbox එකට යැවීමට 'Not spam' ලෙස සළකුනු කරන්න.",
     "Permanent failure (bounce)": "Permanent failure (bounce) එකක්",
+    "Phone number": "",
     "Plan": "Plan එක",
     "Plan checkout was cancelled.": "Plan එක checkout කිරීම අවලංගු කරන ලදී.",
     "Plan upgrade was cancelled.": "Plan එක upgrade කිරීම අවලංගු කරන ලදී.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "කරුණාකර required files පිරවීමට කටයුතු කරන්න",
     "Price": "මිල",
     "Re-enable emails": "ඉමේල් නැවත සක්\u200dරීය කරන්න",
@@ -98,7 +106,7 @@
     "Retry": "නැවත උත්සහකරන්න",
     "Save": "Save කරන්න",
     "Send an email and say hi!": "Email එකක් send කරමින් 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.": "{{senderEmail}} වෙත hello ලෙස සඳහන් කරමින් email එකක් එවන්න. මේ හරහා එම email ලිපිනයෙන් ලැබෙන සහ ලිපිනයට යවන emails විශ්වාසදායී බව ඔබගේ email සේවා සපයන්නාට සංඥා කෙරෙනු ඇත.",
+    "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}} වෙත hello ලෙස සඳහන් කරමින් email එකක් එවන්න. මේ හරහා එම email ලිපිනයෙන් ලැබෙන සහ ලිපිනයට යවන emails විශ්වාසදායී බව ඔබගේ email සේවා සපයන්නාට සංඥා කෙරෙනු ඇත.",
     "Sending login link...": "Login link එක යවමින්...",
     "Sending...": "යවමින්...",
     "Show all": "සියල්ල පෙන්වන්\u200bන",
@@ -106,6 +114,7 @@
     "Sign out": "Sign out වෙන්න",
     "Sign up": "ලියාපදිංචි වෙන්න",
     "Signup error: Invalid link": "Signup වීම අසාර්ථකයි: වැරදි link එකකි",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "සමාවෙන්න, නමුත් එය සාර්ථක වූයේ නැත.",
     "Spam complaints": "Spam සඳහා වන පැමිණිලි",
     "Start {{amount}}-day free trial": "{{amount}}-day free trial එක ආරම්භකරන්න",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "සාර්ථකයි! ඔබගේ email ලිපිනය update කරන ලදී.",
     "Successfully unsubscribed": "සාර්ථකව unsubscribed කර ඇත",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "subscribe කිරී\u200bම ගැන ඔබට ස්තුතියි. ඔබ කියවීම ආරම්භ කිරීමට පෙර, ඔබට රසවිඳිය හැකි තවත් වෙබ් අඩවි කිහිපයක් පහත දැක්වේ.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "ප්\u200dරතිචාරය සඳහා ස්තූතියි!",
     "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}} යන email ලිපිනයයි - මෙය වැරදියි නම්, ඔබගේ <button>account settings area එක</button> හරහා update කළ හැක.",
     "There was a problem submitting your feedback. Please try again a little later.": "ඔබගේ feedback එක යොමු කිරීමේදී ගැටළුවක් ඇති විය. තව ටික වේලාවකින් නැවත උත්සාහ කරන්න.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "මෙම වෙබ් අඩවිය ආරාධිතයන් සඳහා පමණි, ප්\u200dරවේශ වීම සඳහා හිමිකරු අමතන්න.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Signup වීම සම්පූර්ණ කිරීම සඳහා, ඔබ\u200dගේ inbox එකට ලැබුණු email එකෙහි ඇති confirmation link එක click කරන්න. එය මිනිත්තු 3ක් ඇතුලත නොපැමිණියේ නම්, spam folder එක පරීක්ෂා කරන්න!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "දින {{amount}}ක් නොමිලයේ භාවිතා කරන්න, ඉන් පසුව {{originalPrice}}ක් පමණි.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Paid subscriber කෙනෙකු වීම හරහා සියළුම newsletters වලට access ලබාගන්න.",
     "Unsubscribe from all emails": "සියළුම email වලින් unsubscribe කරන්න",
     "Unsubscribed": "Unsubscribe කරන ලදී",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Email වලින් unsubscribe වීමෙන්, {{title}} සඳහා වන ඔබගේ paid subscription එක අවලංගු නොවනු ඇත",
     "Update": "Update කරන්න",
     "Update your preferences": "ඔබගේ  preferences update කරන්න",
diff --git a/ghost/i18n/locales/sk/comments.json b/ghost/i18n/locales/sk/comments.json
new file mode 100644
index 00000000000..2a6574b8b39
--- /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": "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útou",
+    "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..84540016483
--- /dev/null
+++ b/ghost/i18n/locales/sk/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "Všetko dobré!",
+    "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..9dd63eea0f5
--- /dev/null
+++ b/ghost/i18n/locales/sk/portal.json
@@ -0,0 +1,173 @@
+{
+    "(save {{highestYearlyDiscount}}%)": "",
+    "{{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}} už nebude dostávať {{newsletterName}} newsletter.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} už nebude dostávať e-maily, keď niekto odpovie na vaše komentáre.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} už nebude dostávať tento newsletter.",
+    "{{trialDays}} days free": "{{trialDays}} dní zdarma",
+    "+1 (123) 456-7890": "",
+    "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 už č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 preferences": "E-mailové nastavnia",
+    "Emails": "E-maily",
+    "Emails disabled": "E-maily vypnuté",
+    "Ends {{offerEndDate}}": "Vyprší {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "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": "Pomoc! 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 a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
+    "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": "Potrebujete pomoc? 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 emailovú 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)",
+    "Phone number": "",
+    "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 enter {{fieldName}}": "",
+    "Please fill in required fields": "Prosím vyplňte požadované polia.",
+    "Price": "Cena",
+    "Re-enable emails": "Obnoviť emaily",
+    "Recommendations": "",
+    "Renews at {{price}}.": "Obnoviť za {{price}}.",
+    "Retry": "Skúsiť znovu",
+    "Save": "Uložiť",
+    "Send an email and say hi!": "Odoslať e-mail a povedzte Ahoj!",
+    "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",
+    "Something went wrong, please try again later.": "",
+    "Sorry, that didn’t work.": "Prepáčte, toto nezafungovalo.",
+    "Spam complaints": "Sťažnosti na spam",
+    "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.": "Super! Skontrolujte Vašu emailovú schránku, kde nájdete odkaz na prihlásenie.",
+    "Success! Your account is fully activated, you now have access to all content.": "Super! Váš účet je aktivovaný. Máte prístup ku všetkému obsahu.",
+    "Success! Your email is updated.": "Super! 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.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
+    "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.",
+    "There was an error processing your payment. Please try again.": "",
+    "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.",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
+    "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",
+    "Unsubscribed from all emails.": "",
+    "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": "Overovací lik zaslaný, skontrolujte prosím svoju emailovú schránku",
+    "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äť!",
+    "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 emaily",
+    "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": "Úspešne ste sa prihlásili na odber:",
+    "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..87353c1eb79
--- /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": "Zadajte prosím správny formát emailovej adresy",
+    "Something went wrong, please try again.": "Niečo sa nepodarilo, skúste to prosím 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 potvrdzujúci odkaz vo Vašej emailovej schránke. Ak email nepríde do 3 minút, skontrolujte prosím svoj spam priečinok!",
+    "Your email address": "Vaša emailová adresa"
+}
diff --git a/ghost/i18n/locales/sl/portal.json b/ghost/i18n/locales/sl/portal.json
index 78617d34816..1f6fbefdae1 100644
--- a/ghost/i18n/locales/sl/portal.json
+++ b/ghost/i18n/locales/sl/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "{{trialDays}} dni brezplačno",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Povezava za prijavo je bila poslana na vašo e-pošto. Če ne prispe v treh minutah, preverite mapo za neželeno pošto.",
     "Account": "Račun",
     "Account settings": "Nastavitve računa",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "E-pošta",
     "Email newsletter": "",
-    "Email preference updated.": "E-poštne nastavitve posodobljene",
     "Email preferences": "Nastavitve e-pošte",
     "Emails": "E-pošta",
     "Emails disabled": "E-pošta onemogočena",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Ni mi všeč",
     "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": "Upravljanje",
@@ -86,10 +92,12 @@
     "Now check your email!": "Preverite e-pošto!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Cena",
     "Re-enable emails": "Ponovna vključitev e-poštnih sporočil",
@@ -98,7 +106,7 @@
     "Retry": "Cena",
     "Save": "Shrani",
     "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 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...": "Pošiljanje povezave za prijavo...",
     "Sending...": "Pošiljanje...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "Registracija",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "Začetek {{amount}}-dnevnega brezplačnega preizkusa",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Uspešno ste se odjavili",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Hvala za povratne informacije!",
     "That didn't go to plan": "To ni šlo po načrtu",
     "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 an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "To spletno mesto je dostopno samo s povabilom, obrnite se na lastnika.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Dokončatje prijavo s klikom na povezavo, ki ste jo dobili na vaš e-poštni naslov. Če je ne prejmete v treh minutah, preverite mapo za neželeno pošto!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Odjava od vseh e-poštnih sporočil",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Odjava od e-poštnih sporočil ne bo preklicala vaše plačane naročnine na {{title}}",
     "Update": "",
     "Update your preferences": "Posodobite svoje nastavitve",
diff --git a/ghost/i18n/locales/sq/portal.json b/ghost/i18n/locales/sq/portal.json
index 5d8e0b3a834..d922130d326 100644
--- a/ghost/i18n/locales/sq/portal.json
+++ b/ghost/i18n/locales/sq/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} dite falas",
     "{{amount}} off": "{{amount}} zbritje",
     "{{amount}} off for first {{number}} months.": "{{amount}} zbritje në {{number}} muajt e parë",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} nuk do të marrë më email kur dikush u përgjigjet komenteve tuaja.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} nuk do te marre me kete buletin.",
     "{{trialDays}} days free": "{{trialDays}} dite falas",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Një lidhje identifikimi është dërguar në kutinë tuaj hyrëse. Nëse nuk arrin për 3 minuta, sigurohuni që të kontrolloni dosjen tuaj të postës së padëshiruar.",
     "Account": "Llogaria",
     "Account settings": "Cilësimet e llogarisë",
@@ -48,11 +50,12 @@
     "Edit": "Modifiko",
     "Email": "Email",
     "Email newsletter": "Buletini i emailit",
-    "Email preference updated.": "Preferenca e emailit u përditësua.",
     "Email preferences": "Preferenat e emailit",
     "Emails": "Emailet",
     "Emails disabled": "Emailet e çaktivizuara",
     "Ends {{offerEndDate}}": "Perfundon {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Gabim",
     "Expires {{expiryDate}}": "Mbaron",
     "Forever": "Pergjithmone",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Nëse e anuloni abonimin tuaj tani, do të vazhdoni të keni akses deri në {{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}}": "Nëse keni një llogari të postës elektronike të korporatës ose të qeverisë, kontaktoni departamentin tuaj të IT dhe kërkojuni që të lejojnë marrjen e emaileve nga {{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.": "Nëse dëshironi të filloni të merrni përsëri emaile, hapat më të mirë të metejshem janë të kontrolloni adresën tuaj të emailit në dosje për ndonjë problem dhe më pas klikoni Ri-abonohu në ekranin e mëparshëm.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Nëse nuk po merrni buletinin me email në të cilin jeni abonuar, këtu janë disa gjëra për të kontrolluar.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Nëse nuk po merrni buletinin me email në të cilin jeni abonuar, këtu janë disa gjëra për të kontrolluar.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Nëse i keni përfunduar të gjitha këto kontrolle dhe ende nuk po merrni email, mund të kontaktoni për të marrë mbështetje duke kontaktuar {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Në rast se merret një dështim i përhershëm gjatë përpjekjes për të dërguar një buletin, emailet do të çaktivizohen në llogari.",
     "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ë klientin tuaj të postës elektronike shtoni {{senderEmail}} në listën tuaj të kontakteve. Kjo i sinjalizon ofruesit tuaj të postës elektronike që emailet e dërguara nga kjo adresë duhet të jenë të besueshme.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Me pak si kjo",
     "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\".": "Sigurohuni që emailet të mos përfundojnë aksidentalisht në dosjet e postës së padëshiruar ose të promovimeve të kutisë suaj hyrëse. Nëse janë, klikoni në \"Shëno si jo të padëshiruar\" dhe/ose \"Lëviz te kutia hyrëse\".",
     "Manage": "Menaxho",
@@ -86,10 +92,12 @@
     "Now check your email!": "Kontrollo emailin tend tani!",
     "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.": "Pasi të regjistroheni përsëri, nëse ende nuk i shihni emailet në kutinë tuaj hyrëse, kontrolloni dosjen tuaj të postës së padëshiruar. Disa ofrues të kutisë hyrëse mbajnë një regjistër të ankesave të mëparshme të postës së padëshiruar dhe do të vazhdojnë të raportojnë emailet. Nëse kjo ndodh, shëno buletinin më të fundit si 'Jo e padëshiruar' për ta zhvendosur atë në kutinë hyrëse kryesore.",
     "Permanent failure (bounce)": "Deshtim i perhershem (kercim)",
+    "Phone number": "",
     "Plan": "Plani",
     "Plan checkout was cancelled.": "Pagesa e planit u anullua.",
     "Plan upgrade was cancelled.": "Përmirësimi i planit u anullua.",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Ju lutem plotesoni fushat e kerkuara",
     "Price": "Çmimi",
     "Re-enable emails": "Ri-aktivizo emailet",
@@ -98,7 +106,7 @@
     "Retry": "Provo perseri",
     "Save": "Ruaj",
     "Send an email and say hi!": "Dergo nje email dhe thuaj pershendetje!",
-    "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.": "Dërgo një email te {{senderEmail}} dhe thuaj përshëndetje. Kjo mund të ndihmojë gjithashtu t'i sinjalizojë ofruesit tuaj të postës elektronike se emailet drejt-dhe-nga kjo adresë duhet të jenë të besueshme.",
+    "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.": "Dërgo një email te {{senderEmail}} dhe thuaj përshëndetje. Kjo mund të ndihmojë gjithashtu t'i sinjalizojë ofruesit tuaj të postës elektronike se emailet drejt-dhe-nga kjo adresë duhet të jenë të besueshme.",
     "Sending login link...": "Duke derguar linkun e identifikimit...",
     "Sending...": "Duke derguar...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "Dil",
     "Sign up": "Rregjistrohu",
     "Signup error: Invalid link": "Gabim ne rregjistrim: Link i pavlefshem",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Na vjen keq, kjo nuk funksionoi.",
     "Spam complaints": "Ankesat për mesazhe të padëshiruara",
     "Start {{amount}}-day free trial": "",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "Sukses! Emaili yt eshte rifreskuar",
     "Successfully unsubscribed": "Çabonuar me sukses",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Faleminderit per komentin!",
     "That didn't go to plan": "Kjo nuk shkoi sipas planit",
     "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.": "Pati një problem me dërgimin e komenteve tuaja. Ju lutemi provoni sërish pak më vonë.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Kjo faqe eshte vetem me ftesa, kontaktoni zoteruesin per akses.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Për të përfunduar regjistrimin, klikoni lidhjen e konfirmimit në kutinë tuaj hyrëse. Nëse nuk arrin brenda 3 minutash, kontrolloni dosjen tuaj të postës elektronike!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Provo falas per {{amount}} dite, pastaj {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Zhbllokoni aksesin per te gjitha buletinet duke u bere nje abonues me pagese.",
     "Unsubscribe from all emails": "Çregjistrohu nga të gjitha emailet",
     "Unsubscribed": "I çabonuar",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Çregjistrimi nga emailet nuk do ta anulojë abonimin tuaj me pagesë në {{title}}",
     "Update": "Rifresko",
     "Update your preferences": "Përditësoni preferencat tuaja",
diff --git a/ghost/i18n/locales/sr/portal.json b/ghost/i18n/locales/sr/portal.json
index 1c5ea8888a9..1105aba33d2 100644
--- a/ghost/i18n/locales/sr/portal.json
+++ b/ghost/i18n/locales/sr/portal.json
@@ -1,77 +1,83 @@
 {
-    "{{amount}} days free": "",
-    "{{amount}} off": "",
-    "{{amount}} off for first {{number}} months.": "",
-    "{{amount}} off for first {{period}}.": "",
-    "{{amount}} off forever.": "",
+    "(save {{highestYearlyDiscount}}%)": "",
+    "{{amount}} days free": "{{amount}} dana besplatno",
+    "{{amount}} off": "{{amount}} popusta",
+    "{{amount}} off for first {{number}} months.": "{{amount}} popusta prvih {{number}} meseci",
+    "{{amount}} off for first {{period}}.": "{{amount}} popusta prvih {{period}}",
+    "{{amount}} off forever.": "{{amount}} popusta zauvek",
     "{{discount}}% discount": "{{discount}}% popust",
-    "{{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}} više neće primati {{newsletterName}} bilten.",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} više neće primati mejlove kada neko odgovori na Vaš komentar.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} više neće primati ovaj bilten.",
     "{{trialDays}} days free": "{{trialDays}} dana besplatno",
-    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Link za logovanje je poslat na Vašu email adresu. Ukoliko ne stigne za 3 minuta proverite spam folder.",
+    "+1 (123) 456-7890": "",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Link za prijavljivanje je poslat na Vašu imejl adresu. Ukoliko ne stigne za 3 minuta, proverite folder sa nepoželjnim porukama.",
     "Account": "Nalog",
     "Account settings": "Podešavanja naloga",
-    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Nakon što probni period istekne, izvršiće se naplata za plan koji ste izabrali. Uvek možete da otkažete pretplatu pre toga.",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "Nakon što besplatni probni period istekne, izvršiće se naplata po regularnoj ceni za nivo koji ste izabrali. Uvek možete da otkažete pretplatu pre toga.",
     "Already a member?": "Već ste član?",
-    "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.": "Desila se neočekivana greška. Molimo probajte opet ili <a>kontaktirajte podršku</a> ako greška i dalje postoji.",
     "Back": "Nazad",
-    "Back to Log in": "Nazad na logovanje",
-    "Billing info": "",
-    "Black Friday": "",
-    "Cancel anytime.": "",
+    "Back to Log in": "Nazad na prijavu",
+    "Billing info": "Informacije o naplati",
+    "Black Friday": "Crni petak",
+    "Cancel anytime.": "Otkažite bilo kada.",
     "Cancel subscription": "Otkaži pretplatu",
     "Cancellation reason": "Razlog za otkazivanje",
-    "Change": "",
-    "Check spam & promotions folders": "",
-    "Check with your mail provider": "",
-    "Choose": "",
+    "Change": "Promeni",
+    "Check spam & promotions folders": "Proverite foldere za nepoželjne poruke i promocije",
+    "Check with your mail provider": "Proverite sa svojim pružaocem imejl usluga",
+    "Choose": "Izaberi",
     "Choose a different plan": "Izaberi drugi plan",
-    "Choose your newsletters": "Izaberi ",
-    "Click here to retry": "",
+    "Choose your newsletters": "Izaberi svoje biltene",
+    "Click here to retry": "Klikni ovde da pokušaš ponovo",
     "Close": "Zatvori",
     "Comments": "Komentari",
-    "Complimentary": "",
+    "Complimentary": "Besplatno",
     "Confirm": "Potvrdi",
-    "Confirm cancellation": "",
-    "Confirm subscription": "",
-    "Contact support": "",
+    "Confirm cancellation": "Potvrdi otkazivanje",
+    "Confirm subscription": "Potvrdi pretplatu",
+    "Contact support": "Kontaktiraj podršku",
     "Continue": "Nastavi",
-    "Continue subscription": "",
-    "Could not sign in. Login link expired.": "",
-    "Could not update email! Invalid link.": "",
-    "Create a new contact": "",
-    "Current plan": "",
+    "Continue subscription": "Nastavi pretplatu",
+    "Could not sign in. Login link expired.": "Prijavljivanje nije uspelo. Link za prijavljivanje je istekao.",
+    "Could not update email! Invalid link.": "Izmena mejla nije uspela! Neispravan link.",
+    "Create a new contact": "Kreiraj novi kontakt",
+    "Current plan": "Trenutni plan",
     "Delete account": "Obriši nalog",
-    "Didn't mean to do this? Manage your preferences <button>here</button>.": "",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Niste hteli da uradite ovo? Izmenite svoje preference <button>ovde</button>",
     "Don't have an account?": "Nemate nalog?",
-    "Edit": "",
-    "Email": "Email",
-    "Email newsletter": "",
-    "Email preference updated.": "Email podešavanja su sačuvana.",
-    "Email preferences": "Email podešavanja",
-    "Emails": "Email-ovi",
-    "Emails disabled": "Isključeni email-ovi",
-    "Ends {{offerEndDate}}": "",
-    "Error": "",
-    "Expires {{expiryDate}}": "",
-    "Forever": "",
-    "Free Trial – Ends {{trialEnd}}": "",
-    "Get help": "Potražite pomoć",
-    "Get in touch for help": "",
+    "Edit": "Izmeni",
+    "Email": "Imejl",
+    "Email newsletter": "Imejl bilten",
+    "Email preferences": "Imejl podešavanja",
+    "Emails": "Imejlovi",
+    "Emails disabled": "Onemogućeni imejlovi",
+    "Ends {{offerEndDate}}": "Završava se {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
+    "Error": "Greška",
+    "Expires {{expiryDate}}": "Ističe {{expiryDate}}",
+    "Forever": "Zauvek",
+    "Free Trial – Ends {{trialEnd}}": "Besplatni probni period – Završava se {{trialEnd}}",
+    "Get help": "Nađite pomoć",
+    "Get in touch for help": "Javite se za pomoć",
     "Get notified when someone replies to your comment": "Obavestite me ako neko odgovori na moj komentar:",
     "Give feedback on this post": "Ostavite komentar na ovaj post",
-    "Help! I'm not receiving emails": "",
+    "Help! I'm not receiving emails": "Pomoć! Ne primam mejlove",
     "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.": "",
+    "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Ako je bilten označen kao nepoželjna poruka, imejlovi su automatski onemogućeni za tu adresu da bi se postarali da više ne primate nepoželjne poruke",
+    "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.": "Ako je primedba za nepoželjne poruke bila slučajna, ili ako želite da ponovo počnete da primate imejlove, možete te se opet pretplatiti na imejlove klikom na dugme na prethodnom ekranu.",
+    "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Ako otkažete svoju pretplatu sada, imaćete pristup 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}}": "Ako imate korporativni ili državni imejl nalog, kontaktirajte svoju IT službu i pitajte ih da dozvole primanje imejlove sa {{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.": "Ako želite da ponovo počnete da primate imejlove, najbolji naredni korak je da proverite da li postoje problemi sa Vašom imejl adresom i onda kliknete dugme za ponovnu pretplatu na prethodnom ekranu.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Ako ne stižu imejlovi sa biltena na koji ste pretplaćeni, evo par stvari koje treba da proverite.",
+    "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Ako ste proverili sve ovo i mejlovi i dalje ne stižu, možete kontaktirati podršku {{supportAddress}}.",
+    "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "U slučaju trajnog kvara kada pokušavate da pošaljete bilten, imejlovi će biti onemogućeni na tom nalogu.",
     "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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Manje sadržaja kao ovaj",
     "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": "Podešavanja",
@@ -80,16 +86,18 @@
     "Monthly": "Mesečno",
     "More like this": "Više sadržaja kao ovaj",
     "Name": "Ime",
-    "Need more help? Contact support": "",
+    "Need more help? Contact support": "Potrebna Vam je pomoć? Kontaktirajte podršku",
     "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?": "Ne dobijate e-poštu?",
-    "Now check your email!": "Proverite Vaš email!",
+    "Now check your email!": "Proverite svoj imejl!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Cena",
     "Re-enable emails": "Omogući email adrese ponovo",
@@ -98,7 +106,7 @@
     "Retry": "Pokušaj opet",
     "Save": "Snimi",
     "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 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...": "Link za logovanje se šalje...",
     "Sending...": "Slanje...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "Registracija",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "Počni {{amount}} dana besplatnu probu",
@@ -120,39 +129,45 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Uspešna odjava",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Hvala za povratne informacije!",
     "That didn't go to plan": "Nešto nije kako treba",
     "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 an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Ovaj sajt je samo za članove, kontaktirajte vlasnika kako bi dobili pristup.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Kliknite na link da biste završili registraciju. Ukoliko ne stigne za 3 minuta proverite spam folder!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Odjavite se sa svih email-ova",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Odjavljivanjem sa email-ova nećete prekinuti Vašu pretplatu na {{title}}",
-    "Update": "",
-    "Update your preferences": "Izmenite Vaša podešavanja",
+    "Update": "Ažuriraj",
+    "Update your preferences": "Ažuriraj svoja podešavanja",
     "Verification link sent, check your inbox": "",
-    "Verify your email address is correct": "",
-    "View plans": "",
+    "Verify your email address is correct": "Potvrdi da je tvoja imejl adresa tačna",
+    "View plans": "Pogledaj planove",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Nismo uspeli da odjavimo email. Molimo Vas kontaktirajte vlasnika sajta.",
-    "Welcome back, {{name}}!": "",
-    "Welcome back!": "",
-    "Welcome to {{siteTitle}}": "",
+    "Welcome back, {{name}}!": "Dobrodošli nazad, {{name}}!",
+    "Welcome back!": "Dobrodošli nazad!",
+    "Welcome to {{siteTitle}}": "Dobrodošli na {{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?": "Zašto je moj imejl onemogućen?",
     "Yearly": "Godišnje",
-    "You currently have a free membership, upgrade to a paid subscription for full access.": "",
-    "You have been successfully resubscribed": "Uspešno ste se prijavili ponovo",
-    "You're currently not receiving emails": "",
-    "You're not receiving emails": "",
-    "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.": "Ne primate e-poruke zato što ste nedavnu poruku označili kao nepoželjnu ili zato što poruke nisu mogle da se isporuče na adresu e-pošte koju ste naveli.",
-    "You've successfully signed in.": "",
-    "You've successfully subscribed to": "",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "Trenutno imate besplatno članstvo, nadogradite na plaćenu pretplatu za pun pristup.",
+    "You have been successfully resubscribed": "Uspešno ste se ponovo pretplatili",
+    "You're currently not receiving emails": "Trenutno ne primate imejlove",
+    "You're not receiving emails": "Ne primate imejlove",
+    "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.": "Ne primate imejlove zato što ste nedavnu poruku označili kao nepoželjnu ili zato što poruke nisu mogle da se isporuče na adresu e-pošte koju ste naveli.",
+    "You've successfully signed in.": "Uspešno ste se prijavili",
+    "You've successfully subscribed to": "Uspešno ste se pretplatili na",
     "Your account": "Vaš nalog",
     "Your input helps shape what gets published.": "Vaš doprinos pomaže u oblikovanju onoga što se objavljuje.",
-    "Your subscription will expire on {{expiryDate}}": "",
-    "Your subscription will renew on {{renewalDate}}": "",
-    "Your subscription will start on {{subscriptionStart}}": ""
+    "Your subscription will expire on {{expiryDate}}": "Vaša pretplata će isteći {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "Vaša pretplata će biti obnovljena {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "Vaša pretplata će se nastaviti {{subscriptionStart}}"
 }
diff --git a/ghost/i18n/locales/sv/comments.json b/ghost/i18n/locales/sv/comments.json
index bcb0715d9a1..f0df3046e56 100644
--- a/ghost/i18n/locales/sv/comments.json
+++ b/ghost/i18n/locales/sv/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}} tecken kvar",
+    "{{amount}} comments": "{{amount}} kommentarer",
+    "{{amount}} days ago": "{{amount}} dagar sedan",
+    "{{amount}} hours ago": "{{amount}} timmar sedan",
+    "{{amount}} minutes ago": "{{amount}} minuter sedan",
+    "{{amount}} months ago": "{{amount}} månader sedan",
+    "{{amount}} more": "{{amount}} fler",
+    "{{amount}} seconds ago": "{{amount}} sekunder sedan",
+    "{{amount}} weeks ago": "{{amount}} veckor sedan",
+    "{{amount}} years ago": "{{amount}} år sedan",
+    "1 comment": "1 kommentar",
+    "Add comment": "Lägg till kommentar",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Lägg till kontext till din kommentar, som ditt namn, din expertis för att skapa ett bra forum.",
+    "Add reply": "Lägg till svar",
+    "Already a member?": "Redan medlem?",
+    "Anonymous": "Anonym",
+    "Become a member of {{publication}} to start commenting.": "Registrera dig på {{publication}} för att börja kommentera.",
+    "Become a paid member of {{publication}} to start commenting.": "Bli betalande medlem på {{publication}} för att börja kommentera ",
+    "Cancel": "Avbryt",
+    "Comment": "Kommentar",
+    "Complete your profile": "Fyll i hela din profil",
+    "Delete": "Ta bort",
+    "Deleted member": "Borttagen medlem",
+    "Discussion": "Diskussion",
+    "Edit": "Ändra",
+    "Edit this comment": "Ändra den här kommentaren",
+    "Edited": "Ändrad",
+    "Enter your name": "Skriv ditt namn",
+    "Expertise": "Expertis",
+    "Founder @ Acme Inc": "Grundare av Företaget AB",
+    "Full-time parent": "Hemmaförälder",
+    "Head of Marketing at Acme, Inc": "Marknadsföringschef på Företaget AB",
+    "Hide": "Dölj",
+    "Hide comment": "Dölj kommentar",
+    "Jamie Larson": "Emma Jansson",
+    "Join the discussion": "Var med i diskussionen",
+    "Just now": "Nu precis",
+    "Local resident": "Lokalboende",
+    "Member discussion": "Medlemsdiskussion",
+    "Name": "Namn",
+    "Neurosurgeon": "Neurokirurg",
+    "One day ago": "En dag sedan",
+    "One hour ago": "En timme sedan",
+    "One minute ago": "En minut sedan",
+    "One month ago": "En månad sedan",
+    "One week ago": "En vecka sedan",
+    "One year ago": "Ett år sedan",
+    "Reply": "Svar",
+    "Reply to comment": "Svara på kommentar",
+    "Report": "Anmäl",
+    "Report comment": "Anmäl kommentar",
+    "Report this comment": "Anmäl den här kommentaren",
+    "Report this comment?": "Anmäl den här kommentaren?",
+    "Save": "Spara",
+    "Sending": "Skickar",
+    "Sent": "Skickad",
+    "Show": "Visa",
+    "Show {{amount}} more replies": "Visa {{amount}} fler svar",
+    "Show {{amount}} previous comments": "Visa {{amount}} tidigare kommentarer",
+    "Show 1 more reply": "Visa 1 kommentar till",
+    "Show 1 previous comment": "Visa 1 tidigare kommentar",
+    "Show comment": "Visa kommentar",
+    "Sign in": "Logga in",
+    "Sign up now": "Registrera dig nu",
+    "Start the conversation": "Inled konversationen",
+    "This comment has been hidden.": "Denna kommentar har dolts",
+    "This comment has been removed.": "Denna kommentar är borttagen",
+    "Upgrade now": "Uppgradera nu",
+    "Yesterday": "I går",
+    "You want to report this comment?": "Vill du anmäla denna kommentar?",
+    "Your request will be sent to the owner of this site.": "Din anmälan skickas till ansvarig för webbplatsen"
 }
diff --git a/ghost/i18n/locales/sv/portal.json b/ghost/i18n/locales/sv/portal.json
index 7571b49db54..d94f0f8004a 100644
--- a/ghost/i18n/locales/sv/portal.json
+++ b/ghost/i18n/locales/sv/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} gratisdagar",
     "{{amount}} off": "{{amount}} i rabatt",
     "{{amount}} off for first {{number}} months.": "{{amount}} i rabatt de första {{number}} månaderna.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} kommer inte längre att få meddelanden när någon svarar på din kommentar",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} kommer inte längre att få det här nyhetsbrevet",
     "{{trialDays}} days free": "{{trialDays}} dagar gratis",
+    "+1 (123) 456-7890": "",
     "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 inloggningslänk har skickats till din inkorg. Om den inte anländer inom 3 minuter, kontrollera din skräppostmapp.",
     "Account": "Konto",
     "Account settings": "Kontoinställningar",
@@ -48,11 +50,12 @@
     "Edit": "Editera",
     "Email": "E-post",
     "Email newsletter": "Nyhetsbrev via e-post",
-    "Email preference updated.": "Inställningar för e-post uppdaterade.",
     "Email preferences": "E-postinställningar",
     "Emails": "E-postmeddelanden",
     "Emails disabled": "E-post inaktiverad",
     "Ends {{offerEndDate}}": "Avslutas {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Fel",
     "Expires {{expiryDate}}": "Utgår {{expiryDate}}",
     "Forever": "Tillsvidare",
@@ -62,21 +65,24 @@
     "Get notified when someone replies to your comment": "Få en avisering när någon svarar på din kommentar",
     "Give feedback on this post": "Ge feedback på det här inlägget",
     "Help! I'm not receiving emails": "Hjälp! Jag får inte e-posten",
-    "Here are a few other sites you may enjoy.": "",
+    "Here are a few other sites you may enjoy.": "Här är några andra webbplatser du kanske skulle uppskatta.",
     "If a newsletter is flagged as spam, emails are automatically disabled for that address to make sure you no longer receive any unwanted messages.": "Om ett nyhetsbrev markeras som skräppost, stängs utskicken till den e-postadressen av automatiskt för att det inte skall skickas ovälkomna meddelanden.",
     "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.": "Om nyhetsbrevet av misstag markerades som skräppost och du vill återuppta utskicken kan du aktivera nyhetsbrevet på föregående sida.",
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Om du säger upp prenumerationen nu kommer du att ha tillgång till {{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}}": "Om din organisations e-postlösning blockerar utskicken kan du be administratören att tillåta e-post från adressen {{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.": "Om du vill börja ta emot utskicken igen, verifiera att du angett korrekt e-postadress och sedan klickar du på återaktivera utskick på förra sidan.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Om du inte får e-postutskicken från oss finns det några saker du kan göra.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Om du inte får e-postutskicken från oss finns det några saker du kan göra.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Om det fortfarande inte fungerar efter att du undersökt allt kan du kontakta oss på {{supportAddress}}.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Om e-postutskick till din adress resulterar i ett permanent fel kommer utskicksförsök att upphöra.",
     "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.": "Spara {{senderEmail}} som en kontakt i ditt e-postprogram. Det signalerar till din e-postleverantör att e-post från denna är adress är viktig.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Mindre sånt här",
     "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\".": "Verifiera att e-postmeddelandena inte hamnat i skräppostmappen. Om de gjort det, flytta dem till inkorgen och/eller markera som \"Ej skräppost\".",
     "Manage": "Hantera",
-    "Maybe later": "",
-    "Memberships unavailable, contact the owner for access.": "",
+    "Maybe later": "Kanske senare",
+    "Memberships unavailable, contact the owner for access.": "Medlemskap inte tillgängligt. Kontakta ansvarig för webplatsen för tillgång.",
     "Monthly": "Månadsvis",
     "More like this": "Mer sånt här",
     "Name": "Namn",
@@ -86,26 +92,29 @@
     "Now check your email!": "Kolla nu din e-post!",
     "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.": "Om du fortfarande inte ser e-post i din inkorg efter att du återaktiverat utskicken, kontrollera din skräppostmapp. Vissa e-postleverantörer behåller en historik över tidigare spamklagomål och fortsätter att markera e-post som spam. Om detta händer, markera det senaste nyhetsbrevet som 'Inte spam' för att flytta tillbaka det till din huvudsakliga inkorg.",
     "Permanent failure (bounce)": "Permanent fel vid e-postutsskick (studs)",
+    "Phone number": "",
     "Plan": "Prenumerationen",
     "Plan checkout was cancelled.": "Köp av prenumeration avbrutet",
     "Plan upgrade was cancelled.": "Uppgradering av prenunmeration avbruten",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Kontakta {{supportAddress}} för att ändra din gratisprenumeration ",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Fyll i alla obligatoriska fält",
     "Price": "Pris",
     "Re-enable emails": "Återaktivera e-post",
-    "Recommendations": "",
+    "Recommendations": "Rekommendationer",
     "Renews at {{price}}.": "Förnyas till priset {{price}}",
     "Retry": "Försök igen",
     "Save": "Spara",
     "Send an email and say hi!": "Skicka e-post och säg hej!",
-    "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.": "Skicka ett e-postmeddelande till {{senderEmail}} och säj hej. Detta blir en signal till din e-postleverantör meddelanden till/från {{senderEmail}} är viktiga.",
+    "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.": "Skicka ett e-postmeddelande till {{senderEmail}} och säj hej. Detta blir en signal till din e-postleverantör meddelanden till/från {{senderEmail}} är viktiga.",
     "Sending login link...": "Skickar inloggningslänk...",
     "Sending...": "Skickar...",
-    "Show all": "",
+    "Show all": "Visa alla",
     "Sign in": "Logga in",
     "Sign out": "Logga ut",
     "Sign up": "Få uppdateringar",
     "Signup error: Invalid link": "Registreringsfel. Länken fungerade inte.",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Tyvärr, det fungerande inte.",
     "Spam complaints": "Skräppostrapporter",
     "Start {{amount}}-day free trial": "Starta {{amount}}-dagars gratis testprenumeration",
@@ -119,27 +128,33 @@
     "Success! Your account is fully activated, you now have access to all content.": "Det gick bra! Ditt konto är uppdaterat och du har tillgång till allt material.",
     "Success! Your email is updated.": "Det gick bra! Din e-postadress är uppdaterad.",
     "Successfully unsubscribed": "Prenumerationen avslutades framgångsrikt",
-    "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.": "Tack för att du prenumererar. Innan du börjar läsa finns några andra webbplatser nedan som du kanske skulle uppskatta.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Tack för din feedback!",
     "That didn't go to plan": "Det där fungerade inte som tänkt",
     "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>.": "E-postadressen vi har för dig är {{memberEmail}} — om det inte stämmer kan du uppdatera den i <button>kontoinställningar</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Det fungerande inte att skicka in din feedbak. Försök igen lite senare.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Den här sidan är endast för inbjudna, kontakta ägaren för åtkomst.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "För att slutföra registreringen, klicka på bekräftelselänken i din inkorg. Om den inte kommer fram inom 3 minuter, kolla din skräppostmapp!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Prova gratis i {{amount}} dagar, sen betalar du {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Få tillgång till alla nyhetsbrev genom att bli betalande prenumerant",
     "Unsubscribe from all emails": "Avregistrera från alla e-postutskick",
     "Unsubscribed": "Avregistrerad",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Avregistrering från e-postmeddelanden kommer inte att avbryta din betalda prenumeration på {{title}}",
     "Update": "Uppdatera",
     "Update your preferences": "Uppdatera dina inställningar",
-    "Verification link sent, check your inbox": "",
+    "Verification link sent, check your inbox": "Verifieringslänken är skickad. Titta i ditt e-postprogram",
     "Verify your email address is correct": "Kontrollera att e-postadressen är korrekt",
     "View plans": "Visa prenumerationsalternativ",
     "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "Vi kunde inte avsluta kontot eftersom e-postadressen inte hittades. Vänligen kontakta webbplatsens ägare.",
     "Welcome back, {{name}}!": "Välkommen tillbaka, {{name}}!",
     "Welcome back!": "Välkommen tillbaka!",
-    "Welcome to {{siteTitle}}": "",
+    "Welcome to {{siteTitle}}": "Välkommen till {{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.": "När en mottagare inte kan ta emot ett e-postmeddelande kallas det vanligtvis för att ett mejl studsar. I många fall kan detta vara tillfälligt. Dock kan i vissa fall ett studsande mejl returneras som ett permanent fel när en e-postadress är ogiltig eller inte existerar.",
     "Why has my email been disabled?": "Varför har e-postutskicken stängts av?",
     "Yearly": "Årligen",
@@ -149,7 +164,7 @@
     "You're not receiving emails": "Du tar inte emot e-post",
     "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 får inte e-postmeddelanden eftersom du antingen markerade ett nyligt meddelande som skräppost, eller för att meddelanden inte kunde levereras till din angivna e-postadress.",
     "You've successfully signed in.": "Du är nu inloggad.",
-    "You've successfully subscribed to": "",
+    "You've successfully subscribed to": "Du är nu anmäld till",
     "Your account": "Ditt konto",
     "Your input helps shape what gets published.": "Din åsikt hjälper till att forma vad som publiceras.",
     "Your subscription will expire on {{expiryDate}}": "Din prenumeration avslutas {{expiryDate}}",
diff --git a/ghost/i18n/locales/th/comments.json b/ghost/i18n/locales/th/comments.json
new file mode 100644
index 00000000000..3c133253d1f
--- /dev/null
+++ b/ghost/i18n/locales/th/comments.json
@@ -0,0 +1,73 @@
+{
+    "{{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.": "เป็นสมาชิกของ {{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": "กนกพัฒน์ สัณห์ฤทัย",
+    "Join the discussion": "เข้าร่วมการสนทนา",
+    "Just now": "ตอนนี้",
+    "Local resident": "ผู้อยู่อาศัยในท้องถิ่น",
+    "Member discussion": "การสนทนาของสมาชิก",
+    "Name": "ชื่อ",
+    "Neurosurgeon": "ศัลยแพทย์ระบบประสาท",
+    "One day ago": "1 วันที่แล้ว",
+    "One hour ago": "1 ชั่วโมงที่แล้ว",
+    "One minute ago": "1 นาทีที่แล้ว",
+    "One month ago": "1 เดือนที่แล้ว",
+    "One week ago": "1 สัปดาห์ที่แล้ว",
+    "One year ago": "1 ปีที่แล้ว",
+    "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": "แสดงอีก 1 การตอบกลับ",
+    "Show 1 previous comment": "แสดง 1 ความคิดเห็น",
+    "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/th/ghost.json b/ghost/i18n/locales/th/ghost.json
new file mode 100644
index 00000000000..34517c9a117
--- /dev/null
+++ b/ghost/i18n/locales/th/ghost.json
@@ -0,0 +1,34 @@
+{
+    "All the best!": "ขอให้โชคดี!",
+    "Complete signup for {{siteTitle}}!": "สมัครใช้งานสำหรับ {{siteTitle}} ให้เสร็จสิ้น!",
+    "Complete your sign up to {{siteTitle}}!": "สมัครใช้งาน {{siteTitle}} ให้เสร็จสิ้น!",
+    "Confirm email address": "ยืนยันที่อยู่อีเมล",
+    "Confirm signup": "ยืนยันการสมัคร",
+    "Confirm your email address": "ยืนยันที่อยู่อีเมลของคุณ",
+    "Confirm your email update for {{siteTitle}}!": "ยืนยันการเปลี่ยนแปลงอีเมลของ {{siteTitle}}",
+    "Confirm your subscription to {{siteTitle}}": "ยืนยันการรับสมัครข้อมูลของคุณกับ {{siteTitle}}",
+    "For your security, the link will expire in 24 hours time.": "เพื่อความปลอดภัยของคุณ, ลิงก์นี้จะหมดอายุภายใน 24 ชั่วโมง",
+    "Hey there,": "สวัสดี,",
+    "Hey there!": "สวัสดี!",
+    "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}}",
+    "See you soon!": "แล้วพบกัน!",
+    "Sent to {{email}}": "ส่งไปที่ {{email}}",
+    "Sign in": "ลงชื่อเข้าใช้",
+    "Sign in to {{siteTitle}}": "ลงชื่อเข้าใช้ไปยัง {{siteTitle}}",
+    "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "แตะลิงก์ด้านล่างเพื่อเสร็จสิ้นขั้นตอนการสมัครใช้งาน {{siteTitle}} และลงชื่อเข้าใช้โดยอัตโนมัติ:",
+    "Thank you for signing up to {{siteTitle}}!": "ขอบคุณสำหรับการสมัครใช้งาน {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}!": "ขอบคุณที่รับสมัครข้อมูลจาก {{siteTitle}}!",
+    "Thank you for subscribing to {{siteTitle}}.": "ขอบคุณที่รับสมัครข้อมูลจาก {{siteTitle}}.",
+    "Thank you for subscribing to {{siteTitle}}. Tap the link below to be automatically signed in:": "ขอบคุณที่รับสมัครข้อมูลจาก {{siteTitle}}. แตะลิงก์ด้านล่างเพื่อลงชื่อเข้าใช้โดยอัตโนมัติ",
+    "This email address will not be used.": "ที่อยู่อีเมลนี้จะไม่ถูกใช้งาน",
+    "Welcome back to {{siteTitle}}!": "ยินดีต้อนรับกลับสู่ {{siteTitle}}!",
+    "Welcome back! Use this link to securely sign in to your {{siteTitle}} account:": "ยินดีต้อนรับกลับ! ใช้ลิงก์นี้เพื่อลงชื่อเข้าใช้บัญชีของคุณบน {{siteTitle}} อย่างปลอดภัย:",
+    "You can also copy & paste this URL into your browser:": "คุณสามารถคัดลอกและวาง URL นี้ลงในเบราว์เซอร์ของคุณได้:",
+    "You will not be signed up, and no account will be created for you.": "คุณจะไม่ได้สมัครใช้งาน และจะไม่มีการสร้างบัญชีสำหรับคุณ",
+    "You will not be subscribed.": "คุณจะไม่ถูกรับสมัครข้อมูล",
+    "You're one tap away from subscribing to {{siteTitle}} — please confirm your email address with this link:": "เพียงแตะครั้งเดียวคุณก็จะสมัครรับข้อมูลจาก {{siteTitle}} — โปรดยืนยันที่อยู่อีเมลของคุณด้วยลิงก์นี้:",
+    "You're one tap away from subscribing to {{siteTitle}}!": "เพียงแตะครั้งเดียวคุณก็จะสมัครรับข้อมูลจาก {{siteTitle}} แล้ว!"
+}
diff --git a/ghost/i18n/locales/th/portal.json b/ghost/i18n/locales/th/portal.json
new file mode 100644
index 00000000000..cc6f94ab3c7
--- /dev/null
+++ b/ghost/i18n/locales/th/portal.json
@@ -0,0 +1,158 @@
+{
+    "{{amount}} days free": "ฟรี {{amount}} วัน",
+    "{{amount}} off": "ลด {{amount}}",
+    "{{amount}} off for first {{number}} months.": "ลด {{amount}} สำหรับ {{number}} เดือนแรก",
+    "{{amount}} off for first {{period}}.": "ลด {{amount}} สำหรับ {{period}} ไตรมาสแรก",
+    "{{amount}} off forever.": "ลด {{amount}} ตลอดไป",
+    "{{discount}}% discount": "ส่วนลด {{discount}}%",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} นี้จะไม่ได้รับจดหมายข่าวจาก {{newsletterName}} อีกต่อไป",
+    "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} จะไม่ได้รับอีเมลอีกต่อไป เมื่อมีคนตอบกลับความคิดเห็นของคุณ",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} จะไม่ได้รับจดหมายข่าวนี้อีกต่อไป",
+    "{{trialDays}} days free": "ฟรี {{trialDays}} วัน",
+    "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "ลิงค์เข้าสู่ระบบถูกส่งไปยังกล่องจดหมายของคุณแล้ว หากไม่ได้รับภายใน 3 นาที โปรดตรวจสอบโฟลเดอร์สแปมของคุณ",
+    "Account": "บัญชี",
+    "Account settings": "ตั้งค่าบัญชี",
+    "After a free trial ends, you will be charged the regular price for the tier you've chosen. You can always cancel before then.": "หลังจากช่วงทดลองใช้ฟรีสิ้นสุดลง, คุณจะถูกเรียกเก็บเงินตามราคาปกติตามระดับที่คุณเลือกไว้ คุณสามารถยกเลิกก่อนเวลาดังกล่าวได้เสมอ",
+    "Already a member?": "เป็นสมาชิกอยู่แล้ว?",
+    "An unexpected error occured. Please try again or <a>contact support</a> if the error persists.": "เกิดข้อผิดพลาดที่ไม่คาดคิด โปรดลองอีกครั้งหรือ <a>ติดต่อฝ่ายสนับสนุน</a> หากข้อผิดพลาดยังคงอยู่",
+    "Back": "ย้อนกลับ",
+    "Back to Log in": "กลับไปยังเข้าสู่ระบบ",
+    "Billing info": "ข้อมูลการเรียกเก็บเงิน",
+    "Black Friday": "แบล็คฟรายเดย์",
+    "Cancel anytime.": "ยกเลิกได้ตลอดเวลา",
+    "Cancel subscription": "ยกเลิกการรับสมัครข้อมูล",
+    "Cancellation reason": "เหตุผลการยกเลิก",
+    "Change": "เปลี่ยน",
+    "Check spam & promotions folders": "ตรวจสอบโฟลเดอร์สแปมและโปรโมชัน",
+    "Check with your mail provider": "ตรวจสอบกับผู้ให้บริการอีเมลของคุณ",
+    "Choose": "เลือก",
+    "Choose a different plan": "เลือกแผนอื่น",
+    "Choose your newsletters": "เลือกอีเมลที่ต้องการรับจดหมายข่าว",
+    "Click here to retry": "คลิกที่นี่เพื่อลองอีกครั้ง",
+    "Close": "ปิด",
+    "Comments": "ความคิดเห็น",
+    "Complimentary": "เพิ่มเติมฟรีโดยไม่คิดค่าใช้จ่าย",
+    "Confirm": "ยืนยัน",
+    "Confirm cancellation": "ยืนยันการยกเลิก",
+    "Confirm subscription": "ยืนยันการรับสมัครข้อมูล",
+    "Contact support": "ติดต่อฝ่ายสนับสนุน",
+    "Continue": "ดำเนินการต่อ",
+    "Continue subscription": "รับสมัครข้อมูลต่อ",
+    "Could not sign in. Login link expired.": "ไม่สามารถลงชื่อเข้าใช้ได้ ลิงก์เข้าสู่ระบบหมดอายุ",
+    "Could not update email! Invalid link.": "ไม่สามารถอัปเดตอีเมลได้! ลิงก์ไม่ถูกต้อง",
+    "Create a new contact": "สร้างผู้ติดต่อใหม่",
+    "Current plan": "แผนปัจจุบัน",
+    "Delete account": "ลบบัญชี",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "ไม่ได้ตั้งใจที่จะทำเช่นนี้? จัดการการตั้งค่าของคุณ<button>ที่นี่</button>",
+    "Don't have an account?": "ยังไม่มีบัญชี?",
+    "Edit": "แก้ไข",
+    "Email": "อีเมล",
+    "Email newsletter": "จดหมายข่าวทางอีเมล",
+    "Email preference updated.": "อัปเดตการตั้งค่าอีเมลแล้ว",
+    "Email preferences": "การตั้งค่าอีเมล",
+    "Emails": "อีเมล",
+    "Emails disabled": "อีเมลถูกปิดใช้งาน",
+    "Ends {{offerEndDate}}": "สิ้นสุด {{offerEndDate}}",
+    "Error": "ข้อผิดพลาด",
+    "Expires {{expiryDate}}": "หมดอายุ {{expiryDate}}",
+    "Forever": "ตลอดไป",
+    "Free Trial – Ends {{trialEnd}}": "ทดลองใช้ฟรี - สิ้นสุด {{trialEnd}}",
+    "Get help": "ต้องการความช่วยเหลือ",
+    "Get in touch for help": "ติดต่อขอความช่วยเหลือ",
+    "Get notified when someone replies to your comment": "รับการแจ้งเตือนเมื่อมีคนตอบกลับความคิดเห็นของคุณ",
+    "Give feedback on this post": "ให้ข้อเสนอแนะเกี่ยวกับโพสต์นี้",
+    "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}}.": "หากคุณยกเลิกการรับสมัครข้อมูลตอนนี้, คุณจะยังสามารถเข้าถึงได้ต่อไปจนถึง {{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}}": "หากคุณมีบัญชีอีเมลของบริษัทหรือภาครัฐ โปรดติดต่อแผนกไอทีของคุณและขอให้พวกเขาอนุญาตให้รับอีเมลจาก {{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 a 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}}.": "หากคุณตรวจสอบทั้งหมดนี้แล้ว แต่ยังไม่ได้รับอีเมล คุณสามารถติดต่อเพื่อแก้ไขปัญหาได้โดยติดต่อ {{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.": "ในโปรแกรมรับส่งอีเมลของคุณ ให้เพิ่ม {{senderEmail}} ลงในรายชื่อผู้ติดต่อของคุณ นี่เป็นการส่งสัญญาณไปยังผู้ให้บริการอีเมลของคุณ ว่าอีเมลที่ส่งจากที่อยู่นี้เชื่อถือได้",
+    "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.": "การเป็นสมาชิกไม่พร้อมใช้งาน, โปรดติดต่อเจ้าของเพื่อขอสิทธิ์ในการเข้าถึง",
+    "Monthly": "รายเดือน",
+    "More like this": "เห็นแบบนี้ให้มากขึ้น",
+    "Name": "ชื่อ",
+    "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).": "จดหมายข่าวสามารถปิดการใช้งานในบัญชีของคุณด้วยเหตุผลสองประการ: อีเมลก่อนหน้านี้ถูกทำเครื่องหมายว่าเป็นสแปม หรือการพยายามที่ส่งอีเมล ส่งผลให้เกิดความล้มเหลวถาวร (อีเมลตีกลับ)",
+    "Not receiving emails?": "ไม่ได้รับอีเมล?",
+    "Now check your email!": "ตรวจสอบอีเมลของคุณตอนนี้!",
+    "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.": "โปรดติดต่อ {{supportAddress}} เพื่อปรับเปลี่ยนการรับสมัครข้อมูลฟรีของคุณ",
+    "Please fill in required fields": "กรุณากรอกข้อมูลในช่องให้ครบถ้วน",
+    "Price": "ราคา",
+    "Re-enable emails": "เปิดใช้งานอีเมลนี้อีกครั้ง",
+    "Recommendations": "รายการแนะนำ",
+    "Renews at {{price}}.": "ต่ออายุที่ {{price}}",
+    "Retry": "ลองอีกครั้ง",
+    "Save": "บันทึก",
+    "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.": "ส่งอีเมลไปที่ {{senderEmail}} และทักทาย นอกจากนี้ยังช่วยส่งสัญญาณไปยังผู้ให้บริการอีเมลของคุณ ว่าอีเมลที่ส่งเข้าและออกจากที่อยู่นี้ควรเชื่อถือได้",
+    "Sending login link...": "กำลังส่งลิงก์เข้าสู่ระบบ...",
+    "Sending...": "กำลังส่ง...",
+    "Show all": "แสดงทั้งหมด",
+    "Sign in": "ลงชื่อเข้าใช้",
+    "Sign out": "ออกจากระบบ",
+    "Sign up": "สมัครใช้งาน",
+    "Signup error: Invalid link": "มีข้อผิดพลาดในการสมัครใช้งาน: ลิงก์ไม่ถูกต้อง",
+    "Sorry, that didn’t work.": "ขออภัย, ไม่สามารถส่งได้",
+    "Spam complaints": "การร้องเรียนเกี่ยวกับสแปม",
+    "Start {{amount}}-day free trial": "เริ่มทดลองใช้ฟรี {{amount}} วัน",
+    "Starting {{startDate}}": "เริ่มวันที่ {{startDate}}",
+    "Starting today": "เริ่มตั้งแต่วันนี้เป็นต้นไป",
+    "Submit 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.": "อัปเดตอีเมลสำเร็จแล้ว!",
+    "Successfully unsubscribed": "ยกเลิกการรับสมัครข้อมูลเรียบร้อยแล้ว",
+    "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>.": "ที่อยู่อีเมลของคุณที่เรามีคือ {{memberEmail}} — หากไม่ถูกต้อง คุณสามารถอัปเดตได้ใน<button>พื้นที่การตั้งค่าบัญชี</button>",
+    "There was a problem submitting your feedback. Please try again a little later.": "เกิดปัญหาในการส่งความคิดเห็นของคุณ โปรดลองอีกครั้งในภายหลัง",
+    "This site is invite-only, contact the owner for access.": "เว็บไซต์นี้สำหรับผู้ได้รับเชิญเท่านั้น โปรดติดต่อเจ้าของเพื่อเข้าถึง",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "เพื่อทำการลงทะเบียนให้เสร็จสิ้น คลิกลิงก์ยืนยันในกล่องจดหมายของคุณ หากไม่ได้รับภายใน 3 นาที ให้ตรวจสอบโฟลเดอร์สแปมของคุณ!",
+    "Try free for {{amount}} days, then {{originalPrice}}.": "ทดลองใช้ฟรี {{amount}} วัน จากนั้นจ่ายเป็น {{ราคาเดิม}}",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "ปลดล็อกการเข้าถึงจดหมายข่าวทั้งหมดโดยสมัครเป็นสมาชิกแบบชำระเงิน",
+    "Unsubscribe from all emails": "ยกเลิกการรับสมัครข้อมูลทางอีเมลทั้งหมด",
+    "Unsubscribed": "ยกเลิกการรับสมัครข้อมูลทางอีเมลแล้ว",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "การยกเลิกการสมัครรับอีเมล จะไม่ยกเลิกการรับสมัครข้อมูลแบบชำระเงินของคุณกับ {{title}}",
+    "Update": "อัปเดต",
+    "Update your preferences": "อัปเดตการตั้งค่าของคุณ",
+    "Verification link sent, check your inbox": "ส่งลิงก์ยืนยันแล้ว โปรดตรวจสอบกล่องจดหมายของคุณ",
+    "Verify your email address is correct": "โปรดตรวจสอบที่อยู่อีเมลของคุณให้ถูกต้อง",
+    "View plans": "ดูแผน",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "เราไม่สามารถยกเลิกการรับสมัครข้อมูลของคุณได้ เนื่องจากไม่พบที่อยู่อีเมล โปรดติดต่อเจ้าของเว็บไซต์",
+    "Welcome back, {{name}}!": "ยินดีต้อนรับกลับมา, {{name}}!",
+    "Welcome back!": "ยินดีต้อนรับกลับ!",
+    "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?": "เหตุใดอีเมลของฉันจึงถูกปิดการใช้งาน?",
+    "Yearly": "รายปี",
+    "You currently have a free membership, upgrade to a paid subscription for full access.": "ขณะนี้คุณเป็นสมาชิกฟรี, อัปเกรดเป็นการรับสมัครข้อมูลแบบชำระเงินเพื่อการเข้าถึงเต็มรูปแบบ",
+    "You have been successfully resubscribed": "คุณรับสมัครข้อมูลทางอีเมลอีกครั้งสำเร็จแล้ว",
+    "You're currently not receiving emails": "ขณะนี้คุณไม่ได้รับข่าวสารทางอีเมล",
+    "You're not receiving emails": "คุณไม่ได้รับอีเมล",
+    "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.": "คุณไม่ได้รับอีเมล เนื่องจากคุณทำเครื่องหมายข้อความล่าสุดว่าเป็นสแปม, หรือเนื่องจากไม่สามารถส่งข้อความไปยังที่อยู่อีเมลที่คุณให้ไว้",
+    "You've successfully signed in.": "คุณลงชื่อเข้าใช้สำเร็จแล้ว",
+    "You've successfully subscribed to": "คุณรับสมัครข้อมูลสำเร็จแล้ว",
+    "Your account": "บัญชีของคุณ",
+    "Your input helps shape what gets published.": "ข้อมูลของคุณ จะช่วยกำหนดสิ่งที่จะได้รับการเผยแพร่ในอนาคต",
+    "Your subscription will expire on {{expiryDate}}": "การรับสมัครข้อมูลของคุณจะหมดอายุในวันที่ {{expiryDate}}",
+    "Your subscription will renew on {{renewalDate}}": "การรับสมัครข้อมูลของคุณจะต่ออายุในวันที่ {{renewalDate}}",
+    "Your subscription will start on {{subscriptionStart}}": "การรับสมัครข้อมูลของคุณจะเริ่มในวันที่ {{subscriptionStart}}"
+}
diff --git a/ghost/i18n/locales/th/signup-form.json b/ghost/i18n/locales/th/signup-form.json
new file mode 100644
index 00000000000..347cc2edb1a
--- /dev/null
+++ b/ghost/i18n/locales/th/signup-form.json
@@ -0,0 +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!": "เพื่อที่จะลงทะเบียนให้เสร็จสิ้น, คลิกลิงก์ยืนยันในกล่องจดหมายของคุณ หากไม่ได้รับลิงค์ใน 3 นาที, ตรวจสอบในโฟลเดอร์สแปมของคุณ!",
+    "Your email address": "ที่อยู่อีเมลของคุณ"
+}
diff --git a/ghost/i18n/locales/tr/comments.json b/ghost/i18n/locales/tr/comments.json
index f38961babc6..af18cc106f6 100644
--- a/ghost/i18n/locales/tr/comments.json
+++ b/ghost/i18n/locales/tr/comments.json
@@ -5,41 +5,41 @@
     "{{amount}} hours ago": "{{amount}} saat önce",
     "{{amount}} minutes ago": "{{amount}} dakika önce",
     "{{amount}} months ago": "{{amount}} ay önce",
-    "{{amount}} more": "",
+    "{{amount}} more": "Daha fazla {{amount}}",
     "{{amount}} seconds ago": "{{amount}} saniye önce",
     "{{amount}} weeks ago": "{{amount}} hafta önce",
     "{{amount}} years ago": "{{amount}} yıl önce",
     "1 comment": "1 yorum",
     "Add comment": "Yorum ekle",
-    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Yorumunuza bağlam ekleyin, adınızı ve uzmanlığınızı paylaşarak sağlıklı bir tartışmayı teşvik edin.",
+    "Add context to your comment, share your name and expertise to foster a healthy discussion.": "Yorumunuza bağlam ekleyin, adınızı ve uzmanlık alanınızı paylaşarak sağlıklı bir tartışmayı teşvik edin.",
     "Add reply": "Yanıt ekle",
     "Already a member?": "Zaten üye misiniz?",
     "Anonymous": "Anonim",
-    "Become a member of {{publication}} to start commenting.": "Yorum yapmaya başlamak için {{publication}} üyesi olun.",
-    "Become a paid member of {{publication}} to start commenting.": "Yorum yapmaya başlamak için {{publication}} ücretli üyesi olun.",
+    "Become a member of {{publication}} to start commenting.": "Yorum yapmaya başlamak için {{publication}} sitesinde hesap oluşturun.",
+    "Become a paid member of {{publication}} to start commenting.": "Yorum yapmaya başlamak için {{publication}} sitesinde ücretli hesap oluşturun.",
     "Cancel": "İptal et",
     "Comment": "Yorum ekle",
     "Complete your profile": "Profilinizi tamamlayın",
     "Delete": "Sil",
     "Deleted member": "Silinen üye",
-    "Discussion": "Tartışma",
+    "Discussion": "Yorumlar",
     "Edit": "Düzenle",
     "Edit this comment": "Bu yorumu düzenle",
     "Edited": "Düzenlendi",
     "Enter your name": "Adınızı girin",
     "Expertise": "Uzmanlık",
-    "Founder @ Acme Inc": "Kurucu @ Acme Inc",
+    "Founder @ Acme Inc": "Kurucu @ Firma Ünvan",
     "Full-time parent": "Tam zamanlı ebeveyn",
-    "Head of Marketing at Acme, Inc": "Acme, Inc'de Pazarlama Müdürü",
+    "Head of Marketing at Acme, Inc": "Firma, Ünvan'da Pazarlama Müdürü",
     "Hide": "Gizle",
     "Hide comment": "Yorumu gizle",
-    "Jamie Larson": "",
+    "Jamie Larson": "Ad Soyad",
     "Join the discussion": "Tartışmaya katıl",
     "Just now": "Şu anda",
     "Local resident": "Yerel sakini",
     "Member discussion": "Üye tartışması",
     "Name": "Ad",
-    "Neurosurgeon": "",
+    "Neurosurgeon": "Beyin cerrahı",
     "One day ago": "Bir gün önce",
     "One hour ago": "Bir saat önce",
     "One minute ago": "Bir dakika önce",
@@ -58,12 +58,12 @@
     "Show": "Göster",
     "Show {{amount}} more replies": "{{amount}} daha fazla yanıt göster",
     "Show {{amount}} previous comments": "{{amount}} önceki yorumu göster",
-    "Show 1 more reply": "1 daha fazla cevap göster",
+    "Show 1 more reply": "1 cevap daha göster",
     "Show 1 previous comment": "1 önceki yorumu göster",
     "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ş",
     "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/tr/ghost.json b/ghost/i18n/locales/tr/ghost.json
index 57ce6459cfb..8247424ed8d 100644
--- a/ghost/i18n/locales/tr/ghost.json
+++ b/ghost/i18n/locales/tr/ghost.json
@@ -1,10 +1,10 @@
 {
     "All the best!": "En iyi dileklerimizle!",
-    "Complete signup for {{siteTitle}}!": "{{siteTitle}} için kaydı tamamlayın!",
+    "Complete signup for {{siteTitle}}!": "{{siteTitle}} sitesi için kaydı tamamlayın!",
     "Complete your sign up to {{siteTitle}}!": "{{siteTitle}} sitesine kaydını tamamla!",
     "Confirm email address": "E-posta adresini onayla",
     "Confirm signup": "Kaydı onayla",
-    "Confirm your email address": "E-posta adresinizi onayla",
+    "Confirm your email address": "E-posta adresinizi onaylayın",
     "Confirm your email update for {{siteTitle}}!": "{{siteTitle}} için e-posta güncellemeni onayla!",
     "Confirm your subscription to {{siteTitle}}": "{{siteTitle}} sitesine aboneliğini onayla",
     "For your security, the link will expire in 24 hours time.": "Güvenliğin için link 24 saat sonra geçerliliğini yitirecek.",
@@ -16,7 +16,7 @@
     "Secure sign in link for {{siteTitle}}": "{{siteTitle}} için güvenli giriş linki",
     "See you soon!": "Yakında görüşmek üzere!",
     "Sent to {{email}}": "{{email}} adresine gönderildi",
-    "Sign in": "Kayıt ol",
+    "Sign in": "Giriş Yap",
     "Sign in to {{siteTitle}}": "{{siteTitle}} sitesine giriş yap",
     "Tap the link below to complete the signup process for {{siteTitle}}, and be automatically signed in:": "{{siteTitle}} sitesine kayıt işlemini tamamlamak için aşağıdaki linke tıkla ve otomatik olarak giriş yap:",
     "Thank you for signing up to {{siteTitle}}!": "{{siteTitle}} sitesine kayıt olduğun için teşekkürler!",
diff --git a/ghost/i18n/locales/tr/portal.json b/ghost/i18n/locales/tr/portal.json
index 53b8dc61690..9e240f7e6b7 100644
--- a/ghost/i18n/locales/tr/portal.json
+++ b/ghost/i18n/locales/tr/portal.json
@@ -1,14 +1,16 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} gün ücretsiz",
     "{{amount}} off": "{{amount}} indirim",
     "{{amount}} off for first {{number}} months.": "İlk {{number}} ay için {{amount}} indirim.",
     "{{amount}} off for first {{period}}.": "İlk {{period}} için {{amount}} indirim.",
     "{{amount}} off forever.": "Sonsuza kadar {{amount}} indirim.",
     "{{discount}}% discount": "%{{discount}} indirim",
-    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} artık {{newsletterName}} haber bülteni almayacak.",
+    "{{memberEmail}} will no longer receive {{newsletterName}} newsletter.": "{{memberEmail}} artık {{newsletterName}} bültenini almayacak.",
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}}, yorumlarınıza yanıt verildiğinde artık e-posta almayacak.",
-    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} artık bu haber bültenini almayacak.",
+    "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} artık bu bülteni almayacak.",
     "{{trialDays}} days free": "{{trialDays}} gün ücretsiz",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Gelen kutuna bir giriş linki gönderildi. Eğer 3 dakika içinde ulaşmazsa spam klasörünü kontrol ettiğinden emin ol.",
     "Account": "Hesap",
     "Account settings": "Hesap ayarları",
@@ -27,7 +29,7 @@
     "Check with your mail provider": "Posta sağlayıcınızla kontrol edin",
     "Choose": "Seç",
     "Choose a different plan": "Farklı bir plan seç",
-    "Choose your newsletters": "Haber e-postanı seç",
+    "Choose your newsletters": "Bültenleri seç",
     "Click here to retry": "Tekrar denemek için buraya tıkla",
     "Close": "Kapat",
     "Comments": "Yorumlar",
@@ -43,20 +45,21 @@
     "Create a new contact": "Yeni bir kullanıcı oluştur",
     "Current plan": "Mevcut plan",
     "Delete account": "Hesabı sil",
-    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Bunu yapmak istemedin mi? Tercihlerinizi <button>buradan</button> yönetin.",
+    "Didn't mean to do this? Manage your preferences <button>here</button>.": "Bunu yanlışlıkla yaptıysanız, tercihlerinizi <button>buradan</button> yönetebilirsiniz.",
     "Don't have an account?": "Hesabın yok mu?",
     "Edit": "Düzenle",
     "Email": "E-posta",
     "Email newsletter": "E-posta bülteni",
-    "Email preference updated.": "E-posta tercihi güncellendi.",
     "Email preferences": "E-posta tercihleri",
     "Emails": "E-postalar",
     "Emails disabled": "E-postalar devre dışı",
     "Ends {{offerEndDate}}": "{{offerEndDate}} tarihinde bitiyor",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Hata",
     "Expires {{expiryDate}}": "{{expiryDate}} tarihinde sona eriyor",
     "Forever": "Süresiz",
-    "Free Trial – Ends {{trialEnd}}": "Ücretsiz Deneme – {{trialEnd}} tarihinde sona erer",
+    "Free Trial – Ends {{trialEnd}}": "Ücretsiz Deneme – Bitiş Tarihi {{trialEnd}}",
     "Get help": "Yardım al",
     "Get in touch for help": "Yardım için iletişime geçin",
     "Get notified when someone replies to your comment": "Birisi yorumuna cevap yazdığında bildirim al",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "Aboneliğinizi şimdi iptal ederseniz, {{periodEnd}} tarihine kadar erişiminiz devam edecek.",
     "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}}": "Kurumsal veya devlet e-posta hesabınız varsa BT departmanınıza ulaşın ve {{senderEmail}} adresinden e-posta alınmasına izin vermelerini isteyin.",
     "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.": "Tekrar e-posta almaya başlamak istiyorsanız, bundan sonraki en iyi adım, dosyadaki e-posta adresinizde herhangi bir sorun olup olmadığını kontrol etmek ve ardından önceki ekranda yeniden abone ol'u tıklamaktır.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Abone olduğunuz e-posta bültenini almıyorsanız, kontrol etmeniz gereken birkaç şey var.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Abone olduğunuz e-posta bültenini almıyorsanız, kontrol etmeniz gereken birkaç şey var.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Tüm bu kontrolleri tamamlamanıza rağmen hala e-posta almıyorsanız, {{supportAddress}} ile iletişime geçerek destek almak için ulaşabilirsiniz.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Haber bülteni göndermeye çalışırken kalıcı bir hata alınması durumunda, hesapta e-postalar devre dışı bırakılır.",
     "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.": "E-posta istemcinizde {{senderEmail}} adresini kişi listenize ekleyin. Bu, posta sağlayıcınıza bu adresten gönderilen e-postaların güvenilir olması gerektiğini bildirir.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Bunun gibi daha az",
     "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\".": "E-postaların yanlışlıkla gelen kutunuzun Spam veya Promosyonlar klasörlerine düşmediğinden emin olun. Varsa, \"Spam değil olarak işaretle\" ve/veya \"Gelen kutusuna taşı\"yı tıklayın.",
     "Manage": "Yönet",
@@ -84,12 +90,14 @@
     "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).": "Bültenler, hesabınızda iki nedenden dolayı devre dışı bırakılabilir: Önceki bir e-posta istenmeyen posta olarak işaretlendi veya bir e-posta gönderilmeye çalışıldığında kalıcı bir başarısızlıkla (geri dönme) sonuçlandı.",
     "Not receiving emails?": "E-posta almıyor musun?",
     "Now check your email!": "Şimdi e-posta kutunu kontrol et!",
-    "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.": "Yeniden abone olduktan sonra, gelen kutunuzda hala e-posta göremiyorsanız spam klasörünüzü kontrol edin. Bazı gelen kutusu sağlayıcıları, önceki spam şikayetlerinin kaydını tutar ve e-postaları işaretlemeye devam eder. Böyle bir durumda, birincil gelen kutunuza geri taşımak için en son haber bültenini 'Spam değil' olarak işaretleyin.",
+    "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.": "Yeniden abone olduktan sonra hala e-postaları gelen kutunuzda görmüyorsanız, spam klasörünü kontrol edin. Bazı e-posta sağlayıcıları önceki spam şikayetlerini kaydedebilir ve e-postaları işaretlemeye devam edebilir. Bu durumda, en son bülteni 'Spam değil' olarak işaretleyerek ana gelen kutunuza geri taşıyabilirsiniz.",
     "Permanent failure (bounce)": "Kalıcı başarısızlık (sıçra)",
+    "Phone number": "",
     "Plan": "Plan",
     "Plan checkout was cancelled.": "Plan ödemesi iptal edildi.",
     "Plan upgrade was cancelled.": "Plan yükseltme iptal edildi.",
-    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please contact {{supportAddress}} to adjust your complimentary subscription.": "Ücretsiz aboneliğinizi ayarlamak için lütfen {{supportAddress}} ile iletişime geçin.",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "Lütfen gerekli alanları doldurunuz",
     "Price": "Fiyat",
     "Re-enable emails": "E-postaları yeniden etkinleştir",
@@ -98,7 +106,7 @@
     "Retry": "Tekrar dene",
     "Save": "Kaydet",
     "Send an email and say hi!": "Bir e-posta gönderin ve merhaba deyin!",
-    "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}} adresine bir e-posta gönderin ve merhaba deyin. Bu, posta sağlayıcınıza bu adresten gelen ve bu adresten gelen e-postalara güvenilmesi gerektiğinin sinyalini de verebilir.",
+    "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}} adresine bir e-posta gönderin ve merhaba deyin. Bu aynı zamanda posta sağlayıcınıza bu adrese gelen ve bu adresten giden e-postalara güvenilmesi gerektiği sinyalini de iletebilir.",
     "Sending login link...": "Giriş linki gönderiliyor...",
     "Sending...": "Gönderiliyor...",
     "Show all": "Hepsini göster",
@@ -106,6 +114,7 @@
     "Sign out": "Çıkış yap",
     "Sign up": "Kayıt ol",
     "Signup error: Invalid link": "Kayıt hatası: Geçersiz bağlantı",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Üzgünüm, bu işe yaramadı.",
     "Spam complaints": "Spam şikayetleri",
     "Start {{amount}}-day free trial": "{{amount}} gün ücretsiz deneme süresini başlat",
@@ -119,35 +128,41 @@
     "Success! Your account is fully activated, you now have access to all content.": "Başarılı! Hesabınız tamamen etkinleştirildi, artık tüm içeriğe erişebilirsiniz.",
     "Success! Your email is updated.": "Başarılı! E-postanız güncellendi.",
     "Successfully unsubscribed": "Abonelikten başarıyla çıkıldı",
-    "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.": "Abone olduğunuz için teşekkür ederiz. Okumaya başlamadan önce, aşağıda keyif alabileceğiniz birkaç başka site bulunmaktadır.",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Geri bildirim için teşekkürler!",
     "That didn't go to plan": "Bir şeyler ters gitti",
-    "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>.": "",
+    "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>.": "Sizin için kayıtlı olan e-posta adresi {{memberEmail}} — eğer bu doğru değilse, bunu <button>hesap ayarları bölümünde</button> güncelleyebilirsiniz.",
     "There was a problem submitting your feedback. Please try again a little later.": "Geri bildiriminiz gönderilirken bir sorun oluştu. Lütfen biraz sonra tekrar deneyin.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Bu site sadece davetiyesi olanlar içindir, erişim için site sahibiyle iletişime geç.",
-    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Kaydını tamamlamak için gelen kutuna gönderilen onay linkine tıkla. Eğer 3 dakika içinde ulaşmazsa spam klasörünü kontrol et!",
+    "This site is not accepting payments at the moment.": "",
+    "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Kaydınızı tamamlamak için gelen kutunuzdaki onay bağlantısına tıklayın. Eğer 3 dakika içinde gelmezse, spam klasörünüzü kontrol edin!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "{{amount}} gün ücretsiz deneyin, ardından {{originalPrice}}.",
-    "Unlock access to all newsletters by becoming a paid subscriber.": "Ücretli bir abone olarak tüm haber bültenlerine erişimin kilidini açın.",
+    "Unlock access to all newsletters by becoming a paid subscriber.": "Tüm bültenlere erişimi açmak için ücretli bir abone olun.",
     "Unsubscribe from all emails": "Tüm e-postaların aboneliğinden çık",
     "Unsubscribed": "Abonelikten çıkıldı",
-    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "E-postaların aboneliğinden çıkmak, {{title}} sitesine olan ücretli aboneliğini iptal etmeyecek",
+    "Unsubscribed from all emails.": "Tüm e-postalardan abonelik iptal edildi.",
+    "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "E-posta aboneliğinden çıkmak, {{title}} için ödeme yapmış aboneliğinizi iptal etmeyecektir",
     "Update": "Güncelle",
     "Update your preferences": "Tercihlerini güncelle",
     "Verification link sent, check your inbox": "Doğrulama bağlantısı gönderildi, gelen kutunuzu kontrol edin",
     "Verify your email address is correct": "E-posta adresinizin doğru olduğunu doğrulayın",
     "View plans": "Planları göster",
-    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "E-posta adresi bulunamadığı için seni abonelikten çıkaramıyoruz. Lütfen site sahibiyle iletişime geç.",
+    "We couldn't unsubscribe you as the email address was not found. Please contact the site owner.": "E-posta adresi bulunamadığı için sizi abonelikten çıkaramadık. Lütfen site sahibi ile iletişime geçin.",
     "Welcome back, {{name}}!": "Tekrar hoş geldin {{name}}!",
     "Welcome back!": "Tekrar hoşgeldiniz!",
     "Welcome to {{siteTitle}}": "{{siteTitle}} hoş geldiniz",
-    "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.": "Bir gelen kutusu bir e-postayı kabul edemediğinde buna genellikle geri dönen denir. Çoğu durumda, bu geçici olabilir. Bununla birlikte, bazı durumlarda, bir e-posta adresi geçersiz olduğunda veya mevcut olmadığında, geri dönen bir e-posta kalıcı bir başarısızlık olarak döndürülebilir.",
+    "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.": "Gelen kutusu bir e-postayı kabul etmeyi reddettiğinde, buna genellikle bir geri dönen denir. Çoğu durumda bu geçici olabilir. Ancak, bazı durumlarda, bir e-posta adresi geçersiz veya mevcut olmadığında bir geri dönen e-postası kalıcı bir başarısızlık olarak geri dönebilir.",
     "Why has my email been disabled?": "E-postam neden devre dışı bırakıldı?",
     "Yearly": "Yıllık",
     "You currently have a free membership, upgrade to a paid subscription for full access.": "Şu anda ücretsiz üyeliğiniz var, tam erişim için ücretli aboneliğe yükseltin.",
     "You have been successfully resubscribed": "Başarıyla yeniden abone oldun",
     "You're currently not receiving emails": "Şu anda e-posta almıyorsunuz",
     "You're not receiving emails": "E-posta almıyorsunuz",
-    "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.": "E-postaları almıyorsun çünkü yakınlarda gönderilen bir mesajı spam olarak işaretledin ya da mesajlar verilen e-posta adresine teslim edilemedi.",
+    "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.": "E-postaları alamıyorsanız, ya yakın zamanda bir mesajı spam olarak işaretlediniz ya da mesajlar sağlanan e-posta adresinize teslim edilemedi.",
     "You've successfully signed in.": "Başarıyla oturum açtınız.",
     "You've successfully subscribed to": "Başarıyla abone oldunuz",
     "Your account": "Hesabın",
diff --git a/ghost/i18n/locales/uk/portal.json b/ghost/i18n/locales/uk/portal.json
index b933026826d..4e27943f144 100644
--- a/ghost/i18n/locales/uk/portal.json
+++ b/ghost/i18n/locales/uk/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "Безплатно {{trialDays}} дні(-в)",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Посилання для входу було надіслано на твою пошту. Якщо воно не прийде протягом 3 хвилин, перевірь папку спам.",
     "Account": "Oбліковий запис",
     "Account settings": "Налаштування облікового запису",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "Електронна пошта",
     "Email newsletter": "",
-    "Email preference updated.": "Налаштування електронної пошти оновлені.",
     "Email preferences": "Налаштування електронної пошти",
     "Emails": "Електронні листи",
     "Emails disabled": "Електронна пошта вимкнена",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "Управління",
@@ -86,10 +92,12 @@
     "Now check your email!": "А тепер перевір свою пошту!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Ціна",
     "Re-enable emails": "Знову включити пошту",
@@ -98,7 +106,7 @@
     "Retry": "Повтори спробу",
     "Save": "Збережи",
     "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 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...": "Відправляється посилання для входу...",
     "Sending...": "Відправляється...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "Реєстрація",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "Почни {{amount}}-денний безплатний період",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Підписку успішно скасовано",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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>.": "",
     "There was a problem submitting your feedback. Please try again a little later.": "",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Цей сайт доступний тільки за запрошенням, звернись до власника сайта для доступу.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Щоб завершити реєстрацію, натисни посилання в своїй електронній пошті для підтвердження. Якщо електронний лист не прийде протягом 3 хвилин, перевір папку спам!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Відписатись від усіх листів",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Відписка від листів не скасує твою платну підписку на {{title}}",
     "Update": "",
     "Update your preferences": "Онови свої налаштування",
diff --git a/ghost/i18n/locales/uz/portal.json b/ghost/i18n/locales/uz/portal.json
index f857c7a7074..3ce39116079 100644
--- a/ghost/i18n/locales/uz/portal.json
+++ b/ghost/i18n/locales/uz/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "",
     "{{amount}} off": "",
     "{{amount}} off for first {{number}} months.": "",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "",
     "{{memberEmail}} will no longer receive this newsletter.": "",
     "{{trialDays}} days free": "{{trialDays}} kun bepul",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Kirish havolasi email pochtangizga yuborildi. Agar u 3 daqiqada kelmasa, spam bo'limini tekshiring",
     "Account": "Hisob",
     "Account settings": "Hisob sozlamalari",
@@ -48,11 +50,12 @@
     "Edit": "",
     "Email": "Email",
     "Email newsletter": "",
-    "Email preference updated.": "Email sozlamalari yangilandi.",
     "Email preferences": "Email sozlamalari",
     "Emails": "Elektron xatlar",
     "Emails disabled": "Elektron pochta xabarlari o‘chirilgan",
     "Ends {{offerEndDate}}": "",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "",
     "Expires {{expiryDate}}": "",
     "Forever": "",
@@ -68,10 +71,13 @@
     "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're not receiving the email newsletter you've subscribed to, here are a 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.": "",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Bu kabi kamroq",
     "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": "Boshqarmoq",
@@ -86,10 +92,12 @@
     "Now check your email!": "Endi elektron pochtangizni tekshiring!",
     "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)": "",
+    "Phone number": "",
     "Plan": "",
     "Plan checkout was cancelled.": "",
     "Plan upgrade was cancelled.": "",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "",
     "Price": "Narx",
     "Re-enable emails": "Elektron pochta xabarlarini qayta yoqing",
@@ -98,7 +106,7 @@
     "Retry": "Qayta urinmoq",
     "Save": "Saqlamoq",
     "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 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...": "Kirish havolasi yuborilmoqda...",
     "Sending...": "Yuborilmoqda...",
     "Show all": "",
@@ -106,6 +114,7 @@
     "Sign out": "",
     "Sign up": "Ro'yxatdan o'tmoq",
     "Signup error: Invalid link": "",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "",
     "Spam complaints": "",
     "Start {{amount}}-day free trial": "{{amount}}-kun sinov muddatini boshlang",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "",
     "Successfully unsubscribed": "Obuna muvaffaqiyatli bekor qilindi",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Izoh uchun rahmat!",
     "That didn't go to plan": "Bu rejaga mos kelmadi",
     "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 an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Bu saytda faqat taklif qilinadi, kirish uchun egasiga murojaat qiling.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Ro‘yxatdan o‘tishni yakunlash uchun pochta qutingizdagi tasdiqlash havolasini bosing. Agar u 3 daqiqada kelmasa, spam jildini tekshiring!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "",
     "Unlock access to all newsletters by becoming a paid subscriber.": "",
     "Unsubscribe from all emails": "Barcha elektron pochta xabarlariga obunani bekor qiling",
     "Unsubscribed": "",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "Elektron pochtalarga obunani bekor qilish {{title}}ga pulli obunanu bekor qilmaydi",
     "Update": "",
     "Update your preferences": "Sozlamalarni yangilash",
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..a5248133887 100644
--- a/ghost/i18n/locales/vi/portal.json
+++ b/ghost/i18n/locales/vi/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} ngày đọc thử",
     "{{amount}} off": "Giảm {{amount}}",
     "{{amount}} off for first {{number}} months.": "Giảm {{amount}} cho {{number}} tháng đầu tiên.",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} sẽ không còn được nhận email khi ai đó trả lời phản hồi của bạn.",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} sẽ không còn được nhận bản tin này.",
     "{{trialDays}} days free": "{{trialDays}} ngày đọc thử miễn phí",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "Liên kết đăng nhập đã được gửi đến hộp thư của bạn. Sau 3 phút mà chưa thấy, hãy kiểm tra thư hộp thư spam.",
     "Account": "Tài khoản",
     "Account settings": "Cài đặt",
@@ -48,11 +50,12 @@
     "Edit": "Chỉnh sửa",
     "Email": "Email",
     "Email newsletter": "Email bản tin",
-    "Email preference updated.": "Đã cập nhật email.",
     "Email preferences": "Thiết lập email",
     "Emails": "Emails",
     "Emails disabled": "Vô hiệu hóa email",
     "Ends {{offerEndDate}}": "Kết thúc vào {{offerEndDate}}",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "Lỗi",
     "Expires {{expiryDate}}": "Hết hạn vào {{expiryDate}}",
     "Forever": "Vĩnh viễn",
@@ -62,21 +65,24 @@
     "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}}.",
     "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}}": "Nếu bạn dùng tài khoản email của công ty hoặc chính phủ, hãy liên hệ với bộ phận IT và yêu cầu họ cho phép nhận email từ {{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.": "Nếu bạn muốn bắt đầu nhận lại email, tốt nhất là kiểm tra địa chỉ email của bạn trong hồ sơ xem có vấn đề gì không và sau đó nhấn vào đăng ký lại trên màn hình trước đó.",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "Nếu bạn không nhận được bản tin email mà bạn đã đăng ký, đây là một số việc cần kiểm tra.",
+    "If you're not receiving the email newsletter you've subscribed to, here are a few things to check.": "Nếu bạn không nhận được bản tin email mà bạn đã đăng ký, đây là một số việc cần kiểm tra.",
     "If you've completed all these checks and you're still not receiving emails, you can reach out to get support by contacting {{supportAddress}}.": "Nếu bạn đã hoàn thành tất cả các bước kiểm tra này mà vẫn không nhận được email, hãy liên hệ với {{supportAddress}} để được hỗ trợ.",
     "In the event a permanent failure is received when attempting to send a newsletter, emails will be disabled on the account.": "Trong trường hợp nhận được lỗi vĩnh viễn khi cố gắng gửi bản tin, email sẽ bị vô hiệu hóa trên tài khoản.",
     "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.": "Trong ứng dụng email của bạn, hãy thêm {{senderEmail}} vào danh sách liên hệ của bạn. Điều này báo hiệu cho nhà cung cấp dịch vụ email của bạn rằng các email được gửi từ địa chỉ này là đáng tin cậy.",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "Less like this": "Không thích lắm",
     "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",
@@ -86,26 +92,29 @@
     "Now check your email!": "Kiểm tra hộp thư ngay!",
     "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.": "Sau khi đăng ký lại, nếu bạn vẫn không thấy email trong hộp thư đến của mình, hãy kiểm tra mục thư rác. Một số nhà cung cấp email lưu giữ hồ sơ về các khiếu nại thư rác trước đây và sẽ tiếp tục gắn nhãn email. Nếu điều này xảy ra, hãy đánh dấu bản tin mới nhất là 'Không phải thư rác' để chuyển nó trở lại hộp thư đến chính của bạn.",
     "Permanent failure (bounce)": "Thất bại vĩnh viễn (thư bị trả lại)",
+    "Phone number": "",
     "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 enter {{fieldName}}": "",
     "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.",
+    "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ý",
     "Signup error: Invalid link": "Lỗi đăng ký: Liên kết không hợp lệ",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "Rất tiếc, không dùng được.",
     "Spam complaints": "Than phiền",
     "Start {{amount}}-day free trial": "Bắt đầu đọc thử {{amount}} ngày",
@@ -120,26 +129,32 @@
     "Success! Your email is updated.": "Xong! Đã cập nhật email của bạn.",
     "Successfully unsubscribed": "Đã hủy theo dõi thành công",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "Thanks for the feedback!": "Cám ơn phản hồi của bạn!",
     "That didn't go to plan": "Không thực hiện được",
     "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>.": "Địa chỉ email của bạn là {{memberEmail}} — nếu sai, bạn có thể đổi trong <button>cài đặt tài khoản</button>.",
     "There was a problem submitting your feedback. Please try again a little later.": "Có vấn đề khi gửi phản hồi. Xin thử lại sau.",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "Trang web này chỉ dành cho những người được mời, hãy liên hệ với chủ sở hữu để cấp quyền truy cập.",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "Để hoàn tất đăng ký, nhấn vào liên kết xác nhận trong hộp thư đến của bạn. Sau 3 phút mà không thấy, hãy kiểm tra hộp thư spam của bạn!",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "Đọc thử {{amount}} ngày, phí sau đọc thử là {{originalPrice}}.",
     "Unlock access to all newsletters by becoming a paid subscriber.": "Trở thành thành viên trả phí để mở khóa truy cập toàn bộ bản tin.",
     "Unsubscribe from all emails": "Hủy theo dõi tất cả email",
     "Unsubscribed": "Đã hủy theo dõi",
+    "Unsubscribed from all emails.": "",
     "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 +164,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..0b1799231b9 100644
--- a/ghost/i18n/locales/zh-Hant/portal.json
+++ b/ghost/i18n/locales/zh-Hant/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}} 天免費",
     "{{amount}} off": "{{amount}} 元優惠",
     "{{amount}} off for first {{number}} months.": "前 {{number}} 個月有 {{amount}} 元折扣優惠",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}} 將不再收到他人回覆您的評論時的通知。",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}} 將不再收到此電子報。",
     "{{trialDays}} days free": "{{trialDays}} 天免費試用",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "登入連結已經發送到您的收件匣。如果在 3 分鐘內未收到，請務必檢查您的垃圾郵件。",
     "Account": "帳號",
     "Account settings": "帳號設定",
@@ -48,11 +50,12 @@
     "Edit": "編輯",
     "Email": "email",
     "Email newsletter": "電子報",
-    "Email preference updated.": "email 偏好已更新。",
     "Email preferences": "email 偏好設定",
     "Emails": "電子報",
     "Emails disabled": "已停止接收電子報",
     "Ends {{offerEndDate}}": "於 {{offerEndDate}} 結束",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "錯誤",
     "Expires {{expiryDate}}": "於 {{expiryDate}} 過期",
     "Forever": "永久",
@@ -62,21 +65,24 @@
     "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}} 之前仍可存取內容。",
     "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}}": "如果您有企業或政府郵件帳戶，請聯繫相關 IT 部門，要求他們允許來自 {{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.": "如果您希望重新開始接收郵件，最好的方法是檢查您註冊的 email 地址是否正常運作，然後在前一個畫面點擊重新訂閱。",
-    "If you're not receiving the email newsletter you've subscribed to, here are few things to check.": "如果您沒有收到您訂閱的電子報，請檢查以下幾個事項。",
+    "If you're not receiving the email newsletter you've subscribed to, here are a 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}}.": "如果您已經完成了上述所有檢查項目，但仍然沒有收到電子報，您可以透過聯繫 {{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.": "在您的 email 系統中將 {{senderEmail}} 加入您的聯絡人列表中。如此一來，您的 email 系統就會知道可以信任從該地址發送的郵件。",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "名字",
@@ -86,26 +92,29 @@
     "Now check your email!": "立即檢查您的 email。",
     "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.": "重新訂閱後，如果您在收件夾中仍然看不到郵件，請檢查您的垃圾郵件匣。一些 email 服務商會保留先前的垃圾郵件記錄並持續標記此類郵件。如果發生這種情況，請將最新的電子報標記為「非垃圾郵件」，將其移回您的主要收件匣。",
     "Permanent failure (bounce)": "永久錯誤 (郵件遭到退回)",
+    "Phone number": "",
     "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 enter {{fieldName}}": "",
     "Please fill in required fields": "請填寫必填項目",
     "Price": "價格",
     "Re-enable emails": "重新啟用 email",
-    "Recommendations": "",
+    "Recommendations": "所有推薦",
     "Renews at {{price}}.": "以 {{price}} 的價格續約。",
     "Retry": "重試",
     "Save": "儲存",
     "Send an email and say hi!": "發送 email 問好！",
-    "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 供應商了解這個地址的往來郵件應該受到信任。",
+    "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": "註冊",
     "Signup error: Invalid link": "註冊錯誤：連結無效",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "抱歉，該操作無法完成。",
     "Spam complaints": "垃圾郵件",
     "Start {{amount}}-day free trial": "開始 {{amount}} 天免費試用",
@@ -119,17 +128,23 @@
     "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.": "感謝您的訂閱，以下是一些你可能也會有興趣的網站。",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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>進行更新。",
     "There was a problem submitting your feedback. Please try again a little later.": "提交您的意見時遇到問題。請稍後再試。",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "此網站僅限受邀請者觀看，請聯繫網站擁有者取得存取權限。",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "要完成註冊，請點擊您收件匣中的確認連結。如果在 3 分鐘內沒有收到，請檢查您的垃圾郵件。",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "免費試用 {{amount}} 天，然後以 {{originalPrice}} 開始訂閱。",
     "Unlock access to all newsletters by becoming a paid subscriber.": "成為付費會員以解鎖所有電子報內容。",
     "Unsubscribe from all emails": "取消所有電子報訂閱",
     "Unsubscribed": "未訂閱",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "取消接收電子報不會取消您對 {{title}} 的付費訂閱。",
     "Update": "更新",
     "Update your preferences": "更新您的偏好設定",
@@ -139,7 +154,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/locales/zh/portal.json b/ghost/i18n/locales/zh/portal.json
index 08bfeb6dc92..4024d7c3556 100644
--- a/ghost/i18n/locales/zh/portal.json
+++ b/ghost/i18n/locales/zh/portal.json
@@ -1,4 +1,5 @@
 {
+    "(save {{highestYearlyDiscount}}%)": "",
     "{{amount}} days free": "{{amount}}天免费",
     "{{amount}} off": "减免{{amount}}",
     "{{amount}} off for first {{number}} months.": "前{{number}}月减免{{amount}}",
@@ -9,6 +10,7 @@
     "{{memberEmail}} will no longer receive emails when someone replies to your comments.": "{{memberEmail}}将不会再收到评论回复提醒邮件。",
     "{{memberEmail}} will no longer receive this newsletter.": "{{memberEmail}}将不会再收到本刊物。",
     "{{trialDays}} days free": "{{trialDays}} 天免费试用",
+    "+1 (123) 456-7890": "",
     "A login link has been sent to your inbox. If it doesn't arrive in 3 minutes, be sure to check your spam folder.": "登录链接已经发送到您的收件箱。如果在3分钟内还没有收到，请务必检查您的垃圾邮件文件夹。",
     "Account": "账户",
     "Account settings": "账户设置",
@@ -48,11 +50,12 @@
     "Edit": "编辑",
     "Email": "电子邮件",
     "Email newsletter": "电子邮件快报",
-    "Email preference updated.": "电子邮件偏好已更新。",
     "Email preferences": "电子邮件偏好设置",
     "Emails": "电子邮件列表",
     "Emails disabled": "关闭电子邮件列表",
     "Ends {{offerEndDate}}": "于{{offerEndDate}}结束",
+    "Enter your email address": "",
+    "Enter your name": "",
     "Error": "错误",
     "Expires {{expiryDate}}": "于{{expiryDate}}过期",
     "Forever": "永久",
@@ -68,10 +71,13 @@
     "If you cancel your subscription now, you will continue to have access until {{periodEnd}}.": "如果现在取消订阅，当前订阅在{{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}}": "如果您使用公司或者政府邮件账户，请联系相应IT部门以允许从{{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're not receiving the email newsletter you've subscribed to, here are a 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}}.": "如果您已经完成全部检查项目却依旧没有收到邮件，您可以联系{{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.": "在您的电子邮件客户端将 {{senderEmail}} 加入联系人列表。这将向您的邮件供应商表明来自该地址的邮件是可信的。",
+    "Invalid email address": "",
+    "Jamie Larson": "",
+    "jamie@example.com": "",
     "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": "管理",
@@ -86,10 +92,12 @@
     "Now check your email!": "现在请检查您的电子邮件！",
     "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)": "永久错误 (bounce)",
+    "Phone number": "",
     "Plan": "订阅计划",
     "Plan checkout was cancelled.": "订阅付款已取消。",
     "Plan upgrade was cancelled.": "订阅升级已取消。",
     "Please contact {{supportAddress}} to adjust your complimentary subscription.": "请联系 {{supportAddress}} 调整您的免费订阅。",
+    "Please enter {{fieldName}}": "",
     "Please fill in required fields": "请填写必须项目",
     "Price": "价格",
     "Re-enable emails": "重启电子邮件",
@@ -98,7 +106,7 @@
     "Retry": "重试",
     "Save": "保存",
     "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.": "发送邮件到{{senderEmail}}问好。这有助于您的邮件服务商将该地址的往来邮件判定为可信邮件。",
+    "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}}问好。这有助于您的邮件服务商将该地址的往来邮件判定为可信邮件。",
     "Sending login link...": "正在发送登录链接...",
     "Sending...": "发送中...",
     "Show all": "显示全部",
@@ -106,6 +114,7 @@
     "Sign out": "退出",
     "Sign up": "注册",
     "Signup error: Invalid link": "注册错误：链接无效",
+    "Something went wrong, please try again later.": "",
     "Sorry, that didn’t work.": "抱歉，该操作无法完成。",
     "Spam complaints": "垃圾邮件",
     "Start {{amount}}-day free trial": "开始 {{amount}}-天免费试用",
@@ -120,16 +129,22 @@
     "Success! Your email is updated.": "成功！您的电子邮件已更新。",
     "Successfully unsubscribed": "成功取消订阅",
     "Thank you for subscribing. Before you start reading, below are a few other sites you may enjoy.": "感谢您的订阅。在开始阅读之前，以下是您可能会喜欢的一些其他网站。",
+    "Thank you for your support": "",
+    "Thank you for your support!": "",
     "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>.": "您的电子邮件地址是 {{memberEmail}} - 如果该邮箱不正确，您可以在<button>帐户设置区域</button>中更新它。",
     "There was a problem submitting your feedback. Please try again a little later.": "提交您的反馈时遇到错误。请稍后重试。",
+    "There was an error processing your payment. Please try again.": "",
     "This site is invite-only, contact the owner for access.": "此网站仅限邀请，联系网站所有者以获取访问",
+    "This site is not accepting payments at the moment.": "",
     "To complete signup, click the confirmation link in your inbox. If it doesn't arrive within 3 minutes, check your spam folder!": "要完成注册，请点击您收件箱中的确认链接。如果在3分钟内没有收到，请检查一下您的垃圾邮件文件夹！",
+    "To continue to stay up to date, subscribe to {{publication}} below.": "",
     "Try free for {{amount}} days, then {{originalPrice}}.": "{{amount}}天免费试用，之后{{originalPrice}}。",
     "Unlock access to all newsletters by becoming a paid subscriber.": "成为付费订阅用户以解锁全部快报。",
     "Unsubscribe from all emails": "取消所有邮件订阅",
     "Unsubscribed": "取消订阅",
+    "Unsubscribed from all emails.": "",
     "Unsubscribing from emails will not cancel your paid subscription to {{title}}": "取消邮件订阅不会取消您对 {{title}} 的付费订阅。",
     "Update": "更新",
     "Update your preferences": "更新您的偏好设置",
diff --git a/ghost/i18n/package.json b/ghost/i18n/package.json
index 5e153b12514..f5f73dcdf05 100644
--- a/ghost/i18n/package.json
+++ b/ghost/i18n/package.json
@@ -26,10 +26,10 @@
   ],
   "devDependencies": {
     "c8": "8.0.1",
-    "i18next-parser": "8.8.0",
+    "i18next-parser": "8.13.0",
     "mocha": "10.2.0"
   },
   "dependencies": {
-    "i18next": "23.6.0"
+    "i18next": "23.14.0"
   }
 }
diff --git a/ghost/importer-revue/package.json b/ghost/importer-revue/package.json
index 9e08f644638..2aeba09b4fa 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.32",
+    "@tryghost/kg-default-cards": "10.0.9",
+    "@tryghost/string": "0.2.12",
     "lodash": "4.17.21",
     "papaparse": "5.3.2",
     "simple-dom": "1.4.0"
diff --git a/ghost/in-memory-repository/package.json b/ghost/in-memory-repository/package.json
index 5cbbd79fbe2..d7a3e0efb94 100644
--- a/ghost/in-memory-repository/package.json
+++ b/ghost/in-memory-repository/package.json
@@ -7,8 +7,8 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "build:ts": "yarn build",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",
@@ -25,6 +25,6 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/nql": "0.11.0"
+    "@tryghost/nql": "0.12.4"
   }
 }
diff --git a/ghost/in-memory-repository/test/InMemoryRepository.test.ts b/ghost/in-memory-repository/test/InMemoryRepository.test.ts
index ec5d4ff757f..2c57e3e35a5 100644
--- a/ghost/in-memory-repository/test/InMemoryRepository.test.ts
+++ b/ghost/in-memory-repository/test/InMemoryRepository.test.ts
@@ -1,4 +1,4 @@
-import assert from 'assert';
+import assert from 'assert/strict';
 import {InMemoryRepository} from '../src/index';
 
 type SimpleEntity = {
diff --git a/ghost/job-manager/package.json b/ghost/job-manager/package.json
index 073475379b5..1a7418e1a3d 100644
--- a/ghost/job-manager/package.json
+++ b/ghost/job-manager/package.json
@@ -18,7 +18,7 @@
     "lib"
   ],
   "devDependencies": {
-    "@sinonjs/fake-timers": "11.0.0",
+    "@sinonjs/fake-timers": "11.3.1",
     "c8": "8.0.1",
     "date-fns": "2.30.0",
     "delay": "5.0.0",
@@ -27,12 +27,12 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@breejs/later": "4.1.0",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@breejs/later": "4.2.0",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
     "bree": "6.5.0",
     "cron-validate": "1.4.5",
-    "fastq": "1.15.0",
+    "fastq": "1.17.1",
     "p-wait-for": "3.2.0"
   }
 }
diff --git a/ghost/link-redirects/README.md b/ghost/link-redirects/README.md
index a4ccb2c18fb..14c19fdc1b2 100644
--- a/ghost/link-redirects/README.md
+++ b/ghost/link-redirects/README.md
@@ -19,3 +19,133 @@ Follow the instructions for the top-level repo.
 - `yarn lint` run just eslint
 - `yarn test` run lint and tests
 
+## Overview of how Ghost handles LinkRedirects
+### Summary
+When a publisher sends an email newsletter with email click analytics enabled, Ghost will replace all the links in the email's content with a link of the form `https://{site_url}/r/{redirect hash}?m={member UUID}`. When a member clicks on a link in their email, Ghost receives the request, redirects the user to the original link's URL, then updates some analytics data in the database.
+
+### The details
+The following deep-dive covers the link redirect flow from when the member clicks on a link in an email.
+
+First, we lookup the redirect by the `/r/{hash}` value in the URL:
+```
+select `redirects`.* from `redirects` where `redirects`.`from` = ? limit ? undefined
+```
+
+If the redirect exists, the `LinkRedirectsService` emits a `RedirectEvent`, and then responds to the HTTP request with a 302. 
+
+The `LinkClickTrackingService` subscribes to the `RedirectEvent` and kicks off the analytics inserts/updates. First we grab the `uuid` from the `?m={uuid}` parameter and lookup the member by `uuid`:
+```
+select `members`.* from `members` where `members`.`uuid` = ? limit ? undefined
+```
+
+Then we insert a row into the `members_click_events` table to record the click:
+```
+insert into `members_click_events` (`created_at`, `id`, `member_id`, `redirect_id`) values (?, ?, ?, ?) undefined
+```
+
+Then we query for the row we just inserted:
+```
+select `members_click_events`.* from `members_click_events` where `members_click_events`.`id` = ? limit ? undefined
+```
+
+At this point, we emit a `MemberLinkClickEvent` with the member ID and `lastSeenAt` timestamp. 
+
+The `LastSeenAtUpdater` subscribes to the `MemberLinkClickEvent`. First, it checks if the `lastSeenAt` value has already been updated in the current day. 
+
+If it has, we stop here. 
+
+If it hasn't, we continue to update the member. First, we select the member by ID:
+```
+select `members`.* from `members` where `members`.`id` = ? limit ? undefined
+```
+
+Then we start a transaction and get a lock on the member for updating:
+```
+BEGIN; trx34
+select `members`.* from `members` where `members`.`id` = ? limit ? for update trx34
+```
+
+Since we're editing the member, we will eventually need to emit a `member.edited` webhook with the standard includes (labels and newsletters) so we also query them here:
+```
+select `labels`.*, `members_labels`.`member_id` as `_pivot_member_id`, `members_labels`.`label_id` as `_pivot_label_id`, `members_labels`.`sort_order` as `_pivot_sort_order` from `labels` inner join `members_labels` on `members_labels`.`label_id` = `labels`.`id` where `members_labels`.`member_id` in (?) order by `sort_order` ASC for update trx34
+```
+
+Then we query the member's newsletters:
+```
+select `newsletters`.*, `members_newsletters`.`member_id` as `_pivot_member_id`, `members_newsletters`.`newsletter_id` as `_pivot_newsletter_id` from `newsletters` inner join `members_newsletters` on `members_newsletters`.`newsletter_id` = `newsletters`.`id` where `members_newsletters`.`member_id` in (?) order by `newsletters`.`sort_order` ASC for update trx34
+```
+
+Then we update the member:
+```
+update `members` set `uuid` = ?, `transient_id` = ?, `email` = ?, `status` = ?, `name` = ?, `expertise` = ?, `note` = ?, `geolocation` = ?, `enable_comment_notifications` = ?, `email_count` = ?, `email_opened_count` = ?, `email_open_rate` = ?, `email_disabled` = ?, `last_seen_at` = ?, `last_commented_at` = ?, `created_at` = ?, `created_by` = ?, `updated_at` = ?, `updated_by` = ? where `id` = ? trx34
+```
+
+Then we select the member by ID again to get the freshly updated values from the DB:
+```
+select `members`.* from `members` where `members`.`id` = ? limit ? trx34
+```
+
+Then we commit the transaction:
+```
+COMMIT; trx34
+```
+
+Finally, we query for any member.edited webhooks and fire the `member.edited` event:
+```
+select `webhooks`.* from `webhooks` where `event` = ? trx34
+```
+
+
+### Sequence Diagram
+```mermaid
+sequenceDiagram
+    actor Member
+    participant Ghost
+    participant Ghost Async
+    participant DB
+    rect rgba(0,100,0, 0.1)
+    Member ->>Ghost: Clicks link in email
+    Ghost ->> DB: Query: lookup redirect
+    DB ->> Ghost: Redirect record
+    Note right of DB: Serve the redirect
+    Ghost -->> Ghost Async: Emit RedirectEvent
+    Ghost ->> Member: 302 Redirect
+    end
+    rect rgba(100,0,0,0.1)
+    Ghost Async ->> DB: Lookup Member by `uuid` from URL param
+    DB ->> Ghost Async: `member` record
+    Ghost Async ->> DB: Insert `member_click_event`
+    Note right of DB: Insert click event
+    DB ->> Ghost Async: 👌
+    Ghost Async ->> DB: Select `member_click_event`
+    DB ->> Ghost Async: `member_click_event` record
+    end
+    rect rgba(0,0,100, 0.1)
+    Ghost Async ->> DB: Select `member` by id
+    DB ->> Ghost Async: `member` record
+    Ghost Async ->> DB: Begin transaction 
+    activate DB
+    DB ->> Ghost Async: 👌
+    Ghost Async ->> DB: Select `member` for update
+    DB ->> Ghost Async: `member` record
+    Ghost Async ->> DB: Select member labels for update
+    Note right of DB: Update member `lastSeenAt`
+    DB ->> Ghost Async: Member's labels
+    Ghost Async ->> DB: Select member newsletters for update
+    DB ->> Ghost Async: Member's newsletters
+    Ghost Async ->> DB: Update member's `lastSeenAt` timestamp
+    DB ->> Ghost Async: 👌
+    Ghost Async ->> DB: Select `member` by ID
+    DB ->> Ghost Async: `member` record
+    Ghost Async ->> DB: Commit transaction
+    DB ->> Ghost Async: 👌
+    deactivate DB
+    end
+    rect rgba(100,100,0,0.1)
+    Ghost Async ->> DB: Select `webhooks`
+    Note right of DB: Send `member.edited` webhook 
+    DB ->> Ghost Async: `webhook` records
+    create participant Webhook Recipient
+    Ghost Async ->> Webhook Recipient: `member.edited` webhook
+    end
+```
\ No newline at end of file
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-replacer/lib/link-replacer.js b/ghost/link-replacer/lib/link-replacer.js
index 3592fa97f2a..1d5cdb4869d 100644
--- a/ghost/link-replacer/lib/link-replacer.js
+++ b/ghost/link-replacer/lib/link-replacer.js
@@ -8,39 +8,84 @@ class LinkReplacer {
      * @returns {Promise<string>}
     */
     async replace(html, replaceLink, options = {}) {
-        const cheerio = require('cheerio');
+        const {tokenize} = require('html5parser');
         const entities = require('entities');
+
         try {
-            const $ = cheerio.load(html, {
-                xml: {
-                    // This makes sure we use the faster and less destructive htmlparser2 parser
-                    xmlMode: false
-                },
-                // Do not replace &, ', " and others with HTML entities (is bugged because it replaces &map_ with something weird (&#x21A6;))
-                decodeEntities: false
-            }, false);
-
-            for (const el of $('a').toArray()) {
-                const href = $(el).attr('href');
-                if (href) {
-                    let url;
-                    const path = entities.decode(href);
-                    try {
-                        url = new URL(path, options.base);
-                    } catch (e) {
-                        // Ignore invalid URLs
+            const tokens = tokenize(html); // IToken[]
+            const replacements = [];
+
+            let inAnchor = false;
+            let inHref = false;
+
+            // interface IToken {
+            //   start: number;
+            //   end: number;
+            //   value: string;
+            //   type: TokenKind;
+            // }
+
+            // const enum TokenKind {
+            // 0  Literal,
+            // 1  OpenTag, // trim leading '<'
+            // 2  OpenTagEnd, // trim tailing '>', only could be '/' or ''
+            // 3  CloseTag, // trim leading '</' and tailing '>'
+            // 4  Whitespace, // the whitespace between attributes
+            // 5  AttrValueEq,
+            // 6  AttrValueNq,
+            // 7  AttrValueSq,
+            // 8  AttrValueDq,
+            // }
+
+            for (const token of tokens) {
+                if (token.type === 1 && token.value === 'a') {
+                    inAnchor = true;
+                }
+
+                if (inAnchor) {
+                    if (token.type === 2) {
+                        inAnchor = false;
+                        inHref = false;
+                    }
+
+                    if (token.type === 6 && token.value === 'href') {
+                        inHref = true;
                     }
-                    if (url) {
-                        url = await replaceLink(url, path);
-                        const str = url.toString();
-                        $(el).attr('href', str);
+
+                    if (inHref && token.type === 8) {
+                        const path = entities.decode(token.value.substring(1, token.value.length - 1));
+                        let url;
+                        try {
+                            url = new URL(path, options.base);
+                        } catch (e) {
+                            // Ignore invalid URLs
+                        }
+                        if (url) {
+                            url = await replaceLink(url, path);
+                            const str = url.toString();
+                            replacements.push({url: str, start: token.start + 1, end: token.end - 1});
+                        }
+
+                        inHref = false;
                     }
                 }
             }
 
-            return $.html();
+            let offsetAdjustment = 0;
+
+            replacements.forEach(({url, start, end}) => {
+                const originalLength = end - start;
+                const replacementLength = url.length;
+
+                html = html.slice(0, start + offsetAdjustment) + url + html.slice(end + offsetAdjustment);
+
+                offsetAdjustment += replacementLength - originalLength;
+            });
+
+            return html;
         } catch (e) {
-            // Catch errors from cheerio
+            // do nothing in case of error,
+            // we don't want to break the content for the sake of member attribution
             return html;
         }
     }
diff --git a/ghost/link-replacer/package.json b/ghost/link-replacer/package.json
index 8566559bf69..b5432ec2f0f 100644
--- a/ghost/link-replacer/package.json
+++ b/ghost/link-replacer/package.json
@@ -18,13 +18,14 @@
     "lib"
   ],
   "devDependencies": {
+    "@probe.gl/bench": "4.0.9",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "cheerio": "0.22.0",
-    "entities": "4.5.0"
+    "entities": "4.5.0",
+    "html5parser": "2.0.2"
   }
 }
diff --git a/ghost/link-replacer/test/LinkReplacer.test.js b/ghost/link-replacer/test/LinkReplacer.test.js
index cfcbb74739b..2528009da47 100644
--- a/ghost/link-replacer/test/LinkReplacer.test.js
+++ b/ghost/link-replacer/test/LinkReplacer.test.js
@@ -1,6 +1,6 @@
 const assert = require('assert/strict');
 const linkReplacer = require('../lib/link-replacer');
-const cheerio = require('cheerio');
+const html5parser = require('html5parser');
 const sinon = require('sinon');
 
 describe('LinkReplacementService', function () {
@@ -83,12 +83,20 @@ describe('LinkReplacementService', function () {
             assert.equal(replaced, expected);
         });
 
-        it('Ignores cheerio errors', async function () {
-            sinon.stub(cheerio, 'load').throws(new Error('test'));
+        it('Ignores parse errors', async function () {
+            sinon.stub(html5parser, 'tokenize').throws(new Error('test'));
             const html = '<a href="http://localhost:2368/dir/path">link</a>';
 
             const replaced = await linkReplacer.replace(html, () => 'valid');
             assert.equal(replaced, html);
         });
+
+        it('Doesn\'t replace single-quote attributes with double-quote', async function () {
+            const html = '<div data-graph-name=\'The "all-in" cost of a grant\'>Test</div>';
+            const expected = '<div data-graph-name=\'The "all-in" cost of a grant\'>Test</div>';
+
+            const replaced = await linkReplacer.replace(html, () => new URL('https://google.com/test-dir?test-query'));
+            assert.equal(replaced, expected);
+        });
     });
 });
diff --git a/ghost/link-replacer/test/benchmark.js b/ghost/link-replacer/test/benchmark.js
new file mode 100644
index 00000000000..bc9ffb15322
--- /dev/null
+++ b/ghost/link-replacer/test/benchmark.js
@@ -0,0 +1,14 @@
+const {readFileSync} = require('node:fs');
+const {Bench} = require('@probe.gl/bench');
+const linkReplacer = require('../lib/link-replacer');
+const linkReplacerNew = require('../lib/link-replacer-new');
+
+// load html from file in ./fixtures/example-post.html
+const html = readFileSync('./test/fixtures/example-post.html', {encoding: 'utf8', flag: 'r'});
+
+const bench = new Bench()
+    .group('LinkReplacer')
+    .addAsync('cheerio', () => linkReplacer.replace(html, () => new URL('https://google.com/test-dir?test-query')))
+    .addAsync('html5parser', () => linkReplacerNew.replace(html, () => new URL('https://google.com/test-dir?test-query')));
+
+bench.run();
diff --git a/ghost/link-replacer/test/fixtures/example-post.html b/ghost/link-replacer/test/fixtures/example-post.html
new file mode 100644
index 00000000000..e0f7efe7b75
--- /dev/null
+++ b/ghost/link-replacer/test/fixtures/example-post.html
@@ -0,0 +1,78 @@
+<p>Faster and more robust than ever before, we just shipped a complete rewrite of the Ghost editor. This is our third
+    major iteration of the Ghost editor, packed with new features, including:</p>
+<ul>
+    <li><a href="https://ghost.org/changelog/image-editor/"><strong>Native image editing</strong></a> - so you can
+        adjust photos on the fly</li>
+    <li><a href="https://ghost.org/changelog/post-history/"><strong>Post history</strong></a> - so you can see who
+        edited what, when, and restore old versions</li>
+    <li><a href="https://ghost.org/changelog/create-landing-pages/"><strong>Landing page cards</strong></a> - so you can
+        build beautiful custom experiences</li>
+    <li><a href="https://ghost.org/changelog/bookmarker/"><strong>Bookmarking</strong></a> - so you can collect links
+        from around the web for your posts</li>
+</ul>
+<p>And some fixes for longstanding issues with our previous editor, like:</p>
+<ul>
+    <li><strong>Faster overall performance</strong> - things just feel more <em>snappy</em></li>
+    <li><strong>Improved handling of very large posts</strong> - which, in the past, was... painful</li>
+    <li><strong>Better undo/redo chaining</strong> - a smoother experience when fixing mistakes</li>
+    <li><strong>Much improved mobile editing</strong> - so you can write on the go in iOS / Android</li>
+    <li><strong>Nested lists</strong> - for structuring your bulleted thoughts<ul>
+            <li>Which wasn't possible before<ul>
+                    <li>But is now</li>
+                </ul>
+            </li>
+        </ul>
+    </li>
+    <li><strong>More keyboard shortcuts</strong> - find the full list in the post settings menu</li>
+</ul>
+<p>The new editor is now available across all Ghost installs. <a
+        href="https://ghost.org/pricing/"><strong>Ghost(Pro)</strong></a> users can log into their sites to give it a
+    try. If you're a developer, self-hosting Ghost, you'll need to <a href="https://ghost.org/docs/update/">update</a>
+    to the latest version to get access to everything that's new.</p>
+<hr>
+<h2 id="developer-changes">Developer changes</h2>
+<p>Keep reading below if you're curious about the technical details behind the new editor, and what it means if you're
+    building API integrations with Ghost.</p>
+<figure class="kg-card kg-image-card kg-width-wide"><img
+        src="https://ghost.org/changelog/content/images/2023/10/Frame-1--4-.png" class="kg-image" alt="" loading="lazy"
+        width="2000" height="1052"></figure>
+<p>As we worked on this new editor, one of our main goals was to keep things the same. We made a few visual tweaks here
+    and there, but for the most part it's still the same editor you know and love... it just works better than it did
+    before.</p>
+<p>Under the hood, though, the technical changes we've made to the editor unlock exciting possibilities for the future.
+</p>
+<p>Ghost's editor, called Koenig, was previously built in <a href="https://emberjs.com/">Ember.js</a> on an open
+    JSON-based document storage format called <a href="https://github.com/bustle/mobiledoc-kit">MobileDoc</a>. We loved
+    how it worked, but MobileDoc never became widely adopted, so the technology underpinning our editor became a bit
+    stagnant. This limited our ability to build new features, or solve frustrating core bugs (like better mobile
+    support).</p>
+<p>Koenig has now been rebuilt on a new stack: <a href="https://react.dev/">React.js</a> and <a
+        href="https://lexical.dev/">Lexical</a> — both of which are open source frameworks developed by Meta. So, Ghost
+    is now using the same underlying technology that powers every single editor, comment box, or user input for billions
+    of users across Facebook and Instagram.</p>
+<figure class="kg-card kg-image-card kg-width-wide kg-card-hascaption"><img
+        src="https://ghost.org/changelog/content/images/2023/10/Screenshot-2023-10-23-at-16.44.43@2x.png"
+        class="kg-image" alt="" loading="lazy" width="2000" height="1246">
+    <figcaption><span style="white-space: pre-wrap;">Try the new Koenig editor for yourself — </span><a
+            href="https://koenig.ghost.org/"><span style="white-space: pre-wrap;">https://koenig.ghost.org</span></a>
+    </figcaption>
+</figure>
+<p>Ghost is the first independent company outside of Meta to build a full-scale dynamic editor on top of Lexical, and we
+    worked directly with the Lexical core team to make it happen. Today's announcement reflects over a year of quiet,
+    dedicated work by both teams to get to where we are now.</p>
+<p>We have lots of plans for continuing to improve Ghost's editing experience, and this shift in architecture has opened
+    a lot of new doors for what's possible next.</p>
+<p>For developers building integrations with Ghost, check out our updated API docs, which cover how to interact with
+    Lexical content stored in the database:</p>
+<figure class="kg-card kg-bookmark-card"><a class="kg-bookmark-container"
+        href="https://ghost.org/docs/admin-api/#posts">
+        <div class="kg-bookmark-content">
+            <div class="kg-bookmark-title">Ghost Admin API Documentation</div>
+            <div class="kg-bookmark-description">Manage content via Ghost’s Admin API, with secure role-based
+                authentication. Read more on Ghost Docs 👉</div>
+            <div class="kg-bookmark-metadata"><img class="kg-bookmark-icon" src="https://ghost.org/favicon.ico"
+                    alt=""><span class="kg-bookmark-author">Ghost - The Professional Publishing Platform</span></div>
+        </div>
+        <div class="kg-bookmark-thumbnail"><img src="https://ghost.org/images/meta/ghost-docs.png" alt=""></div>
+    </a></figure>
+<p></p>
diff --git a/ghost/link-tracking/lib/LinkClickTrackingService.js b/ghost/link-tracking/lib/LinkClickTrackingService.js
index bdd776a4a03..9b63729f10d 100644
--- a/ghost/link-tracking/lib/LinkClickTrackingService.js
+++ b/ghost/link-tracking/lib/LinkClickTrackingService.js
@@ -105,9 +105,6 @@ class LinkClickTrackingService {
    * @throws {errors.BadRequestError}
    */
     #parseLinkFilter(filter) {
-        // decode filter to manage any encoded uri components
-        filter = decodeURIComponent(filter);
-
         try {
             const filterJson = nql(filter).parse();
             const postId = filterJson?.$and?.[0]?.post_id;
@@ -154,7 +151,7 @@ class LinkClickTrackingService {
 
         // manages transformation of current url to relative for comparision
         const transformedOldUrl = this.#urlUtils.absoluteToTransformReady(redirectUrl.href);
-        const filterQuery = `post_id:${postId}+to:'${transformedOldUrl}'`;
+        const filterQuery = `post_id:'${postId}'+to:'${transformedOldUrl}'`;
 
         const updatedFilterOptions = {
             ...filterOptions,
diff --git a/ghost/link-tracking/package.json b/ghost/link-tracking/package.json
index 4e0cf432205..80798304fc4 100644
--- a/ghost/link-tracking/package.json
+++ b/ghost/link-tracking/package.json
@@ -24,10 +24,10 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
+    "@tryghost/errors": "1.3.5",
     "@tryghost/link-redirects": "0.0.0",
-    "@tryghost/nql": "0.11.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/nql": "0.12.4",
+    "@tryghost/tpl": "0.1.32",
     "bson-objectid": "2.0.4",
     "lodash": "4.17.21",
     "moment": "2.29.4"
diff --git a/ghost/link-tracking/test/LinkClickTrackingService.test.js b/ghost/link-tracking/test/LinkClickTrackingService.test.js
index 7cfd4f55c2f..f3564467972 100644
--- a/ghost/link-tracking/test/LinkClickTrackingService.test.js
+++ b/ghost/link-tracking/test/LinkClickTrackingService.test.js
@@ -5,6 +5,7 @@ const assert = require('assert/strict');
 const ObjectID = require('bson-objectid').default;
 const PostLink = require('../lib/PostLink');
 const {RedirectEvent} = require('@tryghost/link-redirects');
+const errors = require('@tryghost/errors');
 
 describe('LinkClickTrackingService', function () {
     it('exists', function () {
@@ -208,5 +209,141 @@ describe('LinkClickTrackingService', function () {
                 unsuccessfulData: []
             });
         });
+
+        //test for #parseLinkFilter method
+        it('correctly decodes and parses the filter', async function () {
+            const urlUtilsStub = {
+                absoluteToTransformReady: sinon.stub().returnsArg(0),
+                isSiteUrl: sinon.stub().returns(true)
+            };
+            const postLinkRepositoryStub = {
+                updateLinks: sinon.stub().resolves({
+                    successful: 0,
+                    unsuccessful: 0,
+                    errors: [],
+                    unsuccessfulData: []
+                })
+            };
+            const linkRedirectServiceStub = {
+                getFilteredIds: sinon.stub().resolves([])
+            };
+
+            const service = new LinkClickTrackingService({
+                urlUtils: urlUtilsStub,
+                postLinkRepository: postLinkRepositoryStub,
+                linkRedirectService: linkRedirectServiceStub
+            });
+
+            const options = {
+                filter: 'post_id:1+to:\'https://example.com/path\''
+            };
+
+            const data = {
+                action: 'updateLink',
+                meta: {
+                    link: {to: 'https://example.com/new-path'}
+                }
+            };
+
+            const result = await service.bulkEdit(data, options);
+
+            should(postLinkRepositoryStub.updateLinks.calledOnce).be.true();
+            should(result).eql({
+                successful: 0,
+                unsuccessful: 0,
+                errors: [],
+                unsuccessfulData: []
+            });
+
+            const [filterOptions] = linkRedirectServiceStub.getFilteredIds.firstCall.args;
+            should(filterOptions.filter).equal('post_id:\'1\'+to:\'https://example.com/path\'');
+        });
+
+        //test for #parseLinkFilter method
+        it('correctly decodes and parses the filter for encoded urls', async function () {
+            const urlUtilsStub = {
+                absoluteToTransformReady: sinon.stub().returnsArg(0),
+                isSiteUrl: sinon.stub().returns(true)
+            };
+            const postLinkRepositoryStub = {
+                updateLinks: sinon.stub().resolves({
+                    successful: 0,
+                    unsuccessful: 0,
+                    errors: [],
+                    unsuccessfulData: []
+                })
+            };
+            const linkRedirectServiceStub = {
+                getFilteredIds: sinon.stub().resolves([])
+            };
+
+            const service = new LinkClickTrackingService({
+                urlUtils: urlUtilsStub,
+                postLinkRepository: postLinkRepositoryStub,
+                linkRedirectService: linkRedirectServiceStub
+            });
+
+            const options = {
+                filter: 'post_id:1+to:\'https://example.com/path%2Ftestpath\''
+            };
+
+            const data = {
+                action: 'updateLink',
+                meta: {
+                    link: {to: 'https://example.com/new-path'}
+                }
+            };
+
+            const result = await service.bulkEdit(data, options);
+
+            should(postLinkRepositoryStub.updateLinks.calledOnce).be.true();
+            should(result).eql({
+                successful: 0,
+                unsuccessful: 0,
+                errors: [],
+                unsuccessfulData: []
+            });
+
+            const [filterOptions] = linkRedirectServiceStub.getFilteredIds.firstCall.args;
+            should(filterOptions.filter).equal('post_id:\'1\'+to:\'https://example.com/path%2Ftestpath\'');
+        });
+
+        //test for #parseLinkFilter method
+        it('throws BadRequestError for invalid filter', async function () {
+            const urlUtilsStub = {
+                absoluteToTransformReady: sinon.stub().returnsArg(0),
+                isSiteUrl: sinon.stub().returns(true)
+            };
+            const postLinkRepositoryStub = {
+                updateLinks: sinon.stub().resolves({
+                    successful: 0,
+                    unsuccessful: 0,
+                    errors: [],
+                    unsuccessfulData: []
+                })
+            };
+            const linkRedirectServiceStub = {
+                getFilteredIds: sinon.stub().resolves([])
+            };
+
+            const service = new LinkClickTrackingService({
+                urlUtils: urlUtilsStub,
+                postLinkRepository: postLinkRepositoryStub,
+                linkRedirectService: linkRedirectServiceStub
+            });
+
+            const options = {
+                filter: 'invalid_filter'
+            };
+
+            const data = {
+                action: 'updateLink',
+                meta: {
+                    link: {to: 'https://example.com/new-path'}
+                }
+            };
+
+            await should(service.bulkEdit(data, options)).be.rejectedWith(errors.BadRequestError);
+        });
     });
 });
diff --git a/ghost/magic-link/lib/MagicLink.js b/ghost/magic-link/lib/MagicLink.js
index b418222605e..b49b25a20b8 100644
--- a/ghost/magic-link/lib/MagicLink.js
+++ b/ghost/magic-link/lib/MagicLink.js
@@ -33,6 +33,7 @@ class MagicLink {
      * @param {typeof defaultGetText} [options.getText]
      * @param {typeof defaultGetHTML} [options.getHTML]
      * @param {typeof defaultGetSubject} [options.getSubject]
+     * @param {object} [options.sentry]
      */
     constructor(options) {
         if (!options || !options.transporter || !options.tokenProvider || !options.getSigninURL) {
@@ -44,6 +45,7 @@ class MagicLink {
         this.getText = options.getText || defaultGetText;
         this.getHTML = options.getHTML || defaultGetHTML;
         this.getSubject = options.getSubject || defaultGetSubject;
+        this.sentry = options.sentry || undefined;
     }
 
     /**
@@ -57,6 +59,8 @@ class MagicLink {
      * @returns {Promise<{token: Token, info: SentMessageInfo}>}
      */
     async sendMagicLink(options) {
+        this.sentry?.captureMessage?.(`[Magic Link] Generating magic link`, {extra: options});
+        
         if (!isEmail(options.email)) {
             throw new BadRequestError({
                 message: tpl(messages.invalidEmail)
diff --git a/ghost/magic-link/package.json b/ghost/magic-link/package.json
index 6532a35b222..dad7f48e822 100644
--- a/ghost/magic-link/package.json
+++ b/ghost/magic-link/package.json
@@ -18,17 +18,17 @@
     "lib"
   ],
   "devDependencies": {
-    "@types/jsonwebtoken": "9.0.3",
-    "@types/nodemailer": "6.4.11",
+    "@types/jsonwebtoken": "9.0.6",
+    "@types/nodemailer": "6.4.15",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
-    "@tryghost/validator": "0.2.4",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/tpl": "0.1.32",
+    "@tryghost/validator": "0.2.14",
     "jsonwebtoken": "8.5.1"
   }
 }
diff --git a/ghost/mail-events/package.json b/ghost/mail-events/package.json
index b3458573689..7162718ecd8 100644
--- a/ghost/mail-events/package.json
+++ b/ghost/mail-events/package.json
@@ -7,8 +7,8 @@
     "main": "build/index.js",
     "types": "build/index.d.ts",
     "scripts": {
-        "build": "tsc",
-        "build:ts": "yarn build",
+        "build": "yarn build:ts",
+        "build:ts": "tsc",
         "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
         "test": "yarn test:types && yarn test:unit",
         "test:types": "tsc --noEmit",
@@ -25,9 +25,9 @@
         "sinon": "15.2.0"
     },
     "dependencies": {
-        "@tryghost/errors": "1.2.26",
+        "@tryghost/errors": "1.3.5",
         "@tryghost/in-memory-repository": "0.0.0",
-        "@tryghost/tpl": "0.1.25"
+        "@tryghost/tpl": "0.1.32"
     },
     "c8": {
         "exclude": [
diff --git a/ghost/mail-events/test/MailEventService.test.ts b/ghost/mail-events/test/MailEventService.test.ts
index 00a0351a50f..a7282f56cab 100644
--- a/ghost/mail-events/test/MailEventService.test.ts
+++ b/ghost/mail-events/test/MailEventService.test.ts
@@ -1,8 +1,8 @@
-import assert from 'assert';
+import assert from 'assert/strict';
 import sinon from 'sinon';
 
-import {MailEvent} from '../src/MailEvent';
 import {InMemoryMailEventRepository as MailEventRepository} from '../src/InMemoryMailEventRepository';
+import {MailEvent} from '../src/MailEvent';
 import {MailEventService} from '../src/MailEventService';
 
 const makePayloadEvent = (
diff --git a/ghost/mailgun-client/lib/MailgunClient.js b/ghost/mailgun-client/lib/MailgunClient.js
index 2154fb5f07f..b39fbf50a0d 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%>, <%tag_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..eb8a288b18c 100644
--- a/ghost/mailgun-client/package.json
+++ b/ghost/mailgun-client/package.json
@@ -24,11 +24,11 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
-    "@tryghost/logging": "2.4.8",
-    "@tryghost/metrics": "1.0.24",
+    "@tryghost/debug": "0.1.32",
+    "@tryghost/logging": "2.4.18",
+    "@tryghost/metrics": "1.0.34",
     "form-data": "4.0.0",
     "lodash": "4.17.21",
-    "mailgun.js": "9.3.0"
+    "mailgun.js": "10.2.3"
   }
 }
diff --git a/ghost/member-attribution/lib/AttributionBuilder.js b/ghost/member-attribution/lib/AttributionBuilder.js
index 77404f37257..253921234f2 100644
--- a/ghost/member-attribution/lib/AttributionBuilder.js
+++ b/ghost/member-attribution/lib/AttributionBuilder.js
@@ -94,7 +94,7 @@ class Attribution {
         }
 
         // Fetch model
-        const model = await this.#urlTranslator.getResourceById(this.id, this.type, {absolute: true});
+        const model = await this.#urlTranslator.getResourceById(this.id, this.type);
         return this.getResource(model);
     }
 }
diff --git a/ghost/member-attribution/package.json b/ghost/member-attribution/package.json
index add5147d70f..262bf44e4eb 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.12"
   }
 }
diff --git a/ghost/member-attribution/test/outbound-link-tagger.test.js b/ghost/member-attribution/test/outbound-link-tagger.test.js
index e1595ddb0bf..39fea66a104 100644
--- a/ghost/member-attribution/test/outbound-link-tagger.test.js
+++ b/ghost/member-attribution/test/outbound-link-tagger.test.js
@@ -189,7 +189,7 @@ describe('OutboundLinkTagger', function () {
                 }
             });
             const html = await service.addToHtml('<a href="test">Hello world</a><a href="">Hello world</a>');
-            assert.equal(html, '<a href="test">Hello world</a><a href>Hello world</a>');
+            assert.equal(html, '<a href="test">Hello world</a><a href="">Hello world</a>');
         });
 
         it('keeps HTML if throws', async function () {
diff --git a/ghost/member-events/index.js b/ghost/member-events/index.js
index 4f6fdb94edf..6995e32620e 100644
--- a/ghost/member-events/index.js
+++ b/ghost/member-events/index.js
@@ -11,5 +11,6 @@ module.exports = {
     SubscriptionCreatedEvent: require('./lib/SubscriptionCreatedEvent'),
     SubscriptionActivatedEvent: require('./lib/SubscriptionActivatedEvent'),
     SubscriptionCancelledEvent: require('./lib/SubscriptionCancelledEvent'),
+    OfferRedemptionEvent: require('./lib/OfferRedemptionEvent'),
     MemberLinkClickEvent: require('./lib/MemberLinkClickEvent')
 };
diff --git a/ghost/member-events/lib/OfferRedemptionEvent.js b/ghost/member-events/lib/OfferRedemptionEvent.js
new file mode 100644
index 00000000000..95ab8a2b866
--- /dev/null
+++ b/ghost/member-events/lib/OfferRedemptionEvent.js
@@ -0,0 +1,28 @@
+/**
+ * @typedef {object} OfferRedemptionEventData
+ * @prop {string} memberId
+ * @prop {string} offerId
+ * @prop {string} subscriptionId
+ */
+
+/**
+ * Server-side event firing on page views (page, post, tags...)
+ */
+module.exports = class OfferRedemptionEvent {
+    /**
+     * @param {OfferRedemptionEventData} data
+     * @param {Date} timestamp
+     */
+    constructor(data, timestamp) {
+        this.data = data;
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * @param {OfferRedemptionEventData} data
+     * @param {Date} [timestamp]
+     */
+    static create(data, timestamp) {
+        return new OfferRedemptionEvent(data, timestamp || new Date);
+    }
+};
diff --git a/ghost/member-events/lib/SubscriptionCancelledEvent.js b/ghost/member-events/lib/SubscriptionCancelledEvent.js
index 184a4399bfa..81fa4222279 100644
--- a/ghost/member-events/lib/SubscriptionCancelledEvent.js
+++ b/ghost/member-events/lib/SubscriptionCancelledEvent.js
@@ -4,6 +4,9 @@
  * @prop {string} memberId
  * @prop {string} tierId
  * @prop {string} subscriptionId
+ * @prop {boolean} cancelNow
+ * @prop {Date} expiryAt
+ * @prop {Date} canceledAt
  */
 
 module.exports = class SubscriptionCancelledEvent {
diff --git a/ghost/members-api/lib/controllers/RouterController.js b/ghost/members-api/lib/controllers/RouterController.js
index 3be126c547a..486022263aa 100644
--- a/ghost/members-api/lib/controllers/RouterController.js
+++ b/ghost/members-api/lib/controllers/RouterController.js
@@ -8,7 +8,9 @@ const messages = {
     emailRequired: 'Email is required.',
     badRequest: 'Bad Request.',
     notFound: 'Not Found.',
+    offerNotFound: 'This offer does not exist.',
     offerArchived: 'This offer is archived.',
+    tierNotFound: 'This tier does not exist.',
     tierArchived: 'This tier is archived.',
     existingSubscription: 'A subscription exists for this Member.',
     unableToCheckout: 'Unable to initiate checkout session',
@@ -111,11 +113,18 @@ module.exports = class RouterController {
             return res.end('Bad Request.');
         }
 
+        const subscriptions = await member.related('stripeSubscriptions').fetch();
+
+        const activeSubscription = subscriptions.models.find((sub) => {
+            return ['active', 'trialing', 'unpaid', 'past_due'].includes(sub.get('status'));
+        });
+
+        let currency = activeSubscription?.get('plan_currency') || undefined;
+
         let customer;
         if (!req.body.subscription_id) {
             customer = await this._stripeAPIService.getCustomerForMemberCheckoutSession(member);
         } else {
-            const subscriptions = await member.related('stripeSubscriptions').fetch();
             const subscription = subscriptions.models.find((sub) => {
                 return sub.get('subscription_id') === req.body.subscription_id;
             });
@@ -126,13 +135,15 @@ module.exports = class RouterController {
                 });
                 return res.end(`Could not find subscription ${req.body.subscription_id}`);
             }
+            currency = subscription.get('plan_currency') || undefined;
             customer = await this._stripeAPIService.getCustomer(subscription.get('customer_id'));
         }
 
         const session = await this._stripeAPIService.createCheckoutSetupSession(customer, {
             successUrl: req.body.successUrl,
             cancelUrl: req.body.cancelUrl,
-            subscription_id: req.body.subscription_id
+            subscription_id: req.body.subscription_id,
+            currency
         });
         const publicKey = this._stripeAPIService.getPublicKey();
         const sessionInfo = {
@@ -195,7 +206,6 @@ module.exports = class RouterController {
      * @returns
      */
     async _getSubscriptionCheckoutData(body) {
-        const ghostPriceId = body.priceId;
         const tierId = body.tierId;
         const offerId = body.offerId;
 
@@ -204,44 +214,67 @@ module.exports = class RouterController {
         let offer;
 
         // Validate basic input
-        if (!ghostPriceId && !offerId && !tierId && !cadence) {
+        if (!offerId && !tierId) {
+            logging.error('[RouterController._getSubscriptionCheckoutData] Expected offerId or tierId, received none');
             throw new BadRequestError({
-                message: tpl(messages.badRequest)
+                message: tpl(messages.badRequest),
+                context: 'Expected offerId or tierId, received none'
             });
         }
 
-        if (offerId && (ghostPriceId || (tierId && cadence))) {
+        if (offerId && tierId) {
+            logging.error('[RouterController._getSubscriptionCheckoutData] Expected offerId or tierId, received both');
             throw new BadRequestError({
-                message: tpl(messages.badRequest)
-            });
-        }
-
-        if (ghostPriceId && tierId && cadence) {
-            throw new BadRequestError({
-                message: tpl(messages.badRequest)
+                message: tpl(messages.badRequest),
+                context: 'Expected offerId or tierId, received both'
             });
         }
 
         if (tierId && !cadence) {
+            logging.error('[RouterController._getSubscriptionCheckoutData] Expected cadence to be "month" or "year", received ', cadence);
             throw new BadRequestError({
-                message: tpl(messages.badRequest)
+                message: tpl(messages.badRequest),
+                context: 'Expected cadence to be "month" or "year", received ' + cadence
             });
         }
 
-        if (cadence && cadence !== 'month' && cadence !== 'year') {
+        if (tierId && cadence && cadence !== 'month' && cadence !== 'year') {
+            logging.error('[RouterController._getSubscriptionCheckoutData] Expected cadence to be "month" or "year", received ', cadence);
             throw new BadRequestError({
-                message: tpl(messages.badRequest)
+                message: tpl(messages.badRequest),
+                context: 'Expected cadence to be "month" or "year", received "' + cadence + '"'
             });
         }
 
         // Fetch tier and offer
         if (offerId) {
             offer = await this._offersAPI.getOffer({id: offerId});
+
+            if (!offer) {
+                throw new BadRequestError({
+                    message: tpl(messages.offerNotFound),
+                    context: 'Offer with id "' + offerId + '" not found'
+                });
+            }
+
             tier = await this._tiersService.api.read(offer.tier.id);
             cadence = offer.cadence;
-        } else {
+        } else if (tierId) {
             offer = null;
-            tier = await this._tiersService.api.read(tierId);
+
+            try {
+                // If the tierId is not a valid ID, the following line will throw
+                tier = await this._tiersService.api.read(tierId);
+
+                if (!tier) {
+                    throw undefined;
+                }
+            } catch (err) {
+                throw new BadRequestError({
+                    message: tpl(messages.tierNotFound),
+                    context: 'Tier with id "' + tierId + '" not found'
+                });
+            }
         }
 
         if (tier.status === 'archived') {
@@ -437,7 +470,7 @@ module.exports = class RouterController {
     }
 
     async sendMagicLink(req, res) {
-        const {email, autoRedirect} = req.body;
+        const {email, honeypot, autoRedirect} = req.body;
         let {emailType, redirect} = req.body;
 
         let referer = req.get('referer');
@@ -459,6 +492,15 @@ module.exports = class RouterController {
             });
         }
 
+        if (honeypot) {
+            logging.warn('Honeypot field filled, this is likely a bot');
+
+            // Honeypot field is filled, this is a bot.
+            // Pretend that the email was sent successfully.
+            res.writeHead(201);
+            return res.end('Created.');
+        }
+
         if (!emailType) {
             // Default to subscribe form that also allows to login (safe fallback for older clients)
             if (!this._allowSelfSignup()) {
@@ -487,10 +529,10 @@ module.exports = class RouterController {
                 if (requestedNewsletters && requestedNewsletters.length > 0 && requestedNewsletters.every(newsletter => newsletter.name !== undefined)) {
                     const newsletterNames = requestedNewsletters.map(newsletter => newsletter.name);
                     const newsletterNamesFilter = newsletterNames.map(newsletter => `'${newsletter.replace(/("|')/g, '\\$1')}'`);
-                    const newsletters = await this._newslettersService.browse({
+                    const newsletters = (await this._newslettersService.getAll({
                         filter: `name:[${newsletterNamesFilter}]`,
                         columns: ['id','name','status']
-                    });
+                    }));
 
                     if (newsletters.length !== newsletterNames.length) { //check for invalid newsletters
                         const validNewsletters = newsletters.map(newsletter => newsletter.name);
diff --git a/ghost/members-api/lib/members-api.js b/ghost/members-api/lib/members-api.js
index d187eda7b71..a726ad9eab4 100644
--- a/ghost/members-api/lib/members-api.js
+++ b/ghost/members-api/lib/members-api.js
@@ -71,7 +71,8 @@ module.exports = function MembersAPI({
     newslettersService,
     memberAttributionService,
     emailSuppressionList,
-    settingsCache
+    settingsCache,
+    sentry
 }) {
     const tokenService = new TokenService({
         privateKey,
@@ -122,7 +123,8 @@ module.exports = function MembersAPI({
         EmailSpamComplaintEvent,
         Comment,
         labsService,
-        memberAttributionService
+        memberAttributionService,
+        MemberEmailChangeEvent
     });
 
     const memberBREADService = new MemberBREADService({
@@ -153,7 +155,8 @@ module.exports = function MembersAPI({
         getSigninURL,
         getText,
         getHTML,
-        getSubject
+        getSubject,
+        sentry
     });
 
     const paymentsService = new PaymentsService({
@@ -275,8 +278,16 @@ module.exports = function MembersAPI({
         return memberBREADService.read({email});
     }
 
-    async function getMemberIdentityToken(email) {
-        const member = await getMemberIdentityData(email);
+    async function getMemberIdentityDataFromTransientId(transientId) {
+        return memberBREADService.read({transient_id: transientId});
+    }
+
+    async function cycleTransientId(memberId) {
+        await users.cycleTransientId({id: memberId});
+    }
+
+    async function getMemberIdentityToken(transientId) {
+        const member = await getMemberIdentityDataFromTransientId(transientId);
         if (!member) {
             return null;
         }
@@ -309,7 +320,7 @@ module.exports = function MembersAPI({
         return getMemberIdentityData(email);
     }
 
-    const forwardError = fn => async (req, res, next) => {
+    const forwardError = fn => async function forwardErrorMw(req, res, next) {
         try {
             await fn(req, res, next);
         } catch (err) {
@@ -367,7 +378,9 @@ module.exports = function MembersAPI({
         middleware,
         getMemberDataFromMagicLinkToken,
         getMemberIdentityToken,
+        getMemberIdentityDataFromTransientId,
         getMemberIdentityData,
+        cycleTransientId,
         setMemberGeolocationFromIp,
         getPublicConfig,
         bus,
diff --git a/ghost/members-api/lib/repositories/EventRepository.js b/ghost/members-api/lib/repositories/EventRepository.js
index b86ff1312ab..3fd41fc7390 100644
--- a/ghost/members-api/lib/repositories/EventRepository.js
+++ b/ghost/members-api/lib/repositories/EventRepository.js
@@ -1,7 +1,7 @@
 const errors = require('@tryghost/errors');
 const nql = require('@tryghost/nql');
 const mingo = require('mingo');
-const {replaceFilters, expandFilters, splitFilter, getUsedKeys, chainTransformers, mapKeys} = require('@tryghost/mongo-utils');
+const {replaceFilters, expandFilters, splitFilter, getUsedKeys, chainTransformers, mapKeys, rejectStatements} = require('@tryghost/mongo-utils');
 
 /**
  * This mongo transformer ignores the provided filter option and replaces the filter with a custom filter that was provided to the transformer. Allowing us to set a mongo filter instead of a string based NQL filter.
@@ -31,7 +31,8 @@ module.exports = class EventRepository {
         EmailSpamComplaintEvent,
         Comment,
         labsService,
-        memberAttributionService
+        memberAttributionService,
+        MemberEmailChangeEvent
     }) {
         this._DonationPaymentEvent = DonationPaymentEvent;
         this._MemberSubscribeEvent = MemberSubscribeEvent;
@@ -48,6 +49,7 @@ module.exports = class EventRepository {
         this._MemberFeedback = MemberFeedback;
         this._EmailSpamComplaintEvent = EmailSpamComplaintEvent;
         this._memberAttributionService = memberAttributionService;
+        this._MemberEmailChangeEvent = MemberEmailChangeEvent;
     }
 
     async getEventTimeline(options = {}) {
@@ -76,7 +78,8 @@ module.exports = class EventRepository {
             pageActions.push(
                 {type: 'newsletter_event', action: 'getNewsletterSubscriptionEvents'},
                 {type: 'login_event', action: 'getLoginEvents'},
-                {type: 'payment_event', action: 'getPaymentEvents'}
+                {type: 'payment_event', action: 'getPaymentEvents'},
+                {type: 'email_change_event', action: 'getEmailChangeEvent'}
             );
         }
 
@@ -148,6 +151,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'newsletter'],
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -190,6 +194,7 @@ module.exports = class EventRepository {
                 'stripeSubscription.stripePrice.stripeProduct.product'
             ],
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -242,6 +247,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member'],
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -274,6 +280,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member'],
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -311,6 +318,7 @@ module.exports = class EventRepository {
                 'tagAttribution'
             ],
             filter: 'subscriptionCreatedEvent.id:null+custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -365,6 +373,7 @@ module.exports = class EventRepository {
                 'tagAttribution'
             ],
             filter: 'member_id:-null+custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -413,6 +422,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'post', 'parent'],
             filter: 'member_id:-null+custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -446,6 +456,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'link', 'link.post'],
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -478,24 +489,68 @@ module.exports = class EventRepository {
      * This groups click events per member for the same post, and only returns the first actual event, and includes the total clicks per event (for the same member and post)
      */
     async getAggregatedClickEvents(options = {}, filter) {
-        // This counts all clicks for a member for the same post
-        const postClickQuery = `SELECT count(distinct A.redirect_id)
-            FROM members_click_events A
-            LEFT JOIN redirects A_r on A_r.id = A.redirect_id
-            LEFT JOIN redirects B_r on B_r.id = members_click_events.redirect_id
-            WHERE A.member_id = members_click_events.member_id AND A_r.post_id = B_r.post_id`;
-
-        // Counts all clicks for the same member, for the same post, but only preceding events. This should be zero to include the event (so we only include the first events)
-        const postClickQueryPreceding = `SELECT count(distinct A.redirect_id)
-            FROM members_click_events A
-            LEFT JOIN redirects A_r on A_r.id = A.redirect_id
-            LEFT JOIN redirects B_r on B_r.id = members_click_events.redirect_id
-            WHERE A.member_id = members_click_events.member_id AND A_r.post_id = B_r.post_id AND (A.created_at < members_click_events.created_at OR (A.created_at = members_click_events.created_at AND A.id < members_click_events.id))`;
+        let postId = '';
+
+        if (filter && filter.$and) {
+            // Case when there is an $and condition
+            postId = filter.$and.find(condition => condition['data.post_id'])?.['data.post_id'];
+        } else {
+            // Case when there's no $and condition, directly look for data.post_id
+            postId = filter ? filter['data.post_id'] : '';
+        }
 
+        //Remove type filter as we don't need it in the query 
+        const [typeFilter, otherFilter] = this.getNQLSubset(options.filter); // eslint-disable-line
+
+        filter = this.removePostIdFilter(otherFilter); //Remove post_id filter as we don't need it in the query
+
+        let postClicksQuery = postId && postId !== '' ? `SELECT
+                    mce.id,
+                    mce.member_id,
+                    mce.redirect_id,
+                    mce.created_at
+                FROM
+                    members_click_events mce
+                INNER JOIN
+                    redirects r ON mce.redirect_id = r.id
+                WHERE
+                    r.post_id = '${postId}'
+        `
+            : `SELECT
+                        mce.id,
+                        mce.member_id,
+                        mce.redirect_id,
+                        mce.created_at
+                    FROM
+                        members_click_events mce
+                    INNER JOIN
+                        redirects r ON mce.redirect_id = r.id
+            `;
+
+        const firstClicksQuery = `
+            SELECT
+                id,
+                member_id,
+                redirect_id,
+                created_at,
+                ROW_NUMBER() OVER (PARTITION BY member_id ORDER BY created_at, id) AS rn
+            FROM
+                PostClicks
+        `;
+
+        const mainQuery = `SELECT COUNT(DISTINCT redirect_id)
+                    FROM PostClicks AS inner_mce
+                    WHERE inner_mce.member_id = FirstClicks.member_id
+                    AND inner_mce.redirect_id IN (
+                        SELECT redirect_id
+                        FROM PostClicks
+                    )`;
         options = {
             ...options,
             withRelated: ['member'],
+            filterRelations: false,
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -507,11 +562,22 @@ module.exports = class EventRepository {
                     'data.post_id': 'post_id'
                 })
             ),
+            useCTE: true,
             // We need to use MIN to make pagination work correctly
             // Note: we cannot do `count(distinct redirect_id) as count__clicks`, because we don't want the created_at filter to affect that count
             // For pagination to work correctly, we also need to return the id of the first event (or the minimum id if multiple events happend at the same time, but should be the first). Just MIN(id) won't work because that value changes if filter created_at < x is applied.
-            selectRaw: `id, member_id, created_at, (${postClickQuery}) as count__clicks`,
-            whereRaw: `(${postClickQueryPreceding}) = 0`
+            selectRaw: `id, member_id, created_at, (${mainQuery}) as count__clicks`,
+            whereRaw: `rn = 1 ORDER BY created_at DESC, id DESC`,
+            cte: [{
+                name: `PostClicks`,
+                query: postClicksQuery
+            },
+            {
+                name: `FirstClicks`,
+                query: firstClicksQuery
+            }],
+            from: 'FirstClicks',
+            order: ''
         };
 
         const {data: models, meta} = await this._MemberLinkClickEvent.findPage(options);
@@ -534,6 +600,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'post'],
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -568,6 +635,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'email'],
             filter: filterStr,
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -610,6 +678,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'email'],
             filter: 'delivered_at:-null+custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -652,6 +721,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'email'],
             filter: 'opened_at:-null+custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -694,6 +764,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'email'],
             filter: 'custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -727,6 +798,7 @@ module.exports = class EventRepository {
             ...options,
             withRelated: ['member', 'email'],
             filter: 'failed_at:-null+custom:true',
+            useBasicCount: true,
             mongoTransformer: chainTransformers(
                 // First set the filter manually
                 replaceCustomFilterTransformer(filter),
@@ -764,6 +836,39 @@ module.exports = class EventRepository {
         };
     }
 
+    async getEmailChangeEvent(options = {}, filter) {
+        options = {
+            ...options,
+            withRelated: ['member'],
+            filter: 'custom:true',
+            useBasicCount: true,
+            mongoTransformer: chainTransformers(
+                // First set the filter manually
+                replaceCustomFilterTransformer(filter),
+
+                // Map the used keys in that filter
+                ...mapKeys({
+                    'data.created_at': 'created_at',
+                    'data.member_id': 'member_id'
+                })
+            )
+        };
+
+        const {data: models, meta} = await this._MemberEmailChangeEvent.findPage(options);
+
+        const data = models.map((model) => {
+            return {
+                type: 'email_change_event',
+                data: model.toJSON(options)
+            };
+        });
+
+        return {
+            data,
+            meta
+        };
+    }
+
     /**
      * Split the filter in two parts:
      * - One with 'type' that will be applied to all the pages
@@ -777,7 +882,15 @@ module.exports = class EventRepository {
         }
 
         const allowList = ['data.created_at', 'data.member_id', 'data.post_id', 'type', 'id'];
-        const parsed = nql(filter).parse();
+        let parsed;
+        try {
+            parsed = nql(filter).parse();
+        } catch (e) {
+            throw new errors.BadRequestError({
+                message: e.message
+            });
+        }
+
         const keys = getUsedKeys(parsed);
 
         for (const key of keys) {
@@ -797,6 +910,20 @@ module.exports = class EventRepository {
         }
     }
 
+    removePostIdFilter(filter) {
+        if (!filter) {
+            return filter;
+        }
+    
+        try {
+            return rejectStatements(filter, key => key === 'data.post_id');
+        } catch (e) {
+            throw new errors.IncorrectUsageError({
+                message: e.message
+            });
+        }
+    }
+
     async getMRR() {
         const results = await this._MemberPaidSubscriptionEvent.findAll({
             aggregateMRRDeltas: true
diff --git a/ghost/members-api/lib/repositories/MemberRepository.js b/ghost/members-api/lib/repositories/MemberRepository.js
index e79f1a36046..bec24a22220 100644
--- a/ghost/members-api/lib/repositories/MemberRepository.js
+++ b/ghost/members-api/lib/repositories/MemberRepository.js
@@ -3,10 +3,11 @@ const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
 const DomainEvents = require('@tryghost/domain-events');
-const {SubscriptionActivatedEvent, MemberCreatedEvent, SubscriptionCreatedEvent, MemberSubscribeEvent, SubscriptionCancelledEvent} = require('@tryghost/member-events');
+const {SubscriptionActivatedEvent, MemberCreatedEvent, SubscriptionCreatedEvent, MemberSubscribeEvent, SubscriptionCancelledEvent, OfferRedemptionEvent} = require('@tryghost/member-events');
 const ObjectId = require('bson-objectid').default;
 const {NotFoundError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
+const uuid = require('uuid');
 
 const messages = {
     noStripeConnection: 'Cannot {action} without a Stripe Connection',
@@ -76,6 +77,7 @@ module.exports = class MemberRepository {
         this._MemberPaidSubscriptionEvent = MemberPaidSubscriptionEvent;
         this._MemberStatusEvent = MemberStatusEvent;
         this._MemberProductEvent = MemberProductEvent;
+        this._OfferRedemption = OfferRedemption;
         this._StripeCustomer = StripeCustomer;
         this._StripeCustomerSubscription = StripeCustomerSubscription;
         this._stripeAPIService = stripeAPIService;
@@ -85,16 +87,26 @@ module.exports = class MemberRepository {
         this._newslettersService = newslettersService;
         this._labsService = labsService;
 
-        DomainEvents.subscribe(SubscriptionCreatedEvent, async function (event) {
+        DomainEvents.subscribe(OfferRedemptionEvent, async function (event) {
             if (!event.data.offerId) {
                 return;
             }
 
-            await OfferRedemption.add({
+            // To be extra safe, check if the redemption already exists before adding it
+            const existingRedemption = await OfferRedemption.findOne({
                 member_id: event.data.memberId,
                 subscription_id: event.data.subscriptionId,
                 offer_id: event.data.offerId
             });
+
+            if (!existingRedemption) {
+                await OfferRedemption.add({
+                    member_id: event.data.memberId,
+                    subscription_id: event.data.subscriptionId,
+                    offer_id: event.data.offerId,
+                    created_at: event.timestamp || Date.now()
+                });
+            }
         });
     }
 
@@ -103,8 +115,12 @@ module.exports = class MemberRepository {
             // Only dispatch the event after the transaction has finished
             options.transacting.executionPromise.then(async () => {
                 DomainEvents.dispatch(event);
-            }).catch(() => {
+            }).catch((err) => {
                 // catches transaction errors/rollback to not dispatch event
+                logging.error({
+                    err,
+                    message: `Error dispatching event ${event.constructor.name} for member ${event.data.memberId} after transaction finished`
+                });
             });
         } else {
             DomainEvents.dispatch(event);
@@ -200,7 +216,7 @@ module.exports = class MemberRepository {
             }
             return null;
         }
-        return this._Member.findOne(data, options);
+        return await this._Member.findOne(data, options);
     }
 
     async getByToken(token, options) {
@@ -211,6 +227,16 @@ module.exports = class MemberRepository {
         }, options);
     }
 
+    _generateTransientId() {
+        return uuid.v4();
+    }
+
+    async cycleTransientId({id, email}) {
+        await this.update({
+            transient_id: this._generateTransientId()
+        }, {id, email});
+    }
+
     /**
      * Create a member
      * @param {Object} data
@@ -252,6 +278,9 @@ module.exports = class MemberRepository {
 
         const memberData = _.pick(data, ['email', 'name', 'note', 'subscribed', 'geolocation', 'created_at', 'products', 'newsletters', 'email_disabled']);
 
+        // Generate a random transient_id
+        memberData.transient_id = await this._generateTransientId();
+
         // Throw error if email is invalid using latest validator
         if (!validator.isEmail(memberData.email, {legacy: false})) {
             throw new errors.ValidationError({
@@ -387,7 +416,7 @@ module.exports = class MemberRepository {
         // By default subscribe to all active auto opt-in newsletters with members visibility
         //TODO: Will mostly need to be updated later for paid-only newsletters
         browseOptions.filter = 'status:active+subscribe_on_signup:true+visibility:members';
-        const newsletters = await this._newslettersService.browse(browseOptions);
+        const newsletters = await this._newslettersService.getAll(browseOptions);
         return newsletters || [];
     }
 
@@ -421,7 +450,8 @@ module.exports = class MemberRepository {
             'last_seen_at',
             'last_commented_at',
             'expertise',
-            'email_disabled'
+            'email_disabled',
+            'transient_id'
         ]);
 
         // Trim whitespaces from expertise
@@ -533,6 +563,14 @@ module.exports = class MemberRepository {
 
         for (const productId of productsToAdd) {
             const product = await this._productRepository.get({id: productId}, sharedOptions);
+            if (!product) {
+                throw new errors.BadRequestError({
+                    message: tpl(messages.productNotFound, {
+                        id: productId
+                    })
+                });
+            }
+
             if (product.get('active') !== true) {
                 throw new errors.BadRequestError({message: tpl(messages.tierArchived)});
             }
@@ -544,7 +582,6 @@ module.exports = class MemberRepository {
 
         if (needsNewsletters) {
             const existingNewsletters = initialMember.related('newsletters').models;
-
             // This maps the old subscribed property to the new newsletters field and is only used to keep backward compatibility
             if (!memberData.newsletters) {
                 if (memberData.subscribed === false) {
@@ -557,12 +594,13 @@ module.exports = class MemberRepository {
 
             // only ever populated with active newsletters - never archived ones
             if (memberData.newsletters) {
+                const archivedNewsletters = existingNewsletters.filter(n => n.get('status') === 'archived').map(n => n.id);
                 const existingNewsletterIds = existingNewsletters
                     .filter(newsletter => newsletter.attributes.status !== 'archived')
                     .map(newsletter => newsletter.id);
                 const incomingNewsletterIds = memberData.newsletters.map(newsletter => newsletter.id);
-
-                newslettersToAdd = _.differenceWith(incomingNewsletterIds, existingNewsletterIds);
+                // make sure newslettersToAdd does not contain archived newsletters (since that creates false events)
+                newslettersToAdd = _.differenceWith(_.differenceWith(incomingNewsletterIds, existingNewsletterIds), archivedNewsletters);
                 newslettersToRemove = _.differenceWith(existingNewsletterIds, incomingNewsletterIds);
             }
 
@@ -764,9 +802,9 @@ module.exports = class MemberRepository {
         if (data.action === 'unsubscribe') {
             const hasNewsletterSelected = (Object.prototype.hasOwnProperty.call(data, 'newsletter') && data.newsletter !== null);
             if (hasNewsletterSelected) {
-                const membersArr = memberIds.join(',');
+                const membersArr = memberIds.map(i => `'${i}'`).join(',');
                 const unsubscribeRows = await this._MemberNewsletter.getFilteredCollectionQuery({
-                    filter: `newsletter_id:${data.newsletter}+member_id:[${membersArr}]`
+                    filter: `newsletter_id:'${data.newsletter}'+member_id:[${membersArr}]`
                 });
                 const toUnsubscribe = unsubscribeRows.map(row => row.id);
 
@@ -965,7 +1003,7 @@ module.exports = class MemberRepository {
             subscription_id: subscription.id,
             status: subscription.status,
             cancel_at_period_end: subscription.cancel_at_period_end,
-            cancellation_reason: subscription.metadata && subscription.metadata.cancellation_reason || null,
+            cancellation_reason: this.getCancellationReason(subscription),
             current_period_end: new Date(subscription.current_period_end * 1000),
             start_date: new Date(subscription.start_date * 1000),
             default_payment_card_last4: paymentMethod && paymentMethod.card && paymentMethod.card.last4 || null,
@@ -1010,9 +1048,21 @@ module.exports = class MemberRepository {
 
             return 'inactive';
         };
-
         let eventData = {};
-        if (model) {
+
+        const shouldBeDeleted = subscription.metadata && !!subscription.metadata.ghost_migrated_to && subscription.status === 'canceled';
+        if (shouldBeDeleted) {
+            logging.warn(`Subscription ${subscriptionData.subscription_id} is marked for deletion, skipping linking.`);
+
+            if (model) {
+                // Delete all paid subscription events manually for this subscription
+                // This is the only related event without a foreign key constraint
+                await this._MemberPaidSubscriptionEvent.query().where('subscription_id', model.id).delete().transacting(options.transacting);
+
+                // Delete the subscription in the database because we don't want to show it in the UI or in our data calculations
+                await model.destroy(options);
+            }
+        } else if (model) {
             // CASE: Offer is already mapped against sub, don't overwrite it with NULL
             // Needed for trial offers, which don't have a stripe coupon/discount attached to sub
             if (!subscriptionData.offer_id) {
@@ -1023,11 +1073,23 @@ module.exports = class MemberRepository {
                 id: model.id
             });
 
+            // CASE: Existing free member subscribes to a paid tier with an offer
+            // Stripe doesn't send the discount/offer info in the subscription.created event
+            // So we need to record the offer redemption event upon updating the subscription here
+            if (model.get('offer_id') === null && subscriptionData.offer_id) {
+                const event = OfferRedemptionEvent.create({
+                    memberId: member.id,
+                    offerId: subscriptionData.offer_id,
+                    subscriptionId: updated.id
+                }, updated.get('created_at'));
+                this.dispatchEvent(event, options);
+            }
+
             if (model.get('mrr') !== updated.get('mrr') || model.get('plan_id') !== updated.get('plan_id') || model.get('status') !== updated.get('status') || model.get('cancel_at_period_end') !== updated.get('cancel_at_period_end')) {
                 const originalMrrDelta = model.get('mrr');
                 const updatedMrrDelta = updated.get('mrr');
 
-                const getEventName = (originalStatus, updatedStatus) => {
+                const getEventType = (originalStatus, updatedStatus) => {
                     if (originalStatus === updatedStatus) {
                         return 'updated';
                     }
@@ -1041,12 +1103,14 @@ module.exports = class MemberRepository {
 
                 const originalStatus = getStatus(model);
                 const updatedStatus = getStatus(updated);
+                const eventType = getEventType(originalStatus, updatedStatus);
 
                 const mrrDelta = updatedMrrDelta - originalMrrDelta;
+
                 await this._MemberPaidSubscriptionEvent.add({
                     member_id: member.id,
                     source: 'stripe',
-                    type: getEventName(originalStatus, updatedStatus),
+                    type: eventType,
                     subscription_id: updated.id,
                     from_plan: model.get('plan_id'),
                     to_plan: updated.get('status') === 'canceled' ? null : updated.get('plan_id'),
@@ -1071,6 +1135,29 @@ module.exports = class MemberRepository {
                     });
                     this.dispatchEvent(event, options);
                 }
+
+                // Dispatch cancellation event, i.e. send paid cancellation staff notification, if:
+                // 1. The subscription has been set to cancel at period end, by the member in Portal, status 'canceled'
+                // 2. The subscription has been immediately canceled (e.g. due to multiple failed payments), status 'expired'
+                if (this.isActiveSubscriptionStatus(originalStatus) && (updatedStatus === 'canceled' || updatedStatus === 'expired')) {
+                    const context = options?.context || {};
+                    const source = this._resolveContextSource(context);
+                    const cancelNow = updatedStatus === 'expired';
+                    const canceledAt = new Date(subscription.canceled_at * 1000);
+                    const expiryAt = cancelNow ? canceledAt : updated.get('current_period_end');
+
+                    const event = SubscriptionCancelledEvent.create({
+                        source,
+                        tierId: ghostProduct?.get('id'),
+                        memberId: member.id,
+                        subscriptionId: updated.get('id'),
+                        cancelNow,
+                        canceledAt,
+                        expiryAt
+                    });
+
+                    this.dispatchEvent(event, options);
+                }
             }
         } else {
             eventData.created_at = new Date(subscription.start_date * 1000);
@@ -1090,7 +1177,7 @@ module.exports = class MemberRepository {
             const context = options?.context || {};
             const source = this._resolveContextSource(context);
 
-            const event = SubscriptionCreatedEvent.create({
+            const subscriptionCreatedEvent = SubscriptionCreatedEvent.create({
                 source,
                 tierId: ghostProduct?.get('id'),
                 memberId: member.id,
@@ -1099,7 +1186,17 @@ module.exports = class MemberRepository {
                 attribution: data.attribution,
                 batchId: options.batch_id
             });
-            this.dispatchEvent(event, options);
+
+            this.dispatchEvent(subscriptionCreatedEvent, options);
+
+            if (offerId) {
+                const offerRedemptionEvent = OfferRedemptionEvent.create({
+                    memberId: member.id,
+                    offerId: offerId,
+                    subscriptionId: subscriptionModel.get('id')
+                });
+                this.dispatchEvent(offerRedemptionEvent, options);
+            }
 
             if (getStatus(subscriptionModel) === 'active') {
                 const activatedEvent = SubscriptionActivatedEvent.create({
@@ -1118,7 +1215,7 @@ module.exports = class MemberRepository {
         let memberProducts = (await member.related('products').fetch(options)).toJSON();
         const oldMemberProducts = member.related('products').toJSON();
         let status = memberProducts.length === 0 ? 'free' : 'comped';
-        if (this.isActiveSubscriptionStatus(subscription.status)) {
+        if (!shouldBeDeleted && this.isActiveSubscriptionStatus(subscription.status)) {
             if (this.isComplimentarySubscription(subscription)) {
                 status = 'comped';
             } else {
@@ -1257,6 +1354,19 @@ module.exports = class MemberRepository {
         }
     }
 
+    getCancellationReason(subscription) {
+        // Case: manual cancellation in Portal
+        if (subscription.metadata && subscription.metadata.cancellation_reason) {
+            return subscription.metadata.cancellation_reason;
+
+        // Case: Automatic cancellation due to several payment failures
+        } else if (subscription.cancellation_details && subscription.cancellation_details.reason && subscription.cancellation_details.reason === 'payment_failed') {
+            return 'Payment failed';
+        }
+
+        return null;
+    }
+
     async getSubscription(data, options) {
         if (!this._stripeAPIService.configured) {
             throw new errors.BadRequestError({message: tpl(messages.noStripeConnection, {action: 'get Stripe Subscription'})});
@@ -1399,34 +1509,6 @@ module.exports = class MemberRepository {
                 id: member.id,
                 subscription: updatedSubscription
             }, options);
-
-            // Dispatch cancellation event
-            if (data.subscription.cancel_at_period_end) {
-                const stripeProductId = _.get(updatedSubscription, 'items.data[0].price.product');
-
-                let ghostProduct;
-                try {
-                    ghostProduct = await this._productRepository.get(
-                        {stripe_product_id: stripeProductId},
-                        {...sharedOptions, forUpdate: true}
-                    );
-                } catch (e) {
-                    ghostProduct = null;
-                }
-
-                const context = options?.context || {};
-                const source = this._resolveContextSource(context);
-                const cancellationTimestamp = updatedSubscription.canceled_at
-                    ? new Date(updatedSubscription.canceled_at * 1000)
-                    : new Date();
-                const cancelEventData = {
-                    source,
-                    memberId: member.id,
-                    subscriptionId: subscriptionModel.get('id'),
-                    tierId: ghostProduct?.get('id')
-                };
-                this.dispatchEvent(SubscriptionCancelledEvent.create(cancelEventData, cancellationTimestamp), options);
-            }
         }
     }
 
diff --git a/ghost/members-api/lib/services/MemberBREADService.js b/ghost/members-api/lib/services/MemberBREADService.js
index ad99f99d989..66faef1a949 100644
--- a/ghost/members-api/lib/services/MemberBREADService.js
+++ b/ghost/members-api/lib/services/MemberBREADService.js
@@ -242,7 +242,7 @@ module.exports = class MemberBREADService {
 
         const suppressionData = await this.emailSuppressionList.getSuppressionData(member.email);
         member.email_suppression = {
-            suppressed: suppressionData.suppressed,
+            suppressed: suppressionData.suppressed || !!model.get('email_disabled'),
             info: suppressionData.info
         };
 
@@ -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) {
@@ -359,6 +365,10 @@ module.exports = class MemberBREADService {
         return this.read({id: model.id}, options);
     }
 
+    async logout(options) {
+        await this.memberRepository.cycleTransientId(options);
+    }
+
     async browse(options) {
         const defaultWithRelated = [
             'labels',
@@ -383,6 +393,9 @@ module.exports = class MemberBREADService {
             withRelated.add('email_recipients.email');
         }
 
+        //option param to skip distinct from count query, distinct adds a lot of latency and in this case the result set will always be unique.
+        options.useBasicCount = true;
+
         const page = await this.memberRepository.list({
             ...options,
             withRelated: Array.from(withRelated)
@@ -395,11 +408,10 @@ module.exports = class MemberBREADService {
         const subscriptions = page.data.flatMap(model => model.related('stripeSubscriptions').slice());
         const offerMap = await this.fetchSubscriptionOffers(subscriptions);
 
-        const members = page.data.map(model => model.toJSON(options));
-
-        const bulkSuppressionData = await this.emailSuppressionList.getBulkSuppressionData(members.map(member => member.email));
+        const bulkSuppressionData = await this.emailSuppressionList.getBulkSuppressionData(page.data.map(member => member.get('email')));
 
-        const data = members.map((member, index) => {
+        const data = page.data.map((model, index) => {
+            const member = model.toJSON(options);
             member.subscriptions = member.subscriptions.filter(sub => !!sub.price);
             this.attachSubscriptionsToMember(member);
             this.attachOffersToSubscriptions(member, offerMap);
@@ -407,7 +419,7 @@ module.exports = class MemberBREADService {
                 delete member.products;
             }
             member.email_suppression = {
-                suppressed: bulkSuppressionData[index].suppressed,
+                suppressed: bulkSuppressionData[index].suppressed || !!model.get('email_disabled'),
                 info: bulkSuppressionData[index].info
             };
             return member;
diff --git a/ghost/members-api/package.json b/ghost/members-api/package.json
index 321723800aa..9084a0120ca 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",
@@ -31,22 +31,23 @@
   },
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
     "@tryghost/magic-link": "0.0.0",
     "@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/nql": "0.12.4",
+    "@tryghost/tpl": "0.1.32",
+    "@tryghost/validator": "0.2.14",
+    "@types/jsonwebtoken": "9.0.6",
     "body-parser": "1.20.2",
     "bson-objectid": "2.0.4",
-    "express": "4.18.2",
+    "express": "4.19.2",
     "got": "11.8.6",
     "jsonwebtoken": "8.5.1",
     "lodash": "4.17.21",
     "moment": "2.29.4",
-    "node-jose": "2.2.0"
+    "node-jose": "2.2.0",
+    "uuid": "9.0.1"
   }
 }
diff --git a/ghost/members-api/test/unit/lib/controllers/router.test.js b/ghost/members-api/test/unit/lib/controllers/router.test.js
index f3b23aa0f85..fe6b9559d89 100644
--- a/ghost/members-api/test/unit/lib/controllers/router.test.js
+++ b/ghost/members-api/test/unit/lib/controllers/router.test.js
@@ -1,4 +1,7 @@
 const sinon = require('sinon');
+const assert = require('assert').strict;
+const errors = require('@tryghost/errors');
+
 const RouterController = require('../../../../lib/controllers/RouterController');
 
 describe('RouterController', function () {
@@ -86,6 +89,153 @@ describe('RouterController', function () {
             })).should.be.true();
         });
 
+        describe('_getSubscriptionCheckoutData', function () {
+            it('returns a BadRequestError if both offerId and tierId are missing', async function () {
+                const routerController = new RouterController({
+                    tiersService,
+                    paymentsService,
+                    offersAPI,
+                    stripeAPIService,
+                    labsService
+                });
+
+                try {
+                    await routerController._getSubscriptionCheckoutData({body: {}});
+                    assert.fail('Expected function to throw BadRequestError');
+                } catch (error) {
+                    assert(error instanceof errors.BadRequestError, 'Error should be an instance of BadRequestError');
+                    assert.equal(error.context, 'Expected offerId or tierId, received none');
+                }
+            });
+
+            it('returns a BadRequestError if both offerId and tierId are provided', async function () {
+                const routerController = new RouterController({
+                    tiersService,
+                    paymentsService,
+                    offersAPI,
+                    stripeAPIService,
+                    labsService
+                });
+
+                try {
+                    await routerController._getSubscriptionCheckoutData({tierId: 'tier_123', offerId: 'offer_123'});
+                    assert.fail('Expected function to throw BadRequestError');
+                } catch (error) {
+                    assert(error instanceof errors.BadRequestError, 'Error should be an instance of BadRequestError');
+                    assert.equal(error.context, 'Expected offerId or tierId, received both');
+                }
+            });
+
+            it('returns a BadRequestError if tierId is provided wihout a cadence', async function () {
+                const routerController = new RouterController({
+                    tiersService,
+                    paymentsService,
+                    offersAPI,
+                    stripeAPIService,
+                    labsService
+                });
+
+                try {
+                    await routerController._getSubscriptionCheckoutData({tierId: 'tier_123'});
+                    assert.fail('Expected function to throw BadRequestError');
+                } catch (error) {
+                    assert(error instanceof errors.BadRequestError, 'Error should be an instance of BadRequestError');
+                    assert.equal(error.context, 'Expected cadence to be "month" or "year", received undefined');
+                }
+            });
+
+            it('returns a BadRequestError if tierId is provided wihout a valid cadence', async function () {
+                const routerController = new RouterController({
+                    tiersService,
+                    paymentsService,
+                    offersAPI,
+                    stripeAPIService,
+                    labsService
+                });
+
+                try {
+                    await routerController._getSubscriptionCheckoutData({tierId: 'tier_123', cadence: 'day'});
+                    assert.fail('Expected function to throw BadRequestError');
+                } catch (error) {
+                    assert(error instanceof errors.BadRequestError, 'Error should be an instance of BadRequestError');
+                    assert.equal(error.context, 'Expected cadence to be "month" or "year", received "day"');
+                }
+            });
+
+            it('returns a BadRequestError if offer is not found by offerId', async function () {
+                offersAPI = {
+                    getOffer: sinon.stub().resolves(null)
+                };
+
+                const routerController = new RouterController({
+                    tiersService,
+                    paymentsService,
+                    offersAPI,
+                    stripeAPIService,
+                    labsService
+                });
+
+                try {
+                    await routerController._getSubscriptionCheckoutData({offerId: 'invalid'});
+
+                    assert.fail('Expected function to throw BadRequestError');
+                } catch (error) {
+                    assert(error instanceof errors.BadRequestError, 'Error should be an instance of BadRequestError');
+                    assert.equal(error.context, 'Offer with id "invalid" not found');
+                }
+            });
+
+            it('returns a BadRequestError if tier is not found by tierId', async function () {
+                tiersService = {
+                    api: {
+                        read: sinon.stub().resolves(null)
+                    }
+                };
+
+                const routerController = new RouterController({
+                    tiersService,
+                    paymentsService,
+                    offersAPI,
+                    stripeAPIService,
+                    labsService
+                });
+
+                try {
+                    await routerController._getSubscriptionCheckoutData({tierId: 'invalid', cadence: 'year'});
+
+                    assert.fail('Expected function to throw BadRequestError');
+                } catch (error) {
+                    assert(error instanceof errors.BadRequestError, 'Error should be an instance of BadRequestError');
+                    assert.equal(error.context, 'Tier with id "invalid" not found');
+                }
+            });
+
+            it('returns a BadRequestError if fetching tier by tierId throws', async function () {
+                tiersService = {
+                    api: {
+                        read: sinon.stub().rejects(new Error('Fail to fetch tier'))
+                    }
+                };
+
+                const routerController = new RouterController({
+                    tiersService,
+                    paymentsService,
+                    offersAPI,
+                    stripeAPIService,
+                    labsService
+                });
+
+                try {
+                    await routerController._getSubscriptionCheckoutData({tierId: 'invalid', cadence: 'year'});
+
+                    assert.fail('Expected function to throw BadRequestError');
+                } catch (error) {
+                    assert(error instanceof errors.BadRequestError, 'Error should be an instance of BadRequestError');
+                    assert.equal(error.context, 'Tier with id "invalid" not found');
+                }
+            });
+        });
+
         afterEach(function () {
             sinon.restore();
         });
@@ -146,10 +296,10 @@ describe('RouterController', function () {
                 const newsletterNames = newsletters.map(newsletter => newsletter.name);
                 const newsletterNamesFilter = newsletterNames.map(newsletter => `'${newsletter.replace(/("|')/g, '\\$1')}'`);
                 const newslettersServiceStub = {
-                    browse: sinon.stub()
+                    getAll: sinon.stub()
                 };
 
-                newslettersServiceStub.browse
+                newslettersServiceStub.getAll
                     .withArgs({
                         filter: `name:[${newsletterNamesFilter}]`,
                         columns: ['id','name','status']
@@ -181,10 +331,10 @@ describe('RouterController', function () {
                 ];
 
                 const newslettersServiceStub = {
-                    browse: sinon.stub()
+                    getAll: sinon.stub()
                 };
 
-                newslettersServiceStub.browse
+                newslettersServiceStub.getAll
                     .withArgs({
                         filter: `name:['${INVALID_NEWSLETTER_NAME}']`,
                         columns: ['id','name','status']
@@ -221,10 +371,10 @@ describe('RouterController', function () {
 
                 const newsletterNames = newsletters.map(newsletter => `'${newsletter.name}'`);
                 const newslettersServiceStub = {
-                    browse: sinon.stub()
+                    getAll: sinon.stub()
                 };
 
-                newslettersServiceStub.browse
+                newslettersServiceStub.getAll
                     .withArgs({
                         filter: `name:[${newsletterNames}]`,
                         columns: ['id', 'name','status']
@@ -238,5 +388,52 @@ describe('RouterController', function () {
                 await controller.sendMagicLink(req, res).should.be.rejectedWith(`Cannot subscribe to archived newsletters Newsletter 2`);
             });
         });
+
+        describe('honeypot', function () {
+            let req, res, sendEmailWithMagicLinkStub;
+
+            const createRouterController = (deps = {}) => {
+                return new RouterController({
+                    allowSelfSignup: sinon.stub().returns(true),
+                    memberAttributionService: {
+                        getAttribution: sinon.stub().resolves({})
+                    },
+                    sendEmailWithMagicLink: sendEmailWithMagicLinkStub,
+                    ...deps
+                });
+            };
+
+            beforeEach(function () {
+                req = {
+                    body: {
+                        email: 'jamie@example.com',
+                        emailType: 'signup'
+                    },
+                    get: sinon.stub()
+                };
+                res = {
+                    writeHead: sinon.stub(),
+
+                    end: sinon.stub()
+                };
+                sendEmailWithMagicLinkStub = sinon.stub().resolves();
+            });
+
+            it('Sends emails when honeypot is not filled', async function () {
+                const controller = createRouterController();
+
+                await controller.sendMagicLink(req, res).should.be.fulfilled();
+                sendEmailWithMagicLinkStub.calledOnce.should.be.true();
+            });
+
+            it('Does not send emails when honeypot is filled', async function () {
+                const controller = createRouterController();
+
+                req.body.honeypot = 'filled!';
+
+                await controller.sendMagicLink(req, res).should.be.fulfilled();
+                sendEmailWithMagicLinkStub.notCalled.should.be.true();
+            });
+        });
     });
 });
diff --git a/ghost/members-api/test/unit/lib/repositories/event.test.js b/ghost/members-api/test/unit/lib/repositories/event.test.js
index 439aa495d31..9b2f2f66868 100644
--- a/ghost/members-api/test/unit/lib/repositories/event.test.js
+++ b/ghost/members-api/test/unit/lib/repositories/event.test.js
@@ -19,6 +19,12 @@ describe('EventRepository', function () {
             });
         });
 
+        it('throws when using invalid filter', function () {
+            should.throws(() => {
+                eventRepository.getNQLSubset('undefined');
+            }, errors.BadRequestError);
+        });
+
         it('throws when using properties that aren\'t in the allowlist', function () {
             should.throws(() => {
                 eventRepository.getNQLSubset('(types:1)');
diff --git a/ghost/members-api/test/unit/lib/repositories/member.test.js b/ghost/members-api/test/unit/lib/repositories/member.test.js
index 0baf70977d7..fc6b795091a 100644
--- a/ghost/members-api/test/unit/lib/repositories/member.test.js
+++ b/ghost/members-api/test/unit/lib/repositories/member.test.js
@@ -2,10 +2,11 @@ const assert = require('assert/strict');
 const sinon = require('sinon');
 const DomainEvents = require('@tryghost/domain-events');
 const MemberRepository = require('../../../../lib/repositories/MemberRepository');
-const {SubscriptionCreatedEvent} = require('@tryghost/member-events');
+const {SubscriptionCreatedEvent, OfferRedemptionEvent} = require('@tryghost/member-events');
 
 const mockOfferRedemption = {
-    add: sinon.stub()
+    add: sinon.stub(),
+    findOne: sinon.stub()
 };
 
 describe('MemberRepository', function () {
@@ -143,6 +144,91 @@ describe('MemberRepository', function () {
         });
     });
 
+    describe('newsletter subscriptions', function () {
+        let Member;
+        let MemberProductEvent;
+        let productRepository;
+        let stripeAPIService;
+        let existingNewsletters;
+        let MemberSubscribeEvent;
+
+        beforeEach(async function () {
+            sinon.spy();
+            existingNewsletters = [
+                {
+                    id: 'newsletter_id_123',
+                    attributes: {
+                        status: 'active'
+                    },
+                    get: sinon.stub().withArgs('status').returns('active')
+                },
+                {
+                    id: 'newsletter_id_1234_archive',
+                    attributes: {
+                        status: 'archived'
+                    },
+                    get: sinon.stub().withArgs('status').returns('archived')
+                }
+            ];
+
+            Member = {
+                findOne: sinon.stub().resolves({
+                    get: sinon.stub().returns('member_id_123'),
+                    related: sinon.stub().withArgs('newsletters').returns({
+                        models: existingNewsletters
+                    }),
+                    toJSON: sinon.stub().returns({})
+                }),
+                edit: sinon.stub().resolves({
+                    attributes: {},
+                    _previousAttributes: {}
+                })
+            };
+
+            stripeAPIService = {
+                configured: false
+            };
+
+            MemberSubscribeEvent = {
+                add: sinon.stub().resolves()
+            };
+        });
+
+        it('Does not create false archived newsletter events', async function () {
+            const repo = new MemberRepository({
+                Member,
+                MemberProductEvent,
+                productRepository,
+                stripeAPIService,
+                MemberSubscribeEventModel: MemberSubscribeEvent,
+                OfferRedemption: mockOfferRedemption
+            });
+
+            await repo.update({
+                email: 'test@email.com',
+                newsletters: [{
+                    id: 'newsletter_id_123'
+                },
+                {
+                    id: 'newsletter_id_456'
+                },
+                {
+                    id: 'newsletter_id_new'
+                },
+                {
+                    id: 'newsletter_id_1234_archive'
+                }]
+            },{
+                transacting: {
+                    executionPromise: Promise.resolve()
+                },
+                context: {}
+            });
+
+            MemberSubscribeEvent.add.calledTwice.should.be.true();
+        });
+    });
+
     describe('linkSubscription', function (){
         let Member;
         let MemberPaidSubscriptionEvent;
@@ -153,14 +239,16 @@ describe('MemberRepository', function () {
         let offerRepository;
         let labsService;
         let subscriptionData;
-        let notifySpy;
+        let subscriptionCreatedNotifySpy;
+        let offerRedemptionNotifySpy;
 
         afterEach(function () {
             sinon.restore();
         });
 
         beforeEach(async function () {
-            notifySpy = sinon.spy();
+            subscriptionCreatedNotifySpy = sinon.spy();
+            offerRedemptionNotifySpy = sinon.spy();
 
             subscriptionData = {
                 id: 'sub_123',
@@ -198,7 +286,8 @@ describe('MemberRepository', function () {
                             }),
                             toJSON: sinon.stub().returns(relation === 'products' ? [] : {}),
                             fetch: sinon.stub().resolves({
-                                toJSON: sinon.stub().returns(relation === 'products' ? [] : {})
+                                toJSON: sinon.stub().returns(relation === 'products' ? [] : {}),
+                                models: []
                             })
                         };
                     },
@@ -215,6 +304,9 @@ describe('MemberRepository', function () {
             StripeCustomerSubscription = {
                 add: sinon.stub().resolves({
                     get: sinon.stub().returns()
+                }),
+                edit: sinon.stub().resolves({
+                    get: sinon.stub().returns()
                 })
             };
             MemberProductEvent = {
@@ -259,7 +351,8 @@ describe('MemberRepository', function () {
 
             sinon.stub(repo, 'getSubscriptionByStripeID').resolves(null);
 
-            DomainEvents.subscribe(SubscriptionCreatedEvent, notifySpy);
+            DomainEvents.subscribe(SubscriptionCreatedEvent, subscriptionCreatedNotifySpy);
+            DomainEvents.subscribe(OfferRedemptionEvent, offerRedemptionNotifySpy);
 
             await repo.linkSubscription({
                 subscription: subscriptionData
@@ -270,10 +363,12 @@ describe('MemberRepository', function () {
                 context: {}
             });
 
-            notifySpy.calledOnce.should.be.true();
+            subscriptionCreatedNotifySpy.calledOnce.should.be.true();
+            offerRedemptionNotifySpy.called.should.be.false();
         });
 
-        it('attaches offer information to subscription event', async function (){
+        it('dispatches the offer redemption event for a new member starting a subscription', async function (){
+            // When a new member starts a paid subscription, the subscription is created with the offer ID
             const repo = new MemberRepository({
                 stripeAPIService,
                 StripeCustomerSubscription,
@@ -286,9 +381,11 @@ describe('MemberRepository', function () {
                 OfferRedemption: mockOfferRedemption
             });
 
+            // No existing subscription
             sinon.stub(repo, 'getSubscriptionByStripeID').resolves(null);
 
-            DomainEvents.subscribe(SubscriptionCreatedEvent, notifySpy);
+            DomainEvents.subscribe(SubscriptionCreatedEvent, subscriptionCreatedNotifySpy);
+            DomainEvents.subscribe(OfferRedemptionEvent, offerRedemptionNotifySpy);
 
             await repo.linkSubscription({
                 id: 'member_id_123',
@@ -301,8 +398,60 @@ describe('MemberRepository', function () {
                 context: {}
             });
 
-            notifySpy.calledOnce.should.be.true();
-            notifySpy.calledWith(sinon.match((event) => {
+            subscriptionCreatedNotifySpy.calledOnce.should.be.true();
+            subscriptionCreatedNotifySpy.calledWith(sinon.match((event) => {
+                if (event.data.offerId === 'offer_123') {
+                    return true;
+                }
+                return false;
+            })).should.be.true();
+
+            offerRedemptionNotifySpy.called.should.be.true();
+            offerRedemptionNotifySpy.calledWith(sinon.match((event) => {
+                if (event.data.offerId === 'offer_123') {
+                    return true;
+                }
+                return false;
+            })).should.be.true();
+        });
+
+        it('dispatches the offer redemption event for an existing member upgrading to a paid subscription', async function (){
+            // When an existing free member upgrades to a paid subscription, the subscription is first created _without_ the offer id
+            // Then it is updated with the offer id after the checkout.completed webhook is received
+            const repo = new MemberRepository({
+                stripeAPIService,
+                StripeCustomerSubscription,
+                MemberPaidSubscriptionEvent,
+                MemberProductEvent,
+                productRepository,
+                offerRepository,
+                labsService,
+                Member,
+                OfferRedemption: mockOfferRedemption
+            });
+
+            sinon.stub(repo, 'getSubscriptionByStripeID').resolves({
+                get: sinon.stub().withArgs('offer_id').returns(null)
+            });
+
+            DomainEvents.subscribe(SubscriptionCreatedEvent, subscriptionCreatedNotifySpy);
+            DomainEvents.subscribe(OfferRedemptionEvent, offerRedemptionNotifySpy);
+
+            await repo.linkSubscription({
+                id: 'member_id_123',
+                subscription: subscriptionData,
+                offerId: 'offer_123'
+            }, {
+                transacting: {
+                    executionPromise: Promise.resolve()
+                },
+                context: {}
+            });
+
+            subscriptionCreatedNotifySpy.calledOnce.should.be.false();
+
+            offerRedemptionNotifySpy.called.should.be.true();
+            offerRedemptionNotifySpy.calledWith(sinon.match((event) => {
                 if (event.data.offerId === 'offer_123') {
                     return true;
                 }
diff --git a/ghost/members-api/test/unit/lib/services/member-bread.test.js b/ghost/members-api/test/unit/lib/services/member-bread.test.js
index 720071591c8..95ad97c26de 100644
--- a/ghost/members-api/test/unit/lib/services/member-bread.test.js
+++ b/ghost/members-api/test/unit/lib/services/member-bread.test.js
@@ -42,7 +42,10 @@ describe('MemberBreadService', function () {
             memberModelStub = {
                 id: MEMBER_ID,
                 related: sinon.stub().returns([]),
-                toJSON: sinon.stub().returns({...memberModelJSON})
+                toJSON: sinon.stub().returns({...memberModelJSON}),
+                get: function (key) {
+                    return this[key];
+                }
             };
             memberRepositoryStub = {
                 get: sinon.stub().resolves(null),
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-csv/lib/unparse.js b/ghost/members-csv/lib/unparse.js
index 58abb231c2e..983cff741f0 100644
--- a/ghost/members-csv/lib/unparse.js
+++ b/ghost/members-csv/lib/unparse.js
@@ -14,53 +14,54 @@ const DEFAULT_COLUMNS = [
     'tiers'
 ];
 
-const unparse = (members, columns = DEFAULT_COLUMNS.slice()) => {
+const unparse = (rows, columns = DEFAULT_COLUMNS.slice()) => {
     columns = columns.map((column) => {
         if (column === 'subscribed') {
             return 'subscribed_to_emails';
         }
         return column;
     });
-    const mappedMembers = members.map((member) => {
-        if (member.error && !columns.includes('error')) {
+    const mappedRows = rows.map((row) => {
+        if (row.error && !columns.includes('error')) {
             columns.push('error');
         }
 
         let labels = '';
-        if (typeof member.labels === 'string') {
-            labels = member.labels;
-        } else if (Array.isArray(member.labels)) {
-            labels = member.labels.map((l) => {
+        if (typeof row.labels === 'string') {
+            labels = row.labels;
+        } else if (Array.isArray(row.labels)) {
+            labels = row.labels.map((l) => {
                 return typeof l === 'string' ? l : l.name;
             }).join(',');
         }
 
         let tiers = '';
 
-        if (Array.isArray(member.tiers)) {
-            tiers = member.tiers.map((tier) => {
+        if (Array.isArray(row.tiers)) {
+            tiers = row.tiers.map((tier) => {
                 return tier.name;
             }).join(',');
         }
 
         return {
-            id: member.id,
-            email: member.email,
-            name: member.name,
-            note: member.note,
-            subscribed_to_emails: member.subscribed || member.subscribed_to_emails ? true : false,
-            complimentary_plan: member.comped || member.complimentary_plan,
-            stripe_customer_id: _.get(member, 'subscriptions[0].customer.id') || member.stripe_customer_id,
-            created_at: member.created_at,
-            deleted_at: member.deleted_at,
+            id: row.id,
+            email: row.email,
+            name: row.name,
+            note: row.note,
+            subscribed_to_emails: 'subscribed' in row ? row.subscribed : row.subscribed_to_emails,
+            complimentary_plan: row.comped || row.complimentary_plan,
+            stripe_customer_id: _.get(row, 'subscriptions[0].customer.id') || row.stripe_customer_id,
+            created_at: row.created_at,
+            deleted_at: row.deleted_at,
             labels: labels,
             tiers: tiers,
-            import_tier: member.import_tier || null,
-            error: member.error || null
+            import_tier: row.import_tier || null,
+            error: row.error || null
         };
     });
 
-    return papaparse.unparse(mappedMembers, {
+    return papaparse.unparse(mappedRows, {
+        escapeFormulae: true,
         columns
     });
 };
diff --git a/ghost/members-csv/package.json b/ghost/members-csv/package.json
index 185da9c4a5a..c054c0de396 100644
--- a/ghost/members-csv/package.json
+++ b/ghost/members-csv/package.json
@@ -24,7 +24,7 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "lodash": "4.17.21",
     "papaparse": "5.3.2",
     "pump": "3.0.0"
diff --git a/ghost/members-csv/test/unparse.test.js b/ghost/members-csv/test/unparse.test.js
index 47a48ccaf1f..e04352d9518 100644
--- a/ghost/members-csv/test/unparse.test.js
+++ b/ghost/members-csv/test/unparse.test.js
@@ -13,7 +13,7 @@ describe('unparse', function () {
 
         assert.ok(result);
 
-        const expected = `id,email,name,note,subscribed_to_emails,complimentary_plan,stripe_customer_id,created_at,deleted_at,labels,tiers\r\n,email@example.com,Sam Memberino,Early supporter,false,,,,,,`;
+        const expected = `id,email,name,note,subscribed_to_emails,complimentary_plan,stripe_customer_id,created_at,deleted_at,labels,tiers\r\n,email@example.com,Sam Memberino,Early supporter,,,,,,,`;
         assert.equal(result, expected);
     });
 
@@ -103,4 +103,32 @@ third-member-email@email.com,"banana, avocado"`;
         const expected = `email,tiers\r\nmember-email@email.com,Bronze Level`;
         assert.equal(result, expected);
     });
+
+    it('escapes fields starting with CSV injection characters', async function () {
+        const json = [{
+            email: 'email@example.com',
+            name: '=1+2',
+            note: 'Early supporter'
+        }];
+
+        const result = unparse(json);
+        assert.ok(result);
+
+        const expected = `id,email,name,note,subscribed_to_emails,complimentary_plan,stripe_customer_id,created_at,deleted_at,labels,tiers\r\n,email@example.com,"'=1+2",Early supporter,,,,,,,`;
+        assert.equal(result, expected);
+    });
+
+    it('escapes fields with CSV injection characters and quotes', async function () {
+        const json = [{
+            email: 'email@example.com',
+            name: `=1+2'" `,
+            note: 'Early supporter'
+        }];
+
+        const result = unparse(json);
+        assert.ok(result);
+
+        const expected = `id,email,name,note,subscribed_to_emails,complimentary_plan,stripe_customer_id,created_at,deleted_at,labels,tiers\r\n,email@example.com,"'=1+2'"" ",Early supporter,,,,,,,`;
+        assert.equal(result, expected);
+    });
 });
diff --git a/ghost/members-events-service/lib/LastSeenAtUpdater.js b/ghost/members-events-service/lib/LastSeenAtUpdater.js
index 269dbd28d23..0b9a854c76a 100644
--- a/ghost/members-events-service/lib/LastSeenAtUpdater.js
+++ b/ghost/members-events-service/lib/LastSeenAtUpdater.js
@@ -15,13 +15,15 @@ class LastSeenAtUpdater {
      * @param {any} deps.services.settingsCache The settings service
      * @param {() => object} deps.getMembersApi - A function which returns an instance of members-api
      * @param {any} deps.db Database connection
+     * @param {any} deps.events The event emitter
      */
     constructor({
         services: {
             settingsCache
         },
         getMembersApi,
-        db
+        db,
+        events
     }) {
         if (!getMembersApi) {
             throw new IncorrectUsageError({message: 'Missing option getMembersApi'});
@@ -30,6 +32,7 @@ class LastSeenAtUpdater {
         this._getMembersApi = getMembersApi;
         this._settingsCacheService = settingsCache;
         this._db = db;
+        this._events = events;
     }
     /**
      * Subscribe to events of this domainEvents service
@@ -104,17 +107,27 @@ class LastSeenAtUpdater {
      * - memberLastSeenAt is 2022-02-27 23:00:00, timestamp is current time, then `last_seen_at` is set to the current time
      * - memberLastSeenAt is 2022-02-28 01:00:00, timestamp is current time, then `last_seen_at` isn't changed
      * @param {string} memberId The id of the member to be udpated
-     * @param {string|null} memberLastSeenAt The previous last_seen_at property value for the current member
      * @param {Date} timestamp The event timestamp
      */
     async updateLastSeenAt(memberId, memberLastSeenAt, timestamp) {
         const timezone = this._settingsCacheService.get('timezone');
+        // First, check if memberLastSeenAt is null or before the beginning of the current day in the publication timezone
+        // This isn't strictly necessary since we will fetch the member row for update and double check this
+        // This is an optimization to avoid unnecessary database queries if last_seen_at is already after the beginning of the current day
         if (memberLastSeenAt === null || moment(moment.utc(timestamp).tz(timezone).startOf('day')).isAfter(memberLastSeenAt)) {
             const membersApi = this._getMembersApi();
-            await membersApi.members.update({
-                last_seen_at: moment.utc(timestamp).format('YYYY-MM-DD HH:mm:ss')
-            }, {
-                id: memberId
+            await this._db.knex.transaction(async (trx) => {
+                // To avoid a race condition, we lock the member row for update, then the last_seen_at field again to prevent simultaneous updates
+                const currentMember = await membersApi.members.get({id: memberId}, {require: true, transacting: trx, forUpdate: true});
+                const currentMemberLastSeenAt = currentMember.get('last_seen_at');
+                if (currentMemberLastSeenAt === null || moment(moment.utc(timestamp).tz(timezone).startOf('day')).isAfter(currentMemberLastSeenAt)) {
+                    const memberToUpdate = await currentMember.refresh({transacting: trx, forUpdate: false, withRelated: ['labels', 'newsletters']});
+                    const updatedMember = await memberToUpdate.save({last_seen_at: moment.utc(timestamp).format('YYYY-MM-DD HH:mm:ss')}, {transacting: trx, patch: true, method: 'update'});
+                    // The standard event doesn't get emitted inside the transaction, so we do it manually
+                    this._events.emit('member.edited', updatedMember);
+                    return Promise.resolve(updatedMember);
+                }
+                return Promise.resolve(undefined);
             });
         }
     }
diff --git a/ghost/members-events-service/package.json b/ghost/members-events-service/package.json
index a0110e9a82b..4d431e5c92d 100644
--- a/ghost/members-events-service/package.json
+++ b/ghost/members-events-service/package.json
@@ -20,14 +20,14 @@
   "devDependencies": {
     "c8": "8.0.1",
     "mocha": "10.2.0",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
     "@tryghost/member-events": "0.0.0",
     "moment-timezone": "0.5.34"
   }
diff --git a/ghost/members-events-service/test/last-seen-at-updater.test.js b/ghost/members-events-service/test/last-seen-at-updater.test.js
index 49320ca6672..f3628e34034 100644
--- a/ghost/members-events-service/test/last-seen-at-updater.test.js
+++ b/ghost/members-events-service/test/last-seen-at-updater.test.js
@@ -6,11 +6,19 @@ const assert = require('assert/strict');
 const sinon = require('sinon');
 const {LastSeenAtUpdater} = require('../');
 const DomainEvents = require('@tryghost/domain-events');
-const {MemberPageViewEvent, MemberCommentEvent} = require('@tryghost/member-events');
+const {MemberPageViewEvent, MemberCommentEvent, MemberSubscribeEvent, MemberLinkClickEvent} = require('@tryghost/member-events');
 const moment = require('moment');
 const {EmailOpenedEvent} = require('@tryghost/email-events');
+const EventEmitter = require('events');
 
 describe('LastSeenAtUpdater', function () {
+    let events;
+
+    beforeEach(function () {
+        events = new EventEmitter();
+        DomainEvents.ee.removeAllListeners();
+    });
+
     it('Calls updateLastSeenAt on MemberPageViewEvents', async function () {
         const now = moment('2022-02-28T18:00:00Z').utc();
         const previousLastSeen = moment('2022-02-27T23:00:00Z').toISOString();
@@ -28,7 +36,8 @@ describe('LastSeenAtUpdater', function () {
                         update: stub
                     }
                 };
-            }
+            },
+            events
         });
         updater.subscribe(DomainEvents);
         sinon.stub(updater, 'updateLastSeenAt');
@@ -36,6 +45,32 @@ describe('LastSeenAtUpdater', function () {
         assert(updater.updateLastSeenAt.calledOnceWithExactly('1', previousLastSeen, now.toDate()));
     });
 
+    it('Calls updateLastSeenAt on MemberLinkClickEvents', async function () {
+        const now = moment('2022-02-28T18:00:00Z').utc();
+        const previousLastSeen = moment('2022-02-27T23:00:00Z').toISOString();
+        const stub = sinon.stub().resolves();
+        const settingsCache = sinon.stub().returns('Etc/UTC');
+        const updater = new LastSeenAtUpdater({
+            services: {
+                settingsCache: {
+                    get: settingsCache
+                }
+            },
+            getMembersApi() {
+                return {
+                    members: {
+                        update: stub
+                    }
+                };
+            },
+            events
+        });
+        updater.subscribe(DomainEvents);
+        sinon.stub(updater, 'updateLastSeenAt');
+        DomainEvents.dispatch(MemberLinkClickEvent.create({memberId: '1', memberLastSeenAt: previousLastSeen, url: '/'}, now.toDate()));
+        assert(updater.updateLastSeenAt.calledOnceWithExactly('1', previousLastSeen, now.toDate()));
+    });
+
     it('Calls updateLastSeenAt on email opened events', async function () {
         const now = moment('2022-02-28T18:00:00Z').utc();
         const settingsCache = sinon.stub().returns('Etc/UTC');
@@ -60,7 +95,8 @@ describe('LastSeenAtUpdater', function () {
             getMembersApi() {
                 return {};
             },
-            db
+            db,
+            events
         });
         updater.subscribe(DomainEvents);
         sinon.spy(updater, 'updateLastSeenAt');
@@ -87,7 +123,8 @@ describe('LastSeenAtUpdater', function () {
                         update: stub
                     }
                 };
-            }
+            },
+            events
         });
         updater.subscribe(DomainEvents);
         sinon.stub(updater, 'updateLastCommentedAt');
@@ -98,7 +135,11 @@ describe('LastSeenAtUpdater', function () {
     it('works correctly on another timezone (not updating last_seen_at)', async function () {
         const now = moment('2022-02-28T04:00:00Z').utc();
         const previousLastSeen = moment('2022-02-27T20:00:00Z').toISOString();
-        const stub = sinon.stub().resolves();
+        const transactionStub = sinon.stub().callsFake((callback) => {
+            return callback();
+        });
+        const saveStub = sinon.stub().resolves();
+        const getStub = sinon.stub().resolves({get: () => previousLastSeen, save: saveStub});
         const settingsCache = sinon.stub().returns('Asia/Bangkok');
         const updater = new LastSeenAtUpdater({
             services: {
@@ -109,13 +150,19 @@ describe('LastSeenAtUpdater', function () {
             getMembersApi() {
                 return {
                     members: {
-                        update: stub
+                        get: getStub
                     }
                 };
-            }
+            },
+            db: {
+                knex: {
+                    transaction: transactionStub
+                }
+            },
+            events
         });
         await updater.updateLastSeenAt('1', previousLastSeen, now.toDate());
-        assert(stub.notCalled, 'The LastSeenAtUpdater should attempt a member update when the new timestamp is within the same day in the publication timezone.');
+        assert(saveStub.notCalled, 'The LastSeenAtUpdater should attempt a member update when the new timestamp is within the same day in the publication timezone.');
     });
 
     it('works correctly on another timezone (not updating last_commented_at)', async function () {
@@ -143,7 +190,8 @@ describe('LastSeenAtUpdater', function () {
                         }
                     }
                 };
-            }
+            },
+            events
         });
         await updater.updateLastCommentedAt('1', now.toDate());
         assert(stub.notCalled, 'The LastSeenAtUpdater should attempt a member update when the new timestamp is within the same day in the publication timezone.');
@@ -152,7 +200,12 @@ describe('LastSeenAtUpdater', function () {
     it('works correctly on another timezone (updating last_seen_at)', async function () {
         const now = moment('2022-02-28T04:00:00Z').utc();
         const previousLastSeen = moment('2022-02-27T20:00:00Z').toISOString();
-        const stub = sinon.stub().resolves();
+        const transactionStub = sinon.stub().callsFake((callback) => {
+            return callback();
+        });
+        const saveStub = sinon.stub().resolves();
+        const refreshStub = sinon.stub().resolves({save: saveStub});
+        const getStub = sinon.stub().resolves({get: () => previousLastSeen, refresh: refreshStub});
         const settingsCache = sinon.stub().returns('Europe/Paris');
         const updater = new LastSeenAtUpdater({
             services: {
@@ -163,23 +216,32 @@ describe('LastSeenAtUpdater', function () {
             getMembersApi() {
                 return {
                     members: {
-                        update: stub
+                        get: getStub
                     }
                 };
-            }
+            },
+            db: {
+                knex: {
+                    transaction: transactionStub
+                }
+            },
+            events
         });
         await updater.updateLastSeenAt('1', previousLastSeen, now.toDate());
-        assert(stub.calledOnceWithExactly({
-            last_seen_at: now.format('YYYY-MM-DD HH:mm:ss')
-        }, {
-            id: '1'
-        }), 'The LastSeenAtUpdater should attempt a member update with the current date.');
+        assert(saveStub.calledOnceWithExactly(
+            sinon.match({last_seen_at: now.tz('utc').format('YYYY-MM-DD HH:mm:ss')}),
+            sinon.match({transacting: sinon.match.any, patch: true, method: 'update'})
+        ), 'The LastSeenAtUpdater should attempt a member update with the current date.');
     });
 
     it('Doesn\'t update when last_seen_at is too recent', async function () {
         const now = moment('2022-02-28T18:00:00Z');
         const previousLastSeen = moment('2022-02-28T00:00:00Z').toISOString();
-        const stub = sinon.stub().resolves();
+        const saveStub = sinon.stub().resolves();
+        const getStub = sinon.stub().resolves({get: () => previousLastSeen, save: saveStub});
+        const transactionStub = sinon.stub().callsFake((callback) => {
+            return callback();
+        });
         const settingsCache = sinon.stub().returns('Etc/UTC');
         const updater = new LastSeenAtUpdater({
             services: {
@@ -190,13 +252,19 @@ describe('LastSeenAtUpdater', function () {
             getMembersApi() {
                 return {
                     members: {
-                        update: stub
+                        get: getStub
                     }
                 };
-            }
+            },
+            db: {
+                knex: {
+                    transaction: transactionStub
+                }
+            },
+            events
         });
         await updater.updateLastSeenAt('1', previousLastSeen, now.toDate());
-        assert(stub.notCalled, 'The LastSeenAtUpdater should\'t update a member when the previous last_seen_at is close to the event timestamp.');
+        assert(saveStub.notCalled, 'The LastSeenAtUpdater should\'t update a member when the previous last_seen_at is close to the event timestamp.');
     });
 
     it('Doesn\'t update when last_commented_at is too recent', async function () {
@@ -224,7 +292,8 @@ describe('LastSeenAtUpdater', function () {
                         }
                     }
                 };
-            }
+            },
+            events
         });
         await updater.updateLastCommentedAt('1', now.toDate());
         assert(stub.notCalled, 'The LastSeenAtUpdater should\'t update a member');
@@ -255,7 +324,8 @@ describe('LastSeenAtUpdater', function () {
                         }
                     }
                 };
-            }
+            },
+            events
         });
         await updater.updateLastCommentedAt('1', now.toDate());
         assert(stub.notCalled, 'The LastSeenAtUpdater should\'t update a member.');
@@ -286,7 +356,8 @@ describe('LastSeenAtUpdater', function () {
                         }
                     }
                 };
-            }
+            },
+            events
         });
         await updater.updateLastCommentedAt('1', now.toDate());
         assert(stub.calledOnce, 'The LastSeenAtUpdater should attempt a member update');
@@ -324,7 +395,8 @@ describe('LastSeenAtUpdater', function () {
                         }
                     }
                 };
-            }
+            },
+            events
         });
         await updater.updateLastCommentedAt('1', now.toDate());
         assert(stub.calledOnce, 'The LastSeenAtUpdater should attempt a member update');
@@ -338,25 +410,26 @@ describe('LastSeenAtUpdater', function () {
     });
 
     it('Doesn\'t fire on other events', async function () {
-        const now = moment('2022-02-28T18:00:00Z');
-        const stub = sinon.stub().resolves();
-        const settingsCache = sinon.stub().returns('Etc/UTC');
+        const spy = sinon.spy();
         const updater = new LastSeenAtUpdater({
             services: {
                 settingsCache: {
-                    get: settingsCache
+                    get: () => 'Etc/UTC'
                 }
             },
             getMembersApi() {
                 return {
                     members: {
-                        update: stub
+                        update: spy
                     }
                 };
-            }
+            },
+            events
         });
-        await updater.updateLastSeenAt('1', undefined, now.toDate());
-        assert(stub.notCalled, 'The LastSeenAtUpdater should never fire on MemberPageViewEvent events.');
+        updater.subscribe(DomainEvents);
+        DomainEvents.dispatch(MemberSubscribeEvent.create({memberId: '1', source: 'api'}, new Date()));
+        await DomainEvents.allSettled();
+        assert(spy.notCalled, 'The LastSeenAtUpdater should never fire on MemberSubscribeEvent events.');
     });
 
     it('throws if getMembersApi is not passed to LastSeenAtUpdater', async function () {
@@ -372,4 +445,55 @@ describe('LastSeenAtUpdater', function () {
             });
         }, 'Missing option getMembersApi');
     });
+
+    it('avoids a race condition when updating last_seen_at', async function () {
+        const now = moment.utc('2022-02-28T18:00:00Z');
+        const saveStub = sinon.stub().resolves();
+        const refreshStub = sinon.stub().resolves({save: saveStub});
+        const settingsCache = sinon.stub().returns('Europe/Brussels');
+        const transactionStub = sinon.stub().callsFake((callback) => {
+            return callback();
+        });
+        const getStub = sinon.stub();
+        getStub.onFirstCall().resolves({get: () => null, save: saveStub, refresh: refreshStub});
+        getStub.onSecondCall().resolves({get: () => now.toDate(), save: saveStub, refresh: refreshStub});
+        getStub.resolves({get: () => now.toDate(), save: saveStub, refresh: refreshStub});
+        const updater = new LastSeenAtUpdater({
+            services: {
+                settingsCache: {
+                    get: settingsCache
+                }
+            },
+            getMembersApi() {
+                return {
+                    members: {
+                        get: getStub
+                    }
+                };
+            },
+            db: {
+                knex: {
+                    transaction: transactionStub
+                }
+            },
+            events
+        });
+        sinon.stub(events, 'emit');
+        await Promise.all([
+            updater.updateLastSeenAt('1', null, now.toDate()),
+            updater.updateLastSeenAt('1', null, now.toDate()),
+            updater.updateLastSeenAt('1', null, now.toDate()),
+            updater.updateLastSeenAt('1', null, now.toDate())
+        ]);
+        assert(saveStub.calledOnce, `The LastSeenAtUpdater should attempt a member update only once, but was called ${saveStub.callCount} times`);
+        assert(saveStub.calledOnceWithExactly(
+            sinon.match({last_seen_at: now.tz('utc').format('YYYY-MM-DD HH:mm:ss')}),
+            sinon.match({transacting: undefined, patch: true, method: 'update'})
+        ), 'The LastSeenAtUpdater should attempt a member update with the current date.');
+
+        assert(events.emit.calledOnceWithExactly(
+            'member.edited', 
+            sinon.match.any
+        ), 'The LastSeenAtUpdater should emit a member.edited event if it updated last_seen_at');
+    });
 });
diff --git a/ghost/members-importer/lib/MembersCSVImporter.js b/ghost/members-importer/lib/MembersCSVImporter.js
index fde1c9955c5..f4dc988ce24 100644
--- a/ghost/members-importer/lib/MembersCSVImporter.js
+++ b/ghost/members-importer/lib/MembersCSVImporter.js
@@ -1,6 +1,7 @@
 const moment = require('moment-timezone');
 const path = require('path');
 const fs = require('fs-extra');
+const metrics = require('@tryghost/metrics');
 const membersCSV = require('@tryghost/members-csv');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
@@ -33,7 +34,7 @@ const DEFAULT_CSV_HEADER_MAPPING = {
  * @property {Function} getTimezone - function returning currently configured timezone
  * @property {() => Object} getMembersRepository - member model access instance for data access and manipulation
  * @property {() => Promise<import('@tryghost/tiers/lib/Tier')>} getDefaultTier - async function returning default Member Tier
- * @property {() => Promise<import('@tryghost/tiers/lib/Tier')>} getTierByName - async function returning Member Tier by name
+ * @property {(string) => Promise<import('@tryghost/tiers/lib/Tier')>} getTierByName - async function returning Member Tier by name
  * @property {Function} sendEmail - function sending an email
  * @property {(string) => boolean} isSet - Method checking if specific feature is enabled
  * @property {({job, offloaded, name}) => void} addJob - Method registering an async job
@@ -119,6 +120,7 @@ module.exports = class MembersCSVImporter {
      * @param {string} filePath - the path to a "prepared" CSV file
      */
     async perform(filePath) {
+        const performStart = Date.now();
         const rows = await membersCSV.parse(filePath, DEFAULT_CSV_HEADER_MAPPING);
 
         const defaultTier = await this._getDefaultTier();
@@ -176,6 +178,14 @@ module.exports = class MembersCSVImporter {
                         memberValues.subscribed = false;
                     }
 
+                    // Don't overwrite name or note if they are blank in the file
+                    if (!row.name) {
+                        memberValues.name = existingMember.name;
+                    }
+                    if (!row.note) {
+                        memberValues.note = existingMember.note;
+                    }
+
                     member = await membersRepository.update({
                         ...memberValues,
                         labels: existingLabels.concat(memberValues.labels)
@@ -273,6 +283,12 @@ module.exports = class MembersCSVImporter {
             archivableStripePriceIds.map(stripePriceId => this._stripeUtils.archivePrice(stripePriceId))
         );
 
+        metrics.metric({
+            imported: result.imported,
+            errors: result.errors.length,
+            value: Date.now() - performStart
+        });
+
         return {
             total: result.imported + result.errors.length,
             ...result
diff --git a/ghost/members-importer/lib/MembersCSVImporterStripeUtils.js b/ghost/members-importer/lib/MembersCSVImporterStripeUtils.js
index 82f19adb402..113d97295a4 100644
--- a/ghost/members-importer/lib/MembersCSVImporterStripeUtils.js
+++ b/ghost/members-importer/lib/MembersCSVImporterStripeUtils.js
@@ -153,7 +153,8 @@ module.exports = class MembersCSVImporterStripeUtils {
             await this._stripeAPIService.updateSubscriptionItemPrice(
                 stripeSubscription.id,
                 stripeSubscriptionItem.id,
-                newStripePrice.id
+                newStripePrice.id,
+                {prorationBehavior: 'none'}
             );
 
             stripePriceId = newStripePrice.id;
@@ -167,7 +168,8 @@ module.exports = class MembersCSVImporterStripeUtils {
                 await this._stripeAPIService.updateSubscriptionItemPrice(
                     stripeSubscription.id,
                     stripeSubscriptionItem.id,
-                    stripePriceId
+                    stripePriceId,
+                    {prorationBehavior: 'none'}
                 );
             }
         }
diff --git a/ghost/members-importer/package.json b/ghost/members-importer/package.json
index 8ef1ce965a7..7727b98d4a9 100644
--- a/ghost/members-importer/package.json
+++ b/ghost/members-importer/package.json
@@ -19,16 +19,17 @@
   ],
   "devDependencies": {
     "c8": "8.0.1",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
     "@tryghost/members-csv": "0.0.0",
-    "@tryghost/tpl": "0.1.24",
-    "moment-timezone": "0.5.23"
+    "@tryghost/metrics": "1.0.34",
+    "@tryghost/tpl": "0.1.32",
+    "moment-timezone": "0.5.45"
   }
 }
diff --git a/ghost/members-importer/test/MembersCSVImporter.test.js b/ghost/members-importer/test/MembersCSVImporter.test.js
index 06ff3ebe30f..217763c1a74 100644
--- a/ghost/members-importer/test/MembersCSVImporter.test.js
+++ b/ghost/members-importer/test/MembersCSVImporter.test.js
@@ -25,7 +25,7 @@ describe('MembersCSVImporter', function () {
         email: 'email',
         name: 'name',
         note: 'note',
-        subscribed_to_emails: 'subscribed',
+        subscribed_to_emails: 'subscribed_to_emails',
         created_at: 'created_at',
         complimentary_plan: 'complimentary_plan',
         stripe_customer_id: 'stripe_customer_id',
@@ -221,6 +221,222 @@ describe('MembersCSVImporter', function () {
             }]);
             should.deepEqual(membersRepositoryStub.update.args[0][1].id, 'test_member_id');
         });
+
+        it('should subscribe or unsubscribe members as per the `subscribe_to_emails` column', async function () {
+            /**
+             * @NOTE This tests all the different scenarios for the `subscribed_to_emails` column for existing and new members
+             * For existing members with at least one newsletter subscription:
+             * CASE 1: If `subscribe_to_emails` is `true`, the member should remain subscribed (but not added to any additional newsletters)
+             * CASE 2: If `subscribe_to_emails` is `false`, the member should be unsubscribed from all newsletters
+             * CASE 3: If `subscribe_to_emails` is NULL, the member should remain subscribed (but not added to any additional newsletters)
+             * CASE 4: If `subscribe_to_emails` is empty, the member should remain subscribed (but not added to any additional newsletters)
+             * CASE 5: If `subscribe_to_emails` is invalid, the member should remain subscribed (but not added to any additional newsletters)
+             * 
+             * 
+             * For existing members with no newsletter subscriptions:
+             * CASE 6: If `subscribe_to_emails` is `true`, the member should remain unsubscribed (as they likely have previously unsubscribed)
+             * CASE 7: If `subscribe_to_emails` is `false`, the member should remain unsubscribed
+             * CASE 8: If `subscribe_to_emails` is NULL, the member should remain unsubscribed
+             * CASE 9: If `subscribe_to_emails` is empty, the member should remain unsubscribed
+             * CASE 10: If `subscribe_to_emails` is invalid, the member should remain unsubscribed
+             *
+             * - In summary, an existing member with no pre-existing newsletter subscriptions should _never_ be subscribed to newsletters upon import
+             * 
+             * For new members:
+             * CASE 11: If `subscribe_to_emails` is `true`, the member should be created and subscribed
+             * CASE 12: If `subscribe_to_emails` is `false`, the member should be created but not subscribed
+             * CASE 13: If `subscribe_to_emails` is NULL, the member should be created and subscribed
+             * CASE 14: If `subscribe_to_emails` is empty, the member should be created and subscribed
+             * CASE 15: If `subscribe_to_emails` is invalid, the member should be created and subscribed
+             */
+
+            const internalLabel = {
+                name: 'Test Subscription Import'
+            };
+            const LabelModelStub = {
+                findOne: sinon.stub()
+                    .withArgs({
+                        name: 'Test Subscription Import'
+                    })
+                    .resolves({
+                        name: 'Test Subscription Import'
+                    })
+            };
+
+            const importer = buildMockImporterInstance();
+
+            const defaultNewsletters = [
+                {id: 'newsletter_1'},
+                {id: 'newsletter_2'}
+            ];
+
+            const existingMembers = [
+                {email: 'member_subscribed_true@example.com', newsletters: defaultNewsletters},
+                {email: 'member_subscribed_null@example.com', newsletters: defaultNewsletters},
+                {email: 'member_subscribed_false@example.com', newsletters: defaultNewsletters},
+                {email: 'member_subscribed_empty@example.com', newsletters: defaultNewsletters},
+                {email: 'member_subscribed_invalid@example.com', newsletters: defaultNewsletters},
+                {email: 'member_not_subscribed_true@example.com', newsletters: []},
+                {email: 'member_not_subscribed_null@example.com', newsletters: []},
+                {email: 'member_not_subscribed_false@example.com', newsletters: []},
+                {email: 'member_not_subscribed_empty@example.com', newsletters: []},
+                {email: 'member_not_subscribed_invalid@example.com', newsletters: []}
+            ];
+
+            membersRepositoryStub.get = sinon.stub();
+
+            for (const existingMember of existingMembers) {
+                const newslettersCollection = {
+                    length: existingMember.newsletters.length,
+                    toJSON: sinon.stub().returns(existingMember.newsletters)
+                };
+                const memberRecord = {
+                    related: sinon.stub()
+                };
+                memberRecord.related.withArgs('labels').returns(null);
+                memberRecord.related.withArgs('newsletters').returns(newslettersCollection);
+                membersRepositoryStub.get.withArgs({email: existingMember.email}).resolves(memberRecord);
+            }
+
+            const result = await importer.process({
+                pathToCSV: `${csvPath}/subscribed-to-emails-cases.csv`,
+                headerMapping: defaultAllowedFields,
+                importLabel: {
+                    name: 'Test Subscription Import'
+                },
+                user: {
+                    email: 'test@example.com'
+                },
+                LabelModel: LabelModelStub,
+                forceInline: true,
+                verificationTrigger: {
+                    testImportThreshold: () => {}
+                }
+            });
+
+            should.exist(result.meta);
+            should.exist(result.meta.stats);
+            should.exist(result.meta.stats.imported);
+            result.meta.stats.imported.should.equal(5);
+
+            should.exist(result.meta.stats.invalid);
+            should.deepEqual(result.meta.import_label, internalLabel);
+
+            should.exist(result.meta.originalImportSize);
+            result.meta.originalImportSize.should.equal(15);
+
+            fsWriteSpy.calledOnce.should.be.true();
+
+            // member records get inserted
+            should.equal(membersRepositoryStub.create.callCount, 5);
+
+            should.equal(membersRepositoryStub.create.args[0][1].context.import, true, 'inserts are done in the "import" context');
+
+            // CASE 1: Existing member with at least one newsletter subscription, `subscribed_to_emails` column is true
+            // Member's newsletter subscriptions should not change
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[0][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels', 'newsletters']);
+            should.equal(membersRepositoryStub.update.args[0][0].email, 'member_subscribed_true@example.com');
+            should.equal(membersRepositoryStub.update.args[0][0].subscribed, true);
+            should.deepEqual(membersRepositoryStub.update.args[0][0].newsletters, defaultNewsletters);
+
+            // CASE 2: Existing member with at least one newsletter subscription, `subscribed_to_emails` column is false
+            // Member's newsletter subscriptions should be removed
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[1][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.update.args[1][0].email, 'member_subscribed_false@example.com');
+            should.equal(membersRepositoryStub.update.args[1][0].subscribed, false);
+            should.equal(membersRepositoryStub.update.args[1][0].newsletters, undefined);
+
+            // CASE 3: Existing member with at least one newsletter subscription, `subscribed_to_emails` column is NULL
+            // Member's newsletter subscriptions should not change
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[2][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels', 'newsletters']);
+            should.equal(membersRepositoryStub.update.args[2][0].email, 'member_subscribed_null@example.com');
+            should.equal(membersRepositoryStub.update.args[2][0].subscribed, true);
+            should.deepEqual(membersRepositoryStub.update.args[2][0].newsletters, defaultNewsletters);
+
+            // CASE 4: Existing member with at least one newsletter subscription, `subscribed_to_emails` column is empty
+            // Member's newsletter subscriptions should not change
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[3][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels', 'newsletters']);
+            should.equal(membersRepositoryStub.update.args[3][0].email, 'member_subscribed_empty@example.com');
+            should.equal(membersRepositoryStub.update.args[3][0].subscribed, true);
+            should.deepEqual(membersRepositoryStub.update.args[3][0].newsletters, defaultNewsletters);
+
+            // CASE 5: Existing member with at least one newsletter subscription, `subscribed_to_emails` column is invalid
+            // Member's newsletter subscriptions should not change
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[4][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels', 'newsletters']);
+            should.equal(membersRepositoryStub.update.args[4][0].email, 'member_subscribed_invalid@example.com');
+            should.equal(membersRepositoryStub.update.args[4][0].subscribed, true);
+            should.deepEqual(membersRepositoryStub.update.args[4][0].newsletters, defaultNewsletters);
+
+            // CASE 6: Existing member with no newsletter subscriptions, `subscribed_to_emails` column is true
+            // Member should remain unsubscribed and not added to any newsletters
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[5][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.update.args[5][0].email, 'member_not_subscribed_true@example.com');
+            should.equal(membersRepositoryStub.update.args[5][0].subscribed, false);
+            should.equal(membersRepositoryStub.update.args[5][0].newsletters, undefined);
+
+            // CASE 7: Existing member with no newsletter subscriptions, `subscribed_to_emails` column is false
+            // Member should remain unsubscribed and not added to any newsletters
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[6][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.update.args[6][0].email, 'member_not_subscribed_false@example.com');
+            should.equal(membersRepositoryStub.update.args[6][0].subscribed, false);
+            should.equal(membersRepositoryStub.update.args[6][0].newsletters, undefined);
+
+            // CASE 8: Existing member with no newsletter subscriptions, `subscribed_to_emails` column is NULL
+            // Member should remain unsubscribed and not added to any newsletters
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[7][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.update.args[7][0].email, 'member_not_subscribed_null@example.com');
+            should.equal(membersRepositoryStub.update.args[7][0].subscribed, false);
+            should.equal(membersRepositoryStub.update.args[7][0].newsletters, undefined);
+
+            // CASE 9: Existing member with no newsletter subscriptions, `subscribed_to_emails` column is empty
+            // Member should remain unsubscribed and not added to any newsletters
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[8][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.update.args[8][0].email, 'member_not_subscribed_empty@example.com');
+            should.equal(membersRepositoryStub.update.args[8][0].subscribed, false);
+            should.equal(membersRepositoryStub.update.args[8][0].newsletters, undefined);
+
+            // CASE 10: Existing member with no newsletter subscriptions, `subscribed_to_emails` column is invalid
+            // Member should remain unsubscribed and not added to any newsletters
+            should.deepEqual(Object.keys(membersRepositoryStub.update.args[9][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.update.args[9][0].email, 'member_not_subscribed_invalid@example.com');
+            should.equal(membersRepositoryStub.update.args[9][0].subscribed, false);
+            should.equal(membersRepositoryStub.update.args[9][0].newsletters, undefined);
+
+            // CASE 11: New member, `subscribed_to_emails` column is true
+            // Member should be created and subscribed
+            should.deepEqual(Object.keys(membersRepositoryStub.create.args[0][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.create.args[0][0].email, 'new_member_true@example.com');
+            should.equal(membersRepositoryStub.create.args[0][0].subscribed, true);
+            should.equal(membersRepositoryStub.create.args[0][0].newsletters, undefined);
+
+            // CASE 12: New member, `subscribed_to_emails` column is false
+            // Member should be created but not subscribed
+            should.deepEqual(Object.keys(membersRepositoryStub.create.args[1][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.create.args[1][0].email, 'new_member_false@example.com');
+            should.equal(membersRepositoryStub.create.args[1][0].subscribed, false);
+            should.equal(membersRepositoryStub.create.args[1][0].newsletters, undefined);
+
+            // CASE 13: New member, `subscribed_to_emails` column is NULL
+            // Member should be created but not subscribed
+            should.deepEqual(Object.keys(membersRepositoryStub.create.args[2][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.create.args[2][0].email, 'new_member_null@example.com');
+            should.equal(membersRepositoryStub.create.args[2][0].subscribed, true);
+            should.equal(membersRepositoryStub.create.args[2][0].newsletters, undefined);
+
+            // CASE 14: New member, `subscribed_to_emails` column is empty
+            // Member should be created but not subscribed
+            should.deepEqual(Object.keys(membersRepositoryStub.create.args[3][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.create.args[3][0].email, 'new_member_empty@example.com');
+            should.equal(membersRepositoryStub.create.args[3][0].subscribed, true);
+            should.equal(membersRepositoryStub.create.args[3][0].newsletters, undefined);
+
+            // CASE 15: New member, `subscribed_to_emails` column is invalid
+            // Member should be created but not subscribed
+            should.deepEqual(Object.keys(membersRepositoryStub.create.args[4][0]), ['email', 'name', 'note', 'subscribed', 'created_at', 'labels']);
+            should.equal(membersRepositoryStub.create.args[4][0].email, 'new_member_invalid@example.com');
+            should.equal(membersRepositoryStub.create.args[4][0].subscribed, true);
+            should.equal(membersRepositoryStub.create.args[4][0].newsletters, undefined);
+        });
     });
 
     describe('sendErrorEmail', function () {
@@ -394,6 +610,30 @@ describe('MembersCSVImporter', function () {
             assert.deepEqual(membersRepositoryStub.update.args[0][0].newsletters, newsletters);
         });
 
+        it('does not overwrite name or note fields for existing members when left blank in the import file', async function () {
+            const importer = buildMockImporterInstance();
+
+            const member = {
+                name: 'John Bloggs',
+                note: 'A note',
+                related: sinon.stub()
+            };
+
+            member.related.withArgs('labels').returns(null);
+            member.related.withArgs('newsletters').returns({length: 0});
+
+            membersRepositoryStub.get = sinon.stub();
+
+            membersRepositoryStub.get
+                .withArgs({email: 'test@example.com'})
+                .resolves(member);
+
+            await importer.perform(`${csvPath}/single-column-with-header.csv`);
+
+            assert.equal(membersRepositoryStub.update.args[0][0].name, 'John Bloggs');
+            assert.equal(membersRepositoryStub.update.args[0][0].note, 'A note');
+        });
+
         it('does not add subscriptions for existing member when they do not have any subscriptions', async function () {
             const importer = buildMockImporterInstance();
 
diff --git a/ghost/members-importer/test/MembersCSVImporterStripeUtils.test.js b/ghost/members-importer/test/MembersCSVImporterStripeUtils.test.js
index 9b1176613d9..f76159c72e4 100644
--- a/ghost/members-importer/test/MembersCSVImporterStripeUtils.test.js
+++ b/ghost/members-importer/test/MembersCSVImporterStripeUtils.test.js
@@ -304,7 +304,8 @@ describe('MembersCSVImporterStripeUtils', function () {
             stripeAPIServiceStub.updateSubscriptionItemPrice.calledWithExactly(
                 stripeCustomer.subscriptions.data[0].id,
                 stripeCustomerSubscriptionItem.id,
-                GHOST_PRODUCT_STRIPE_PRICE_ID
+                GHOST_PRODUCT_STRIPE_PRICE_ID,
+                {prorationBehavior: 'none'}
             ).should.be.true();
         });
 
@@ -346,7 +347,8 @@ describe('MembersCSVImporterStripeUtils', function () {
             stripeAPIServiceStub.updateSubscriptionItemPrice.calledWithExactly(
                 stripeCustomer.subscriptions.data[0].id,
                 stripeCustomerSubscriptionItem.id,
-                NEW_STRIPE_PRICE_ID
+                NEW_STRIPE_PRICE_ID,
+                {prorationBehavior: 'none'}
             ).should.be.true();
         });
 
diff --git a/ghost/members-importer/test/fixtures/subscribed-to-emails-cases.csv b/ghost/members-importer/test/fixtures/subscribed-to-emails-cases.csv
new file mode 100644
index 00000000000..4af2abd400f
--- /dev/null
+++ b/ghost/members-importer/test/fixtures/subscribed-to-emails-cases.csv
@@ -0,0 +1,16 @@
+email,name,note,subscribed_to_emails,stripe_customer_id,complimentary_plan,labels,created_at
+member_subscribed_true@example.com,Test Email,This is a test template for importing your members list to Ghost,true,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_subscribed_false@example.com,Test Email,This is a test template for importing your members list to Ghost,false,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_subscribed_null@example.com,Test Email,This is a test template for importing your members list to Ghost,null,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_subscribed_empty@example.com,Test Email,This is a test template for importing your members list to Ghost,,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_subscribed_invalid@example.com,Test Email,This is a test template for importing your members list to Ghost,asdfasdf,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_not_subscribed_true@example.com,Test Email,This is a test template for importing your members list to Ghost,true,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_not_subscribed_false@example.com,Test Email,This is a test template for importing your members list to Ghost,false,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_not_subscribed_null@example.com,Test Email,This is a test template for importing your members list to Ghost,null,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_not_subscribed_empty@example.com,Test Email,This is a test template for importing your members list to Ghost,,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+member_not_subscribed_invalid@example.com,Test Email,This is a test template for importing your members list to Ghost,asdfasdf,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+new_member_true@example.com,Test Email,This is a test template for importing your members list to Ghost,true,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+new_member_false@example.com,Test Email,This is a test template for importing your members list to Ghost,false,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+new_member_null@example.com,Test Email,This is a test template for importing your members list to Ghost,null,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+new_member_empty@example.com,Test Email,This is a test template for importing your members list to Ghost,,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
+new_member_invalid@example.com,Test Email,This is a test template for importing your members list to Ghost,asdfasdf,Example: cus_GdsYH4fZbHx9hF,false,"vip,promotion",2019-10-30T14:52:08.000Z
\ No newline at end of file
diff --git a/ghost/members-ssr/lib/members-ssr.js b/ghost/members-ssr/lib/members-ssr.js
index d0b394887d7..3511503a4c4 100644
--- a/ghost/members-ssr/lib/members-ssr.js
+++ b/ghost/members-ssr/lib/members-ssr.js
@@ -18,6 +18,8 @@ const {
 
 /**
  * @typedef {object} Member
+ * @prop {string} id
+ * @prop {string} transient_id
  * @prop {string} email
  */
 
@@ -109,6 +111,11 @@ class MembersSSR {
     _removeSessionCookie(req, res) {
         const cookies = this._getCookies(req, res);
         cookies.set(this.sessionCookieName, null, this.sessionCookieOptions);
+        // If members caching cookies are set, remove them
+        if (cookies.get('ghost-access') || cookies.get('ghost-access-hmac')) {
+            cookies.set('ghost-access', null, {...this.sessionCookieOptions, signed: false});
+            cookies.set('ghost-access-hmac', null, {...this.sessionCookieOptions, signed: false});
+        }
     }
 
     /**
@@ -169,6 +176,18 @@ class MembersSSR {
         return api.getMemberIdentityData(email);
     }
 
+    /**
+     * @method _getMemberIdentityData
+     *
+     * @param {string} transientId
+     *
+     * @returns {Promise<Member>} member
+     */
+    async _getMemberIdentityDataFromTransientId(transientId) {
+        const api = await this._getMembersApi();
+        return api.getMemberIdentityDataFromTransientId(transientId);
+    }
+
     /**
      * @method _getMemberIdentityToken
      *
@@ -176,9 +195,9 @@ class MembersSSR {
      *
      * @returns {Promise<JWT>} member
      */
-    async _getMemberIdentityToken(email) {
+    async _getMemberIdentityToken(transientId) {
         const api = await this._getMembersApi();
-        return api.getMemberIdentityToken(email);
+        return api.getMemberIdentityToken(transientId);
     }
 
     /**
@@ -235,11 +254,16 @@ class MembersSSR {
             }
         }
 
-        this._setSessionCookie(req, res, member.email);
+        this._setSessionCookie(req, res, member.transient_id);
 
         return member;
     }
 
+    async _cycleTransientId(memberId) {
+        const api = await this._getMembersApi();
+        return api.cycleTransientId(memberId);
+    }
+
     /**
      * @method deleteSession
      * @param {Request} req
@@ -248,6 +272,13 @@ class MembersSSR {
      * @returns {Promise<void>}
      */
     async deleteSession(req, res) {
+        if (req.body && typeof req.body === 'object' && req.body.all) {
+            // Update transient_id to invalidate all sessions
+            const member = await this.getMemberDataFromSession(req, res);
+            if (member) {
+                await this._cycleTransientId(member.id);
+            }
+        }
         this._removeSessionCookie(req, res);
     }
 
@@ -260,9 +291,8 @@ class MembersSSR {
      * @returns {Promise<Member>}
      */
     async getMemberDataFromSession(req, res) {
-        const email = this._getSessionCookies(req, res);
-
-        const member = await this._getMemberIdentityData(email);
+        const transientId = this._getSessionCookies(req, res);
+        const member = await this._getMemberIdentityDataFromTransientId(transientId);
         return member;
     }
 
@@ -275,10 +305,10 @@ class MembersSSR {
      * @returns {Promise<JWT>} identity token
      */
     async getIdentityTokenForMemberFromSession(req, res) {
-        const email = this._getSessionCookies(req, res);
-        const token = await this._getMemberIdentityToken(email);
+        const transientId = this._getSessionCookies(req, res);
+        const token = await this._getMemberIdentityToken(transientId);
         if (!token) {
-            this.deleteSession(req, res);
+            await this.deleteSession(req, res);
             throw new BadRequestError({
                 message: 'Invalid session, could not get identity token'
             });
diff --git a/ghost/members-ssr/package.json b/ghost/members-ssr/package.json
index 3c9895f2462..72a485a8dec 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.9.0",
     "c8": "8.0.1",
     "keypair": "1.0.4",
     "mocha": "10.2.0",
@@ -26,9 +26,9 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
-    "@tryghost/errors": "1.2.26",
-    "cookies": "0.8.0",
+    "@tryghost/debug": "0.1.32",
+    "@tryghost/errors": "1.3.5",
+    "cookies": "0.9.1",
     "jsonwebtoken": "8.5.1"
   }
 }
diff --git a/ghost/milestones/package.json b/ghost/milestones/package.json
index 8bba709441e..0723edd9cb2 100644
--- a/ghost/milestones/package.json
+++ b/ghost/milestones/package.json
@@ -23,7 +23,7 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
+    "@tryghost/errors": "1.3.5",
     "bson-objectid": "2.0.4"
   }
 }
diff --git a/ghost/minifier/package.json b/ghost/minifier/package.json
index f74bb3a1595..6cafd69752b 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/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/debug": "0.1.32",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/tpl": "0.1.32",
     "csso": "5.0.5",
-    "terser": "5.22.0",
+    "terser": "5.31.6",
     "tiny-glob": "0.2.9"
   }
 }
diff --git a/ghost/model-to-domain-event-interceptor/package.json b/ghost/model-to-domain-event-interceptor/package.json
index 961fc9632d9..70383339d97 100644
--- a/ghost/model-to-domain-event-interceptor/package.json
+++ b/ghost/model-to-domain-event-interceptor/package.json
@@ -7,8 +7,8 @@
     "main": "build/index.js",
     "types": "build/index.d.ts",
     "scripts": {
-        "build": "tsc",
-        "build:ts": "yarn build",
+        "build": "yarn build:ts",
+        "build:ts": "tsc",
         "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
         "test": "yarn test:types && yarn test:unit",
         "test:types": "tsc --noEmit",
diff --git a/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js b/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js
index ef3afbaeb33..8c34de63fb8 100644
--- a/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js
+++ b/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js
@@ -7,7 +7,7 @@ const versionMismatchHandler = (APIVersionCompatibilityService) => {
      * @param {import('express').Response} res
      * @param {import('express').NextFunction} next
      */
-    return async (err, req, res, next) => {
+    return async function versionMismatchHandlerMiddleware(err, req, res, next) {
         if (err && err.errorType === 'RequestNotAcceptableError') {
             if (err.code === 'UPDATE_CLIENT') {
                 const {key, type} = extractApiKey(req);
@@ -24,7 +24,7 @@ const versionMismatchHandler = (APIVersionCompatibilityService) => {
             }
         }
 
-        next(err, req, res);
+        next(err);
     };
 };
 
diff --git a/ghost/mw-api-version-mismatch/package.json b/ghost/mw-api-version-mismatch/package.json
index 032d86db444..727eedf4551 100644
--- a/ghost/mw-api-version-mismatch/package.json
+++ b/ghost/mw-api-version-mismatch/package.json
@@ -18,7 +18,7 @@
     "lib"
   ],
   "devDependencies": {
-    "@tryghost/errors": "1.2.26",
+    "@tryghost/errors": "1.3.5",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
diff --git a/ghost/mw-error-handler/lib/mw-error-handler.js b/ghost/mw-error-handler/lib/mw-error-handler.js
index e3cff03b1ec..d2dafe7ec90 100644
--- a/ghost/mw-error-handler/lib/mw-error-handler.js
+++ b/ghost/mw-error-handler/lib/mw-error-handler.js
@@ -9,6 +9,7 @@ const tpl = require('@tryghost/tpl');
 
 const messages = {
     genericError: 'An unexpected error occurred, please try again.',
+    invalidValue: 'Invalid value',
     pageNotFound: 'Page not found',
     resourceNotFound: 'Resource not found',
     methodNotAcceptableVersionAhead: {
@@ -21,6 +22,7 @@ const messages = {
         context: 'Provided client accept-version {acceptVersion} is behind current Ghost version {ghostVersion}.',
         help: 'Try upgrading your Ghost API client.'
     },
+    badVersion: 'Requested version is not supported.',
     actions: {
         images: {
             upload: 'upload image'
@@ -63,7 +65,7 @@ function isDependencyInStack(dependency, err) {
 /**
  * Get an error ready to be shown the the user
  */
-module.exports.prepareError = (err, req, res, next) => {
+module.exports.prepareError = function prepareError(err, req, res, next) {
     debug(err);
 
     if (Array.isArray(err)) {
@@ -87,6 +89,25 @@ module.exports.prepareError = (err, req, res, next) => {
                 message: err.message,
                 statusCode: err.statusCode
             });
+        // 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;
+
+            if (err.code === 'ER_WRONG_VALUE') {
+                err = new errors.ValidationError({
+                    message: tpl(messages.invalidValue),
+                    context: err.message,
+                    err
+                });
+            } else {
+                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({
@@ -108,7 +129,7 @@ module.exports.prepareError = (err, req, res, next) => {
     next(err);
 };
 
-module.exports.prepareStack = (err, req, res, next) => { // eslint-disable-line no-unused-vars
+module.exports.prepareStack = function prepareStack(err, req, res, next) { // eslint-disable-line no-unused-vars
     const clonedError = prepareStackForUser(err);
 
     next(clonedError);
@@ -121,7 +142,7 @@ module.exports.prepareStack = (err, req, res, next) => { // eslint-disable-line
  * @param {import('express').Response} res
  * @param {import('express').NextFunction} next
  */
-module.exports.jsonErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
+module.exports.jsonErrorRenderer = function jsonErrorRenderer(err, req, res, next) { // eslint-disable-line no-unused-vars
     const userError = prepareUserMessage(err, req);
 
     res.json({
@@ -143,8 +164,8 @@ module.exports.jsonErrorRenderer = (err, req, res, next) => { // eslint-disable-
  *
  * @param {String} [cacheControlHeaderValue] cache-control header value
  */
-module.exports.prepareErrorCacheControl = (cacheControlHeaderValue) => {
-    return (err, req, res, next) => {
+module.exports.prepareErrorCacheControl = function prepareErrorCacheControl(cacheControlHeaderValue) {
+    return function prepareErrorCacheControlInner(err, req, res, next) {
         let cacheControl = cacheControlHeaderValue;
         if (!cacheControlHeaderValue) {
             // never cache errors unless it's a 404
@@ -164,7 +185,7 @@ module.exports.prepareErrorCacheControl = (cacheControlHeaderValue) => {
     };
 };
 
-const prepareUserMessage = (err, req) => {
+const prepareUserMessage = function prepareUserMessage(err, req) {
     const userError = {
         message: err.message,
         context: err.context
@@ -214,49 +235,57 @@ const prepareUserMessage = (err, req) => {
     return userError;
 };
 
-module.exports.resourceNotFound = (req, res, next) => {
-    if (req && req.headers && req.headers['accept-version']
-        && res.locals && res.locals.safeVersion
-        && semver.compare(semver.coerce(req.headers['accept-version']), semver.coerce(res.locals.safeVersion)) !== 0) {
-        const versionComparison = semver.compare(
-            semver.coerce(req.headers['accept-version']),
-            semver.coerce(res.locals.safeVersion)
-        );
-
-        let notAcceptableError;
-        if (versionComparison === 1) {
-            notAcceptableError = new errors.RequestNotAcceptableError({
-                message: tpl(
-                    messages.methodNotAcceptableVersionAhead.message
-                ),
-                context: tpl(messages.methodNotAcceptableVersionAhead.context, {
-                    acceptVersion: req.headers['accept-version'],
-                    ghostVersion: `v${res.locals.safeVersion}`
-                }),
-                help: tpl(messages.methodNotAcceptableVersionAhead.help),
-                code: 'UPDATE_GHOST'
-            });
-        } else {
-            notAcceptableError = new errors.RequestNotAcceptableError({
-                message: tpl(
-                    messages.methodNotAcceptableVersionBehind.message
-                ),
-                context: tpl(messages.methodNotAcceptableVersionBehind.context, {
-                    acceptVersion: req.headers['accept-version'],
-                    ghostVersion: `v${res.locals.safeVersion}`
-                }),
-                help: tpl(messages.methodNotAcceptableVersionBehind.help),
-                code: 'UPDATE_CLIENT'
-            });
+module.exports.resourceNotFound = function resourceNotFound(req, res, next) {
+    if (req?.headers?.['accept-version'] && res.locals?.safeVersion) {
+        // Protect against invalid `Accept-Version` headers
+        const acceptVersionSemver = semver.coerce(req.headers['accept-version']);
+        if (!acceptVersionSemver) {
+            return next(new errors.BadRequestError({
+                message: tpl(messages.badVersion)
+            }));
         }
 
-        next(notAcceptableError);
-    } else {
-        next(new errors.NotFoundError({message: tpl(messages.resourceNotFound)}));
+        if (semver.compare(acceptVersionSemver, semver.coerce(res.locals.safeVersion)) !== 0) {
+            const versionComparison = semver.compare(
+                acceptVersionSemver,
+                semver.coerce(res.locals.safeVersion)
+            );
+
+            let notAcceptableError;
+            if (versionComparison === 1) {
+                notAcceptableError = new errors.RequestNotAcceptableError({
+                    message: tpl(
+                        messages.methodNotAcceptableVersionAhead.message
+                    ),
+                    context: tpl(messages.methodNotAcceptableVersionAhead.context, {
+                        acceptVersion: req.headers['accept-version'],
+                        ghostVersion: `v${res.locals.safeVersion}`
+                    }),
+                    help: tpl(messages.methodNotAcceptableVersionAhead.help),
+                    code: 'UPDATE_GHOST'
+                });
+            } else {
+                notAcceptableError = new errors.RequestNotAcceptableError({
+                    message: tpl(
+                        messages.methodNotAcceptableVersionBehind.message
+                    ),
+                    context: tpl(messages.methodNotAcceptableVersionBehind.context, {
+                        acceptVersion: req.headers['accept-version'],
+                        ghostVersion: `v${res.locals.safeVersion}`
+                    }),
+                    help: tpl(messages.methodNotAcceptableVersionBehind.help),
+                    code: 'UPDATE_CLIENT'
+                });
+            }
+
+            return next(notAcceptableError);
+        }
     }
+
+    next(new errors.NotFoundError({message: tpl(messages.resourceNotFound)}));
 };
 
-module.exports.pageNotFound = (req, res, next) => {
+module.exports.pageNotFound = function pageNotFound(req, res, next) {
     next(new errors.NotFoundError({message: tpl(messages.pageNotFound)}));
 };
 
diff --git a/ghost/mw-error-handler/package.json b/ghost/mw-error-handler/package.json
index d188c55cbf6..15130d7b9e3 100644
--- a/ghost/mw-error-handler/package.json
+++ b/ghost/mw-error-handler/package.json
@@ -20,15 +20,14 @@
   "devDependencies": {
     "c8": "8.0.1",
     "mocha": "10.2.0",
-    "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/http-cache-utils": "0.1.9",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/debug": "0.1.32",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/http-cache-utils": "0.1.17",
+    "@tryghost/tpl": "0.1.32",
     "lodash": "4.17.21",
-    "semver": "7.5.4"
+    "semver": "7.6.3"
   }
 }
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..0612f4d4d4f 100644
--- a/ghost/mw-error-handler/test/mw-error-handler.test.js
+++ b/ghost/mw-error-handler/test/mw-error-handler.test.js
@@ -1,9 +1,7 @@
-// Switch these lines once there are useful utils
-// const testUtils = require('./utils');
-require('./utils');
 const path = require('path');
-const should = require('should');
 const assert = require('assert/strict');
+const sinon = require('sinon');
+
 const {InternalServerError, NotFoundError} = require('@tryghost/errors');
 const {cacheControlValues} = require('@tryghost/http-cache-utils');
 const {
@@ -22,12 +20,12 @@ describe('Prepare Error', function () {
         prepareError(new Error('test!'), {}, {
             set: () => {}
         }, (err) => {
-            err.statusCode.should.eql(500);
-            err.name.should.eql('InternalServerError');
-            err.message.should.eql('An unexpected error occurred, please try again.');
-            err.context.should.eql('test!');
-            err.code.should.eql('UNEXPECTED_ERROR');
-            err.stack.should.startWith('Error: test!');
+            assert.equal(err.statusCode, 500);
+            assert.equal(err.name, 'InternalServerError');
+            assert.equal(err.message, 'An unexpected error occurred, please try again.');
+            assert.equal(err.context, 'test!');
+            assert.equal(err.code, 'UNEXPECTED_ERROR');
+            assert.ok(err.stack.startsWith('Error: test!'));
             done();
         });
     });
@@ -36,11 +34,11 @@ describe('Prepare Error', function () {
         prepareError(new InternalServerError({message: 'Handled Error', context: 'Details'}), {}, {
             set: () => {}
         }, (err) => {
-            err.statusCode.should.eql(500);
-            err.name.should.eql('InternalServerError');
-            err.message.should.eql('Handled Error');
-            err.context.should.eql('Details');
-            err.stack.should.startWith('InternalServerError: Handled Error');
+            assert.equal(err.statusCode, 500);
+            assert.equal(err.name, 'InternalServerError');
+            assert.equal(err.message, 'Handled Error');
+            assert.equal(err.context, 'Details');
+            assert.ok(err.stack.startsWith('InternalServerError: Handled Error'));
             done();
         });
     });
@@ -51,10 +49,10 @@ describe('Prepare Error', function () {
         prepareError(error, {}, {
             set: () => {}
         }, (err) => {
-            err.statusCode.should.eql(404);
-            err.name.should.eql('NotFoundError');
-            err.stack.should.startWith('NotFoundError: Resource could not be found');
-            err.hideStack.should.eql(true);
+            assert.equal(err.statusCode, 404);
+            assert.equal(err.name, 'NotFoundError');
+            assert.ok(err.stack.startsWith('NotFoundError: Resource could not be found'));
+            assert.equal(err.hideStack, true);
             done();
         });
     });
@@ -63,9 +61,9 @@ describe('Prepare Error', function () {
         prepareError([new Error('test!')], {}, {
             set: () => {}
         }, (err) => {
-            err.statusCode.should.eql(500);
-            err.name.should.eql('InternalServerError');
-            err.stack.should.startWith('Error: test!');
+            assert.equal(err.statusCode, 500);
+            assert.equal(err.name, 'InternalServerError');
+            assert.ok(err.stack.startsWith('Error: test!'));
             done();
         });
     });
@@ -79,11 +77,11 @@ describe('Prepare Error', function () {
         prepareError(error, {}, {
             set: () => {}
         }, (err) => {
-            err.statusCode.should.eql(400);
-            err.name.should.eql('IncorrectUsageError');
+            assert.equal(err.statusCode, 400);
+            assert.equal(err.name, 'IncorrectUsageError');
             // TODO: consider if the message should be trusted here
-            err.message.should.eql('obscure handlebars message!');
-            err.stack.should.startWith('Error: obscure handlebars message!');
+            assert.equal(err.message, 'obscure handlebars message!');
+            assert.ok(err.stack.startsWith('Error: obscure handlebars message!'));
             done();
         });
     });
@@ -97,10 +95,56 @@ describe('Prepare Error', function () {
         prepareError(error, {}, {
             set: () => {}
         }, (err) => {
-            err.statusCode.should.eql(400);
-            err.name.should.eql('IncorrectUsageError');
-            err.message.should.eql('obscure express-hbs message!');
-            err.stack.should.startWith('Error: obscure express-hbs message!');
+            assert.equal(err.statusCode, 400);
+            assert.equal(err.name, 'IncorrectUsageError');
+            assert.equal(err.message, 'obscure express-hbs message!');
+            assert.ok(err.stack.startsWith('Error: obscure express-hbs message!'));
+            done();
+        });
+    });
+
+    it('Correctly prepares a known ER_WRONG_VALUE 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) => {
+            assert.equal(err.statusCode, 422);
+            assert.equal(err.name, 'ValidationError');
+            assert.equal(err.message, 'Invalid value');
+            assert.equal(err.code, 'ER_WRONG_VALUE');
+            assert.equal(err.sqlErrorCode, 'ER_WRONG_VALUE');
+            assert.equal(err.sql, 'select anything from anywhere where something = anything;');
+            assert.equal(err.sqlMessage, 'Incorrect DATETIME value: 3234234234');
+            done();
+        });
+    });
+
+    it('Correctly prepares an unknown 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_BAD_FIELD_ERROR';
+        error.sql = 'select anything from anywhere where something = anything;';
+        error.sqlMessage = 'Incorrect value: erororoor';
+
+        prepareError(error, {}, {
+            set: () => {}
+        }, (err) => {
+            assert.equal(err.statusCode, 500);
+            assert.equal(err.name, 'InternalServerError');
+            assert.equal(err.message, 'An unexpected error occurred, please try again.');
+            assert.equal(err.code, 'UNEXPECTED_ERROR');
+            assert.equal(err.sqlErrorCode, 'ER_BAD_FIELD_ERROR');
+            assert.equal(err.sql, 'select anything from anywhere where something = anything;');
+            assert.equal(err.sqlMessage, 'Incorrect value: erororoor');
             done();
         });
     });
@@ -110,7 +154,7 @@ describe('Prepare Stack', function () {
     it('Correctly prepares the stack for an error', function (done) {
         prepareStack(new Error('test!'), {}, {}, (err) => {
             // Includes "Stack Trace" text prepending human readable trace
-            err.stack.should.startWith('Error: test!\nStack Trace:');
+            assert.ok(err.stack.startsWith('Error: test!\nStack Trace:'));
             done();
         });
     });
@@ -178,8 +222,8 @@ describe('Error renderers', function () {
     it('Renders JSON', function (done) {
         jsonErrorRenderer(new Error('test!'), {}, {
             json: (data) => {
-                data.errors.length.should.eql(1);
-                data.errors[0].message.should.eql('test!');
+                assert.equal(data.errors.length, 1);
+                assert.equal(data.errors[0].message, 'test!');
                 done();
             }
         }, () => {});
@@ -193,9 +237,9 @@ describe('Error renderers', function () {
             }
         }, {
             json: (data) => {
-                data.errors.length.should.eql(1);
-                data.errors[0].message.should.eql('Unknown error - RangeError, cannot read oembed.');
-                data.errors[0].context.should.eql('test!');
+                assert.equal(data.errors.length, 1);
+                assert.equal(data.errors[0].message, 'Unknown error - RangeError, cannot read oembed.');
+                assert.equal(data.errors[0].context, 'test!');
                 done();
             }
         }, () => {});
@@ -211,9 +255,9 @@ describe('Error renderers', function () {
             }
         }, {
             json: (data) => {
-                data.errors.length.should.eql(1);
-                data.errors[0].message.should.eql('Internal server error, cannot list blog.');
-                data.errors[0].context.should.eql('test!');
+                assert.equal(data.errors.length, 1);
+                assert.equal(data.errors[0].message, 'Internal server error, cannot list blog.');
+                assert.equal(data.errors[0].context, 'test!');
                 done();
             }
         }, () => {});
@@ -230,9 +274,9 @@ describe('Error renderers', function () {
             }
         }, {
             json: (data) => {
-                data.errors.length.should.eql(1);
-                data.errors[0].message.should.eql('Internal server error, cannot upload image.');
-                data.errors[0].context.should.eql('test! Image was too large.');
+                assert.equal(data.errors.length, 1);
+                assert.equal(data.errors[0].message, 'Internal server error, cannot upload image.');
+                assert.equal(data.errors[0].context, 'test! Image was too large.');
                 done();
             }
         }, () => {});
@@ -243,7 +287,7 @@ describe('Error renderers', function () {
             errorHandler: () => {}
         });
 
-        renderer.length.should.eql(4);
+        assert.equal(renderer.length, 4);
     });
 
     it('Exports the JSON renderer', function () {
@@ -251,15 +295,35 @@ describe('Error renderers', function () {
             errorHandler: () => {}
         });
 
-        renderer.length.should.eql(5);
+        assert.equal(renderer.length, 5);
     });
 });
 
 describe('Resource Not Found', function () {
     it('Returns 404 Not Found Error for a generic case', function (done) {
         resourceNotFound({}, {}, (error) => {
-            should.equal(error.statusCode, 404);
-            should.equal(error.message, 'Resource not found');
+            assert.equal(error.statusCode, 404);
+            assert.equal(error.message, 'Resource not found');
+            done();
+        });
+    });
+
+    it('Returns 406 Request Not Acceptable Error for invalid version', function (done) {
+        const req = {
+            headers: {
+                'accept-version': 'foo'
+            }
+        };
+
+        const res = {
+            locals: {
+                safeVersion: '4.3'
+            }
+        };
+
+        resourceNotFound(req, res, (error) => {
+            assert.equal(error.statusCode, 400);
+            assert.equal(error.message, 'Requested version is not supported.');
             done();
         });
     });
@@ -278,10 +342,10 @@ describe('Resource Not Found', function () {
         };
 
         resourceNotFound(req, res, (error) => {
-            should.equal(error.statusCode, 406);
-            should.equal(error.message, 'Request could not be served, the endpoint was not found.');
-            should.equal(error.context, 'Provided client accept-version v3.9 is behind current Ghost version v4.3.');
-            should.equal(error.help, 'Try upgrading your Ghost API client.');
+            assert.equal(error.statusCode, 406);
+            assert.equal(error.message, 'Request could not be served, the endpoint was not found.');
+            assert.equal(error.context, 'Provided client accept-version v3.9 is behind current Ghost version v4.3.');
+            assert.equal(error.help, 'Try upgrading your Ghost API client.');
             done();
         });
     });
@@ -300,10 +364,10 @@ describe('Resource Not Found', function () {
         };
 
         resourceNotFound(req, res, (error) => {
-            should.equal(error.statusCode, 406);
-            should.equal(error.message, 'Request could not be served, the endpoint was not found.');
-            should.equal(error.context, 'Provided client accept-version v4.8 is ahead of current Ghost version v4.3.');
-            should.equal(error.help, 'Try upgrading your Ghost install.');
+            assert.equal(error.statusCode, 406);
+            assert.equal(error.message, 'Request could not be served, the endpoint was not found.');
+            assert.equal(error.context, 'Provided client accept-version v4.8 is ahead of current Ghost version v4.3.');
+            assert.equal(error.help, 'Try upgrading your Ghost install.');
             done();
         });
     });
@@ -322,8 +386,8 @@ describe('Resource Not Found', function () {
         };
 
         resourceNotFound(req, res, (error) => {
-            should.equal(error.statusCode, 404);
-            should.equal(error.message, 'Resource not found');
+            assert.equal(error.statusCode, 404);
+            assert.equal(error.message, 'Resource not found');
             done();
         });
     });
@@ -331,16 +395,16 @@ describe('Resource Not Found', function () {
     describe('pageNotFound', function () {
         it('returns 404 with special message when message not set', function (done) {
             pageNotFound({}, {}, (error) => {
-                should.equal(error.statusCode, 404);
-                should.equal(error.message, 'Page not found');
+                assert.equal(error.statusCode, 404);
+                assert.equal(error.message, 'Page not found');
                 done();
             });
         });
 
         it('returns 404 with special message even if message is set', function (done) {
             pageNotFound({message: 'uh oh'}, {}, (error) => {
-                should.equal(error.statusCode, 404);
-                should.equal(error.message, 'Page not found');
+                assert.equal(error.statusCode, 404);
+                assert.equal(error.message, 'Page not found');
                 done();
             });
         });
diff --git a/ghost/mw-error-handler/test/utils/assertions.js b/ghost/mw-error-handler/test/utils/assertions.js
deleted file mode 100644
index 7364ee8aa19..00000000000
--- a/ghost/mw-error-handler/test/utils/assertions.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Custom Should Assertions
- *
- * Add any custom assertions to this file.
- */
-
-// Example Assertion
-// should.Assertion.add('ExampleAssertion', function () {
-//     this.params = {operator: 'to be a valid Example Assertion'};
-//     this.obj.should.be.an.Object;
-// });
diff --git a/ghost/mw-error-handler/test/utils/index.js b/ghost/mw-error-handler/test/utils/index.js
deleted file mode 100644
index 0d67d86ff86..00000000000
--- a/ghost/mw-error-handler/test/utils/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Test Utilities
- *
- * Shared utils for writing tests
- */
-
-// Require overrides - these add globals for tests
-require('./overrides');
-
-// Require assertions - adds custom should assertions
-require('./assertions');
diff --git a/ghost/mw-error-handler/test/utils/overrides.js b/ghost/mw-error-handler/test/utils/overrides.js
deleted file mode 100644
index 90203424ee2..00000000000
--- a/ghost/mw-error-handler/test/utils/overrides.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file is required before any test is run
-
-// Taken from the should wiki, this is how to make should global
-// Should is a global in our eslint test config
-global.should = require('should').noConflict();
-should.extend();
-
-// Sinon is a simple case
-// Sinon is a global in our eslint test config
-global.sinon = require('sinon');
diff --git a/ghost/mw-session-from-token/README.md b/ghost/mw-session-from-token/README.md
index c549d5da942..b8894b58abe 100644
--- a/ghost/mw-session-from-token/README.md
+++ b/ghost/mw-session-from-token/README.md
@@ -23,9 +23,9 @@ const sessionFromTokenMiddleware = require('@tryghost/mw-session-from-token')({
     }
 });
 
-someExpressApp.get('/some/sso/url', someSessionMiddleware, sessionFromTokenMiddleware, (req, res, next) => {
+someExpressApp.get('/some/sso/url', someSessionMiddleware, sessionFromTokenMiddleware, function sessionFromTokenMiddleware(req, res, next) {
     res.redirect('/loggedin');
-}, (err, res, res, next) => {
+}, function nextMw(err, res, res, next) => {
     res.redirect('/error');
 });
 ```
diff --git a/ghost/mw-session-from-token/package.json b/ghost/mw-session-from-token/package.json
index b0ebee35610..db6087e2ba3 100644
--- a/ghost/mw-session-from-token/package.json
+++ b/ghost/mw-session-from-token/package.json
@@ -19,7 +19,7 @@
   ],
   "devDependencies": {
     "c8": "8.0.1",
-    "express": "4.18.2",
+    "express": "4.19.2",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
diff --git a/ghost/mw-version-match/package.json b/ghost/mw-version-match/package.json
index a1a1f171474..7f3dc6705a7 100644
--- a/ghost/mw-version-match/package.json
+++ b/ghost/mw-version-match/package.json
@@ -23,8 +23,8 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
-    "semver": "7.5.4"
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/tpl": "0.1.32",
+    "semver": "7.6.3"
   }
 }
diff --git a/ghost/nql-filter-expansions/package.json b/ghost/nql-filter-expansions/package.json
index 1a1f3cfeed3..f835e9f73f8 100644
--- a/ghost/nql-filter-expansions/package.json
+++ b/ghost/nql-filter-expansions/package.json
@@ -7,8 +7,8 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "build:ts": "yarn build",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",
diff --git a/ghost/oembed-service/lib/OEmbedService.js b/ghost/oembed-service/lib/OEmbedService.js
index 064069ae18d..85e1330b716 100644
--- a/ghost/oembed-service/lib/OEmbedService.js
+++ b/ghost/oembed-service/lib/OEmbedService.js
@@ -1,15 +1,18 @@
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
-const cheerio = require('cheerio');
 const _ = require('lodash');
 const charset = require('charset');
 const iconv = require('iconv-lite');
 
+// Some sites block non-standard user agents so we need to mimic a typical browser
+const USER_AGENT = 'Mozilla/5.0 (compatible; Ghost/5.0; +https://ghost.org/)';
+
 const messages = {
     noUrlProvided: 'No url provided.',
     insufficientMetadata: 'URL contains insufficient metadata.',
     unknownProvider: 'No provider found for supplied URL.',
+    unableToFetchOembed: 'Unable to fetch requested embed.',
     unauthorized: 'URL contains a private resource.'
 };
 
@@ -26,10 +29,10 @@ const findUrlWithProvider = (url) => {
     // providers list is not always up to date with scheme or www vs non-www
     let baseUrl = url.replace(/^\/\/|^https?:\/\/(?:www\.)?/, '');
     let testUrls = [
-        `http://${baseUrl}`,
         `https://${baseUrl}`,
-        `http://www.${baseUrl}`,
-        `https://www.${baseUrl}`
+        `https://www.${baseUrl}`,
+        `http://${baseUrl}`,
+        `http://www.${baseUrl}`
     ];
 
     for (let testUrl of testUrls) {
@@ -101,15 +104,17 @@ class OEmbedService {
         try {
             return await extract(url);
         } catch (err) {
-            if (err.message === 'Request failed with error code 401') {
-                throw new errors.UnauthorizedError({
-                    message: messages.unauthorized
-                });
-            } else {
-                throw new errors.InternalServerError({
-                    message: err.message
+            if (err.message === 'Request failed with error code 401' || err.message === 'Request failed with error code 403') {
+                throw new errors.ValidationError({
+                    message: tpl(messages.unableToFetchOembed),
+                    context: messages.unauthorized
                 });
             }
+
+            throw new errors.ValidationError({
+                message: tpl(messages.unableToFetchOembed),
+                context: err.message
+            });
         }
     }
 
@@ -123,6 +128,9 @@ class OEmbedService {
         return this.externalRequest(
             url,
             {
+                headers: {
+                    'user-agent': USER_AGENT
+                },
                 timeout: 2000,
                 followRedirect: true,
                 ...options
@@ -202,7 +210,11 @@ class OEmbedService {
      * @returns {Promise<Object>}
      */
     async fetchBookmarkData(url, html) {
-        const gotOpts = {};
+        const gotOpts = {
+            headers: {
+                'User-Agent': USER_AGENT
+            }
+        };
 
         if (process.env.NODE_ENV?.startsWith('test')) {
             gotOpts.retry = 0;
@@ -235,11 +247,11 @@ class OEmbedService {
             scraperResponse = await metascraper({
                 html,
                 url,
-                // In development, allow non-standard tlds
+                // In development, allow non-standard TLDs
                 validateUrl: this.config.get('env') !== 'development'
             });
         } catch (err) {
-            // Log to avoid being blind to errors happenning in metascraper
+            // Log to avoid being blind to errors happening in metascraper
             logging.error(err);
             return this.unknownProvider(url);
         }
@@ -259,6 +271,15 @@ class OEmbedService {
             });
         }
 
+        if (metadata.icon) {
+            try {
+                await this.externalRequest.head(metadata.icon);
+            } catch (err) {
+                metadata.icon = 'https://static.ghost.org/v5.0.0/images/link-icon.svg';
+                logging.error(err);
+            }
+        }
+
         return {
             version: '1.0',
             type: 'bookmark',
@@ -275,6 +296,9 @@ class OEmbedService {
      * @returns {Promise<Object>}
      */
     async fetchOembedData(url, html, cardType) {
+        // Lazy require the library to keep boot quick
+        const cheerio = require('cheerio');
+
         // check for <link rel="alternate" type="application/json+oembed"> element
         let oembedUrl;
         try {
@@ -318,11 +342,16 @@ class OEmbedService {
                 ];
                 const oembed = _.pick(body, knownFields);
 
+                // Fallback to bookmark if it's a link type
+                if (oembed.type === 'link') {
+                    return;
+                }
+
                 // ensure we have required data for certain types
                 if (oembed.type === 'photo' && !oembed.url) {
                     return;
                 }
-                if ((oembed.type === 'video' || oembed.type === 'rich') && (!oembed.html || !oembed.width || !oembed.height)) {
+                if ((oembed.type === 'video' || oembed.type === 'rich') && (!oembed.html || !oembed.width)) {
                     return;
                 }
 
@@ -344,6 +373,18 @@ class OEmbedService {
         try {
             const urlObject = new URL(url);
 
+            // YouTube has started not returning oembed <link>tags for some live URLs
+            // when fetched from an IP address that's in a non-EN region.
+            // We convert live URLs to watch URLs so we can go straight to the
+            // oembed request via a known provider rather than going through the page fetch routine.
+            const ytLiveRegex = /^\/live\/([a-zA-Z0-9_-]+)$/;
+            if (urlObject.hostname.match(/(?:www\.)?youtube\.com/) && ytLiveRegex.test(urlObject.pathname)) {
+                const videoId = ytLiveRegex.exec(urlObject.pathname)[1];
+                urlObject.pathname = '/watch';
+                urlObject.searchParams.set('v', videoId);
+                url = urlObject.toString();
+            }
+
             // Trimming solves the difference of url validation between `new URL(url)`
             // and metascraper.
             url = url.trim();
diff --git a/ghost/oembed-service/package.json b/ghost/oembed-service/package.json
index 098b1d70c5d..187381fe4a2 100644
--- a/ghost/oembed-service/package.json
+++ b/ghost/oembed-service/package.json
@@ -23,22 +23,22 @@
   },
   "dependencies": {
     "@extractus/oembed-extractor": "3.2.1",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
+    "@tryghost/tpl": "0.1.32",
     "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",
-    "tough-cookie": "4.1.3"
+    "metascraper": "5.45.15",
+    "metascraper-author": "5.45.10",
+    "metascraper-description": "5.45.10",
+    "metascraper-image": "5.45.10",
+    "metascraper-logo": "5.45.10",
+    "metascraper-logo-favicon": "5.42.0",
+    "metascraper-publisher": "5.45.10",
+    "metascraper-title": "5.45.10",
+    "metascraper-url": "5.45.10",
+    "tough-cookie": "4.1.4"
   }
 }
diff --git a/ghost/oembed-service/test/hello.test.js b/ghost/oembed-service/test/hello.test.js
deleted file mode 100644
index d9b99270284..00000000000
--- a/ghost/oembed-service/test/hello.test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const assert = require('assert/strict');
-
-describe('Hello world', function () {
-    it('Runs a test', function () {
-        assert.ok(require('../index'));
-    });
-});
diff --git a/ghost/oembed-service/test/oembed-service.test.js b/ghost/oembed-service/test/oembed-service.test.js
new file mode 100644
index 00000000000..7266c2a53db
--- /dev/null
+++ b/ghost/oembed-service/test/oembed-service.test.js
@@ -0,0 +1,228 @@
+const assert = require('assert/strict');
+const nock = require('nock');
+const got = require('got');
+
+const OembedService = require('../');
+
+describe('oembed-service', function () {
+    /** @type {OembedService} */
+    let oembedService;
+
+    before(function () {
+        oembedService = new OembedService({
+            config: {get() {
+                return true;
+            }},
+            externalRequest: got
+        });
+
+        nock.disableNetConnect();
+    });
+
+    afterEach(function () {
+        nock.cleanAll();
+    });
+
+    describe('known provider', function () {
+        it('should return data if successful', async function () {
+            nock('https://www.youtube.com')
+                .get('/oembed')
+                .query(true)
+                .reply(200, {
+                    title: 'Test Title',
+                    author_name: 'Test Author',
+                    author_url: 'https://www.youtube.com/user/testauthor',
+                    html: '<iframe src="https://www.youtube.com/embed/1234"></iframe>'
+                });
+
+            const response = await oembedService.knownProvider('https://www.youtube.com/watch?v=1234');
+            assert.equal(response.title, 'Test Title');
+            assert.equal(response.author_name, 'Test Author');
+            assert.equal(response.author_url, 'https://www.youtube.com/user/testauthor');
+            assert.equal(response.html, '<iframe src="https://www.youtube.com/embed/1234"></iframe>');
+        });
+
+        it('should return a ValidationError if upstream 401s', async function () {
+            nock('https://www.youtube.com')
+                .get('/oembed')
+                .query(true)
+                .reply(401);
+
+            try {
+                await oembedService.knownProvider('https://www.youtube.com/watch?v=1234');
+            } catch (error) {
+                assert.equal(error.name, 'ValidationError');
+                assert.equal(error.statusCode, 422);
+                assert.equal(error.context, 'URL contains a private resource.');
+            }
+        });
+
+        it('should return a ValidationError if upstream 403s', async function () {
+            nock('https://www.youtube.com')
+                .get('/oembed')
+                .query(true)
+                .reply(403);
+
+            try {
+                await oembedService.knownProvider('https://www.youtube.com/watch?v=1234');
+            } catch (error) {
+                assert.equal(error.name, 'ValidationError');
+                assert.equal(error.statusCode, 422);
+                assert.equal(error.context, 'URL contains a private resource.');
+            }
+        });
+
+        it('should return a ValidationError if upstream 404s', async function () {
+            nock('https://www.youtube.com')
+                .get('/oembed')
+                .query(true)
+                .reply(404);
+
+            try {
+                await oembedService.knownProvider('https://www.youtube.com/watch?v=1234');
+            } catch (error) {
+                assert.equal(error.name, 'ValidationError');
+                assert.equal(error.statusCode, 422);
+                assert.equal(error.context, 'Request failed with error code 404');
+            }
+        });
+
+        it('should return a ValidationError if upstream 500s', async function () {
+            nock('https://www.youtube.com')
+                .get('/oembed')
+                .query(true)
+                .reply(500);
+
+            try {
+                await oembedService.knownProvider('https://www.youtube.com/watch?v=1234');
+            } catch (error) {
+                assert.equal(error.name, 'ValidationError');
+                assert.equal(error.statusCode, 422);
+                assert.equal(error.context, 'Request failed with error code 500');
+            }
+        });
+    });
+
+    describe('fetchOembedDataFromUrl', function () {
+        it('allows rich embeds to skip height field', async function () {
+            nock('https://www.example.com')
+                .get('/')
+                .query(true)
+                .reply(200, `<html><head><link type="application/json+oembed" href="https://www.example.com/oembed"></head></html>`);
+
+            nock('https://www.example.com')
+                .get('/oembed')
+                .query(true)
+                .reply(200, {
+                    type: 'rich',
+                    version: '1.0',
+                    title: 'Test Title',
+                    author_name: 'Test Author',
+                    author_url: 'https://example.com/user/testauthor',
+                    html: '<iframe src="https://www.example.com/embed"></iframe>',
+                    width: 640,
+                    height: null
+                });
+
+            const response = await oembedService.fetchOembedDataFromUrl('https://www.example.com');
+
+            assert.equal(response.title, 'Test Title');
+            assert.equal(response.author_name, 'Test Author');
+            assert.equal(response.author_url, 'https://example.com/user/testauthor');
+            assert.equal(response.html, '<iframe src="https://www.example.com/embed"></iframe>');
+        });
+
+        it('uses a known user-agent for bookmark requests', async function () {
+            nock('https://www.example.com')
+                .get('/')
+                .query(true)
+                .matchHeader('User-Agent', /Mozilla\/.*/)
+                .reply(200, `<html><head><title>Example</title></head></html>`);
+
+            const response = await oembedService.fetchOembedDataFromUrl('https://www.example.com', 'bookmark');
+
+            assert.equal(response.version, '1.0');
+            assert.equal(response.type, 'bookmark');
+            assert.equal(response.url, 'https://www.example.com');
+            assert.equal(response.metadata.title, 'Example');
+        });
+
+        it('should return a bookmark response when the oembed endpoint returns a link type', async function () {
+            nock('https://www.example.com')
+                .get('/')
+                .query(true)
+                .reply(200, `<html><head><link type="application/json+oembed" href="https://www.example.com/oembed"><title>Example</title></head></html>`);
+
+            nock('https://www.example.com')
+                .get('/oembed')
+                .query(true)
+                .reply(200, {
+                    type: 'link',
+                    version: '1.0',
+                    title: 'Test Title',
+                    author_name: 'Test Author',
+                    author_url: 'https://example.com/user/testauthor',
+                    url: 'https://www.example.com'
+                });
+
+            const response = await oembedService.fetchOembedDataFromUrl('https://www.example.com');
+
+            assert.equal(response.version, '1.0');
+            assert.equal(response.type, 'bookmark');
+            assert.equal(response.url, 'https://www.example.com');
+            assert.equal(response.metadata.title, 'Example');
+        });
+
+        it('converts YT live URLs to watch URLs', async function () {
+            nock('https://www.youtube.com')
+                .get('/oembed')
+                .query((query) => {
+                    // Ensure the URL is converted to a watch URL and retains existing query params.
+                    const actual = query.url;
+                    const expected = 'https://youtube.com/watch?param=existing&v=1234';
+
+                    assert.equal(actual, expected, 'URL passed to oembed endpoint is incorrect');
+
+                    return actual === expected;
+                })
+                .reply(200, {
+                    type: 'rich',
+                    version: '1.0',
+                    title: 'Test Title',
+                    author_name: 'Test Author',
+                    author_url: 'https://example.com/user/testauthor',
+                    html: '<iframe src="https://www.example.com/embed"></iframe>',
+                    width: 640,
+                    height: null
+                });
+
+            await oembedService.fetchOembedDataFromUrl('https://www.youtube.com/live/1234?param=existing');
+        });
+
+        it('converts YT live URLs to watch URLs (non-www)', async function () {
+            nock('https://www.youtube.com')
+                .get('/oembed')
+                .query((query) => {
+                    // Ensure the URL is converted to a watch URL and retains existing query params.
+                    const actual = query.url;
+                    const expected = 'https://youtube.com/watch?param=existing&v=1234';
+
+                    assert.equal(actual, expected, 'URL passed to oembed endpoint is incorrect');
+
+                    return actual === expected;
+                })
+                .reply(200, {
+                    type: 'rich',
+                    version: '1.0',
+                    title: 'Test Title',
+                    author_name: 'Test Author',
+                    author_url: 'https://example.com/user/testauthor',
+                    html: '<iframe src="https://www.example.com/embed"></iframe>',
+                    width: 640,
+                    height: null
+                });
+
+            await oembedService.fetchOembedDataFromUrl('https://youtube.com/live/1234?param=existing');
+        });
+    });
+});
diff --git a/ghost/offers/lib/application/OfferMapper.js b/ghost/offers/lib/application/OfferMapper.js
index b9602162d4d..20ffb1fc102 100644
--- a/ghost/offers/lib/application/OfferMapper.js
+++ b/ghost/offers/lib/application/OfferMapper.js
@@ -28,6 +28,8 @@
  * @prop {object} tier
  * @prop {string} tier.id
  * @prop {string} tier.name
+ * @prop {string} created_at
+ * @prop {string|null} last_redeemed
  */
 
 class OfferMapper {
@@ -54,7 +56,9 @@ class OfferMapper {
             tier: {
                 id: offer.tier.id,
                 name: offer.tier.name
-            }
+            },
+            created_at: offer.createdAt,
+            last_redeemed: offer.lastRedeemed
         };
     }
 }
diff --git a/ghost/offers/lib/domain/models/Offer.js b/ghost/offers/lib/domain/models/Offer.js
index 879f6c40464..af1be11e924 100644
--- a/ghost/offers/lib/domain/models/Offer.js
+++ b/ghost/offers/lib/domain/models/Offer.js
@@ -13,6 +13,7 @@ const OfferCurrency = require('./OfferCurrency');
 const OfferStatus = require('./OfferStatus');
 const OfferCreatedEvent = require('../events/OfferCreatedEvent');
 const OfferCodeChangeEvent = require('../events/OfferCodeChangeEvent');
+const OfferCreatedAt = require('./OfferCreatedAt');
 
 /**
  * @typedef {object} OfferProps
@@ -29,6 +30,8 @@ const OfferCodeChangeEvent = require('../events/OfferCodeChangeEvent');
  * @prop {OfferStatus} status
  * @prop {OfferTier} tier
  * @prop {number} redemptionCount
+ * @prop {string} createdAt
+ * @prop {string|null} lastRedeemed
  */
 
 /**
@@ -47,6 +50,8 @@ const OfferCodeChangeEvent = require('../events/OfferCodeChangeEvent');
  * @prop {string} status
  * @prop {number} redemptionCount
  * @prop {TierProps|OfferTier} tier
+ * @prop {Date} created_at
+ * @prop {Date|null} last_redeemed
  */
 
 /**
@@ -179,6 +184,14 @@ class Offer {
         return !!this.options.isNew;
     }
 
+    get createdAt() {
+        return this.props.createdAt;
+    }
+
+    get lastRedeemed() {
+        return this.props.lastRedeemed;
+    }
+
     /**
      * @param {OfferCode} code
      * @param {UniqueChecker} uniqueChecker
@@ -275,6 +288,8 @@ class Offer {
         const cadence = OfferCadence.create(data.cadence);
         const duration = OfferDuration.create(data.duration, data.duration_in_months);
         const status = OfferStatus.create(data.status || 'active');
+        const createdAt = isNew ? OfferCreatedAt.create() : OfferCreatedAt.create(data.created_at);
+        const lastRedeemed = data.last_redeemed ? new Date(data.last_redeemed).toISOString() : null;
 
         if (isNew && data.redemptionCount !== undefined) {
             // TODO correct error
@@ -340,7 +355,9 @@ class Offer {
             currency,
             tier,
             redemptionCount,
-            status
+            status,
+            createdAt,
+            lastRedeemed
         }, {isNew});
     }
 }
diff --git a/ghost/offers/lib/domain/models/OfferCreatedAt.js b/ghost/offers/lib/domain/models/OfferCreatedAt.js
new file mode 100644
index 00000000000..dbe53ca9dca
--- /dev/null
+++ b/ghost/offers/lib/domain/models/OfferCreatedAt.js
@@ -0,0 +1,30 @@
+const ValueObject = require('./shared/ValueObject');
+const InvalidOfferCreatedAt = require('../errors').InvalidOfferCreatedAt;
+
+/** @extends ValueObject<string> */
+class OfferCreatedAt extends ValueObject {
+    /** @param {Date} createdAt */
+    constructor(createdAt) {
+        super(createdAt.toISOString()); // Convert Date to ISO string
+    }
+
+    static create(createdAt) {
+        if (createdAt === null || createdAt === undefined) {
+            const now = new Date();
+            now.setMilliseconds(0);
+            return now.toISOString();
+        }
+
+        if (!(createdAt instanceof Date)) {
+            throw new InvalidOfferCreatedAt({
+                message: 'Offer `created_at` must be a Date.'
+            });
+        }
+
+        return createdAt.toISOString();
+    }
+
+    static InvalidOfferCreatedAt = InvalidOfferCreatedAt;
+}
+
+module.exports = OfferCreatedAt;
diff --git a/ghost/offers/package.json b/ghost/offers/package.json
index 06465f634a4..25d02f8180d 100644
--- a/ghost/offers/package.json
+++ b/ghost/offers/package.json
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/mongo-utils": "0.5.0",
-    "@tryghost/string": "0.2.4",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/mongo-utils": "0.6.2",
+    "@tryghost/string": "0.2.12",
     "lodash": "4.17.21"
   }
 }
diff --git a/ghost/offers/test/lib/domain/models/Offer.test.js b/ghost/offers/test/lib/domain/models/Offer.test.js
index 9a4263b0d23..89655dcb058 100644
--- a/ghost/offers/test/lib/domain/models/Offer.test.js
+++ b/ghost/offers/test/lib/domain/models/Offer.test.js
@@ -259,6 +259,27 @@ describe('Offer', function () {
                 should.ok(err);
             });
         });
+
+        it('Sets createdAt for new Offers', async function () {
+            const data = {
+                name: 'My Offer',
+                code: 'offer-code',
+                display_title: 'My Offer Title',
+                display_description: 'My Offer Description',
+                cadence: 'month',
+                type: 'fixed',
+                amount: 1000,
+                duration: 'forever',
+                currency: 'USD',
+                tier: {
+                    id: ObjectID()
+                }
+            };
+
+            const offer = await Offer.create(data, mockUniqueChecker);
+
+            should.equal(typeof offer.createdAt, 'string');
+        });
     });
 
     describe('#updateCode', function () {
diff --git a/ghost/package-json/lib/parse.js b/ghost/package-json/lib/parse.js
index 0a81a081fe9..08fd235ded2 100644
--- a/ghost/package-json/lib/parse.js
+++ b/ghost/package-json/lib/parse.js
@@ -23,35 +23,32 @@ async function parse(path) {
     try {
         source = await fs.readFile(path, {encoding: 'utf8'});
     } catch (readError) {
-        const err = new errors.IncorrectUsageError();
-        err.message = tpl(messages.couldNotReadPackage);
-        err.context = path;
-        err.err = readError;
-
-        return Promise.reject(err);
+        throw new errors.IncorrectUsageError({
+            message: tpl(messages.couldNotReadPackage),
+            context: path,
+            err: readError
+        });
     }
 
     try {
         json = JSON.parse(source);
     } catch (parseError) {
-        const err = new errors.IncorrectUsageError();
-        err.message = tpl(messages.themeFileIsMalformed);
-        err.context = path;
-        err.err = parseError;
-        err.help = tpl(messages.willBeRequired, {url: 'https://ghost.org/docs/themes/'});
-
-        return Promise.reject(err);
+        throw new errors.IncorrectUsageError({
+            message: tpl(messages.themeFileIsMalformed),
+            context: path,
+            err: parseError,
+            help: tpl(messages.willBeRequired, {url: 'https://ghost.org/docs/themes/'})
+        });
     }
 
     const hasRequiredKeys = json.name && json.version;
 
     if (!hasRequiredKeys) {
-        const err = new errors.IncorrectUsageError();
-        err.message = tpl(messages.nameOrVersionMissing);
-        err.context = path;
-        err.help = tpl(messages.willBeRequired, {url: 'https://ghost.org/docs/themes/'});
-
-        return Promise.reject(err);
+        throw new errors.IncorrectUsageError({
+            message: tpl(messages.nameOrVersionMissing),
+            context: path,
+            help: tpl(messages.willBeRequired, {url: 'https://ghost.org/docs/themes/'})
+        });
     }
 
     return json;
diff --git a/ghost/package-json/package.json b/ghost/package-json/package.json
index eeaee3b3690..60d3edb3fcf 100644
--- a/ghost/package-json/package.json
+++ b/ghost/package-json/package.json
@@ -25,9 +25,9 @@
     "tmp": "0.2.1"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
-    "fs-extra": "11.1.1",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/tpl": "0.1.32",
+    "fs-extra": "11.2.0",
     "lodash": "4.17.21"
   }
 }
diff --git a/ghost/payments/lib/PaymentsService.js b/ghost/payments/lib/PaymentsService.js
index 6b8fe8db7fc..8d80dcf09a6 100644
--- a/ghost/payments/lib/PaymentsService.js
+++ b/ghost/payments/lib/PaymentsService.js
@@ -276,11 +276,20 @@ class PaymentsService {
         };
     }
 
+    /**
+     * Stripe's nickname field is limited to 250 characters
+     * @returns {string}
+     */
+    getDonationPriceNickname() {
+        const nickname = 'Support ' + this.settingsCache.get('title');
+        return nickname.substring(0, 250);
+    }
+
     /**
      * @returns {Promise<{id: string}>}
      */
     async getPriceForDonations() {
-        const nickname = 'Support ' + this.settingsCache.get('title');
+        const nickname = this.getDonationPriceNickname();
         const currency = this.settingsCache.get('donations_currency');
         const suggestedAmount = this.settingsCache.get('donations_suggested_amount');
 
diff --git a/ghost/payments/package.json b/ghost/payments/package.json
index 60590676824..8bd5acfe644 100644
--- a/ghost/payments/package.json
+++ b/ghost/payments/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
-    "@tryghost/errors": "1.2.26",
+    "@tryghost/errors": "1.3.5",
     "@tryghost/members-offers": "0.0.0",
     "@tryghost/tiers": "0.0.0"
   }
diff --git a/ghost/post-events/package.json b/ghost/post-events/package.json
index f1c53e8e82c..10bf5fbe3c6 100644
--- a/ghost/post-events/package.json
+++ b/ghost/post-events/package.json
@@ -8,8 +8,8 @@
   "types": "build/index.d.ts",
   "scripts": {
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
-    "build": "tsc",
-    "build:ts": "yarn build",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",
diff --git a/ghost/post-revisions/package.json b/ghost/post-revisions/package.json
index f605eec553e..47d3d0da43b 100644
--- a/ghost/post-revisions/package.json
+++ b/ghost/post-revisions/package.json
@@ -7,8 +7,8 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "build:ts": "yarn build",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
     "test:types": "tsc --noEmit",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100  --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:unit && yarn test:types",
diff --git a/ghost/post-revisions/src/PostRevisions.ts b/ghost/post-revisions/src/PostRevisions.ts
index e6536f47c71..bbcabc6e2a9 100644
--- a/ghost/post-revisions/src/PostRevisions.ts
+++ b/ghost/post-revisions/src/PostRevisions.ts
@@ -7,6 +7,7 @@ type PostLike = {
     feature_image_alt: string | null;
     feature_image_caption: string | null;
     title: string;
+    custom_excerpt: string | null;
     reason: string;
     post_status: string;
 }
@@ -19,6 +20,7 @@ type Revision = {
     feature_image_alt: string | null;
     feature_image_caption: string | null;
     title: string;
+    custom_excerpt: string | null;
     post_status: string;
     reason: string;
     created_at_ts: number;
@@ -71,8 +73,9 @@ export class PostRevisions {
         const featuredImagedHasChanged = latestRevision.feature_image !== current.feature_image;
         const lexicalHasChanged = latestRevision.lexical !== current.lexical;
         const titleHasChanged = latestRevision.title !== current.title;
+        const customExcerptHasChanged = latestRevision.custom_excerpt !== current.custom_excerpt;
         // CASE: we only want to save a revision if something has changed since the previous revision
-        if (lexicalHasChanged || titleHasChanged || featuredImagedHasChanged) {
+        if (lexicalHasChanged || titleHasChanged || featuredImagedHasChanged || customExcerptHasChanged) {
             // CASE: user has explicitly requested a revision by hitting cmd+s or leaving the editor
             if (forceRevision) {
                 return {value: true, reason: 'explicit_save'};
@@ -119,6 +122,7 @@ export class PostRevisions {
             feature_image_alt: input.feature_image_alt,
             feature_image_caption: input.feature_image_caption,
             title: input.title,
+            custom_excerpt: input.custom_excerpt,
             reason: input.reason,
             post_status: input.post_status
         };
@@ -127,7 +131,7 @@ export class PostRevisions {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async removeAuthorFromRevisions(authorId: string, options: any): Promise<void> {
         const revisions = await this.model.findAll({
-            filter: `author_id:${authorId}`,
+            filter: `author_id:'${authorId}'`,
             columns: ['id'],
             transacting: options.transacting
         });
diff --git a/ghost/post-revisions/test/PostRevisions.test.ts b/ghost/post-revisions/test/PostRevisions.test.ts
index 9cebe3d96f4..2c35e0129a7 100644
--- a/ghost/post-revisions/test/PostRevisions.test.ts
+++ b/ghost/post-revisions/test/PostRevisions.test.ts
@@ -1,4 +1,4 @@
-import assert from 'assert';
+import assert from 'assert/strict';
 import sinon from 'sinon';
 import {PostRevisions} from '../src';
 
@@ -17,6 +17,7 @@ function makePostLike(data: any = {}) {
         feature_image_alt: data.feature_image_alt || null,
         feature_image_caption: data.feature_image_caption || null,
         title: 'Title',
+        custom_excerpt: 'Subtitle',
         reason: 'reason',
         post_status: 'published'
     }, data);
@@ -33,6 +34,7 @@ function makeRevision(data: any = {}) {
         feature_image_alt: data.feature_image_alt || null,
         feature_image_caption: data.feature_image_caption || null,
         title: 'Title',
+        custom_excerpt: 'Subtitle',
         reason: 'reason',
         post_status: 'published'
     }, data);
@@ -100,6 +102,26 @@ describe('PostRevisions', function () {
             assert.deepEqual(actual, expected);
         });
 
+        it('should return true if the current and previous custom_excerpt values are different and forceRevision is true', function () {
+            const postRevisions = new PostRevisions({config, model: {}});
+
+            const expected = {value: true, reason: 'explicit_save'};
+            const actual = postRevisions.shouldGenerateRevision(makePostLike({
+                lexical: 'blah',
+                html: 'blah',
+                title: 'blah',
+                custom_excerpt: 'blah2'
+            }), [{
+                lexical: 'blah',
+                custom_excerpt: 'not blah'
+            }].map(makeRevision), {
+                forceRevision: true,
+                isPublished: false
+            });
+
+            assert.deepEqual(actual, expected);
+        });
+
         it('should return true if the current and previous feature_image values are different and forceRevision is true', function () {
             const postRevisions = new PostRevisions({config, model: {}});
 
diff --git a/ghost/posts-service/lib/PostsExporter.js b/ghost/posts-service/lib/PostsExporter.js
index 4b590d97d5d..7b05b4727fd 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');
             }
@@ -226,9 +226,6 @@ class PostsExporter {
             for (const subfilter of filter.$or) {
                 strings.push(...this.filterToString(subfilter, allLabels, allTiers));
             }
-        } else if (filter.yg) {
-            // Single filter grouped in brackets
-            strings.push(...this.filterToString(filter.yg, allLabels, allTiers));
         } else {
             for (const key of Object.keys(filter)) {
                 if (key === 'label') {
diff --git a/ghost/posts-service/lib/PostsService.js b/ghost/posts-service/lib/PostsService.js
index 67f22d328be..1299161eecc 100644
--- a/ghost/posts-service/lib/PostsService.js
+++ b/ghost/posts-service/lib/PostsService.js
@@ -108,7 +108,7 @@ class PostsService {
 
     /**
      *
-     * @param {any} frame
+     * @param {import('@tryghost/api-framework').Frame} frame
      * @param {object} [options]
      * @param {(event: EventString, dto: any) => Promise<void> | void} [options.eventHandler] - Called before the editPost method resolves with an event string
      * @returns
diff --git a/ghost/posts-service/package.json b/ghost/posts-service/package.json
index c2a41f06377..832dfd585be 100644
--- a/ghost/posts-service/package.json
+++ b/ghost/posts-service/package.json
@@ -23,10 +23,10 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/nql": "0.11.0",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/nql": "0.12.4",
     "@tryghost/post-events": "0.0.0",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/tpl": "0.1.32",
     "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..d7d62c29f51 100644
--- a/ghost/recommendations/package.json
+++ b/ghost/recommendations/package.json
@@ -8,8 +8,8 @@
   "types": "build/index.d.ts",
   "scripts": {
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
-    "build": "tsc",
-    "build:ts": "yarn build",
+    "build": "yarn build:ts",
+    "build:ts": "tsc",
     "prepare": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
@@ -22,18 +22,18 @@
     "build"
   ],
   "devDependencies": {
-    "@types/node": "^20.5.7",
+    "@types/node": "20.14.8",
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0",
-    "ts-node": "10.9.1",
-    "typescript": "5.2.2"
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5"
   },
   "dependencies": {
-    "@tryghost/tpl": "0.1.25",
-    "@tryghost/errors": "1.2.26",
+    "@tryghost/tpl": "0.1.32",
+    "@tryghost/errors": "1.3.5",
     "@tryghost/in-memory-repository": "0.0.0",
     "@tryghost/bookshelf-repository": "0.0.0",
-    "@tryghost/logging": "2.4.8"
+    "@tryghost/logging": "2.4.18"
   }
 }
diff --git a/ghost/recommendations/src/BookshelfRecommendationRepository.ts b/ghost/recommendations/src/BookshelfRecommendationRepository.ts
index 9ba36b6197a..b0338c8ee6b 100644
--- a/ghost/recommendations/src/BookshelfRecommendationRepository.ts
+++ b/ghost/recommendations/src/BookshelfRecommendationRepository.ts
@@ -109,7 +109,7 @@ export class BookshelfRecommendationRepository extends BookshelfRepository<strin
         //  Query params, hash fragements, protocol and www are ignored.
         const existing = recommendations.find((r) => {
             return r.url.hostname.replace('www.', '') === url.hostname.replace('www.', '') &&
-                   r.url.pathname === url.pathname;
+                   r.url.pathname.replace(/\/$/, '') === url.pathname.replace(/\/$/, '');
         }) || null;
 
         return existing;
diff --git a/ghost/recommendations/src/InMemoryRecommendationRepository.ts b/ghost/recommendations/src/InMemoryRecommendationRepository.ts
index 31b5d3fe481..24043ce534a 100644
--- a/ghost/recommendations/src/InMemoryRecommendationRepository.ts
+++ b/ghost/recommendations/src/InMemoryRecommendationRepository.ts
@@ -12,7 +12,7 @@ export class InMemoryRecommendationRepository extends InMemoryRepository<string,
         //  Query params, hash fragements, protocol and www are ignored.
         const existing = this.store.find((r) => {
             return r.url.hostname.replace('www.', '') === url.hostname.replace('www.', '') &&
-                   r.url.pathname === url.pathname;
+                   r.url.pathname.replace(/\/$/, '') === url.pathname.replace(/\/$/, '');
         }) || null;
 
         return existing;
diff --git a/ghost/recommendations/src/IncomingRecommendationService.ts b/ghost/recommendations/src/IncomingRecommendationService.ts
index 507a867ef31..8d7c3b293b2 100644
--- a/ghost/recommendations/src/IncomingRecommendationService.ts
+++ b/ghost/recommendations/src/IncomingRecommendationService.ts
@@ -80,7 +80,7 @@ export class IncomingRecommendationService {
         // More importantly, we might have missed some deletes which we can detect.
         // So we do a slow revalidation of all incoming recommendations
         // This also prevents doing multiple external fetches when doing quick reboots of Ghost after each other (requires Ghost to be up for at least 15 seconds)
-        if (!process.env.NODE_ENV?.startsWith('test')) {
+        if (!process.env.NODE_ENV?.startsWith('test') && process.env.NODE_ENV !== 'development') {
             setTimeout(() => {
                 logging.info('Updating incoming recommendations on boot');
                 this.#updateIncomingRecommendations().catch((err) => {
diff --git a/ghost/recommendations/src/Recommendation.ts b/ghost/recommendations/src/Recommendation.ts
index 8b06805c801..d663feaa9bd 100644
--- a/ghost/recommendations/src/Recommendation.ts
+++ b/ghost/recommendations/src/Recommendation.ts
@@ -103,15 +103,9 @@ export class Recommendation {
             });
         }
 
-        if (properties.description && properties.description.length > 2000) {
+        if (properties.description && properties.description.length > 200) {
             throw new errors.ValidationError({
-                message: 'Description must be less than 2000 characters'
-            });
-        }
-
-        if (properties.excerpt && properties.excerpt.length > 2000) {
-            throw new errors.ValidationError({
-                message: 'Excerpt must be less than 2000 characters'
+                message: 'Description must be less than 200 characters'
             });
         }
     }
@@ -121,18 +115,18 @@ export class Recommendation {
             this.description = null;
         }
 
-        this.url = this.cleanURL(this.url);
+        if (this.excerpt !== null && this.excerpt.length === 0) {
+            this.excerpt = null;
+        }
+
+        if (this.excerpt !== null && this.excerpt.length > 2000) {
+            this.excerpt = this.excerpt.slice(0, 1997) + '...';
+        }
+
         this.createdAt.setMilliseconds(0);
         this.updatedAt?.setMilliseconds(0);
     }
 
-    cleanURL(url: URL) {
-        url.search = '';
-        url.hash = '';
-
-        return url;
-    };
-
     static create(data: RecommendationCreateData) {
         const id = data.id ?? ObjectId().toString();
 
@@ -181,13 +175,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..c45f9d81d60
--- /dev/null
+++ b/ghost/recommendations/src/RecommendationMetadataService.ts
@@ -0,0 +1,126 @@
+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}) {
+        // Even though we have throwHttpErrors: false, we still need to catch DNS errors
+        // that can arise from externalRequest, otherwise we'll return a HTTP 500 to the user
+        try {
+            // 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;
+                }
+            }
+        } 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..e3dc23d914d 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,60 @@ 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;
+        }
+
+        let metadata;
+        try {
+            metadata = await this.recommendationMetadataService.fetch(url);
+        } catch (e) {
+            logging.error('[Recommendations] Failed to fetch metadata for url ' + url, e);
+
+            return {
+                url: url,
+                title: undefined,
+                excerpt: undefined,
+                featuredImage: undefined,
+                favicon: undefined,
+                oneClickSubscribe: false
+            };
+        }
+
+        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 +205,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/BookshelfRecommendationRepository.test.ts b/ghost/recommendations/test/BookshelfRecommendationRepository.test.ts
index a36005af24e..7577bfa05ee 100644
--- a/ghost/recommendations/test/BookshelfRecommendationRepository.test.ts
+++ b/ghost/recommendations/test/BookshelfRecommendationRepository.test.ts
@@ -114,7 +114,35 @@ describe('BookshelfRecommendationRepository', function () {
         sinon.assert.calledOnce(stub);
     });
 
-    it('getByUrl returns if matching hostname', async function () {
+    it('getByUrl returns null if not matching path', async function () {
+        const repository = new BookshelfRecommendationRepository({} as any, {
+            sentry: undefined
+        });
+        const recommendation = Recommendation.create({
+            id: 'id',
+            title: 'title',
+            description: 'description',
+            excerpt: 'excerpt',
+            featuredImage: new URL('https://example.com'),
+            favicon: new URL('https://example.com'),
+            url: new URL('https://example.com/other-path'),
+            oneClickSubscribe: true,
+            createdAt: new Date('2021-01-01'),
+            updatedAt: new Date('2021-01-02')
+        });
+        const stub = sinon.stub(repository, 'getAll').returns(Promise.resolve([
+            recommendation
+        ]));
+        const entity = await repository.getByUrl(new URL('https://www.example.com/path'));
+
+        assert.equal(
+            entity,
+            null
+        );
+        sinon.assert.calledOnce(stub);
+    });
+
+    it('getByUrl returns if matching hostname and pathname', async function () {
         const repository = new BookshelfRecommendationRepository({} as any, {
             sentry: undefined
         });
@@ -142,7 +170,7 @@ describe('BookshelfRecommendationRepository', function () {
         sinon.assert.calledOnce(stub);
     });
 
-    it('getByUrl returns null if not matching path', async function () {
+    it('getByUrl returns if matching hostname and pathname, but not query params', async function () {
         const repository = new BookshelfRecommendationRepository({} as any, {
             sentry: undefined
         });
@@ -153,7 +181,35 @@ describe('BookshelfRecommendationRepository', function () {
             excerpt: 'excerpt',
             featuredImage: new URL('https://example.com'),
             favicon: new URL('https://example.com'),
-            url: new URL('https://example.com/other-path'),
+            url: new URL('https://example.com/path'),
+            oneClickSubscribe: true,
+            createdAt: new Date('2021-01-01'),
+            updatedAt: new Date('2021-01-02')
+        });
+        const stub = sinon.stub(repository, 'getAll').returns(Promise.resolve([
+            recommendation
+        ]));
+        const entity = await repository.getByUrl(new URL('https://www.example.com/path/?query=param'));
+
+        assert.equal(
+            entity,
+            recommendation
+        );
+        sinon.assert.calledOnce(stub);
+    });
+
+    it('getByUrl returns if matching hostname and pathname, but not hash fragments', async function () {
+        const repository = new BookshelfRecommendationRepository({} as any, {
+            sentry: undefined
+        });
+        const recommendation = Recommendation.create({
+            id: 'id',
+            title: 'title',
+            description: 'description',
+            excerpt: 'excerpt',
+            featuredImage: new URL('https://example.com'),
+            favicon: new URL('https://example.com'),
+            url: new URL('https://example.com/path/#section1'),
             oneClickSubscribe: true,
             createdAt: new Date('2021-01-01'),
             updatedAt: new Date('2021-01-02')
@@ -165,7 +221,7 @@ describe('BookshelfRecommendationRepository', function () {
 
         assert.equal(
             entity,
-            null
+            recommendation
         );
         sinon.assert.calledOnce(stub);
     });
diff --git a/ghost/recommendations/test/IncomingRecommendationService.test.ts b/ghost/recommendations/test/IncomingRecommendationService.test.ts
index 8ca5d91e102..37c949d9562 100644
--- a/ghost/recommendations/test/IncomingRecommendationService.test.ts
+++ b/ghost/recommendations/test/IncomingRecommendationService.test.ts
@@ -48,7 +48,7 @@ describe('IncomingRecommendationService', function () {
             // Sandbox time
             const saved = process.env.NODE_ENV;
             try {
-                process.env.NODE_ENV = 'development';
+                process.env.NODE_ENV = 'nottesting';
                 await service.init();
                 clock.tick(1000 * 60 * 60 * 24);
                 assert(refreshMentions.calledOnce);
@@ -61,7 +61,7 @@ describe('IncomingRecommendationService', function () {
             // Sandbox time
             const saved = process.env.NODE_ENV;
             try {
-                process.env.NODE_ENV = 'development';
+                process.env.NODE_ENV = 'nottesting';
 
                 refreshMentions.rejects(new Error('test'));
                 await service.init();
diff --git a/ghost/recommendations/test/Recommendation.test.ts b/ghost/recommendations/test/Recommendation.test.ts
index e3afbc541e3..2aaddfe0289 100644
--- a/ghost/recommendations/test/Recommendation.test.ts
+++ b/ghost/recommendations/test/Recommendation.test.ts
@@ -41,7 +41,7 @@ describe('Recommendation', function () {
             assert.throws(() => {
                 Recommendation.validate({
                     title: 'Test',
-                    description: 'a'.repeat(2001),
+                    description: 'a'.repeat(201),
                     excerpt: null,
                     featuredImage: null,
                     favicon: null,
@@ -50,24 +50,7 @@ describe('Recommendation', function () {
                 });
             }, {
                 name: 'ValidationError',
-                message: 'Description must be less than 2000 characters'
-            });
-        });
-
-        it('Throws for a long excerpt', function () {
-            assert.throws(() => {
-                Recommendation.validate({
-                    title: 'Test',
-                    description: null,
-                    excerpt: 'a'.repeat(2001),
-                    featuredImage: null,
-                    favicon: null,
-                    url: 'https://example.com',
-                    oneClickSubscribe: false
-                });
-            }, {
-                name: 'ValidationError',
-                message: 'Excerpt must be less than 2000 characters'
+                message: 'Description must be less than 200 characters'
             });
         });
     });
@@ -118,7 +101,37 @@ describe('Recommendation', function () {
             assert.equal(recommendation.description, null);
         });
 
-        it('removes search and hash params', function () {
+        it('sets empty excerpt to null', function () {
+            const recommendation = Recommendation.create({
+                title: 'Test',
+                description: null,
+                excerpt: '',
+                featuredImage: null,
+                favicon: null,
+                url: 'https://example.com',
+                oneClickSubscribe: false,
+                updatedAt: new Date('2021-01-01T00:00:05Z')
+            });
+
+            assert.equal(recommendation.excerpt, null);
+        });
+
+        it('truncates long excerpts', function () {
+            const recommendation = Recommendation.create({
+                title: 'Test',
+                description: null,
+                excerpt: 'a'.repeat(2001),
+                featuredImage: null,
+                favicon: null,
+                url: 'https://example.com',
+                oneClickSubscribe: false,
+                updatedAt: new Date('2021-01-01T00:00:05Z')
+            });
+
+            assert.equal(recommendation.excerpt?.length, 2000);
+        });
+
+        it('keeps search and hash params', function () {
             const recommendation = Recommendation.create({
                 title: 'Test',
                 description: '',
@@ -130,7 +143,7 @@ describe('Recommendation', function () {
                 updatedAt: new Date('2021-01-01T00:00:05Z')
             });
 
-            assert.equal(recommendation.url.toString(), 'https://example.com/');
+            assert.equal(recommendation.url.toString(), 'https://example.com/?query=1#hash');
         });
     });
 
@@ -173,6 +186,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..7d6b1f8f508
--- /dev/null
+++ b/ghost/recommendations/test/RecommendationMetadataService.test.ts
@@ -0,0 +1,223 @@
+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();
+        sinon.restore();
+    });
+
+    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('does not throw an error even if fetching throws an error', async function () {
+        // TODO: simulate DNS resolution failures if possible
+        sinon.stub(got, 'get').rejects(new Error('Failed to fetch'));
+
+        await service.fetch(new URL('https://exampleghostsite.com/subdirectory'));
+    });
+
+    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..0cbe3618025 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,229 @@ 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')
+            });
+        });
+
+        it('Returns undefined recommendation metadata if metadata fails to fetch', async function () {
+            fetchMetadataStub.rejects(new Error('Metadata failed to fetch'));
+
+            const response = await service.checkRecommendation(new URL('http://localhost/newone'));
+            assert.deepEqual(response, {
+                title: undefined,
+                excerpt: undefined,
+                featuredImage: undefined,
+                favicon: undefined,
+                oneClickSubscribe: false,
+                url: new URL('http://localhost/newone')
+            });
+        });
     });
 
     describe('updateRecommendationsEnabledSetting', function () {
diff --git a/ghost/security/package.json b/ghost/security/package.json
index 6ca19bff4a6..905213c8da4 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.12",
     "bcryptjs": "2.4.3"
   }
 }
diff --git a/ghost/session-service/README.md b/ghost/session-service/README.md
index 39dd3e65345..d7bb632221d 100644
--- a/ghost/session-service/README.md
+++ b/ghost/session-service/README.md
@@ -24,7 +24,7 @@ const sessionService = SessionService({
     }
 });
 
-app.use(async (req, res, next) => {
+app.use(async function sessionMiddleware(req, res, next) {
     try {
         const user = await sessionService.getUserForSession(req, res);
         req.user = user;
diff --git a/ghost/session-service/package.json b/ghost/session-service/package.json
index 5f95f1b73da..082e5a48a3b 100644
--- a/ghost/session-service/package.json
+++ b/ghost/session-service/package.json
@@ -19,12 +19,12 @@
   ],
   "devDependencies": {
     "c8": "8.0.1",
-    "express": "4.18.2",
+    "express": "4.19.2",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26"
+    "@tryghost/errors": "1.3.5"
   }
 }
diff --git a/ghost/settings-path-manager/package.json b/ghost/settings-path-manager/package.json
index 9144f1fa5bb..d9d75d97bd5 100644
--- a/ghost/settings-path-manager/package.json
+++ b/ghost/settings-path-manager/package.json
@@ -24,8 +24,8 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/tpl": "0.1.32",
     "date-fns": "2.30.0"
   }
 }
diff --git a/ghost/slack-notifications/lib/SlackNotificationsService.js b/ghost/slack-notifications/lib/SlackNotificationsService.js
index 0ab7bb4c800..73f26b6eec8 100644
--- a/ghost/slack-notifications/lib/SlackNotificationsService.js
+++ b/ghost/slack-notifications/lib/SlackNotificationsService.js
@@ -27,6 +27,7 @@ const {MilestoneCreatedEvent} = require('@tryghost/milestones');
  * @typedef {object} config
  * @prop {boolean} isEnabled
  * @prop {URL} webhookUrl
+ * @prop {number} minThreshold
  */
 
 module.exports = class SlackNotificationsService {
@@ -71,6 +72,7 @@ module.exports = class SlackNotificationsService {
             && event.data.milestone
             && this.#config.isEnabled
             && this.#config.webhookUrl
+            && this.#config.minThreshold < event.data.milestone.value
         ) {
             try {
                 await this.#slackNotifications.notifyMilestoneReceived(event.data);
diff --git a/ghost/slack-notifications/package.json b/ghost/slack-notifications/package.json
index ee43cf6d3b2..b728f7b8167 100644
--- a/ghost/slack-notifications/package.json
+++ b/ghost/slack-notifications/package.json
@@ -23,9 +23,9 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/validator": "0.2.4",
-    "@tryghost/version": "0.1.22",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/validator": "0.2.14",
+    "@tryghost/version": "0.1.30",
     "got": "9.6.0"
   }
 }
diff --git a/ghost/slack-notifications/test/SlackNotificationsService.test.js b/ghost/slack-notifications/test/SlackNotificationsService.test.js
index 1e90150da43..ecb17563cf4 100644
--- a/ghost/slack-notifications/test/SlackNotificationsService.test.js
+++ b/ghost/slack-notifications/test/SlackNotificationsService.test.js
@@ -19,7 +19,8 @@ describe('SlackNotificationsService', function () {
 
         const config = {
             isEnabled: true,
-            webhookUrl: 'https://slack-webhook.example'
+            webhookUrl: 'https://slack-webhook.example',
+            minThreshold: 1000
         };
 
         beforeEach(function () {
@@ -75,13 +76,13 @@ describe('SlackNotificationsService', function () {
                     milestone: {
                         id: new ObjectId().toHexString(),
                         type: 'arr',
-                        value: 1000,
+                        value: 10000,
                         currency: 'usd',
                         createdAt: new Date(),
                         emailSentAt: new Date()
                     },
                     meta: {
-                        currentValue: 1398
+                        currentValue: 13980
                     }
                 }));
 
@@ -118,6 +119,45 @@ describe('SlackNotificationsService', function () {
                 assert(slackNotificationStub.callCount === 0);
             });
 
+            it('does not send notification when milestone value below notification threshold', async function () {
+                service = new SlackNotificationsService({
+                    logging: {
+                        warn: () => {},
+                        error: loggingSpy
+                    },
+                    DomainEvents,
+                    siteUrl: 'https://ghost.example',
+                    config: {
+                        isEnabled: false,
+                        webhookUrl: 'https://slack-webhook.example'
+                    },
+                    slackNotifications: {
+                        notifyMilestoneReceived: slackNotificationStub
+                    }
+                });
+
+                service.subscribeEvents();
+
+                DomainEvents.dispatch(MilestoneCreatedEvent.create({
+                    milestone: {
+                        id: new ObjectId().toHexString(),
+                        type: 'arr',
+                        value: 1000,
+                        currency: 'usd',
+                        createdAt: new Date(),
+                        emailSentAt: new Date()
+                    },
+                    meta: {
+                        currentValue: 1398
+                    }
+                }));
+
+                await DomainEvents.allSettled();
+
+                assert(loggingSpy.callCount === 0);
+                assert(slackNotificationStub.callCount === 0);
+            });
+
             it('does not send notification when no url in hostSettings provided', async function () {
                 service = new SlackNotificationsService({
                     logging: {
@@ -166,8 +206,8 @@ describe('SlackNotificationsService', function () {
                 DomainEvents.dispatch(MilestoneCreatedEvent.create({
                     milestone: {
                         type: 'members',
-                        name: 'members-100',
-                        value: 100,
+                        name: 'members-10000',
+                        value: 10000,
                         createdAt: new Date()
                     }
                 }));
diff --git a/ghost/staff-service/lib/StaffService.js b/ghost/staff-service/lib/StaffService.js
index 24e67e4d21c..ed48a4a8606 100644
--- a/ghost/staff-service/lib/StaffService.js
+++ b/ghost/staff-service/lib/StaffService.js
@@ -4,7 +4,7 @@ const {MilestoneCreatedEvent} = require('@tryghost/milestones');
 // @NOTE: 'StaffService' is a vague name that does not describe what it's actually doing.
 //         Possibly, "StaffNotificationService" or "StaffEventNotificationService" would be a more accurate name
 class StaffService {
-    constructor({logging, models, mailer, settingsCache, settingsHelpers, urlUtils, DomainEvents, labs, memberAttributionService}) {
+    constructor({logging, models, mailer, settingsCache, settingsHelpers, urlUtils, blogIcon, DomainEvents, labs, memberAttributionService}) {
         this.logging = logging;
         this.labs = labs;
         /** @private */
@@ -22,6 +22,7 @@ class StaffService {
             settingsHelpers,
             settingsCache,
             urlUtils,
+            blogIcon,
             labs
         });
     }
@@ -119,11 +120,11 @@ class StaffService {
                 attribution
             });
         } else if (type === SubscriptionCancelledEvent) {
-            subscription.canceledAt = event.timestamp;
             await this.emails.notifyPaidSubscriptionCanceled({
                 member,
                 tier,
-                subscription
+                subscription,
+                ...event.data
             });
         }
     }
diff --git a/ghost/staff-service/lib/StaffServiceEmails.js b/ghost/staff-service/lib/StaffServiceEmails.js
index 19d3da73a77..7a970a0dfe1 100644
--- a/ghost/staff-service/lib/StaffServiceEmails.js
+++ b/ghost/staff-service/lib/StaffServiceEmails.js
@@ -2,14 +2,16 @@ const {promises: fs, readFileSync} = require('fs');
 const path = require('path');
 const moment = require('moment');
 const glob = require('glob');
+const {EmailAddressParser} = require('@tryghost/email-addresses');
 
 class StaffServiceEmails {
-    constructor({logging, models, mailer, settingsHelpers, settingsCache, urlUtils, labs}) {
+    constructor({logging, models, mailer, settingsHelpers, settingsCache, blogIcon, urlUtils, labs}) {
         this.logging = logging;
         this.models = models;
         this.mailer = mailer;
         this.settingsHelpers = settingsHelpers;
         this.settingsCache = settingsCache;
+        this.blogIcon = blogIcon;
         this.urlUtils = urlUtils;
         this.labs = labs;
 
@@ -43,6 +45,7 @@ class StaffServiceEmails {
                 attributionUrl: attribution?.url || '',
                 referrerSource: attribution?.referrerSource,
                 siteTitle: this.settingsCache.get('title'),
+                siteIconUrl: this.blogIcon.getIconUrl({absolute: true, fallbackToDefault: false}),
                 siteUrl: this.urlUtils.getSiteUrl(),
                 siteDomain: this.siteDomain,
                 accentColor: this.settingsCache.get('accent_color'),
@@ -102,6 +105,7 @@ class StaffServiceEmails {
                 offerData,
                 subscriptionData,
                 siteTitle: this.settingsCache.get('title'),
+                siteIconUrl: this.blogIcon.getIconUrl({absolute: true, fallbackToDefault: false}),
                 siteUrl: this.urlUtils.getSiteUrl(),
                 siteDomain: this.siteDomain,
                 accentColor: this.settingsCache.get('accent_color'),
@@ -121,7 +125,7 @@ class StaffServiceEmails {
         }
     }
 
-    async notifyPaidSubscriptionCanceled({member, tier, subscription}, options = {}) {
+    async notifyPaidSubscriptionCanceled({member, tier, subscription, cancelNow, expiryAt, canceledAt}, options = {}) {
         const users = await this.models.User.getEmailAlertUsers('paid-canceled', options);
 
         for (const user of users) {
@@ -139,8 +143,9 @@ class StaffServiceEmails {
             };
 
             const subscriptionData = {
-                expiryAt: this.getFormattedDate(subscription.cancelAt),
-                canceledAt: this.getFormattedDate(subscription.canceledAt),
+                expiryAt: this.getFormattedDate(expiryAt),
+                cancelNow: cancelNow,
+                canceledAt: this.getFormattedDate(canceledAt),
                 cancellationReason: subscription.cancellationReason || ''
             };
 
@@ -151,6 +156,7 @@ class StaffServiceEmails {
                 tierData,
                 subscriptionData,
                 siteTitle: this.settingsCache.get('title'),
+                siteIconUrl: this.blogIcon.getIconUrl({absolute: true, fallbackToDefault: false}),
                 siteUrl: this.urlUtils.getSiteUrl(),
                 siteDomain: this.siteDomain,
                 accentColor: this.settingsCache.get('accent_color'),
@@ -180,6 +186,7 @@ class StaffServiceEmails {
 
         return {
             siteTitle: this.settingsCache.get('title'),
+            siteIconUrl: this.blogIcon.getIconUrl({absolute: true, fallbackToDefault: false}),
             siteUrl: this.urlUtils.getSiteUrl(),
             siteDomain: this.siteDomain,
             accentColor: this.settingsCache.get('accent_color'),
@@ -280,6 +287,7 @@ class StaffServiceEmails {
             const templateData = {
                 siteTitle: this.settingsCache.get('title'),
                 siteUrl: this.urlUtils.getSiteUrl(),
+                siteIconUrl: this.blogIcon.getIconUrl({absolute: true, fallbackToDefault: false}),
                 siteDomain: this.siteDomain,
                 fromEmail: this.fromEmailAddress,
                 toEmail: to,
@@ -288,7 +296,8 @@ class StaffServiceEmails {
                 donation: {
                     name: donationPaymentEvent.name ?? donationPaymentEvent.email,
                     email: donationPaymentEvent.email,
-                    amount: formattedAmount
+                    amount: formattedAmount,
+                    donationMessage: donationPaymentEvent.donationMessage
                 },
                 memberData,
                 accentColor: this.settingsCache.get('accent_color')
@@ -419,12 +428,10 @@ class StaffServiceEmails {
         return this.settingsHelpers.getDefaultEmailDomain();
     }
 
-    get membersAddress() {
-        // TODO: get from address of default newsletter?
-        return `noreply@${this.defaultEmailDomain}`;
-    }
-
     get fromEmailAddress() {
+        if (this.settingsHelpers.useNewEmailAddresses()) {
+            return EmailAddressParser.stringify(this.settingsHelpers.getDefaultEmail());
+        }
         return `ghost@${this.defaultEmailDomain}`;
     }
 
@@ -488,10 +495,14 @@ class StaffServiceEmails {
             sharedData = await this.getSharedData(data.recipient);
         }
 
-        return htmlTemplate({
+        const html = htmlTemplate({
             ...data,
             ...sharedData
         });
+
+        const juice = require('juice');
+
+        return juice(html, {inlinePseudoElements: true, removeStyleTags: true});
     }
 
     async renderText(templateName, data) {
diff --git a/ghost/staff-service/lib/email-templates/donation.hbs b/ghost/staff-service/lib/email-templates/donation.hbs
index 71eadb7bab5..c1896b924e0 100644
--- a/ghost/staff-service/lib/email-templates/donation.hbs
+++ b/ghost/staff-service/lib/email-templates/donation.hbs
@@ -21,22 +21,68 @@
               <tr>
                 <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
                   <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    {{#if siteIconUrl}}
+                      <tr>
+                        <td align="center" style="padding-bottom: 56px; text-align: center;"><a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48"></a></td>
+                      </tr>
+                    {{/if}}
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Cha-ching!</p>
-                        <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: 32px;">You received a one-time payment from {{#if memberData}}
-                          <a style="color:{{accentColor}}" href="{{memberData.adminUrl}}"><strong>{{donation.name}}</strong> ({{donation.email}})</a>
-                        {{else}}
-                          <strong>{{donation.name}}</strong> ({{donation.email}})
-                        {{/if}}
-                          :</p>
-                        <table width="100" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
+                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 24px;">Cha-ching! You received a&nbsp;tip.</h1>
+                        <table width="100" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F4F5F6; border-radius: 8px;">
                           <tbody>
-                              <tr>
-                                  <td align="center" style="padding: 32px 24px; text-align: center;">
-                                      <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 48px; line-height: 48px; padding: 0; text-align: center; margin: 0; color: #15171A; font-weight: 700;">{{donation.amount}}</h1>
-                                  </td>
-                              </tr>
+                            <tr>
+                              <td align="left" style="padding: 24px;">
+                                <table border="0" cellpadding="0" cellspacing="0">
+                                  <tr>
+                                    <td style="padding-right: 8px; background-color: #F4F5F6; text-align: left; vertical-align: middle;" valign="middle">
+                                      <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: 15px; line-height: 26px; padding: 0; text-align: left; margin: 0; color: #15171A; font-weight: 400;">From:</p>
+                                      <p class="text-link-accent-large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; line-height: 26px; padding: 0; padding-bottom: 24px; text-align: left; margin: 0; color: #15171A; font-weight: 700;">{{donation.name}} {{#if memberData}}&bull; <a href="{{memberData.adminUrl}}" target="_blank" style="display: inline; color: {{accentColor}} !important; text-decoration: none !important;">View</a>{{/if}}</p>
+                                      <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: 15px; line-height: 26px; padding: 0; text-align: left; margin: 0; color: #15171A; font-weight: 400;">Amount received:</p>
+                                      <p class="large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; line-height: 26px; padding: 0; padding-bottom: 24px; text-align: left; margin: 0; color: #15171A; font-weight: 700;">{{donation.amount}}</p>
+                                      {{#if donation.donationMessage}}
+                                        <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: 15px; line-height: 22px; padding: 0; padding-bottom: 28px; text-align: left; margin: 0; color: #15171A; font-weight: 400;">“{{donation.donationMessage}}”</p>
+                                      {{/if}}
+                                    </td>
+                                  </tr>
+                                </table>
+                                <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                                  <tbody>
+                                    <tr>
+                                      <td align="left" 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; vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                          <tbody>
+                                            <tr>
+                                              {{#if donation.donationMessage}}
+                                                <td align="left" style="padding: 0;">
+                                                  <table border="0" cellpadding="0" cellspacing="0">
+                                                    <tr>
+                                                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; vertical-align: top; background-color: {{accentColor}}; border-radius: 8px; text-align: center;">
+                                                        <a href="mailto:{{donation.email}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 8px; padding: 10px 20px; text-decoration: none;">Reply</a>
+                                                      </td>
+                                                    </tr>
+                                                  </table>
+                                                </td>
+                                              {{else}}
+                                                <td align="left" style="padding: 0;">
+                                                  <table border="0" cellpadding="0" cellspacing="0">
+                                                    <tr>
+                                                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; vertical-align: top; background-color: {{accentColor}}; border-radius: 8px; text-align: center;">
+                                                        <a href="mailto:{{donation.email}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 8px; padding: 10px 20px; text-decoration: none;">Say thanks</a>
+                                                      </td>
+                                                    </tr>
+                                                  </table>
+                                                </td>
+                                              {{/if}}
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                      </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+                              </td>
+                            </tr>
                           </tbody>
                         </table>
                       </td>
@@ -44,13 +90,13 @@
 
                     <!-- START FOOTER -->
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{toEmail}}</a></p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{toEmail}}</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px">
-                          <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">here</a>.</p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">here</a>.</p>
                       </td>
                     </tr>
 
diff --git a/ghost/staff-service/lib/email-templates/donation.txt.js b/ghost/staff-service/lib/email-templates/donation.txt.js
index 39dc293b2dc..95a3ec35d08 100644
--- a/ghost/staff-service/lib/email-templates/donation.txt.js
+++ b/ghost/staff-service/lib/email-templates/donation.txt.js
@@ -5,6 +5,8 @@ Cha-ching!
 
 You received a one-time payment from of ${data.donation.amount} from "${data.donation.name}".
 
+Message: ${data.donation.donationMessage ? data.donation.donationMessage : 'No message provided'}
+
 ---
 
 Sent to ${data.toEmail} from ${data.siteDomain}.
diff --git a/ghost/staff-service/lib/email-templates/new-free-signup.hbs b/ghost/staff-service/lib/email-templates/new-free-signup.hbs
index c2a10072671..db82aa1f518 100644
--- a/ghost/staff-service/lib/email-templates/new-free-signup.hbs
+++ b/ghost/staff-service/lib/email-templates/new-free-signup.hbs
@@ -26,64 +26,46 @@
               <tr>
                 <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
                   <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    {{#if siteIconUrl}}
+                      <tr>
+                        <td align="center" style="padding-bottom: 56px; text-align: center;"><a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48"></a></td>
+                      </tr>
+                    {{/if}}
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Congratulations!</p>
-                          <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: 32px;">You have a <span style="font-weight: bold; color: #15212A;">new free member</span>.</p>
-
-                        <table width="100" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
-                        <tbody>
-                            <tr>
-                                <td align="left" style="padding: 16px;">
-                                  <table border="0" cellpadding="0" cellspacing="0">
-                                        <tr>
-                                            <td style="padding-right: 14px; background-color: #F9F9FA; text-align: left; vertical-align: middle;" valign="middle">
-                                                <div style="width: 48px; height: 48px; background-color: #15171A; border-radius: 999px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 19px; color: #FFFFFF; text-align: center; vertical-align: center; font-weight: 500; line-height: 47px;">
-                                                    {{memberData.initials}}
-                                                </div>
-                                            </td>
-                                            <td style="padding-right: 8px; background-color: #F9F9FA; text-align: left; vertical-align: middle;" valign="middle">
-                                                <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{memberData.name}}</p>
-                                                {{#if memberData.showEmail}}
-                                                  <p class="text-link" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 13px; padding-right: 8px; padding: 0; margin: 0; color: #394047; font-weight: 400;">{{memberData.email}}</p>
-                                                {{/if}}
-                                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Created on {{memberData.createdAt}}{{#if memberData.location}} &#8226; {{memberData.location}} {{/if}}
-                                                </p>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                        </table>
-
-                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
-                          <tr>
-                            <td align="left" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;">
-                              {{#if referrerSource}}
-                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Signup info</p>
-                                <hr style="border-bottom: 1px solid #F4F4F5; margin-top: 4px; margin-bottom: 8px;" />
-                                <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600; padding-bottom: 4px;">Source
-                                    <span style="font-weight: normal; color:#3A464C;"> - {{referrerSource}}</span>
-                                </p>
-                                {{#if attributionTitle}}
-                                  <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">Page
-                                      <span style="font-weight: normal; color:#3A464C;"> -  <a href="{{attributionUrl}}" style="font-weight: normal; color:#3A464C;text-decoration:none">{{attributionTitle}}</a></span>
-                                  </p>
-                                {{/if}}
-                              {{/if}}
-                            </td>
-                          </tr>
-                        </table>
-
-                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 24px;">You have a new free&nbsp;member</h1>
+                        <table width="100" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F4F5F6; border-radius: 8px;">
                           <tbody>
                             <tr>
-                              <td align="left" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;">
-                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                              <td align="left" style="padding: 24px;">
+                                <table border="0" cellpadding="0" cellspacing="0">
+                                  <tr>
+                                    <td style="padding-right: 8px; background-color: #F4F5F6; text-align: left; vertical-align: middle;" valign="middle">
+                                      <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Name:</p>
+                                      <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}</p>
+                                      {{#if referrerSource}}
+                                        <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Source:</p>
+                                        <p class="large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{referrerSource}}</p>
+                                        {{#if attributionTitle}}
+                                          <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Page:</p>
+                                          <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;"><a href="{{attributionUrl}}">{{attributionTitle}}</a></p>
+                                        {{/if}}
+                                      {{/if}}
+                                    </td>
+                                  </tr>
+                                </table>
+                                <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{memberData.adminUrl}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View member</a></td>
+                                      <td align="left" 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; vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                          <tbody>
+                                            <tr>
+                                              <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; vertical-align: top; background-color: {{accentColor}}; border-radius: 8px; text-align: center;"> <a href="{{memberData.adminUrl}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 8px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 15px; font-weight: normal; margin: 0; padding: 10px 20px; border-color: {{accentColor}};">View member</a></td>
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                      </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -91,21 +73,29 @@
                             </tr>
                           </tbody>
                         </table>
-                        <hr/>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{memberData.adminUrl}}</p>
+
+                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                          <tbody>
+                            <tr>
+                              <td align="left" style="padding-top: 24px;">
+                                <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #7c8b9a; font-weight: normal; margin: 0; line-height: 25px;">Or copy and paste this URL into your browser:</p>
+                                <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin:0; color: #7c8b9a; font-weight: normal;">{{memberData.adminUrl}}</p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{toEmail}}</a></p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{toEmail}}</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px">
-                          <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">here</a>.</p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">here</a>.</p>
                       </td>
                     </tr>
 
diff --git a/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs b/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs
index 40e4e67cdec..5d0aabb3d3b 100644
--- a/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs
+++ b/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs
@@ -19,7 +19,7 @@
                 {{#if subscriptionData.cancellationReason}}
                   Reason: {{subscriptionData.cancellationReason}}
                 {{else}}
-                  A paid member has just canceled their subscription.
+                  A paid member's subscription has just been canceled.
                 {{/if}}
               {{/inline}}
             {{/preview}}
@@ -30,65 +30,49 @@
               <tr>
                 <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
                   <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    {{#if siteIconUrl}}
+                      <tr>
+                        <td align="center" style="padding-bottom: 56px; text-align: center;"><a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48"></a></td>
+                      </tr>
+                    {{/if}}
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Hey there,</p>
-                          <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: 32px;">A paid member has just <span style="font-weight: bold; color: #15212A;">canceled their subscription</span>.</p>
-
-                        <table width="100" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
-                        <tbody>
-                            <tr>
-                                <td align="left" style="padding: 16px;">
-                                  <table border="0" cellpadding="0" cellspacing="0">
-                                        <tr>
-                                            <td style="padding-right: 14px;">
-                                                <div style="width: 48px; height: 48px; background-color: #15171A; border-radius: 999px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 19px; color: #FFFFFF; text-align: center; vertical-align: center; font-weight: 500; line-height: 47px;">
-                                                    {{memberData.initials}}
-                                                </div>
-                                            </td>
-                                            <td style="padding-right: 8px;">
-                                                <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{memberData.name}}</p>
-                                                {{#if memberData.showEmail}}
-                                                  <p class="text-link" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 13px; padding-right: 8px; padding: 0; margin: 0; color: #394047; font-weight: 400;">{{memberData.email}}</p>
-                                                {{/if}}
-                                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Canceled on {{subscriptionData.canceledAt}} </p>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="vertical-align: top; padding-top: 0; padding-right: 16px; padding-bottom: 16px; padding-left: 16px;">
-                                    <hr style="border-bottom: 2px solid #F4F4F5; margin-top: 0; margin-bottom: 16px;" />
-                                    <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Tier</p>
-                                    <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{tierData.name}}<span style="font-weight: normal; color:#3A464C;"> - {{tierData.details}}</span></p>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="vertical-align: top; padding-top: 0; padding-right: 16px; padding-bottom: 16px; padding-left: 16px;">
-                                    <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Subscription will expire on</p>
-                                    <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{subscriptionData.expiryAt}}</p>
-                                </td>
-                            </tr>
-                            {{#if subscriptionData.cancellationReason}}
-                            <tr>
-                                <td style="vertical-align: top; padding-top: 0; padding-right: 16px; padding-bottom: 16px; padding-left: 16px;">
-                                    <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Cancellation reason</p>
-                                    <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 400;">{{subscriptionData.cancellationReason}}</p>
-                                </td>
-                            </tr>
-                            {{/if}}
-                        </tbody>
-                        </table>
-
-                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 24px;">A paid member's subscription has just been&nbsp;canceled</h1>
+                        <table width="100" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F4F5F6; border-radius: 8px;">
                           <tbody>
                             <tr>
-                              <td align="left" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;">
-                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                              <td align="left" style="padding: 24px;">
+                                <table border="0" cellpadding="0" cellspacing="0">
+                                  <tr>
+                                    <td style="padding-right: 8px; background-color: #F4F5F6; text-align: left; vertical-align: middle;" valign="middle">
+                                      <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Name:</p>
+                                      <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}</p>
+                                      <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Tier:</p>
+                                      <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{tierData.name}}{{#if tierData.details}} &bull; {{tierData.details}}{{/if}}</p>
+                                      {{#if subscriptionData.cancelNow}}
+                                        <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Expired on:</p>
+                                      {{else}}
+                                        <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Expires on:</p>
+                                      {{/if}}
+                                      <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{subscriptionData.expiryAt}}</p>
+                                      {{#if subscriptionData.cancellationReason}}
+                                        <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: 15px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 400;">"{{subscriptionData.cancellationReason}}"</p>
+                                      {{/if}}
+                                    </td>
+                                  </tr>
+                                </table>
+                                <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{memberData.adminUrl}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View member</a> </td>
+                                      <td align="left" 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; vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                          <tbody>
+                                            <tr>
+                                              <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; vertical-align: top; background-color: {{accentColor}}; border-radius: 8px; text-align: center;"> <a href="{{memberData.adminUrl}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 8px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 15px; font-weight: normal; margin: 0; padding: 10px 20px; border-color: {{accentColor}};">View member</a></td>
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                      </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -96,21 +80,29 @@
                             </tr>
                           </tbody>
                         </table>
-                        <hr/>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{memberData.adminUrl}}</p>
+
+                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                          <tbody>
+                            <tr>
+                              <td align="left" style="padding-top: 24px;">
+                                <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #7c8b9a; font-weight: normal; margin: 0; line-height: 25px;">Or copy and paste this URL into your browser:</p>
+                                <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin:0; color: #7c8b9a; font-weight: normal;">{{memberData.adminUrl}}</p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{toEmail}}</a></p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{toEmail}}</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px">
-                          <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">here</a>.</p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">here</a>.</p>
                       </td>
                     </tr>
 
diff --git a/ghost/staff-service/lib/email-templates/new-paid-cancellation.txt.js b/ghost/staff-service/lib/email-templates/new-paid-cancellation.txt.js
index 40c2bc15233..f2a4a269583 100644
--- a/ghost/staff-service/lib/email-templates/new-paid-cancellation.txt.js
+++ b/ghost/staff-service/lib/email-templates/new-paid-cancellation.txt.js
@@ -3,7 +3,7 @@ module.exports = function (data) {
     return `
 Hey there,
 
-A paid member has just cancelled their subscription: "${data.memberData.name}"
+A paid member's subscription has just been canceled: "${data.memberData.name}"
 
 ---
 
diff --git a/ghost/staff-service/lib/email-templates/new-paid-started.hbs b/ghost/staff-service/lib/email-templates/new-paid-started.hbs
index d3b7674207c..38cc764c655 100644
--- a/ghost/staff-service/lib/email-templates/new-paid-started.hbs
+++ b/ghost/staff-service/lib/email-templates/new-paid-started.hbs
@@ -26,77 +26,52 @@
               <tr>
                 <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
                   <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    {{#if siteIconUrl}}
+                      <tr>
+                        <td align="center" style="padding-bottom: 56px; text-align: center;"><a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48"></a></td>
+                      </tr>
+                    {{/if}}
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
-                        <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Congratulations!</p>
-                          <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: 32px;">You have a <span style="font-weight: bold; color: #15212A;">new paid member</span>.</p>
-
-                        <table width="100" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
-                        <tbody>
-                            <tr>
-                                <td align="left" style="padding: 16px;">
-                                  <table border="0" cellpadding="0" cellspacing="0">
-                                        <tr>
-                                            <td style="padding-right: 14px; vertical-align: middle;" valign="middle">
-                                                <div style="width: 48px; height: 48px; background-color: #15171A; border-radius: 999px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 19px; color: #FFFFFF; text-align: center; vertical-align: center; font-weight: 500; line-height: 47px;">
-                                                    {{memberData.initials}}
-                                                </div>
-                                            </td>
-                                            <td style="padding-right: 8px; vertical-align: middle;" valign="middle">
-                                                <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{memberData.name}}</p>
-                                                {{#if memberData.showEmail}}
-                                                  <p class="text-link" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 13px; padding-right: 8px; padding: 0; margin: 0; color: #394047; font-weight: 400;">{{memberData.email}}</p>
-                                                {{/if}}
-                                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Subscription started on {{subscriptionData.startedOn}} </p>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                        </table>
-
-                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
-                          <tr>
-                            <td align="left" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;">
-
-                              <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Tier</p>
-                              <hr style="border-bottom: 1px solid #F4F4F5; margin-top: 4px; margin-bottom: 8px;" />
-                              <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600; padding-bottom: 32px;">{{tierData.name}}
-                              {{#if tierData.details}} <span style="font-weight: normal; color:#3A464C;"> - {{tierData.details}}</span>{{/if}}
-                              </p>
-
-                              {{#if offerData}}
-                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Offer</p>
-                                <hr style="border-bottom: 1px solid #F4F4F5; margin-top: 4px; margin-bottom: 8px;" />
-                                <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600; padding-bottom: 32px;">{{offerData.name}} <span style="font-weight: normal; color:#3A464C;"> - {{offerData.details}}</span></p>
-                              {{/if}}
-
-                              {{#if referrerSource}}
-                                <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: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">Signup info</p>
-                                <hr style="border-bottom: 1px solid #F4F4F5; margin-top: 4px; margin-bottom: 8px;" />
-                                <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600; padding-bottom: 4px;">Source
-                                    <span style="font-weight: normal; color:#3A464C;"> - {{referrerSource}}</span>
-                                </p>
-                                {{#if attributionTitle}}
-                                  <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; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">Page
-                                      <span style="font-weight: normal; color:#3A464C;"> -  <a href="{{attributionUrl}}" style="font-weight: normal; color:#3A464C;text-decoration:none">{{attributionTitle}}</a></span>
-                                  </p>
-                                {{/if}}
-                              {{/if}}
-                              
-                            </td>
-                          </tr>
-                        </table>
-
-                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 24px;">You have a new paid&nbsp;subscriber</h1>
+                        <table width="100" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F4F5F6; border-radius: 8px;">
                           <tbody>
                             <tr>
-                              <td align="left" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;">
-                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                              <td align="left" style="padding: 24px;">
+                                <table border="0" cellpadding="0" cellspacing="0">
+                                  <tr>
+                                    <td style="padding-right: 8px; background-color: #F4F5F6; text-align: left; vertical-align: middle;" valign="middle">
+                                      <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Name:</p>
+                                      <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}</p>
+                                      <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Tier:</p>
+                                      <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{tierData.name}}{{#if tierData.details}} &bull; {{tierData.details}}{{/if}}</p>
+                                      {{#if offerData}}
+                                        <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Offer:</p>
+                                        <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{offerData.name}} &bull; <span style="color: {{accentColor}};">{{offerData.details}}</span></p>
+                                      {{/if}}
+                                      {{#if referrerSource}}
+                                        <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Source:</p>
+                                        <p class="large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;">{{referrerSource}}</p>
+                                        {{#if attributionTitle}}
+                                          <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: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 400;">Page:</p>
+                                          <p class="text-link large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 600;"><a href="{{attributionUrl}}">{{attributionTitle}}</a></p>
+                                        {{/if}}
+                                      {{/if}}
+                                    </td>
+                                  </tr>
+                                </table>
+                                <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
                                   <tbody>
                                     <tr>
-                                      <td 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; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{memberData.adminUrl}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View member</a> </td>
+                                      <td align="left" 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; vertical-align: top;">
+                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                          <tbody>
+                                            <tr>
+                                              <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; vertical-align: top; background-color: {{accentColor}}; border-radius: 8px; text-align: center;"> <a href="{{memberData.adminUrl}}" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 8px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 15px; font-weight: normal; margin: 0; padding: 10px 20px; border-color: {{accentColor}};">View member</a></td>
+                                            </tr>
+                                          </tbody>
+                                        </table>
+                                      </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -104,21 +79,29 @@
                             </tr>
                           </tbody>
                         </table>
-                        <hr/>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{memberData.adminUrl}}</p>
+
+                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                          <tbody>
+                            <tr>
+                              <td align="left" style="padding-top: 24px;">
+                                <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #7c8b9a; font-weight: normal; margin: 0; line-height: 25px;">Or copy and paste this URL into your browser:</p>
+                                <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin:0; color: #7c8b9a; font-weight: normal;">{{memberData.adminUrl}}</p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{toEmail}}</a></p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{toEmail}}</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px">
-                          <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">here</a>.</p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">here</a>.</p>
                       </td>
                     </tr>
 
diff --git a/ghost/staff-service/lib/email-templates/partials/styles.hbs b/ghost/staff-service/lib/email-templates/partials/styles.hbs
index 891fb172b88..7de00b563c0 100644
--- a/ghost/staff-service/lib/email-templates/partials/styles.hbs
+++ b/ghost/staff-service/lib/email-templates/partials/styles.hbs
@@ -3,48 +3,46 @@
       RESPONSIVE AND MOBILE FRIENDLY STYLES
   ------------------------------------- */
   @media only screen and (max-width: 620px) {
-    table[class=body] h1 {
-      font-size: 28px !important;
-      margin-bottom: 10px !important;
+    table.body h1 {
+      font-size: 22px !important;
+      padding-bottom: 16px !important;
     }
-    table[class=body] p,
-    table[class=body] ul,
-    table[class=body] ol,
-    table[class=body] td,
-    table[class=body] span,
-    table[class=body] a {
+    table.body p,
+    table.body ul,
+    table.body ol,
+    table.body td,
+    table.body span,
+    table.body a {
       font-size: 16px !important;
     }
-    table[class=body] .wrapper,
-    table[class=body] .article {
+    table.body .wrapper,
+    table.body .article {
       padding: 10px !important;
     }
-    table[class=body] .content {
+    table.body .content {
       padding: 0 !important;
     }
-    table[class=body] .container {
+    table.body .container {
       padding: 0 !important;
       width: 100% !important;
     }
-    table[class=body] .main {
+    table.body .main {
       border-left-width: 0 !important;
       border-radius: 0 !important;
       border-right-width: 0 !important;
     }
-    table[class=body] .btn table {
-      width: 100% !important;
-    }
-    table[class=body] .btn a {
-      width: 100% !important;
-    }
-    table[class=body] .img-responsive {
+    table.body .img-responsive {
       height: auto !important;
       max-width: 100% !important;
       width: auto !important;
     }
-    table[class=body] p[class=small],
-    table[class=body] a[class=small] {
-      font-size: 11px !important;
+    table.body p.large,
+    table.body p.large a {
+      font-size: 18px !important;
+    }
+    table.body p.small,
+    table.body a.small {
+      font-size: 12px !important;
     }
     .new-mention-thumbnail {
       display: none !important;
@@ -74,6 +72,13 @@
       line-height: inherit !important;
       text-decoration: none !important;
     }
+    .text-link-accent a {
+      font-family: inherit !important;
+      font-size: inherit !important;
+      font-weight: inherit !important;
+      line-height: inherit !important;
+      text-decoration: none !important;
+    }
     #MessageViewBody a {
       color: inherit;
       text-decoration: none;
@@ -99,4 +104,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..ca81863d790 100644
--- a/ghost/staff-service/lib/email-templates/recommendation-received.hbs
+++ b/ghost/staff-service/lib/email-templates/recommendation-received.hbs
@@ -21,29 +21,34 @@
               <tr>
                 <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
                   <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    {{#if siteIconUrl}}
+                      <tr>
+                        <td align="center" style="padding-bottom: 56px; text-align: center;"><a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48"></a></td>
+                      </tr>
+                    {{/if}}
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
-
                         {{#if recommendation.recommendingBack}}
-                          <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Great news!</p>
-                          <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>
+                          <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15171A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 24px;">A site is now recommending you&nbsp;back</h1>
                         {{else}}
-                          <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: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Good news!</p>
-                          <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;">{{recommendation.title}} 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 {{siteTitle}} as well.</p>
+                          <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15171A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 12px;">A site is now recommending you to their&nbsp;audience</h1>
+                          <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: 15px; color: #15171A; font-weight: normal; margin: 0; line-height: 1.3em; padding-bottom: 32px;">Every time someone new signs up on their site, they’ll see an option to check out {{siteTitle}} as well.</p>
                         {{/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:#F4F5F6;border-radius:8px;">
+                          <a style="display:flex;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;background:#F4F5F6;border-radius:8px;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">
+                              <div style="color:#15171A;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 style="color:#15171A;font-size:15px;line-height:1.3em;font-weight:700">{{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:#7C8B9A;font-size:13px;line-height:1.35em;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">
+                              <div style="min-width: 140px; max-width: 180px; background-repeat: no-repeat; background-size: cover; background-position: center; border-radius: 0 8px 8px 0;background-image: url('{{recommendation.featuredImage}}')" class="new-mention-thumbnail">
                                 <img src="{{recommendation.featuredImage}}" style="border: none; -ms-interpolation-mode: bicubic; max-width: 100%; display: none;"/>
                               </div>
                             {{/if}}
@@ -52,26 +57,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 #F4F5F6; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; background-color:#F4F5F6;" class="recommendation-card--outlook">
                             <tr>
-                                <td width="100%" style="padding: 20px;background-color:#F9F9FA;">
+                                <td width="100%" style="padding: 20px;background-color:#F4F5F6;">
                                     <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: #15171A; 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: #15171A; font-size: 15px; line-height: 1.5em; font-weight: 700; 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: #7C8B9A; font-size: 13px; line-height: 1.5em; font-weight: 400;text-decoration: none;">{{recommendation.excerpt}}</a></div></td>
+                                          {{/if}}
                                         </tr>
                                     </table>
                                 </td>
@@ -82,15 +91,17 @@
                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
                           <tbody>
                             <tr>
-                              <td align="left" 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; vertical-align: top; padding-top: 32px; padding-bottom: 12px;">
+                              <td align="left" 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; vertical-align: top; padding-top: 24px; padding-bottom: 12px;">
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
                                   <tbody>
                                     <tr>
-                                        {{#if recommendation.recommendingBack}}
-                                            <td 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; vertical-align: top; background-color: #15171a; border-radius: 5px; text-align: center;"> <a href="{{siteUrl}}ghost/#/settings/recommendations" target="_blank" style="display: inline-block; color: #ffffff; background-color: #15171a; border: solid 1px #15171a; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15171a;">View recommendations</a></td>
+                                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; border-radius: 8px; text-align: center;"> 
+                                        {{#if recommendation.recommendingBack}}     
+                                          <a href="{{siteUrl}}ghost/#/settings/recommendations" target="_blank" style="border:solid 1px {{accentColor}};border-radius:8px;box-sizing:border-box;display:inline-block;font-size:15px;font-weight:normal;margin:0;padding:10px 20px;text-decoration:none;background-color:{{accentColor}};border-color:{{accentColor}};color:#ffffff">View recommendations</a>
                                         {{else}}
-                                            <td 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; vertical-align: top; background-color: #15171a; border-radius: 5px; text-align: center;"> <a href="{{siteUrl}}ghost/#/settings/recommendations/add?url={{ encodeURIComponent recommendation.url }}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #15171a; border: solid 1px #15171a; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15171a;">Recommend back</a></td>
+                                          <a href="{{siteUrl}}ghost/#/settings/recommendations/add?url={{ encodeURIComponent recommendation.url }}" target="_blank" style="border:solid 1px {{accentColor}};border-radius:8px;box-sizing:border-box;display:inline-block;font-size:15px;font-weight:normal;margin:0;padding:10px 20px;text-decoration:none;background-color:{{accentColor}};border-color:{{accentColor}};color:#ffffff">Recommend back</a>
                                         {{/if}}
+                                      </td>
                                     </tr>
                                   </tbody>
                                 </table>
@@ -98,21 +109,29 @@
                             </tr>
                           </tbody>
                         </table>
-                        <hr/>
-                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
-                        <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{siteUrl}}ghost/#/settings/recommendations</p>
+
+                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                          <tbody>
+                            <tr>
+                              <td align="left" style="padding-top: 24px;">
+                                <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #7c8b9a; font-weight: normal; margin: 0; line-height: 25px;">Or copy and paste this URL into your browser:</p>
+                                <p class="text-link" style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin:0; color: #7c8b9a; font-weight: normal;">{{siteUrl}}ghost/#/settings/recommendations</p>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <tr>
-                        <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{toEmail}}</a></p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top; padding-top: 56px;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{toEmail}}</a></p>
                       </td>
                     </tr>
                     <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">here</a>.</p>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 12px; vertical-align: top;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">Don’t want to receive these emails? Manage your preferences <a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">here</a>.</p>
                       </td>
                     </tr>
 
diff --git a/ghost/staff-service/package.json b/ghost/staff-service/package.json
index 3348788bb27..49446d9e7d8 100644
--- a/ghost/staff-service/package.json
+++ b/ghost/staff-service/package.json
@@ -23,8 +23,10 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
+    "@tryghost/email-addresses": "0.0.0",
+    "handlebars": "4.7.8",
+    "juice": "9.1.0",
     "lodash": "4.17.21",
-    "moment": "2.29.1",
-    "handlebars": "4.7.8"
+    "moment": "2.29.1"
   }
 }
diff --git a/ghost/staff-service/test/staff-service.test.js b/ghost/staff-service/test/staff-service.test.js
index c2a1ec1c432..a2e167fb171 100644
--- a/ghost/staff-service/test/staff-service.test.js
+++ b/ghost/staff-service/test/staff-service.test.js
@@ -78,10 +78,6 @@ function testCommonPaidSubMailData({member, mailStub, getEmailAlertUsersStub}) {
     mailStub.calledWith(
         sinon.match.has('html', sinon.match('$50.00/month'))
     ).should.be.true();
-
-    mailStub.calledWith(
-        sinon.match.has('html', sinon.match('Subscription started on 1 Aug 2022'))
-    ).should.be.true();
 }
 
 function testCommonPaidSubCancelMailData({mailStub, getEmailAlertUsersStub}) {
@@ -149,9 +145,18 @@ describe('StaffService', function () {
             }
         };
 
+        const blogIcon = {
+            getIconUrl: () => {
+                return 'https://ghost.example/siteicon.png';
+            }
+        };
+
         const settingsHelpers = {
             getDefaultEmailDomain: () => {
                 return 'ghost.example';
+            },
+            useNewEmailAddresses: () => {
+                return false;
             }
         };
 
@@ -181,6 +186,7 @@ describe('StaffService', function () {
                 },
                 settingsCache,
                 urlUtils,
+                blogIcon,
                 settingsHelpers,
                 labs
             });
@@ -217,6 +223,7 @@ describe('StaffService', function () {
                     DomainEvents,
                     settingsCache,
                     urlUtils,
+                    blogIcon,
                     settingsHelpers
                 });
                 service.subscribeEvents();
@@ -336,6 +343,7 @@ describe('StaffService', function () {
                     },
                     settingsCache,
                     urlUtils,
+                    blogIcon,
                     settingsHelpers,
                     labs: {
                         isSet: () => {
@@ -427,9 +435,6 @@ describe('StaffService', function () {
                 mailStub.calledWith(
                     sinon.match.has('html', sinon.match('🥳 Free member signup: Ghost'))
                 ).should.be.true();
-                mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Created on 1 Aug 2022 &#8226; France'))
-                ).should.be.true();
             });
 
             it('sends free member signup alert without member name', async function () {
@@ -452,18 +457,13 @@ describe('StaffService', function () {
                 mailStub.calledWith(
                     sinon.match.has('html', sinon.match('🥳 Free member signup: member@example.com'))
                 ).should.be.true();
-                mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Created on 1 Aug 2022 &#8226; France'))
-                ).should.be.true();
             });
 
             it('sends free member signup alert with attribution', async function () {
                 const member = {
                     name: 'Ghost',
                     email: 'member@example.com',
-                    id: 'abc',
-                    geolocation: '{"country": "France"}',
-                    created_at: '2022-08-01T07:30:39.882Z'
+                    id: 'abc'
                 };
 
                 const attribution = {
@@ -484,9 +484,6 @@ describe('StaffService', function () {
                 mailStub.calledWith(
                     sinon.match.has('html', sinon.match('🥳 Free member signup: Ghost'))
                 ).should.be.true();
-                mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Created on 1 Aug 2022 &#8226; France'))
-                ).should.be.true();
 
                 mailStub.calledWith(
                     sinon.match.has('html', sinon.match('Source'))
@@ -517,9 +514,7 @@ describe('StaffService', function () {
                 member = {
                     name: 'Ghost',
                     email: 'member@example.com',
-                    id: 'abc',
-                    geolocation: '{"country": "France"}',
-                    created_at: '2022-08-01T07:30:39.882Z'
+                    id: 'abc'
                 };
                 offer = {
                     name: 'Half price',
@@ -585,9 +580,7 @@ describe('StaffService', function () {
             it('sends paid subscription start alert without member name', async function () {
                 let memberData = {
                     email: 'member@example.com',
-                    id: 'abc',
-                    geolocation: '{"country": "France"}',
-                    created_at: '2022-08-01T07:30:39.882Z'
+                    id: 'abc'
                 };
                 await service.emails.notifyPaidSubscriptionStarted({member: memberData, offer: null, tier, subscription}, options);
 
@@ -703,6 +696,9 @@ describe('StaffService', function () {
             let member;
             let tier;
             let subscription;
+            let expiryAt;
+            let canceledAt;
+            let cancelNow;
             before(function () {
                 member = {
                     name: 'Ghost',
@@ -719,31 +715,30 @@ describe('StaffService', function () {
                 subscription = {
                     amount: 5000,
                     currency: 'USD',
-                    interval: 'month',
-                    cancelAt: '2024-08-01T07:30:39.882Z',
-                    canceledAt: '2022-08-05T07:30:39.882Z'
+                    interval: 'month'
                 };
+
+                expiryAt = '2024-09-05T07:30:39.882Z';
+                canceledAt = '2022-08-05T07:30:39.882Z';
+                cancelNow = false;
             });
 
-            it('sends paid subscription cancel alert', async function () {
+            it('sends paid subscription cancel notification when sub is canceled at the end of billing period', async function () {
                 await service.emails.notifyPaidSubscriptionCanceled({member, tier, subscription: {
                     ...subscription,
                     cancellationReason: 'Changed my mind!'
-                }}, options);
+                }, expiryAt, canceledAt, cancelNow}, options);
 
                 mailStub.calledOnce.should.be.true();
                 testCommonPaidSubCancelMailData(stubs);
 
+                // Expiration sentence is in the future tense
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Subscription will expire on'))
-                ).should.be.true();
-
-                mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Canceled on 5 Aug 2022'))
+                    sinon.match.has('html', sinon.match('Expires on'))
                 ).should.be.true();
 
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('1 Aug 2024'))
+                    sinon.match.has('html', sinon.match('5 Sep 2024'))
                 ).should.be.true();
 
                 mailStub.calledWith(
@@ -753,39 +748,59 @@ describe('StaffService', function () {
                 mailStub.calledWith(
                     sinon.match.has('html', sinon.match('Reason: Changed my mind!'))
                 ).should.be.true();
-                mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Cancellation reason'))
-                ).should.be.true();
             });
 
-            it('sends paid subscription cancel alert without reason', async function () {
-                await service.emails.notifyPaidSubscriptionCanceled({member, tier, subscription}, options);
+            it('sends paid subscription cancel alert when sub is canceled without reason', async function () {
+                await service.emails.notifyPaidSubscriptionCanceled({member, tier, subscription, expiryAt, cancelNow}, options);
 
                 mailStub.calledOnce.should.be.true();
                 testCommonPaidSubCancelMailData(stubs);
 
+                // Expiration sentence is in the future tense
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Subscription will expire on'))
+                    sinon.match.has('html', sinon.match('Expires on'))
                 ).should.be.true();
 
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Canceled on 5 Aug 2022'))
+                    sinon.match.has('html', sinon.match('5 Sep 2024'))
                 ).should.be.true();
 
+                // Cancellation reason block is hidden
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('1 Aug 2024'))
-                ).should.be.true();
+                    sinon.match.has('html', sinon.match('Reason: '))
+                ).should.be.false();
+            });
+
+            it('sends paid subscription cancel alert when subscription is canceled immediately', async function () {
+                cancelNow = true;
+                await service.emails.notifyPaidSubscriptionCanceled({member, tier, subscription: {
+                    ...subscription,
+                    cancellationReason: 'Payment failed'
+                }, expiryAt, canceledAt, cancelNow}, options);
+
+                mailStub.calledOnce.should.be.true();
+                testCommonPaidSubCancelMailData(stubs);
 
+                // We don't show "Canceled on" when subscription is canceled immediately
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Reason: '))
+                    sinon.match.has('html', sinon.match('Canceled on'))
                 ).should.be.false();
+
+                // Expiration sentence is in the past tense
+                mailStub.calledWith(
+                    sinon.match.has('html', sinon.match('Expired on'))
+                ).should.be.true();
+
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('Cancellation reason'))
+                    sinon.match.has('html', sinon.match('5 Sep 2024'))
+                ).should.be.true();
+
+                mailStub.calledWith(
+                    sinon.match.has('html', 'Offer')
                 ).should.be.false();
 
-                // check preview text
                 mailStub.calledWith(
-                    sinon.match.has('html', sinon.match('A paid member has just canceled their subscription.'))
+                    sinon.match.has('html', sinon.match('Reason: Payment failed'))
                 ).should.be.true();
             });
         });
@@ -915,7 +930,8 @@ describe('StaffService', function () {
                     amount: 1500,
                     currency: 'eur',
                     name: 'Simon',
-                    email: 'simon@example.com'
+                    email: 'simon@example.com',
+                    donationMessage: 'Thank you for the awesome newsletter!'
                 };
 
                 await service.emails.notifyDonationReceived({donationPaymentEvent});
@@ -928,6 +944,112 @@ describe('StaffService', function () {
                     sinon.match.has('html', sinon.match('One-time payment received: €15.00 from Simon'))
                 ).should.be.true();
             });
+
+            it('has donation message in text', async function () {
+                const donationPaymentEvent = {
+                    amount: 1500,
+                    currency: 'eur',
+                    name: 'Jamie',
+                    email: 'jamie@example.com',
+                    donationMessage: 'Thank you for the awesome newsletter!'
+                };
+
+                await service.emails.notifyDonationReceived({donationPaymentEvent});
+
+                getEmailAlertUsersStub.calledWith('donation').should.be.true();
+
+                mailStub.calledOnce.should.be.true();
+
+                mailStub.calledWith(
+                    sinon.match.has('text', sinon.match('Thank you for the awesome newsletter!'))
+                ).should.be.true();
+            });
+
+            it('has donation message in html', async function () {
+                const donationPaymentEvent = {
+                    amount: 1500,
+                    currency: 'eur',
+                    name: 'Jamie',
+                    email: 'jamie@example.com',
+                    donationMessage: 'Thank you for the awesome newsletter!'
+                };
+
+                await service.emails.notifyDonationReceived({donationPaymentEvent});
+
+                getEmailAlertUsersStub.calledWith('donation').should.be.true();
+
+                mailStub.calledOnce.should.be.true();
+
+                mailStub.calledWith(
+                    sinon.match.has('html', sinon.match('Thank you for the awesome newsletter!'))
+                ).should.be.true();
+            });
+
+            it('does not contain donation message in HTML if not provided', async function () {
+                const donationPaymentEvent = {
+                    amount: 1500,
+                    currency: 'eur',
+                    name: 'Jamie',
+                    email: 'jamie@example.com',
+                    donationMessage: null // No donation message provided
+                };
+
+                await service.emails.notifyDonationReceived({donationPaymentEvent});
+
+                getEmailAlertUsersStub.calledWith('donation').should.be.true();
+                mailStub.calledOnce.should.be.true();
+
+                // Check that the specific HTML block for the donation message is NOT present
+                mailStub.calledWith(
+                    sinon.match.has('html', sinon.match(function (html) {
+                        // Ensure that the block with `{{donation.donationMessage}}` does not exist in the rendered HTML
+                        return !html.includes('“') && !html.includes('”');
+                    }))
+                ).should.be.true();
+            });
+
+            // Not really a relevant test, but it's here to show that the donation message is wrapped in quotation marks
+            // and that the above test is actually working, since only the donation message is wrapped in quotation marks
+            it('The donation message is wrapped in quotation marks', async function () {
+                const donationPaymentEvent = {
+                    amount: 1500,
+                    currency: 'eur',
+                    name: 'Jamie',
+                    email: 'jamie@example.com',
+                    donationMessage: 'Thank you for the great newsletter!'
+                };
+
+                await service.emails.notifyDonationReceived({donationPaymentEvent});
+
+                getEmailAlertUsersStub.calledWith('donation').should.be.true();
+                mailStub.calledOnce.should.be.true();
+
+                mailStub.calledWith(
+                    sinon.match.has('html', sinon.match(function (html) {
+                        return html.includes('“') && html.includes('”');
+                    }))
+                ).should.be.true();
+            });
+
+            it('send donation email without message', async function () {
+                const donationPaymentEvent = {
+                    amount: 1500,
+                    currency: 'eur',
+                    name: 'Ronald',
+                    email: 'ronald@example.com',
+                    donationMessage: null
+                };
+
+                await service.emails.notifyDonationReceived({donationPaymentEvent});
+
+                getEmailAlertUsersStub.calledWith('donation').should.be.true();
+
+                mailStub.calledOnce.should.be.true();
+
+                mailStub.calledWith(
+                    sinon.match.has('text', sinon.match('No message provided'))
+                ).should.be.true();
+            });
         });
 
         describe('renderText for webmentions', function () {
diff --git a/ghost/stats-service/lib/MembersStatsService.js b/ghost/stats-service/lib/MembersStatsService.js
index ce46b16e04b..9cfad8d4c02 100644
--- a/ghost/stats-service/lib/MembersStatsService.js
+++ b/ghost/stats-service/lib/MembersStatsService.js
@@ -36,6 +36,7 @@ class MembersStatsService {
      */
     async fetchAllStatusDeltas() {
         const knex = this.knex;
+        const ninetyDaysAgo = moment.utc().subtract(91, 'days').startOf('day').utc().format('YYYY-MM-DD HH:mm:ss');
         const rows = await knex('members_status_events')
             .select(knex.raw('DATE(created_at) as date'))
             .select(knex.raw(`SUM(
@@ -56,8 +57,8 @@ class MembersStatsService {
                 WHEN from_status='free' THEN -1
                 ELSE 0 END
             ) as free_delta`))
-            .groupByRaw('DATE(created_at)')
-            .orderByRaw('DATE(created_at)');
+            .where('created_at', '>=', ninetyDaysAgo)
+            .groupByRaw('DATE(created_at)');
         return rows;
     }
 
@@ -77,6 +78,7 @@ class MembersStatsService {
 
         const cumulativeResults = [];
 
+        rows.sort((a, b) => new Date(a.date) - new Date(b.date));
         // Loop in reverse order (needed to have correct sorted result)
         for (let i = rows.length - 1; i >= 0; i -= 1) {
             const row = rows[i];
diff --git a/ghost/stats-service/lib/MrrStatsService.js b/ghost/stats-service/lib/MrrStatsService.js
index 29d7112a1e9..4434b0ee7be 100644
--- a/ghost/stats-service/lib/MrrStatsService.js
+++ b/ghost/stats-service/lib/MrrStatsService.js
@@ -38,14 +38,15 @@ class MrrStatsService {
      */
     async fetchAllDeltas() {
         const knex = this.knex;
+        const ninetyDaysAgo = moment.utc().subtract(90, 'days').startOf('day').utc().format('YYYY-MM-DD HH:mm:ss');
         const rows = await knex('members_paid_subscription_events')
             .select('currency')
             // In SQLite, DATE(created_at) would map to a string value, while DATE(created_at) would map to a JSDate object in MySQL
             // That is why we need the cast here (to have some consistency)
             .select(knex.raw('CAST(DATE(created_at) as CHAR) as date'))
             .select(knex.raw(`SUM(mrr_delta) as delta`))
-            .groupByRaw('CAST(DATE(created_at) as CHAR), currency')
-            .orderByRaw('CAST(DATE(created_at) as CHAR), currency');
+            .where('created_at', '>=', ninetyDaysAgo)
+            .groupByRaw('CAST(DATE(created_at) as CHAR), currency');
         return rows;
     }
 
@@ -60,6 +61,13 @@ class MrrStatsService {
 
         const rows = await this.fetchAllDeltas();
 
+        rows.sort((rowA, rowB) => {
+            const dateA = new Date(rowA.date);
+            const dateB = new Date(rowB.date);
+        
+            return dateA - dateB || rowA.currency.localeCompare(rowB.currency);
+        });
+
         // Get today in UTC (default timezone)
         const today = moment().format('YYYY-MM-DD');
 
diff --git a/ghost/stats-service/lib/ReferrersStatsService.js b/ghost/stats-service/lib/ReferrersStatsService.js
index 345f4896bbc..aebb06b667b 100644
--- a/ghost/stats-service/lib/ReferrersStatsService.js
+++ b/ghost/stats-service/lib/ReferrersStatsService.js
@@ -101,10 +101,12 @@ class ReferrersStatsService {
      **/
     async fetchAllPaidConversionSources() {
         const knex = this.knex;
+        const ninetyDaysAgo = moment.utc().subtract(90, 'days').startOf('day').utc().format('YYYY-MM-DD HH:mm:ss');
         const rows = await knex('members_subscription_created_events')
             .select(knex.raw(`DATE(created_at) as date`))
             .select(knex.raw(`COUNT(*) as paid_conversions`))
             .select(knex.raw(`referrer_source as source`))
+            .where('created_at', '>=', ninetyDaysAgo)
             .groupBy('date', 'referrer_source')
             .orderBy('date');
 
@@ -116,10 +118,12 @@ class ReferrersStatsService {
      **/
     async fetchAllSignupSources() {
         const knex = this.knex;
+        const ninetyDaysAgo = moment.utc().subtract(90, 'days').startOf('day').utc().format('YYYY-MM-DD HH:mm:ss');
         const rows = await knex('members_created_events')
             .select(knex.raw(`DATE(created_at) as date`))
             .select(knex.raw(`COUNT(*) as signups`))
             .select(knex.raw(`referrer_source as source`))
+            .where('created_at', '>=', ninetyDaysAgo)
             .groupBy('date', 'referrer_source')
             .orderBy('date');
 
diff --git a/ghost/stats-service/package.json b/ghost/stats-service/package.json
index 49a98b61860..0585c9025a8 100644
--- a/ghost/stats-service/package.json
+++ b/ghost/stats-service/package.json
@@ -20,16 +20,16 @@
     "lib"
   ],
   "devDependencies": {
-    "@types/luxon": "3.3.2",
+    "@types/luxon": "3.4.2",
     "@types/mocha": "10.0.1",
     "@types/sinon": "10.0.16",
     "c8": "8.0.1",
     "knex": "2.4.2",
-    "luxon": "3.4.3",
+    "luxon": "3.5.0",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0",
-    "sqlite3": "5.1.6"
+    "sqlite3": "5.1.7"
   },
   "dependencies": {
     "moment": "2.29.3"
diff --git a/ghost/stats-service/test/lib/referrers.test.js b/ghost/stats-service/test/lib/referrers.test.js
index 25d26b228c2..0b2fd2e9fdd 100644
--- a/ghost/stats-service/test/lib/referrers.test.js
+++ b/ghost/stats-service/test/lib/referrers.test.js
@@ -1,6 +1,7 @@
 const knex = require('knex').default;
 const assert = require('assert/strict');
 const ReferrersStatsService = require('../../lib/ReferrersStatsService');
+const {DateTime} = require('luxon');
 
 describe('ReferrersStatsService', function () {
     describe('getReferrerHistory', function () {
@@ -35,12 +36,13 @@ describe('ReferrersStatsService', function () {
         });
 
         async function insertEvents(sources) {
-            const {DateTime} = require('luxon');
             const signupInsert = [];
             const paidInsert = [];
 
+            const startDate = DateTime.now().minus({months: 1});
+            
             for (let index = 0; index < sources.length; index++) {
-                const day = DateTime.fromISO('1970-01-01').plus({days: index}).toISODate();
+                const day = startDate.plus({days: index}).toISODate();
                 if (index > 0) {
                     signupInsert.push({
                         referrer_source: sources[index],
@@ -64,13 +66,13 @@ describe('ReferrersStatsService', function () {
                     referrer_source: null,
                     referrer_medium: null,
                     referrer_url: null,
-                    created_at: '1970-01-09'
+                    created_at: startDate.plus({days: sources.length}).toISODate()
                 },
                 {
                     referrer_source: null,
                     referrer_medium: null,
                     referrer_url: null,
-                    created_at: '1970-01-09'
+                    created_at: startDate.plus({days: sources.length}).toISODate()
                 }
             ]);
 
@@ -80,13 +82,13 @@ describe('ReferrersStatsService', function () {
                     referrer_source: null,
                     referrer_medium: null,
                     referrer_url: null,
-                    created_at: '1970-01-09'
+                    created_at: startDate.plus({days: sources.length}).toISODate()
                 },
                 {
                     referrer_source: null,
                     referrer_medium: null,
                     referrer_url: null,
-                    created_at: '1970-01-09'
+                    created_at: startDate.plus({days: sources.length}).toISODate()
                 }
             ]);
             await db('members_created_events').insert(signupInsert);
@@ -105,13 +107,19 @@ describe('ReferrersStatsService', function () {
                 return result.date === date && result.source === source;
             };
 
-            // Is sorted by date
-            assert.deepEqual(results.data.map(result => result.date), ['1970-01-01', '1970-01-02', '1970-01-03', '1970-01-04', '1970-01-05', '1970-01-06', '1970-01-07', '1970-01-08', '1970-01-09', '1970-01-09']);
+            const startDate = DateTime.now().minus({months: 1});
 
-            const firstDayCounts = results.data.find(finder('Twitter', '1970-01-01'));
-            const secondDayCounts = results.data.find(finder('Ghost Newsletter', '1970-01-02'));
-            const thirdDayCounts = results.data.find(finder('Ghost Explore', '1970-01-03'));
-            const nullReferrerCounts = results.data.find(finder(null, '1970-01-09'));
+            const expectedDates = [];
+            for (let i = 0; i < 10; i++) {
+                expectedDates.push(startDate.plus({days: i}).toISODate());
+            }
+
+            assert.deepEqual(results.data.map(result => result.date), expectedDates);
+
+            const firstDayCounts = results.data.find(finder('Twitter', expectedDates[0]));
+            const secondDayCounts = results.data.find(finder('Ghost Newsletter', expectedDates[1]));
+            const thirdDayCounts = results.data.find(finder('Ghost Explore', expectedDates[2]));
+            const nullReferrerCounts = results.data.find(finder(null, expectedDates[9]));
 
             assert(firstDayCounts.signups === 0);
             assert(firstDayCounts.paid_conversions === 1);
diff --git a/ghost/stripe/lib/StripeAPI.js b/ghost/stripe/lib/StripeAPI.js
index 8e0c58bcbd2..9dc29725e47 100644
--- a/ghost/stripe/lib/StripeAPI.js
+++ b/ghost/stripe/lib/StripeAPI.js
@@ -41,10 +41,19 @@ module.exports = class StripeAPI {
     /**
      * StripeAPI
      */
-    constructor() {
+    constructor(deps) {
         /** @type {Stripe} */
         this._stripe = null;
         this._configured = false;
+        this.labs = deps.labs;
+    }
+
+    get PAYMENT_METHOD_TYPES() {
+        if (this.labs.isSet('additionalPaymentMethods')) {
+            return undefined;
+        } else {
+            return ['card'];
+        }
     }
 
     get configured() {
@@ -458,7 +467,7 @@ module.exports = class StripeAPI {
         }
 
         let stripeSessionOptions = {
-            payment_method_types: ['card'],
+            payment_method_types: this.PAYMENT_METHOD_TYPES,
             success_url: options.successUrl || this._config.checkoutSessionSuccessUrl,
             cancel_url: options.cancelUrl || this._config.checkoutSessionCancelUrl,
             // @ts-ignore - we need to update to latest stripe library to correctly use newer features
@@ -488,6 +497,10 @@ module.exports = class StripeAPI {
             stripeSessionOptions.customer_email = customerEmail;
         }
 
+        if (customerId && this._config.enableAutomaticTax) {
+            stripeSessionOptions.customer_update = {address: 'auto'};
+        }
+
         // @ts-ignore
         const session = await this._stripe.checkout.sessions.create(stripeSessionOptions);
 
@@ -510,6 +523,14 @@ module.exports = class StripeAPI {
         /**
          * @type {Stripe.Checkout.SessionCreateParams}
          */
+
+        // TODO - add it higher up the stack to the metadata object.
+        // add ghost_donation key to metadata object
+        metadata = {
+            ghost_donation: true,
+            ...metadata
+        };
+
         const stripeSessionOptions = {
             mode: 'payment',
             success_url: successUrl || this._config.checkoutSessionSuccessUrl,
@@ -534,9 +555,24 @@ module.exports = class StripeAPI {
             line_items: [{
                 price: priceId,
                 quantity: 1
-            }]
+            }],
+            custom_fields: [
+                {
+                    key: 'donation_message',
+                    label: {
+                        type: 'custom',
+                        custom: 'Add a personal note'
+                    },
+                    type: 'text',
+                    optional: true
+                }
+            ]
         };
 
+        if (customer && this._config.enableAutomaticTax) {
+            stripeSessionOptions.customer_update = {address: 'auto'};
+        }
+
         // @ts-ignore
         const session = await this._stripe.checkout.sessions.create(stripeSessionOptions);
         return session;
@@ -545,14 +581,16 @@ module.exports = class StripeAPI {
     /**
      * @param {ICustomer} customer
      * @param {object} options
-     *
+     * @param {string} options.successUrl
+     * @param {string} options.cancelUrl
+     * @param {string} options.currency - 3-letter ISO code in lowercase, e.g. `usd`
      * @returns {Promise<import('stripe').Stripe.Checkout.Session>}
      */
     async createCheckoutSetupSession(customer, options) {
         await this._rateLimitBucket.throttle();
         const session = await this._stripe.checkout.sessions.create({
             mode: 'setup',
-            payment_method_types: ['card'],
+            payment_method_types: this.PAYMENT_METHOD_TYPES,
             success_url: options.successUrl || this._config.checkoutSetupSessionSuccessUrl,
             cancel_url: options.cancelUrl || this._config.checkoutSetupSessionCancelUrl,
             customer_email: customer.email,
@@ -560,7 +598,11 @@ module.exports = class StripeAPI {
                 metadata: {
                     customer_id: customer.id
                 }
-            }
+            },
+
+            // Note: this is required for dynamic payment methods
+            // https://docs.stripe.com/api/checkout/sessions/create#create_checkout_session-currency
+            currency: this.labs.isSet('additionalPaymentMethods') ? options.currency : undefined
         });
 
         return session;
@@ -675,20 +717,23 @@ module.exports = class StripeAPI {
      * @param {string} subscriptionId - The ID of the Subscription to modify
      * @param {string} id - The ID of the SubscriptionItem
      * @param {string} price - The ID of the new Price
+     * @param {object} [options={}] - Additional data to set on the subscription object
+     * @param {('always_invoice'|'create_prorations'|'none')} [options.prorationBehavior='always_invoice'] - The proration behavior to use. See [Stripe docs](https://docs.stripe.com/api/subscriptions/update#update_subscription-proration_behavior) for more info
+     * @param {string} [options.cancellationReason=null] - The user defined cancellation reason
      *
      * @returns {Promise<import('stripe').Stripe.Subscription>}
      */
-    async updateSubscriptionItemPrice(subscriptionId, id, price) {
+    async updateSubscriptionItemPrice(subscriptionId, id, price, options = {}) {
         await this._rateLimitBucket.throttle();
         const subscription = await this._stripe.subscriptions.update(subscriptionId, {
-            proration_behavior: 'always_invoice',
+            proration_behavior: options.prorationBehavior || 'always_invoice',
             items: [{
                 id,
                 price
             }],
             cancel_at_period_end: false,
             metadata: {
-                cancellation_reason: null
+                cancellation_reason: options.cancellationReason ?? null
             }
         });
         return subscription;
diff --git a/ghost/stripe/lib/StripeService.js b/ghost/stripe/lib/StripeService.js
index 7728b9c9f5d..1ec78f3a1db 100644
--- a/ghost/stripe/lib/StripeService.js
+++ b/ghost/stripe/lib/StripeService.js
@@ -7,13 +7,14 @@ const {StripeLiveEnabledEvent, StripeLiveDisabledEvent} = require('./events');
 
 module.exports = class StripeService {
     constructor({
+        labs,
         membersService,
         donationService,
         staffService,
         StripeWebhook,
         models
     }) {
-        const api = new StripeAPI();
+        const api = new StripeAPI({labs});
         const webhookManager = new WebhookManager({
             StripeWebhook,
             api
diff --git a/ghost/stripe/lib/WebhookController.js b/ghost/stripe/lib/WebhookController.js
index d72fcb29f9c..1877bc26981 100644
--- a/ghost/stripe/lib/WebhookController.js
+++ b/ghost/stripe/lib/WebhookController.js
@@ -111,35 +111,8 @@ module.exports = class WebhookController {
     async invoiceEvent(invoice) {
         if (!invoice.subscription) {
             // Check if this is a one time payment, related to a donation
-            if (invoice.metadata.ghost_donation && invoice.paid) {
-                // Track a one time payment event
-                const amount = invoice.amount_paid;
-
-                const member = invoice.customer ? (await this.deps.memberRepository.get({
-                    customer_id: invoice.customer
-                })) : null;
-
-                const data = DonationPaymentEvent.create({
-                    name: member?.get('name') ?? invoice.customer_name,
-                    email: member?.get('email') ?? invoice.customer_email,
-                    memberId: member?.id ?? null,
-                    amount,
-                    currency: invoice.currency,
-
-                    // Attribution data
-                    attributionId: invoice.metadata.attribution_id ?? null,
-                    attributionUrl: invoice.metadata.attribution_url ?? null,
-                    attributionType: invoice.metadata.attribution_type ?? null,
-                    referrerSource: invoice.metadata.referrer_source ?? null,
-                    referrerMedium: invoice.metadata.referrer_medium ?? null,
-                    referrerUrl: invoice.metadata.referrer_url ?? null
-                });
-
-                await this.deps.donationRepository.save(data);
-                await this.deps.staffServiceEmails.notifyDonationReceived({
-                    donationPaymentEvent: data
-                });
-            }
+            // this is being handled in checkoutSessionEvent because we need to handle the custom donation message
+            // which is not available in the invoice object
             return;
         }
         const subscription = await this.api.getSubscription(invoice.subscription, {
@@ -182,6 +155,40 @@ module.exports = class WebhookController {
      * @private
      */
     async checkoutSessionEvent(session) {
+        if (session.mode === 'payment' && session.metadata?.ghost_donation) {
+            const donationField = session.custom_fields?.find(obj => obj?.key === 'donation_message');
+            // const customMessage = donationField?.text?.value ?? '';
+
+            // custom message should be null if it's empty
+
+            const donationMessage = donationField?.text?.value ? donationField.text.value : null;
+
+            const amount = session.amount_total;
+            const currency = session.currency;
+            const member = session.customer ? (await this.deps.memberRepository.get({
+                customer_id: session.customer
+            })) : null;
+
+            const data = DonationPaymentEvent.create({
+                name: member?.get('name') ?? session.customer_details.name,
+                email: member?.get('email') ?? session.customer_details.email,
+                memberId: member?.id ?? null,
+                amount,
+                currency,
+                donationMessage,
+                attributionId: session.metadata.attribution_id ?? null,
+                attributionUrl: session.metadata.attribution_url ?? null,
+                attributionType: session.metadata.attribution_type ?? null,
+                referrerSource: session.metadata.referrer_source ?? null,
+                referrerMedium: session.metadata.referrer_medium ?? null,
+                referrerUrl: session.metadata.referrer_url ?? null
+            });
+
+            await this.deps.donationRepository.save(data);
+            await this.deps.staffServiceEmails.notifyDonationReceived({
+                donationPaymentEvent: data
+            });
+        }
         if (session.mode === 'setup') {
             const setupIntent = await this.api.getSetupIntent(session.setup_intent);
             const member = await this.deps.memberRepository.get({
diff --git a/ghost/stripe/package.json b/ghost/stripe/package.json
index 2bd462ff1a2..ee08ccf5f04 100644
--- a/ghost/stripe/package.json
+++ b/ghost/stripe/package.json
@@ -25,10 +25,10 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.24",
+    "@tryghost/debug": "0.1.32",
     "@tryghost/domain-events": "0.0.0",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
     "@tryghost/member-events": "0.0.0",
     "leaky-bucket": "2.2.0",
     "lodash": "4.17.21",
diff --git a/ghost/stripe/test/unit/lib/StripeAPI.test.js b/ghost/stripe/test/unit/lib/StripeAPI.test.js
index 3382fd2814a..a4031384962 100644
--- a/ghost/stripe/test/unit/lib/StripeAPI.test.js
+++ b/ghost/stripe/test/unit/lib/StripeAPI.test.js
@@ -2,12 +2,17 @@ const sinon = require('sinon');
 const should = require('should');
 const rewire = require('rewire');
 const StripeAPI = rewire('../../../lib/StripeAPI');
-const api = new StripeAPI();
 
 describe('StripeAPI', function () {
     const mockCustomerEmail = 'foo@example.com';
     const mockCustomerId = 'cust_mock_123456';
     const mockCustomerName = 'Example Customer';
+    let mockLabs = {
+        isSet() {
+            return false;
+        }
+    };
+    const api = new StripeAPI({labs: mockLabs});
 
     let mockStripe;
 
@@ -20,6 +25,7 @@ describe('StripeAPI', function () {
                     }
                 }
             };
+            sinon.stub(mockLabs, 'isSet');
             const mockStripeConstructor = sinon.stub().returns(mockStripe);
             StripeAPI.__set__('Stripe', mockStripeConstructor);
             api.configure({
@@ -35,15 +41,21 @@ describe('StripeAPI', function () {
             sinon.restore();
         });
 
-        it('sends success_url and cancel_url', async function () {
+        it('Sends card as payment method if labs flag not enabled', async function () {
             await api.createCheckoutSession('priceId', null, {});
 
-            should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.success_url);
-            should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.cancel_url);
+            should.deepEqual(mockStripe.checkout.sessions.create.firstCall.firstArg.payment_method_types, ['card']);
         });
 
-        it('createCheckoutSetupSession sends success_url and cancel_url', async function () {
-            await api.createCheckoutSetupSession('priceId', {});
+        it('Sends no payment methods if labs flag is enabled', async function () {
+            mockLabs.isSet.withArgs('additionalPaymentMethods').returns(true);
+            await api.createCheckoutSession('priceId', null, {});
+
+            should.deepEqual(mockStripe.checkout.sessions.create.firstCall.firstArg.payment_method_types, undefined);
+        });
+
+        it('sends success_url and cancel_url', async function () {
+            await api.createCheckoutSession('priceId', null, {});
 
             should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.success_url);
             should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.cancel_url);
@@ -143,6 +155,53 @@ describe('StripeAPI', function () {
         });
     });
 
+    describe('createCheckoutSetupSession', function () {
+        beforeEach(function () {
+            mockStripe = {
+                checkout: {
+                    sessions: {
+                        create: sinon.stub().resolves()
+                    }
+                }
+            };
+            sinon.stub(mockLabs, 'isSet');
+            const mockStripeConstructor = sinon.stub().returns(mockStripe);
+            StripeAPI.__set__('Stripe', mockStripeConstructor);
+            api.configure({
+                checkoutSessionSuccessUrl: '/success',
+                checkoutSessionCancelUrl: '/cancel',
+                checkoutSetupSessionSuccessUrl: '/setup-success',
+                checkoutSetupSessionCancelUrl: '/setup-cancel',
+                secretKey: ''
+            });
+        });
+
+        afterEach(function () {
+            sinon.restore();
+        });
+
+        it('createCheckoutSetupSession sends success_url and cancel_url', async function () {
+            await api.createCheckoutSetupSession('priceId', {});
+
+            should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.success_url);
+            should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.cancel_url);
+        });
+
+        it('createCheckoutSetupSession does not send currency if additionalPaymentMethods flag is off', async function () {
+            mockLabs.isSet.withArgs('additionalPaymentMethods').returns(false);
+            await api.createCheckoutSetupSession('priceId', {currency: 'usd'});
+
+            should.not.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.currency);
+        });
+
+        it('createCheckoutSetupSession sends currency if additionalPaymentMethods flag is on', async function () {
+            mockLabs.isSet.withArgs('additionalPaymentMethods').returns(true);
+            await api.createCheckoutSetupSession('priceId', {currency: 'usd'});
+
+            should.equal(mockStripe.checkout.sessions.create.firstCall.firstArg.currency, 'usd');
+        });
+    });
+
     describe('getCustomerIdByEmail', function () {
         describe('when no customer is found', function () {
             beforeEach(function () {
@@ -282,5 +341,238 @@ describe('StripeAPI', function () {
 
             should.deepEqual(result, mockSubscription);
         });
+
+        describe('createCheckoutSetupSession automatic tax flag', function () {
+            beforeEach(function () {
+                mockStripe = {
+                    checkout: {
+                        sessions: {
+                            create: sinon.stub().resolves()
+                        }
+                    },
+                    customers: {
+                        create: sinon.stub().resolves()
+                    }
+                };
+                sinon.stub(mockLabs, 'isSet');
+                mockLabs.isSet.withArgs('stripeAutomaticTax').returns(true);
+                const mockStripeConstructor = sinon.stub().returns(mockStripe);
+                StripeAPI.__set__('Stripe', mockStripeConstructor);
+                api.configure({
+                    checkoutSessionSuccessUrl: '/success',
+                    checkoutSessionCancelUrl: '/cancel',
+                    checkoutSetupSessionSuccessUrl: '/setup-success',
+                    checkoutSetupSessionCancelUrl: '/setup-cancel',
+                    secretKey: '',
+                    enableAutomaticTax: true
+                });
+            });
+
+            afterEach(function () {
+                sinon.restore();
+            });
+
+            it('createCheckoutSession adds customer_update if automatic tax flag is enabled and customer is not undefined', async function () {
+                const mockCustomer = {
+                    id: mockCustomerId,
+                    customer_email: mockCustomerEmail,
+                    name: 'Example Customer'
+                };
+
+                await api.createCheckoutSession('priceId', mockCustomer, {
+                    trialDays: null
+                });
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.customer_update);
+            });
+
+            it('createCheckoutSession does not add customer_update if automatic tax flag is enabled and customer is undefined', async function () {
+                await api.createCheckoutSession('priceId', undefined, {
+                    trialDays: null
+                });
+                should.not.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.customer_update);
+            });
+
+            it('createCheckoutSession does not add customer_update if automatic tax flag is disabled', async function () {
+                const mockCustomer = {
+                    id: mockCustomerId,
+                    customer_email: mockCustomerEmail,
+                    name: 'Example Customer'
+                };
+                // set enableAutomaticTax: false
+                api.configure({
+                    checkoutSessionSuccessUrl: '/success',
+                    checkoutSessionCancelUrl: '/cancel',
+                    checkoutSetupSessionSuccessUrl: '/setup-success',
+                    checkoutSetupSessionCancelUrl: '/setup-cancel',
+                    secretKey: '',
+                    enableAutomaticTax: false
+                });
+                await api.createCheckoutSession('priceId', mockCustomer, {
+                    trialDays: null
+                });
+                should.not.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.customer_update);
+            });
+        });
+
+        describe('createDonationCheckoutSession', function () {
+            beforeEach(function () {
+                mockStripe = {
+                    checkout: {
+                        sessions: {
+                            create: sinon.stub().resolves()
+                        }
+                    }
+                };
+                sinon.stub(mockLabs, 'isSet');
+                const mockStripeConstructor = sinon.stub().returns(mockStripe);
+                StripeAPI.__set__('Stripe', mockStripeConstructor);
+                api.configure({
+                    checkoutSessionSuccessUrl: '/success',
+                    checkoutSessionCancelUrl: '/cancel',
+                    checkoutSetupSessionSuccessUrl: '/setup-success',
+                    checkoutSetupSessionCancelUrl: '/setup-cancel',
+                    secretKey: ''
+                });
+            });
+
+            afterEach(function () {
+                sinon.restore();
+            });
+
+            it('createDonationCheckoutSession sends success_url and cancel_url', async function () {
+                await api.createDonationCheckoutSession('priceId', {});
+
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.success_url);
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.cancel_url);
+            });
+
+            it('createDonationCheckoutSession does not send currency if additionalPaymentMethods flag is off', async function () {
+                mockLabs.isSet.withArgs('additionalPaymentMethods').returns(false);
+                await api.createDonationCheckoutSession('priceId', {currency: 'usd'});
+
+                should.not.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.currency);
+            });
+
+            it('passes customer ID when a valid customer object is provided', async function () {
+                const mockCustomer = {
+                    id: mockCustomerId,
+                    email: mockCustomerEmail,
+                    name: mockCustomerName
+                };
+
+                await api.createDonationCheckoutSession({
+                    priceId: 'priceId',
+                    successUrl: '/success',
+                    cancelUrl: '/cancel',
+                    metadata: {},
+                    customer: mockCustomer
+                });
+
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.customer);
+                should.equal(mockStripe.checkout.sessions.create.firstCall.firstArg.customer, mockCustomerId);
+            });
+
+            it('passes customer_email when no customer object is provided', async function () {
+                await api.createDonationCheckoutSession({
+                    priceId: 'priceId',
+                    successUrl: '/success',
+                    cancelUrl: '/cancel',
+                    metadata: {},
+                    customerEmail: mockCustomerEmail
+                });
+
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.customer_email);
+                should.equal(mockStripe.checkout.sessions.create.firstCall.firstArg.customer_email, mockCustomerEmail);
+            });
+
+            it('uses only customer when both customer and customerEmail are provided', async function () {
+                const mockCustomer = {
+                    id: mockCustomerId,
+                    email: mockCustomerEmail,
+                    name: mockCustomerName
+                };
+
+                await api.createDonationCheckoutSession({
+                    priceId: 'priceId',
+                    successUrl: '/success',
+                    cancelUrl: '/cancel',
+                    metadata: {},
+                    customer: mockCustomer,
+                    customerEmail: 'another_email@example.com'
+                });
+
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.customer);
+                should.equal(mockStripe.checkout.sessions.create.firstCall.firstArg.customer, mockCustomerId);
+                should.not.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.customer_email);
+            });
+
+            it('passes metadata correctly', async function () {
+                const metadata = {
+                    ghost_donation: true
+                };
+
+                await api.createDonationCheckoutSession({
+                    priceId: 'priceId',
+                    successUrl: '/success',
+                    cancelUrl: '/cancel',
+                    metadata,
+                    customer: null,
+                    customerEmail: mockCustomerEmail
+                });
+
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.metadata);
+                should.deepEqual(mockStripe.checkout.sessions.create.firstCall.firstArg.metadata, metadata);
+            });
+
+            it('passes custom fields correctly', async function () {
+                await api.createDonationCheckoutSession({
+                    priceId: 'priceId',
+                    successUrl: '/success',
+                    cancelUrl: '/cancel',
+                    metadata: {},
+                    customer: null,
+                    customerEmail: mockCustomerEmail
+                });
+
+                should.exist(mockStripe.checkout.sessions.create.firstCall.firstArg.custom_fields);
+                const customFields = mockStripe.checkout.sessions.create.firstCall.firstArg.custom_fields;
+                should.equal(customFields.length, 1);
+            });
+
+            it('has correct data for custom field message', async function () {
+                await api.createDonationCheckoutSession({
+                    priceId: 'priceId',
+                    successUrl: '/success',
+                    cancelUrl: '/cancel',
+                    metadata: {},
+                    customer: null,
+                    customerEmail: mockCustomerEmail
+                });
+
+                const customFields = mockStripe.checkout.sessions.create.firstCall.firstArg.custom_fields;
+                should.deepEqual(customFields[0], {
+                    key: 'donation_message',
+                    label: {
+                        type: 'custom',
+                        custom: 'Add a personal note'
+                    },
+                    type: 'text',
+                    optional: true
+                });
+            });
+
+            it('does not have more than 3 custom fields (stripe limitation)', async function () {
+                await api.createDonationCheckoutSession({
+                    priceId: 'priceId',
+                    successUrl: '/success',
+                    cancelUrl: '/cancel',
+                    metadata: {},
+                    customer: null,
+                    customerEmail: mockCustomerEmail
+                });
+
+                should.ok(mockStripe.checkout.sessions.create.firstCall.firstArg.custom_fields.length <= 3);
+            });
+        });
     });
 });
diff --git a/ghost/stripe/test/unit/lib/WebhookController.test.js b/ghost/stripe/test/unit/lib/WebhookController.test.js
new file mode 100644
index 00000000000..7cb407d97ce
--- /dev/null
+++ b/ghost/stripe/test/unit/lib/WebhookController.test.js
@@ -0,0 +1,174 @@
+const chai = require('chai');
+const sinon = require('sinon');
+const {expect} = chai;
+const WebhookController = require('../../../lib/WebhookController');
+// const {DonationPaymentEvent} = require('@tryghost/donations');
+
+describe('WebhookController', function () {
+    let controller;
+    let deps;
+    let req;
+    let res;
+
+    beforeEach(function () {
+        deps = {
+            api: {getSubscription: sinon.stub(), getCustomer: sinon.stub(), getSetupIntent: sinon.stub(), attachPaymentMethodToCustomer: sinon.stub(), updateSubscriptionDefaultPaymentMethod: sinon.stub()},
+            webhookManager: {parseWebhook: sinon.stub()},
+            eventRepository: {registerPayment: sinon.stub()},
+            memberRepository: {get: sinon.stub(), create: sinon.stub(), update: sinon.stub(), linkSubscription: sinon.stub(), upsertCustomer: sinon.stub()},
+            donationRepository: {save: sinon.stub()},
+            productRepository: {get: sinon.stub()},
+            staffServiceEmails: {notifyDonationReceived: sinon.stub()},
+            sendSignupEmail: sinon.stub()
+        };
+
+        controller = new WebhookController(deps);
+
+        req = {
+            body: {},
+            headers: {
+                'stripe-signature': 'valid-signature'
+            }
+        };
+
+        res = {
+            writeHead: sinon.stub(),
+            end: sinon.stub()
+        };
+    });
+
+    it('should return 400 if request body or signature is missing', async function () {
+        req.body = null;
+        await controller.handle(req, res);
+        expect(res.writeHead.calledWith(400)).to.be.true;
+        expect(res.end.called).to.be.true;
+    });
+
+    it('should return 401 if webhook signature is invalid', async function () {
+        deps.webhookManager.parseWebhook.throws(new Error('Invalid signature'));
+        await controller.handle(req, res);
+        expect(res.writeHead.calledWith(401)).to.be.true;
+        expect(res.end.called).to.be.true;
+    });
+
+    it('should handle customer.subscription.created event', async function () {
+        const event = {
+            type: 'customer.subscription.created',
+            data: {
+                object: {customer: 'cust_123', items: {data: [{price: {id: 'price_123'}}]}}
+            }
+        };
+        deps.webhookManager.parseWebhook.returns(event);
+        deps.memberRepository.get.resolves({id: 'member_123'});
+
+        await controller.handle(req, res);
+
+        expect(deps.memberRepository.get.calledWith({customer_id: 'cust_123'})).to.be.true;
+        expect(deps.memberRepository.linkSubscription.calledOnce).to.be.true;
+        expect(res.writeHead.calledWith(200)).to.be.true;
+        expect(res.end.called).to.be.true;
+    });
+
+    it('should handle a donation in checkoutSessionEvent', async function () {
+        const session = {
+            mode: 'payment',
+            metadata: {
+                ghost_donation: true,
+                attribution_id: 'attr_123',
+                attribution_url: 'https://example.com',
+                attribution_type: 'referral',
+                referrer_source: 'google',
+                referrer_medium: 'cpc',
+                referrer_url: 'https://referrer.com'
+            },
+            amount_total: 5000,
+            currency: 'usd',
+            customer: 'cust_123',
+            customer_details: {
+                name: 'John Doe',
+                email: 'john@example.com'
+            },
+            custom_fields: [{
+                key: 'donation_message',
+                text: {
+                    value: 'Thank you for the awesome newsletter!'
+                }
+            }]
+        };
+
+        const member = {
+            id: 'member_123',
+            get: sinon.stub()
+        };
+
+        member.get.withArgs('name').returns('John Doe');
+        member.get.withArgs('email').returns('john@example.com');
+
+        deps.memberRepository.get.resolves(member);
+
+        await controller.checkoutSessionEvent(session);
+
+        expect(deps.memberRepository.get.calledWith({customer_id: 'cust_123'})).to.be.true;
+        expect(deps.donationRepository.save.calledOnce).to.be.true;
+        expect(deps.staffServiceEmails.notifyDonationReceived.calledOnce).to.be.true;
+    
+        const savedDonationEvent = deps.donationRepository.save.getCall(0).args[0];
+        expect(savedDonationEvent.amount).to.equal(5000);
+        expect(savedDonationEvent.currency).to.equal('usd');
+        expect(savedDonationEvent.name).to.equal('John Doe');
+        expect(savedDonationEvent.email).to.equal('john@example.com');
+        expect(savedDonationEvent.donationMessage).to.equal('Thank you for the awesome newsletter!');
+        expect(savedDonationEvent.attributionId).to.equal('attr_123');
+        expect(savedDonationEvent.attributionUrl).to.equal('https://example.com');
+        expect(savedDonationEvent.attributionType).to.equal('referral');
+        expect(savedDonationEvent.referrerSource).to.equal('google');
+        expect(savedDonationEvent.referrerMedium).to.equal('cpc');
+        expect(savedDonationEvent.referrerUrl).to.equal('https://referrer.com');
+    });
+
+    it('donation message is null if string is empty', async function () {
+        const session = {
+            mode: 'payment',
+            metadata: {
+                ghost_donation: true,
+                attribution_id: 'attr_123',
+                attribution_url: 'https://example.com',
+                attribution_type: 'referral',
+                referrer_source: 'google',
+                referrer_medium: 'cpc',
+                referrer_url: 'https://referrer.com'
+            },
+            amount_total: 5000,
+            currency: 'usd',
+            customer: 'cust_123',
+            customer_details: {
+                name: 'JW',
+                email: 'jw@ily.co'
+            },
+            custom_fields: [{
+                key: 'donation_message',
+                text: {
+                    value: ''
+                }
+            }]
+        };
+
+        const member = {
+            id: 'member_123',
+            get: sinon.stub()
+        };
+
+        member.get.withArgs('name').returns('JW');
+        member.get.withArgs('email').returns('jw@ily.co');
+
+        deps.memberRepository.get.resolves(member);
+
+        await controller.checkoutSessionEvent(session);
+
+        expect(deps.memberRepository.get.calledWith({customer_id: 'cust_123'})).to.be.true;
+
+        const savedDonationEvent = deps.donationRepository.save.getCall(0).args[0];
+
+        expect(savedDonationEvent.donationMessage).to.equal(null);
+    });
+});
diff --git a/ghost/tiers/lib/InMemoryTierRepository.js b/ghost/tiers/lib/InMemoryTierRepository.js
index 682efcaacf2..fbff8a9fc0a 100644
--- a/ghost/tiers/lib/InMemoryTierRepository.js
+++ b/ghost/tiers/lib/InMemoryTierRepository.js
@@ -55,7 +55,8 @@ class InMemoryTierRepository {
      * @returns {Promise<Tier[]>}
      */
     async getAll(options = {}) {
-        const filter = nql(options.filter, {});
+        const filter = nql();
+        filter.filter = options.filter || {};
         return this.#store.slice().filter((item) => {
             return filter.queryJSON(this.toPrimitive(item));
         });
diff --git a/ghost/tiers/lib/TiersAPI.js b/ghost/tiers/lib/TiersAPI.js
index 62e29ef0a96..30848f69775 100644
--- a/ghost/tiers/lib/TiersAPI.js
+++ b/ghost/tiers/lib/TiersAPI.js
@@ -1,5 +1,5 @@
 const ObjectID = require('bson-objectid').default;
-const {BadRequestError} = require('@tryghost/errors');
+const {BadRequestError, IncorrectUsageError} = require('@tryghost/errors');
 const Tier = require('./Tier');
 
 /**
@@ -42,11 +42,16 @@ module.exports = class TiersAPI {
 
     /**
      * @param {object} [options]
-     * @param {string} [options.filter] - An NQL filter string
+     * @param {any} [options.filter] - A mongo query object
      *
      * @returns {Promise<Page<Tier>>}
      */
     async browse(options = {}) {
+        if (typeof options.filter === 'string') {
+            throw new IncorrectUsageError({
+                message: 'filter must be a mongo query object'
+            });
+        }
         const tiers = await this.#repository.getAll(options);
 
         return {
@@ -83,7 +88,12 @@ module.exports = class TiersAPI {
      */
     async readDefaultTier(options = {}) {
         const [defaultTier] = await this.#repository.getAll({
-            filter: 'type:paid+active:true',
+            filter: {
+                $and: [
+                    {type: 'paid'},
+                    {active: true}
+                ]
+            },
             limit: 1,
             ...options
         });
@@ -92,7 +102,7 @@ module.exports = class TiersAPI {
     }
 
     /**
-     * @param {string} id
+     * @param {string} idString
      * @param {object} data
      * @returns {Promise<Tier>}
      */
diff --git a/ghost/tiers/package.json b/ghost/tiers/package.json
index 193a78cc9a1..f3d3bb56dba 100644
--- a/ghost/tiers/package.json
+++ b/ghost/tiers/package.json
@@ -22,9 +22,9 @@
     "mocha": "10.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/string": "0.2.4",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/string": "0.2.12",
+    "@tryghost/tpl": "0.1.32",
     "bson-objectid": "2.0.4"
   }
 }
diff --git a/ghost/tinybird/.tinyenv b/ghost/tinybird/.tinyenv
new file mode 100644
index 00000000000..3281ddfae83
--- /dev/null
+++ b/ghost/tinybird/.tinyenv
@@ -0,0 +1,31 @@
+
+# VERSION format is major.minor.patch-post where major, minor, patch and post are integer numbers
+# bump post to deploy to the current live Release, rollback to previous post version is not available
+# bump patch or minor to deploy a new Release and auto-promote it to live. Add TB_AUTO_PROMOTE=0 to create the Release in preview status
+# bump major to deploy a new Release in preview status
+VERSION=0.0.0
+
+
+
+##########
+# OPTIONAL env vars
+# Deploy a new Release in preview status (default is 1)
+# TB_AUTO_PROMOTE=0
+
+# Check if deploy requires backfilling on preview (default is 1)
+# TB_CHECK_BACKFILL_REQUIRED=0
+
+# Force old Releases deletion on promote (default is 0)
+# Setting it to 1 will remove oldest rollback Releases even when some resource is still in use
+# TB_FORCE_REMOVE_OLDEST_ROLLBACK=0
+
+# Don't print CLI version warning message if there's a new available version
+# TB_VERSION_WARNING=0
+
+# Skip regression tests
+# TB_SKIP_REGRESSION=0
+
+# Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
+# OBFUSCATE_REGEX_PATTERN="https://(www\.)?[^/]+||^Follow these instructions =>"
+# OBFUSCATE_PATTERN_SEPARATOR=||
+##########
diff --git a/ghost/tinybird/README.md b/ghost/tinybird/README.md
new file mode 100644
index 00000000000..d3230a50d63
--- /dev/null
+++ b/ghost/tinybird/README.md
@@ -0,0 +1,18 @@
+# Tinybird
+
+This folder contains configuration for Tinybird, so that the stats feature can be used.
+
+We sync this configuration with Tinybird via the Tinybird CLI.
+
+## Tinybird CLI
+
+The Tinybird CLI is used via Docker.
+
+```bash
+yarn tb
+```
+
+Documentation for the Tinybird CLI: https://docs.tinybird.co/v/0.22.0/cli/overview
+Note: you can use python if you prefer, but we use Docker for consistency.
+
+How to work with version control: https://docs.tinybird.co/v/0.22.0/guides/version-control
diff --git a/ghost/tinybird/datasources/analytics_events.datasource b/ghost/tinybird/datasources/analytics_events.datasource
new file mode 100644
index 00000000000..a812f3a48fa
--- /dev/null
+++ b/ghost/tinybird/datasources/analytics_events.datasource
@@ -0,0 +1,14 @@
+DESCRIPTION >
+    Analytics events landing data source
+
+SCHEMA >
+    `timestamp` DateTime `json:$.timestamp`,
+    `session_id` String `json:$.session_id`,
+    `action` LowCardinality(String) `json:$.action`,
+    `version` LowCardinality(String) `json:$.version`,
+    `payload` String `json:$.payload`
+
+ENGINE MergeTree
+ENGINE_PARTITION_KEY toYYYYMM(timestamp)
+ENGINE_SORTING_KEY timestamp
+ENGINE_TTL timestamp + toIntervalDay(60)
diff --git a/ghost/tinybird/datasources/analytics_pages_mv.datasource b/ghost/tinybird/datasources/analytics_pages_mv.datasource
new file mode 100644
index 00000000000..1ffdf55f640
--- /dev/null
+++ b/ghost/tinybird/datasources/analytics_pages_mv.datasource
@@ -0,0 +1,15 @@
+SCHEMA >
+    `site_uuid` String,
+    `post_uuid` String,
+    `date` Date,
+    `device` String,
+    `browser` String,
+    `location` String,
+    `pathname` String,
+    `member_status` SimpleAggregateFunction(any, String),
+    `visits` AggregateFunction(uniq, String),
+    `hits` AggregateFunction(count)
+
+ENGINE AggregatingMergeTree
+ENGINE_PARTITION_KEY toYYYYMM(date)
+ENGINE_SORTING_KEY date, device, browser, location, pathname, post_uuid, site_uuid
diff --git a/ghost/tinybird/datasources/analytics_sessions_mv.datasource b/ghost/tinybird/datasources/analytics_sessions_mv.datasource
new file mode 100644
index 00000000000..7356906fe80
--- /dev/null
+++ b/ghost/tinybird/datasources/analytics_sessions_mv.datasource
@@ -0,0 +1,16 @@
+SCHEMA >
+    `site_uuid` String,
+    `date` Date,
+    `session_id` String,
+    `member_status` SimpleAggregateFunction(any, String),
+    `post_uuid` SimpleAggregateFunction(any, String),
+    `device` SimpleAggregateFunction(any, String),
+    `browser` SimpleAggregateFunction(any, String),
+    `location` SimpleAggregateFunction(any, String),
+    `first_hit` SimpleAggregateFunction(min, DateTime),
+    `latest_hit` SimpleAggregateFunction(max, DateTime),
+    `hits` AggregateFunction(count)
+
+ENGINE AggregatingMergeTree
+ENGINE_PARTITION_KEY toYYYYMM(date)
+ENGINE_SORTING_KEY date, session_id, site_uuid
diff --git a/ghost/tinybird/datasources/analytics_sources_mv.datasource b/ghost/tinybird/datasources/analytics_sources_mv.datasource
new file mode 100644
index 00000000000..3219f0773e5
--- /dev/null
+++ b/ghost/tinybird/datasources/analytics_sources_mv.datasource
@@ -0,0 +1,14 @@
+SCHEMA >
+    `site_uuid` String,
+    `date` Date,
+    `device` String,
+    `browser` String,
+    `location` String,
+    `referrer` String,
+    `member_status` SimpleAggregateFunction(any, String),
+    `visits` AggregateFunction(uniq, String),
+    `hits` AggregateFunction(count)
+
+ENGINE AggregatingMergeTree
+ENGINE_PARTITION_KEY toYYYYMM(date)
+ENGINE_SORTING_KEY date, device, browser, location, referrer, site_uuid
diff --git a/ghost/tinybird/datasources/fixtures/README.md b/ghost/tinybird/datasources/fixtures/README.md
new file mode 100644
index 00000000000..6130978f2ad
--- /dev/null
+++ b/ghost/tinybird/datasources/fixtures/README.md
@@ -0,0 +1,15 @@
+# Datasource fixtures
+
+The file mockingbird-schema.json is a schema for generating fake data using the Mockingbird CLI.
+
+The CLI is installed via npm:
+
+```
+npm install -g @tinybirdco/mockingbird-cli
+```
+
+The command I'm currently using to generate the data is:
+
+```
+mockingbird-cli tinybird --schema ghost/tinybird/datasources/fixtures/mockingbird-schema.json --endpoint gcp_europe_west3 --token xxxx --datasource analytics_events --eps 50 --limit 5000
+```
diff --git a/ghost/tinybird/datasources/fixtures/mockingbird-schema.json b/ghost/tinybird/datasources/fixtures/mockingbird-schema.json
new file mode 100644
index 00000000000..0475ca0e0b0
--- /dev/null
+++ b/ghost/tinybird/datasources/fixtures/mockingbird-schema.json
@@ -0,0 +1,72 @@
+{
+    "timestamp": {
+      "type": "mockingbird.datetimeBetween",
+      "params": [
+          {
+              "start": "2024-07-01T00:00:00.000Z",
+              "end": "2024-08-20T12:00:00.000Z"
+          }
+      ]
+    },
+    "session_id": {
+      "type": "string.uuid"
+    },
+    "action": {
+      "type": "mockingbird.pick",
+      "params": [
+        {
+          "values": [
+            "page_hit"
+          ]
+        }
+      ]
+    },
+    "version": {
+      "type": "mockingbird.pick",
+      "params": [
+        {
+          "values": [
+            "1"
+          ]
+        }
+      ]
+    },
+    "payload": {
+      "type": "mockingbird.pickWeighted",
+      "params": [
+        {
+          "values": [
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.79 Mobile Safari/537.36 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)\", \"locale\":\"en-US\", \"referrer\":\"https://www.kike.io\", \"pathname\":\"/coming-soon/\", \"href\":\"https://web-analytics.ghost.is/coming-soon/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Googlebot/2.1; +http://www.google.com/bot.html) Chrome/104.0.5112.79 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"IT\", \"referrer\":\"https://www.hn.com\", \"pathname\":\"/about/\", \"href\":\"https://web-analytics.ghost.is/about/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:103.0) Gecko/20100101 Firefox/103.0\", \"locale\":\"en-GB\", \"location\":\"ES\", \"referrer\":\"\", \"pathname\":\"/\", \"href\":\"https://web-analytics.ghost.is\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:103.0) Gecko/20100101 Firefox/103.0\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://www.google.com\", \"pathname\":\"/\", \"href\":\"https://web-analytics.ghost.is\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://web-analytics.ghost.is/\", \"pathname\":\"/coming-soon/\", \"href\":\"https://web-analytics.ghost.is/coming-soon/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://www.google.com\", \"pathname\":\"/hello-world/\", \"href\":\"https://web-analytics.ghost.is/hello-world/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"IL\", \"referrer\":\"https://www.google.com\", \"pathname\":\"/hello-world/\", \"href\":\"https://web-analytics.ghost.is/hello-world/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1\", \"locale\":\"es-ES\", \"location\":\"ES\", \"referrer\":\"https://www.twitter.com\", \"pathname\":\"/\", \"href\":\"https://web-analytics.ghost.is/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"GB\", \"referrer\":\"https://www.facebook.com\", \"pathname\":\"/\", \"href\":\"https://web-analytics.ghost.is/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"CH\", \"referrer\":\"https://www.qq.ch\", \"pathname\":\"/coming-soon/\", \"href\":\"https://web-analytics.ghost.is/coming-soon/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.118 Mobile Safari/537.36\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://www.yandex.com\", \"pathname\":\"/about/\", \"href\":\"https://web-analytics.ghost.is/about/\"}",
+            "{\"site_uuid\":\"mock_site_uuid\", \"user-agent\":\"Mozilla/5.0 (Linux; Android 13; SM-A102U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.118 Mobile Safari/537.36\", \"locale\":\"en-US\", \"location\":\"FR\", \"referrer\":\"https://www.github.com\", \"pathname\":\"/coming-soon/\", \"href\":\"https://web-analytics.ghost.is/coming-soon/\"}",
+
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.79 Mobile Safari/537.36 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)\", \"locale\":\"en-US\", \"referrer\":\"https://www.kike.io\", \"pathname\":\"/products/\", \"href\":\"https://fake-site.ghost.is/products/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Googlebot/2.1; +http://www.google.com/bot.html) Chrome/104.0.5112.79 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"IT\", \"referrer\":\"https://www.hn.com\", \"pathname\":\"/blog/\", \"href\":\"https://fake-site.ghost.is/blog/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:103.0) Gecko/20100101 Firefox/103.0\", \"locale\":\"en-GB\", \"location\":\"ES\", \"referrer\":\"\", \"pathname\":\"/contact/\", \"href\":\"https://fake-site.ghost.is/contact/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:103.0) Gecko/20100101 Firefox/103.0\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://www.google.com\", \"pathname\":\"/faq/\", \"href\":\"https://fake-site.ghost.is/faq/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://fake-site.ghost.is/\", \"pathname\":\"/services/\", \"href\":\"https://fake-site.ghost.is/services/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.5112.102 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://www.google.com\", \"pathname\":\"/team/\", \"href\":\"https://fake-site.ghost.is/team/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"IL\", \"referrer\":\"https://www.google.com\", \"pathname\":\"/pricing/\", \"href\":\"https://fake-site.ghost.is/pricing/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1\", \"locale\":\"es-ES\", \"location\":\"ES\", \"referrer\":\"https://www.twitter.com\", \"pathname\":\"/resources/\", \"href\":\"https://fake-site.ghost.is/resources/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"GB\", \"referrer\":\"https://www.facebook.com\", \"pathname\":\"/careers/\", \"href\":\"https://fake-site.ghost.is/careers/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36\", \"locale\":\"en-US\", \"location\":\"CH\", \"referrer\":\"https://www.qq.ch\", \"pathname\":\"/support/\", \"href\":\"https://fake-site.ghost.is/support/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.118 Mobile Safari/537.36\", \"locale\":\"en-US\", \"location\":\"US\", \"referrer\":\"https://www.yandex.com\", \"pathname\":\"/partners/\", \"href\":\"https://fake-site.ghost.is/partners/\"}",
+            "{\"site_uuid\":\"fake_site_id\", \"user-agent\":\"Mozilla/5.0 (Linux; Android 13; SM-A102U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.118 Mobile Safari/537.36\", \"locale\":\"en-US\", \"location\":\"FR\", \"referrer\":\"https://www.github.com\", \"pathname\":\"/events/\", \"href\":\"https://fake-site.ghost.is/events/\"}"
+          ],
+          "weights": [
+            200, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 400,
+            100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100
+          ]
+        }
+      ]
+    }
+  }
diff --git a/ghost/tinybird/pipes/analytics_hits.pipe b/ghost/tinybird/pipes/analytics_hits.pipe
new file mode 100644
index 00000000000..0b29af48bd2
--- /dev/null
+++ b/ghost/tinybird/pipes/analytics_hits.pipe
@@ -0,0 +1,66 @@
+DESCRIPTION >
+    Parsed `page_hit` events, implementing `browser` and `device` detection logic.
+
+TOKEN "dashboard" READ
+
+NODE parsed_hits
+DESCRIPTION >
+    Parse raw page_hit events
+
+SQL >
+    SELECT
+        timestamp,
+        action,
+        version,
+        coalesce(session_id, '0') as session_id,
+        JSONExtractString(payload, 'locale') as locale,
+        JSONExtractString(payload, 'location') as location,
+        JSONExtractString(payload, 'referrer') as referrer,
+        JSONExtractString(payload, 'pathname') as pathname,
+        JSONExtractString(payload, 'href') as href,
+        JSONExtractString(payload, 'site_uuid') as site_uuid,
+        JSONExtractString(payload, 'member_uuid') as member_uuid,
+        JSONExtractString(payload, 'member_status') as member_status,
+        JSONExtractString(payload, 'post_uuid') as post_uuid,
+        lower(JSONExtractString(payload, 'user-agent')) as user_agent
+    FROM analytics_events
+    where action = 'page_hit'
+
+NODE endpoint
+SQL >
+    SELECT
+        site_uuid,
+        timestamp,
+        action,
+        version,
+        session_id,
+        member_uuid,
+        member_status,
+        post_uuid,
+        location,
+        referrer,
+        pathname,
+        href,
+        case
+            when match(user_agent, 'wget|ahrefsbot|curl|urllib|bitdiscovery|\+https://|googlebot')
+            then 'bot'
+            when match(user_agent, 'android')
+            then 'mobile-android'
+            when match(user_agent, 'ipad|iphone|ipod')
+            then 'mobile-ios'
+            else 'desktop'
+        END as device,
+        case
+            when match(user_agent, 'firefox')
+            then 'firefox'
+            when match(user_agent, 'chrome|crios')
+            then 'chrome'
+            when match(user_agent, 'opera')
+            then 'opera'
+            when match(user_agent, 'msie|trident')
+            then 'ie'
+            when match(user_agent, 'iphone|ipad|safari')
+            then 'safari'
+            else 'Unknown'
+        END as browser
+    FROM parsed_hits
diff --git a/ghost/tinybird/pipes/analytics_pages.pipe b/ghost/tinybird/pipes/analytics_pages.pipe
new file mode 100644
index 00000000000..ee3ed64bb6c
--- /dev/null
+++ b/ghost/tinybird/pipes/analytics_pages.pipe
@@ -0,0 +1,24 @@
+NODE analytics_pages_1
+DESCRIPTION >
+    Aggregate by pathname and calculate session and hits
+
+SQL >
+    SELECT
+        site_uuid,
+        toDate(timestamp) AS date,
+        post_uuid,
+        device,
+        browser,
+        location,
+        pathname,
+        maxIf(
+            member_status,
+            member_status IN ('paid', 'free', 'undefined')
+        ) AS member_status,
+        uniqState(session_id) AS visits,
+        countState() AS hits
+    FROM analytics_hits
+    GROUP BY date, device, browser, location, pathname, post_uuid,site_uuid
+
+TYPE MATERIALIZED
+DATASOURCE analytics_pages_mv
diff --git a/ghost/tinybird/pipes/analytics_sessions.pipe b/ghost/tinybird/pipes/analytics_sessions.pipe
new file mode 100644
index 00000000000..52cc8977ecc
--- /dev/null
+++ b/ghost/tinybird/pipes/analytics_sessions.pipe
@@ -0,0 +1,25 @@
+NODE analytics_sessions_1
+DESCRIPTION >
+    Aggregate by session_id and calculate session metrics
+
+SQL >
+    SELECT
+        site_uuid,
+        toDate(timestamp) AS date,
+        session_id,
+        maxIf(
+            member_status,
+            member_status IN ('paid', 'free', 'undefined')
+        ) AS member_status,
+        anySimpleState(post_uuid) AS post_uuid,
+        anySimpleState(device) AS device,
+        anySimpleState(browser) AS browser,
+        anySimpleState(location) AS location,
+        minSimpleState(timestamp) AS first_hit,
+        maxSimpleState(timestamp) AS latest_hit,
+        countState() AS hits
+    FROM analytics_hits
+    GROUP BY date, session_id, site_uuid
+
+TYPE MATERIALIZED
+DATASOURCE analytics_sessions_mv
diff --git a/ghost/tinybird/pipes/analytics_sources.pipe b/ghost/tinybird/pipes/analytics_sources.pipe
new file mode 100644
index 00000000000..460430eb314
--- /dev/null
+++ b/ghost/tinybird/pipes/analytics_sources.pipe
@@ -0,0 +1,25 @@
+NODE analytics_sources_1
+DESCRIPTION >
+    Aggregate by referral and calculate session and hits
+
+SQL >
+    WITH (SELECT domainWithoutWWW(href) FROM analytics_hits LIMIT 1) AS current_domain
+    SELECT
+        site_uuid,
+        toDate(timestamp) AS date,
+        device,
+        browser,
+        location,
+        referrer,
+        maxIf(
+            member_status,
+            member_status IN ('paid', 'free', 'undefined')
+        ) AS member_status,
+        uniqState(session_id) AS visits,
+        countState() AS hits
+    FROM analytics_hits
+    WHERE domainWithoutWWW(referrer) != current_domain
+    GROUP BY date, device, browser, location, referrer, site_uuid
+
+TYPE MATERIALIZED
+DATASOURCE analytics_sources_mv
diff --git a/ghost/tinybird/pipes/kpis.pipe b/ghost/tinybird/pipes/kpis.pipe
new file mode 100644
index 00000000000..976e429ef3b
--- /dev/null
+++ b/ghost/tinybird/pipes/kpis.pipe
@@ -0,0 +1,143 @@
+DESCRIPTION >
+    Summary with general KPIs per date, including visits, page views, bounce rate and average session duration.
+    Accepts `date_from` and `date_to` date filter, all historical data if not passed.
+    Daily granularity, except when filtering one single day (hourly)
+
+TOKEN "dashboard" READ
+
+NODE timeseries
+DESCRIPTION >
+    Generate a timeseries for the specified time range, so we call fill empty data points.
+    Filters "future" data points.
+
+SQL >
+    %
+    {% set _single_day = defined(date_from) and day_diff(date_from, date_to) == 0 %}
+    with
+        {% if defined(date_from) %}
+            toStartOfDay(
+                toDate(
+                    {{
+                        Date(
+                            date_from,
+                            description="Starting day for filtering a date range",
+                            required=False,
+                        )
+                    }}
+                )
+            ) as start,
+        {% else %} toStartOfDay(timestampAdd(today(), interval -7 day)) as start,
+        {% end %}
+        {% if defined(date_to) %}
+            toStartOfDay(
+                toDate(
+                    {{
+                        Date(
+                            date_to,
+                            description="Finishing day for filtering a date range",
+                            required=False,
+                        )
+                    }}
+                )
+            ) as end
+        {% else %} toStartOfDay(today()) as end
+        {% end %}
+    {% if _single_day %}
+        select
+            arrayJoin(
+                arrayMap(
+                    x -> toDateTime(x),
+                    range(
+                        toUInt32(toDateTime(start)), toUInt32(timestampAdd(end, interval 1 day)), 3600
+                    )
+                )
+            ) as date
+    {% else %}
+        select
+            arrayJoin(
+                arrayMap(
+                    x -> toDate(x),
+                    range(toUInt32(start), toUInt32(timestampAdd(end, interval 1 day)), 24 * 3600)
+                )
+            ) as date
+    {% end %}
+    where date <= now()
+
+NODE hits
+DESCRIPTION >
+    Group by sessions and calculate metrics at that level
+
+SQL >
+    %
+    {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
+        select
+            site_uuid,
+            toStartOfHour(timestamp) as date,
+            session_id,
+            member_status,
+            uniq(session_id) as visits,
+            count() as pageviews,
+            case when min(timestamp) = max(timestamp) then 1 else 0 end as is_bounce,
+            max(timestamp) as latest_hit_aux,
+            min(timestamp) as first_hit_aux
+        from analytics_hits
+        where toDate(timestamp) = {{ Date(date_from) }}
+        group by toStartOfHour(timestamp), session_id, site_uuid, member_status
+    {% else %}
+        select
+            site_uuid,
+            date,
+            member_status,
+            session_id,
+            uniq(session_id) as visits,
+            countMerge(hits) as pageviews,
+            case when min(first_hit) = max(latest_hit) then 1 else 0 end as is_bounce,
+            max(latest_hit) as latest_hit_aux,
+            min(first_hit) as first_hit_aux
+        from analytics_sessions_mv
+        where
+            {% if defined(date_from) %} date >= {{ Date(date_from) }}
+            {% else %} date >= timestampAdd(today(), interval -7 day)
+            {% end %}
+            {% if defined(date_to) %} and date <= {{ Date(date_to) }}
+            {% else %} and date <= today()
+            {% end %}
+        group by date, session_id, site_uuid, member_status
+    {% end %}
+
+NODE data
+DESCRIPTION >
+    General KPIs per date, works for both summary metrics and trends charts.
+
+SQL >
+    select
+        site_uuid,
+        date,
+        member_status,
+        uniq(session_id) as visits,
+        sum(pageviews) as pageviews,
+        sum(case when latest_hit_aux = first_hit_aux then 1 end) / visits as bounce_rate,
+        avg(latest_hit_aux - first_hit_aux) as avg_session_sec
+    from hits
+    group by date, site_uuid, member_status
+
+NODE endpoint
+DESCRIPTION >
+    Join and generate timeseries with metrics
+
+SQL >
+%
+    select
+        a.date as date,
+        sum(b.visits) as visits,
+        sum(b.pageviews) as pageviews,
+        sum(b.bounce_rate) as bounce_rate,
+        sum(b.avg_session_sec) as avg_session_sec
+    from timeseries a
+    left join data b using date
+    where
+        site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+        {% if defined(member_status) %}
+            and member_status IN {{ Array(member_status) }}
+  {% end %}
+  group by date
diff --git a/ghost/tinybird/pipes/top_browsers.pipe b/ghost/tinybird/pipes/top_browsers.pipe
new file mode 100644
index 00000000000..c1404f1aa22
--- /dev/null
+++ b/ghost/tinybird/pipes/top_browsers.pipe
@@ -0,0 +1,36 @@
+DESCRIPTION >
+    Top Browsers ordered by most visits.
+    Accepts `date_from` and `date_to` date filter. Defaults to last 7 days.
+    Also `skip` and `limit` parameters for pagination.
+
+TOKEN "dashboard" READ
+
+NODE endpoint
+DESCRIPTION >
+    Group by browser and calculate hits and visits
+
+SQL >
+    %
+    select browser, uniqMerge(visits) as visits, countMerge(hits) as hits
+    from analytics_sources_mv
+    where
+        site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+        {% if defined(member_status) %}
+            and member_status IN {{ Array(member_status,'String') }}
+        {% end %}
+        {% if defined(date_from) %}
+            and date
+            >=
+            {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+        {% else %}
+            and date >= timestampAdd(today(), interval -7 day)
+        {% end %}
+        {% if defined(date_to) %}
+            and date
+            <=
+            {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+        {% else %} and date <= today()
+        {% end %}
+    group by browser
+    order by visits desc
+    limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
diff --git a/ghost/tinybird/pipes/top_devices.pipe b/ghost/tinybird/pipes/top_devices.pipe
new file mode 100644
index 00000000000..82f8bd7d87e
--- /dev/null
+++ b/ghost/tinybird/pipes/top_devices.pipe
@@ -0,0 +1,37 @@
+
+DESCRIPTION >
+    Top Device Types ordered by most visits.
+    Accepts `date_from` and `date_to` date filter. Defaults to last 7 days.
+    Also `skip` and `limit` parameters for pagination.
+
+TOKEN "dashboard" READ
+
+NODE endpoint
+DESCRIPTION >
+    Group by device and calculate hits and visits
+
+SQL >
+    %
+    select device, uniqMerge(visits) as visits, countMerge(hits) as hits
+    from analytics_sources_mv
+    where
+        site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+         {% if defined(member_status) %}
+            and member_status IN {{ Array(member_status,'String') }}
+        {% end %}
+        {% if defined(date_from) %}
+            and date
+            >=
+            {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+        {% else %}
+            and date >= timestampAdd(today(), interval -7 day)
+        {% end %}
+        {% if defined(date_to) %}
+            and date
+            <=
+            {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+        {% else %} and date <= today()
+        {% end %}
+    group by device
+    order by visits desc
+    limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
diff --git a/ghost/tinybird/pipes/top_locations.pipe b/ghost/tinybird/pipes/top_locations.pipe
new file mode 100644
index 00000000000..78a2db3ca4e
--- /dev/null
+++ b/ghost/tinybird/pipes/top_locations.pipe
@@ -0,0 +1,36 @@
+DESCRIPTION >
+    Top visiting Countries ordered by most visits.
+    Accepts `date_from` and `date_to` date filter. Defaults to last 7 days.
+    Also `skip` and `limit` parameters for pagination.
+
+TOKEN "dashboard" READ
+
+NODE endpoint
+DESCRIPTION >
+    Group by pagepath and calculate hits and visits
+
+SQL >
+    %
+    select location, uniqMerge(visits) as visits, countMerge(hits) as hits
+    from analytics_pages_mv
+    where
+        site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+        {% if defined(member_status) %}
+            and member_status IN {{ Array(member_status,'String') }}
+        {% end %}
+        {% if defined(date_from) %}
+            and date
+            >=
+            {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+        {% else %}
+            and date >= timestampAdd(today(), interval -7 day)
+        {% end %}
+        {% if defined(date_to) %}
+            and date
+            <=
+            {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+        {% else %} and date <= today()
+        {% end %}
+    group by location
+    order by visits desc
+    limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
diff --git a/ghost/tinybird/pipes/top_pages.pipe b/ghost/tinybird/pipes/top_pages.pipe
new file mode 100644
index 00000000000..d2e8aae2665
--- /dev/null
+++ b/ghost/tinybird/pipes/top_pages.pipe
@@ -0,0 +1,40 @@
+DESCRIPTION >
+    Most visited pages for a given period.
+    Accepts `date_from` and `date_to` date filter. Defaults to last 7 days.
+    Also `skip` and `limit` parameters for pagination.
+
+TOKEN "dashboard" READ
+
+NODE endpoint
+DESCRIPTION >
+    Group by pagepath and calculate hits and visits
+
+SQL >
+    %
+    select
+        pathname,
+        uniqMerge(visits) as visits,
+        countMerge(hits) as hits
+    from analytics_pages_mv
+    where
+        site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+         {% if defined(member_status) %}
+            and member_status IN {{ Array(member_status,'String') }}
+        {% end %}
+        {% if defined(date_from) %}
+            and date
+            >=
+            {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+        {% else %}
+            and date >= timestampAdd(today(), interval -7 day)
+        {% end %}
+        {% if defined(date_to) %}
+            and date
+            <=
+            {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+        {% else %} and date <= today()
+        {% end %}
+
+    group by pathname
+    order by visits desc
+    limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
diff --git a/ghost/tinybird/pipes/top_sources.pipe b/ghost/tinybird/pipes/top_sources.pipe
new file mode 100644
index 00000000000..16d570a1a51
--- /dev/null
+++ b/ghost/tinybird/pipes/top_sources.pipe
@@ -0,0 +1,37 @@
+
+DESCRIPTION >
+    Top traffic sources (domains), ordered by most visits.
+    Accepts `date_from` and `date_to` date filter. Defaults to last 7 days.
+    Also `skip` and `limit` parameters for pagination.
+
+TOKEN "dashboard" READ
+
+NODE endpoint
+DESCRIPTION >
+    Group by referral and calculate hits and visits
+
+SQL >
+    %
+    select domainWithoutWWW(referrer) as referrer, uniqMerge(visits) as visits, countMerge(hits) as hits
+    from analytics_sources_mv
+    where
+        site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+        {% if defined(member_status) %}
+            and member_status IN {{ Array(member_status,'String') }}
+        {% end %}
+        {% if defined(date_from) %}
+            and date
+            >=
+            {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
+        {% else %}
+            and date >= timestampAdd(today(), interval -7 day)
+        {% end %}
+        {% if defined(date_to) %}
+            and date
+            <=
+            {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
+        {% else %} and date <= today()
+        {% end %}
+    group by referrer
+    order by visits desc
+    limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
diff --git a/ghost/tinybird/pipes/trend.pipe b/ghost/tinybird/pipes/trend.pipe
new file mode 100644
index 00000000000..519c0c4c65e
--- /dev/null
+++ b/ghost/tinybird/pipes/trend.pipe
@@ -0,0 +1,39 @@
+
+DESCRIPTION >
+    Visits trend over time for the last 30 minutes, filling the blanks.
+    Works great for the realtime chart.
+
+TOKEN "dashboard" READ
+
+NODE timeseries
+DESCRIPTION >
+    Generate a timeseries for the last 30 minutes, so we call fill empty data points
+
+SQL >
+    with (now() - interval 30 minute) as start
+    select addMinutes(toStartOfMinute(start), number) as t
+    from (select arrayJoin(range(1, 31)) as number)
+
+NODE hits
+DESCRIPTION >
+    Get last 30 minutes metrics gropued by minute
+
+SQL >
+    %
+    select toStartOfMinute(timestamp) as t, uniq(session_id) as visits
+    from analytics_hits
+    where
+        site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
+         {% if defined(member_status) %}
+            and member_status IN {{ Array(member_status,'String') }}
+        {% end %}
+        and timestamp >= (now() - interval 30 minute)
+    group by toStartOfMinute(timestamp)
+    order by toStartOfMinute(timestamp)
+
+NODE endpoint
+DESCRIPTION >
+    Join and generate timeseries with metrics for the last 30 minutes
+
+SQL >
+    select a.t, b.visits from timeseries a left join hits b on a.t = b.t order by a.t
diff --git a/ghost/tinybird/requirements.txt b/ghost/tinybird/requirements.txt
new file mode 100644
index 00000000000..86035df9606
--- /dev/null
+++ b/ghost/tinybird/requirements.txt
@@ -0,0 +1 @@
+tinybird-cli>=4,<5
\ No newline at end of file
diff --git a/ghost/tinybird/scripts/append_fixtures.sh b/ghost/tinybird/scripts/append_fixtures.sh
new file mode 100755
index 00000000000..e8745565af9
--- /dev/null
+++ b/ghost/tinybird/scripts/append_fixtures.sh
@@ -0,0 +1,21 @@
+
+#!/usr/bin/env bash
+set -euxo pipefail
+
+directory="datasources/fixtures"
+extensions=("csv" "ndjson")
+
+absolute_directory=$(realpath "$directory")
+
+for extension in "${extensions[@]}"; do
+  file_list=$(find "$absolute_directory" -type f -name "*.$extension")
+
+  for file_path in $file_list; do
+    file_name=$(basename "$file_path")
+    file_name_without_extension="${file_name%.*}"
+
+    command="tb datasource append $file_name_without_extension datasources/fixtures/$file_name"
+    echo $command
+    $command
+  done
+done
diff --git a/ghost/tinybird/scripts/exec_test.sh b/ghost/tinybird/scripts/exec_test.sh
new file mode 100755
index 00000000000..50571d952db
--- /dev/null
+++ b/ghost/tinybird/scripts/exec_test.sh
@@ -0,0 +1,58 @@
+
+#!/usr/bin/env bash
+set -euxo pipefail
+
+export TB_VERSION_WARNING=0
+
+run_test() {
+    t=$1
+    echo "** Running $t **"
+    echo "** $(cat $t)"
+    tmpfile=$(mktemp)
+    retries=0
+    TOTAL_RETRIES=3
+
+    # When appending fixtures, we need to retry in case of the data is not replicated in time
+    while [ $retries -lt $TOTAL_RETRIES ]; do
+        # Run the test and store the output in a temporary file
+        bash $t $2 >$tmpfile
+        exit_code=$?
+        if [ "$exit_code" -eq 0 ]; then
+            # If the test passed, break the loop
+            if diff -B ${t}.result $tmpfile >/dev/null 2>&1; then
+                break
+            # If the test failed, increment the retries counter and try again
+            else
+                retries=$((retries+1))
+            fi
+        # If the bash command failed, print an error message and break the loop
+        else
+            break
+        fi
+    done
+
+    if diff -B ${t}.result $tmpfile >/dev/null 2>&1; then
+        echo "✅ Test $t passed"
+        rm $tmpfile
+        return 0
+    elif [ $retries -eq $TOTAL_RETRIES ]; then
+        echo "🚨 ERROR: Test $t failed, diff:";
+        diff -B ${t}.result $tmpfile
+        rm $tmpfile
+        return 1
+    else
+        echo "🚨 ERROR: Test $t failed with bash command exit code $?"
+        cat $tmpfile
+        rm $tmpfile
+        return 1
+    fi
+    echo ""
+}
+export -f run_test
+
+fail=0
+find ./tests -name "*.test" -print0 | xargs -0 -I {} -P 4 bash -c 'run_test "$@"' _ {} || fail=1
+
+if [ $fail == 1 ]; then
+  exit -1;
+fi
diff --git a/ghost/update-check-service/package.json b/ghost/update-check-service/package.json
index feb5eeadfb4..976f4d27d0b 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/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
-    "@tryghost/tpl": "0.1.24",
+    "@tryghost/debug": "0.1.32",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
+    "@tryghost/tpl": "0.1.32",
     "lodash": "4.17.21",
     "moment": "2.24.0"
   }
diff --git a/ghost/verification-trigger/package.json b/ghost/verification-trigger/package.json
index f1389e385aa..7260b5484b7 100644
--- a/ghost/verification-trigger/package.json
+++ b/ghost/verification-trigger/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
-    "@tryghost/errors": "1.2.26",
+    "@tryghost/errors": "1.3.5",
     "@tryghost/member-events": "0.0.0"
   }
 }
diff --git a/ghost/version-notifications-data-service/lib/VersionNotificationsDataService.js b/ghost/version-notifications-data-service/lib/VersionNotificationsDataService.js
index fe73d743802..5ac3cdef80f 100644
--- a/ghost/version-notifications-data-service/lib/VersionNotificationsDataService.js
+++ b/ghost/version-notifications-data-service/lib/VersionNotificationsDataService.js
@@ -57,7 +57,7 @@ class VersionNotificationsDataService {
      *
      * @param {String} key - api key identification value, it's "secret" in case of Content API key and "id" for Admin API
      * @param {String} type - one of "content" or "admin" values
-     * @returns {Promise<Object>} Integration JSON object
+     * @returns {Promise<Object | null>} Integration JSON object
      */
     async getIntegration(key, type) {
         let queryOptions = null;
@@ -69,6 +69,9 @@ class VersionNotificationsDataService {
         }
 
         const apiKey = await this.ApiKeyModel.findOne(queryOptions, {withRelated: ['integration']});
+        if (!apiKey) {
+            return null;
+        }
 
         return apiKey.relations.integration.toJSON();
     }
diff --git a/ghost/version-notifications-data-service/test/version-notificatons-data-service.test.js b/ghost/version-notifications-data-service/test/version-notificatons-data-service.test.js
index 13cbdf1edba..b036adfc992 100644
--- a/ghost/version-notifications-data-service/test/version-notificatons-data-service.test.js
+++ b/ghost/version-notifications-data-service/test/version-notificatons-data-service.test.js
@@ -190,5 +190,27 @@ describe('Version Notification Data Service', function () {
             assert.equal(integrationName, 'Tri Hita Karana');
             assert.equal(integrationType, 'core');
         });
+
+        it('Returns null when the api-key/integration is not found', async function () {
+            const ApiKeyModel = {
+                findOne: sinon
+                    .stub()
+                    .withArgs({
+                        id: 'key_id'
+                    }, {
+                        withRelated: ['integration']
+                    })
+                    .resolves(null)
+            };
+
+            const versionNotificationsDataService = new VersionNotificationsDataService({
+                UserModel: {},
+                ApiKeyModel,
+                settingsService: {}
+            });
+
+            const integration = await versionNotificationsDataService.getIntegration('key_id', 'admin');
+            assert.equal(integration, null);
+        });
     });
 });
diff --git a/ghost/webmentions/package.json b/ghost/webmentions/package.json
index f8c8188708d..b36acd059eb 100644
--- a/ghost/webmentions/package.json
+++ b/ghost/webmentions/package.json
@@ -25,8 +25,8 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
     "cheerio": "0.22.0"
   }
 }
diff --git a/ghost/webmentions/test/InMemoryMentionRepository.test.js b/ghost/webmentions/test/InMemoryMentionRepository.test.js
index 59610680c0f..5fb06e37340 100644
--- a/ghost/webmentions/test/InMemoryMentionRepository.test.js
+++ b/ghost/webmentions/test/InMemoryMentionRepository.test.js
@@ -47,7 +47,7 @@ describe('InMemoryMentionRepository', function () {
         }
 
         const pageOne = await repository.getPage({
-            filter: `resource_id:${resourceId.toHexString()}`,
+            filter: `resource_id:'${resourceId.toHexString()}'`,
             limit: 2,
             page: 1
         });
@@ -57,7 +57,7 @@ describe('InMemoryMentionRepository', function () {
         assert(pageOne.meta.pagination.next === 2);
 
         const pageTwo = await repository.getPage({
-            filter: `resource_id:${resourceId.toHexString()}`,
+            filter: `resource_id:'${resourceId.toHexString()}'`,
             limit: 2,
             page: 2
         });
@@ -67,7 +67,7 @@ describe('InMemoryMentionRepository', function () {
         assert(pageTwo.meta.pagination.next === 3);
 
         const pageThree = await repository.getPage({
-            filter: `resource_id:${resourceId.toHexString()}`,
+            filter: `resource_id:'${resourceId.toHexString()}'`,
             limit: 2,
             page: 3
         });
diff --git a/nx.json b/nx.json
index 69b54f55761..aba23a9546e 100644
--- a/nx.json
+++ b/nx.json
@@ -10,6 +10,7 @@
                     "test",
                     "test:unit"
                 ],
+                "useDaemonProcess": false,
                 "cacheDirectory": ".nxcache"
             }
         }
@@ -21,6 +22,20 @@
         ]
     },
     "targetDefaults": {
+        "build": {
+            "dependsOn": [
+                "^build"
+            ],
+            "inputs": [
+                "default",
+                "^default"
+            ],
+            "outputs": [
+                "{projectRoot}/dist",
+                "{projectRoot}/es",
+                "{projectRoot}/umd"
+            ]
+        },
         "build:ts": {
             "dependsOn": [
                 "^build:ts"
diff --git a/package.json b/package.json
index 1c1a47103bd..efb217f752d 100644
--- a/package.json
+++ b/package.json
@@ -27,23 +27,28 @@
     "dev:admin": "node .github/scripts/dev.js --admin",
     "dev:ghost": "node .github/scripts/dev.js --ghost",
     "dev": "node .github/scripts/dev.js",
-    "fix": "yarn cache clean && rm -rf node_modules && yarn",
+    "fix": "yarn cache clean && rimraf -g '**/node_modules' && yarn",
     "knex-migrator": "yarn workspace ghost run knex-migrator",
-    "setup": "yarn && git submodule update --init",
+    "setup": "yarn && git submodule update --init && NODE_ENV=development node .github/scripts/setup.js",
+    "reset:data": "cd ghost/core && node index.js generate-data --clear-database --quantities members:100000,posts:500 --seed 123",
+    "reset:data:empty": "cd ghost/core && node index.js generate-data --clear-database --quantities members:0,posts:0 --seed 123",
+    "reset:data:xxl": "cd ghost/core && node index.js generate-data --clear-database --quantities members:2000000,posts:0,emails:0,members_stripe_customers:0,members_login_events:0,members_status_events:0 --seed 123",
+    "docker:reset": "docker-compose -f .github/scripts/docker-compose.yml down -v && docker-compose -f .github/scripts/docker-compose.yml up -d --wait",
     "lint": "nx run-many -t lint",
     "test": "nx run-many -t test",
     "test:unit": "nx run-many -t test:unit",
     "main": "yarn main:monorepo && yarn main:submodules",
     "main:monorepo": "git checkout main && git pull ${GHOST_UPSTREAM:-origin} main && yarn",
     "main:submodules": "git submodule sync && git submodule update && git submodule foreach \"git checkout main && git pull ${GHOST_UPSTREAM:-origin} main && yarn\"",
-    "prepare": "husky install .github/hooks"
+    "prepare": "husky install .github/hooks",
+    "tb": "docker run --rm -v $(pwd):/ghost -w /ghost/ghost/tinybird -it tinybirdco/tinybird-cli-docker"
   },
   "resolutions": {
-    "@elastic/elasticsearch": "8.5.0",
-    "@tryghost/errors": "1.2.26",
-    "@tryghost/logging": "2.4.8",
+    "@tryghost/errors": "1.3.5",
+    "@tryghost/logging": "2.4.18",
+    "jackspeak": "2.1.1",
     "moment": "2.24.0",
-    "moment-timezone": "0.5.23"
+    "moment-timezone": "0.5.45"
   },
   "renovate": {
     "extends": [
@@ -61,7 +66,8 @@
       "validator",
       "codemirror",
       "faker",
-      "ember-cli-code-coverage"
+      "ember-cli-code-coverage",
+      "ember-cli-terser"
     ],
     "ignorePaths": [
       "test",
@@ -104,15 +110,17 @@
     "*.js": "eslint"
   },
   "devDependencies": {
+    "chalk": "4.1.2",
     "concurrently": "8.2.2",
     "eslint": "8.44.0",
-    "eslint-plugin-ghost": "3.3.2",
+    "eslint-plugin-ghost": "3.4.0",
     "eslint-plugin-react": "7.33.0",
     "husky": "8.0.3",
-    "lint-staged": "14.0.1",
+    "lint-staged": "15.2.10",
     "nx": "16.8.1",
-    "rimraf": "5.0.5",
-    "ts-node": "10.9.1",
-    "typescript": "5.2.2"
+    "rimraf": "5.0.10",
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5",
+    "inquirer": "8.2.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 948e266ca88..a5d1538b0cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -47,15 +47,6 @@
   dependencies:
     default-browser-id "3.0.0"
 
-"@aws-crypto/crc32@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-3.0.0.tgz#07300eca214409c33e3ff769cd5697b57fdd38fa"
-  integrity sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==
-  dependencies:
-    "@aws-crypto/util" "^3.0.0"
-    "@aws-sdk/types" "^3.222.0"
-    tslib "^1.11.1"
-
 "@aws-crypto/ie11-detection@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz#9c39f4a5558196636031a933ec1b4792de959d6a"
@@ -63,13 +54,6 @@
   dependencies:
     tslib "^1.11.1"
 
-"@aws-crypto/ie11-detection@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz#640ae66b4ec3395cee6a8e94ebcd9f80c24cd688"
-  integrity sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==
-  dependencies:
-    tslib "^1.11.1"
-
 "@aws-crypto/sha256-browser@2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz#741c9024df55ec59b51e5b1f5d806a4852699fb5"
@@ -84,20 +68,6 @@
     "@aws-sdk/util-utf8-browser" "^3.0.0"
     tslib "^1.11.1"
 
-"@aws-crypto/sha256-browser@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz#05f160138ab893f1c6ba5be57cfd108f05827766"
-  integrity sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==
-  dependencies:
-    "@aws-crypto/ie11-detection" "^3.0.0"
-    "@aws-crypto/sha256-js" "^3.0.0"
-    "@aws-crypto/supports-web-crypto" "^3.0.0"
-    "@aws-crypto/util" "^3.0.0"
-    "@aws-sdk/types" "^3.222.0"
-    "@aws-sdk/util-locate-window" "^3.0.0"
-    "@aws-sdk/util-utf8-browser" "^3.0.0"
-    tslib "^1.11.1"
-
 "@aws-crypto/sha256-js@2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz#f1f936039bdebd0b9e2dd834d65afdc2aac4efcb"
@@ -107,15 +77,6 @@
     "@aws-sdk/types" "^3.1.0"
     tslib "^1.11.1"
 
-"@aws-crypto/sha256-js@3.0.0", "@aws-crypto/sha256-js@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz#f06b84d550d25521e60d2a0e2a90139341e007c2"
-  integrity sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==
-  dependencies:
-    "@aws-crypto/util" "^3.0.0"
-    "@aws-sdk/types" "^3.222.0"
-    tslib "^1.11.1"
-
 "@aws-crypto/sha256-js@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz#c81e5d378b8a74ff1671b58632779986e50f4c99"
@@ -132,13 +93,6 @@
   dependencies:
     tslib "^1.11.1"
 
-"@aws-crypto/supports-web-crypto@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz#5d1bf825afa8072af2717c3e455f35cda0103ec2"
-  integrity sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==
-  dependencies:
-    tslib "^1.11.1"
-
 "@aws-crypto/util@^2.0.0", "@aws-crypto/util@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz#adf5ff5dfbc7713082f897f1d01e551ce0edb9c0"
@@ -148,15 +102,6 @@
     "@aws-sdk/util-utf8-browser" "^3.0.0"
     tslib "^1.11.1"
 
-"@aws-crypto/util@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-3.0.0.tgz#1c7ca90c29293f0883468ad48117937f0fe5bfb0"
-  integrity sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==
-  dependencies:
-    "@aws-sdk/types" "^3.222.0"
-    "@aws-sdk/util-utf8-browser" "^3.0.0"
-    tslib "^1.11.1"
-
 "@aws-sdk/abort-controller@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.193.0.tgz#af3ccc95a68ed1bae5918e5ba11ed1c0ab46c6f9"
@@ -165,53 +110,6 @@
     "@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==
-  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"
-    "@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-utf8" "^2.0.0"
-    "@smithy/util-waiter" "^2.0.5"
-    tslib "^2.5.0"
-
 "@aws-sdk/client-ses@^3.31.0":
   version "3.194.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/client-ses/-/client-ses-3.194.0.tgz#785bad5ec7385fb0cf2201eea9549c279fcc70ae"
@@ -293,45 +191,6 @@
     "@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==
-  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"
-    "@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-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
 "@aws-sdk/client-sts@3.194.0":
   version "3.194.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.194.0.tgz#ea4295346f9039cfcab5c73ed04808a9935bb060"
@@ -375,49 +234,6 @@
     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==
-  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"
-    "@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-utf8" "^2.0.0"
-    fast-xml-parser "4.2.5"
-    tslib "^2.5.0"
-
 "@aws-sdk/config-resolver@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.193.0.tgz#57248376671d8c18000388e944b190737c7b606f"
@@ -438,16 +254,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/credential-provider-imds@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.193.0.tgz#b06071ca5cc6f2f14de886a7dbff2cd386fc368c"
@@ -473,22 +279,6 @@
     "@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==
-  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"
-    "@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"
-    tslib "^2.5.0"
-
 "@aws-sdk/credential-provider-node@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.193.0.tgz#6777fb9b55edba8de752c2afa294f88333bb0b24"
@@ -505,23 +295,6 @@
     "@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"
-    "@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"
-    tslib "^2.5.0"
-
 "@aws-sdk/credential-provider-process@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.193.0.tgz#0093068d0d6770844ea48d0404ad1098d712588f"
@@ -532,17 +305,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/credential-provider-sso@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.193.0.tgz#0aa6f30e1e0766b8aec590fac1aa8121894e8368"
@@ -554,19 +316,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/client-sso" "3.398.0"
-    "@aws-sdk/token-providers" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/credential-provider-web-identity@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.193.0.tgz#b11a023c1cf2a3ad8cbf356f186c13963976e95a"
@@ -576,16 +325,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/fetch-http-handler@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.193.0.tgz#e9a5d352ffd5d0047e5518d8dd7263ad07154ddd"
@@ -653,16 +392,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/middleware-logger@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.193.0.tgz#505a1905edd9e0417d7ba60bc1e203311c31e7b1"
@@ -671,15 +400,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/middleware-recursion-detection@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.193.0.tgz#ece646efb6af98aa085ca689e644d104c94cfc3d"
@@ -689,16 +409,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/middleware-retry@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.193.0.tgz#d5efa38d2318b93d4b716c1db44f35feaa0f48ba"
@@ -723,16 +433,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/middleware-signing" "3.398.0"
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/middleware-serde@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.193.0.tgz#b4e2851b11fe091a8ae19f06cbf51a70e9f5e43c"
@@ -753,19 +453,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/signature-v4" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-middleware" "^2.0.0"
-    tslib "^2.5.0"
-
 "@aws-sdk/middleware-stack@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.193.0.tgz#bf1cb39b9f2a2da9c9579a22ff50a58726210bc3"
@@ -782,17 +469,6 @@
     "@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==
-  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"
-    tslib "^2.5.0"
-
 "@aws-sdk/node-config-provider@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.193.0.tgz#ffe76c0a92ba61f1979593f68260147cbbfd1072"
@@ -881,58 +557,17 @@
     "@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==
-  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/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/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-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
 "@aws-sdk/types@3.193.0":
   version "3.193.0"
   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.1.0", "@aws-sdk/types@^3.110.0":
+  version "3.460.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.460.0.tgz#f87602928a57473f724b6efca0158e64f658be71"
+  integrity sha512-MyZSWS/FV8Bnux5eD9en7KLgVxevlVrGNEP3X2D7fpnUlLhl0a7k8+OpSI2ozEQB8hIU2DLc/XXTKRerHSefxQ==
   dependencies:
-    "@smithy/types" "^2.2.2"
+    "@smithy/types" "^2.5.0"
     tslib "^2.5.0"
 
 "@aws-sdk/url-parser@3.193.0":
@@ -1018,14 +653,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    tslib "^2.5.0"
-
 "@aws-sdk/util-hex-encoding@3.188.0":
   version "3.188.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.188.0.tgz#c2d8b02b952db58acbd5f53718109657c69c460f"
@@ -1063,16 +690,6 @@
     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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/types" "^2.2.2"
-    bowser "^2.11.0"
-    tslib "^2.5.0"
-
 "@aws-sdk/util-user-agent-node@3.193.0":
   version "3.193.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.193.0.tgz#2d29afa708383b264eb85a4a72a4faf4892e033d"
@@ -1082,16 +699,6 @@
     "@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==
-  dependencies:
-    "@aws-sdk/types" "3.398.0"
-    "@smithy/node-config-provider" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
 "@aws-sdk/util-utf8-browser@3.188.0", "@aws-sdk/util-utf8-browser@^3.0.0":
   version "3.188.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz#484762bd600401350e148277731d6744a4a92225"
@@ -1123,57 +730,57 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.22.13":
-  version "7.22.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
-  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/highlight" "^7.22.13"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
-  version "7.22.9"
-  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/compat-data@^7.17.7", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5", "@babel/compat-data@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed"
+  integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==
 
-"@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.16.7", "@babel/core@^7.18.9", "@babel/core@^7.20.12", "@babel/core@^7.21.3", "@babel/core@^7.23.0", "@babel/core@^7.23.2", "@babel/core@^7.23.5", "@babel/core@^7.23.9", "@babel/core@^7.3.4":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4"
+  integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
-    "@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/template" "^7.22.15"
-    "@babel/traverse" "^7.22.20"
-    "@babel/types" "^7.22.19"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helpers" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/template" "^7.24.7"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/eslint-parser@7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.15.tgz#263f059c476e29ca4972481a17b8b660cb025a34"
-  integrity sha512-yc8OOBIQk1EcRrpizuARSQS0TWAcOMpEJ1aafhNznaeYkeL+OhqnDObGFylB8ka8VFF/sZc+S4RzHyO+3LjQxg==
+"@babel/eslint-parser@7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.23.3.tgz#7bf0db1c53b54da0c8a12627373554a0828479ca"
+  integrity sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     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.23.0", "@babel/generator@^7.24.7", "@babel/generator@^7.7.2":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d"
+  integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==
   dependencies:
-    "@babel/types" "^7.22.15"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.24.7"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
@@ -1183,43 +790,43 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878"
-  integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
+  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.10", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
-  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9"
+  integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-validator-option" "^7.22.15"
-    browserslist "^4.21.9"
+    "@babel/compat-data" "^7.24.7"
+    "@babel/helper-validator-option" "^7.24.7"
+    browserslist "^4.22.2"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.10", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.22.5", "@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4"
-  integrity sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.23.5", "@babel/helper-create-class-features-plugin@^7.23.7", "@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d"
+  integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
     "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-replace-supers" "^7.22.20"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6"
-  integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
+  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     regexpu-core "^5.3.1"
@@ -1237,10 +844,10 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-define-polyfill-provider@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7"
-  integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==
+"@babel/helper-define-polyfill-provider@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba"
+  integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -1248,50 +855,53 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
-"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
+  dependencies:
+    "@babel/types" "^7.24.7"
 
-"@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", "@babel/helper-function-name@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
+  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+"@babel/helper-hoist-variables@^7.22.5", "@babel/helper-hoist-variables@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
+  integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-member-expression-to-functions@^7.22.15":
+"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
   integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
     "@babel/types" "^7.23.0"
 
-"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.8.3":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.7", "@babel/helper-module-imports@^7.8.3":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@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.23.3", "@babel/helper-module-transforms@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8"
+  integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
 
 "@babel/helper-optimise-call-expression@^7.22.5":
   version "7.22.5"
@@ -1300,21 +910,21 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.22.5", "@babel/helper-remap-async-to-generator@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
-  integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
+"@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-wrap-function" "^7.22.9"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
-"@babel/helper-replace-supers@^7.22.20", "@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+"@babel/helper-replace-supers@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
   integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
@@ -1323,12 +933,13 @@
     "@babel/helper-member-expression-to-functions" "^7.22.15"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-simple-access@^7.22.5", "@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
   version "7.22.5"
@@ -1337,77 +948,85 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+"@babel/helper-split-export-declaration@^7.22.6", "@babel/helper-split-export-declaration@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856"
+  integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+"@babel/helper-string-parser@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2"
+  integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==
 
-"@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
-"@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
-  integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
+"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5", "@babel/helper-validator-option@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6"
+  integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==
 
-"@babel/helper-wrap-function@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz#189937248c45b0182c1dcf32f3444ca153944cb9"
-  integrity sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
     "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
-"@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.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416"
+  integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.22.13":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
-  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.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.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.0", "@babel/parser@^7.23.9", "@babel/parser@^7.24.7", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85"
+  integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
-  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
+  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
-  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
+  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
 
-"@babel/plugin-proposal-class-properties@7.18.6", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz#20c60d4639d18f7da8602548512e9d3a4c8d7098"
+  integrity sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-proposal-class-properties@7.18.6", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
@@ -1415,26 +1034,16 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-decorators@7.23.2", "@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7", "@babel/plugin-proposal-decorators@^7.20.13":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.2.tgz#0b345a5754f48309fa50b7cd99075ef0295b12c8"
-  integrity sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg==
+"@babel/plugin-proposal-decorators@7.23.7", "@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7", "@babel/plugin-proposal-decorators@^7.20.13":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.7.tgz#1d827902cbd3d9054e54fb2f2056cdd1eaa0e368"
+  integrity sha512-b1s5JyeMvqj7d9m9KhJNHKc18gEJiSyVzVX3bwbiPalQBQpuvfPh6lA9F7Kk/dWH0TIiXRpB9yicwijY6buPng==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-create-class-features-plugin" "^7.23.7"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/plugin-syntax-decorators" "^7.22.10"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-decorators" "^7.23.3"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -1442,7 +1051,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.6.0":
+"@babel/plugin-proposal-optional-chaining@^7.6.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
@@ -1451,7 +1060,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.5":
+"@babel/plugin-proposal-private-methods@^7.16.5", "@babel/plugin-proposal-private-methods@^7.16.7":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
@@ -1502,10 +1111,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz#7d83ea04d893c442b78ebf4c3cbac59a7211deff"
-  integrity sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==
+"@babel/plugin-syntax-decorators@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz#a1d351d6c25bfdcf2e16f99b039101bc0ffcb0ca"
+  integrity sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1523,24 +1132,24 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-flow@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1"
-  integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==
+"@babel/plugin-syntax-flow@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz#084564e0f3cc21ea6c70c44cff984a1c0509729a"
+  integrity sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-syntax-import-assertions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
-  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+"@babel/plugin-syntax-import-assertions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
+  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-syntax-import-attributes@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
-  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
+"@babel/plugin-syntax-import-attributes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
+  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1558,12 +1167,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.21.4", "@babel/plugin-syntax-jsx@^7.7.2":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2"
-  integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
+"@babel/plugin-syntax-jsx@^7.23.3", "@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
+  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -1621,10 +1230,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2", "@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
-  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
+"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.23.3", "@babel/plugin-syntax-typescript@^7.7.2", "@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f"
+  integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1636,219 +1245,219 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
-  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
+"@babel/plugin-transform-arrow-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
+  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-generator-functions@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz#45946cd17f915b10e65c29b8ed18a0a50fc648c8"
-  integrity sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==
+"@babel/plugin-transform-async-generator-functions@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz#93ac8e3531f347fba519b4703f9ff2a75c6ae27a"
+  integrity sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.9"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-async-to-generator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
-  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
+"@babel/plugin-transform-async-to-generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
+  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
   dependencies:
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
 
-"@babel/plugin-transform-block-scoped-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
-  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
+"@babel/plugin-transform-block-scoped-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
+  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.22.10", "@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz#88a1dccc3383899eb5e660534a76a22ecee64faa"
-  integrity sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==
+"@babel/plugin-transform-block-scoping@^7.23.4", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
+  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-class-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
-  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+"@babel/plugin-transform-class-properties@^7.22.5", "@babel/plugin-transform-class-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
+  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-class-static-block@^7.22.11", "@babel/plugin-transform-class-static-block@^7.22.5":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz#dc8cc6e498f55692ac6b4b89e56d87cec766c974"
-  integrity sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==
+"@babel/plugin-transform-class-static-block@^7.16.7", "@babel/plugin-transform-class-static-block@^7.22.11", "@babel/plugin-transform-class-static-block@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
+  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363"
-  integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
+"@babel/plugin-transform-classes@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz#e7a75f815e0c534cc4c9a39c56636c84fc0d64f2"
+  integrity sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
     "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
-  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
+"@babel/plugin-transform-computed-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
+  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.5"
+    "@babel/template" "^7.22.15"
 
-"@babel/plugin-transform-destructuring@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz#38e2273814a58c810b6c34ea293be4973c4eb5e2"
-  integrity sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==
+"@babel/plugin-transform-destructuring@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
+  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
-  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
+"@babel/plugin-transform-dotall-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
+  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
-  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
+"@babel/plugin-transform-duplicate-keys@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
+  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dynamic-import@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e"
-  integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==
+"@babel/plugin-transform-dynamic-import@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
+  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-exponentiation-operator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
-  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
+"@babel/plugin-transform-exponentiation-operator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
+  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-export-namespace-from@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b"
-  integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==
+"@babel/plugin-transform-export-namespace-from@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
+  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-flow-strip-types@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz#6aeca0adcb81dc627c8986e770bfaa4d9812aff5"
-  integrity sha512-FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w==
+"@babel/plugin-transform-flow-strip-types@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz#cfa7ca159cc3306fab526fc67091556b51af26ff"
+  integrity sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-flow" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-flow" "^7.23.3"
 
-"@babel/plugin-transform-for-of@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
-  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
+"@babel/plugin-transform-for-of@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz#afe115ff0fbce735e02868d41489093c63e15559"
+  integrity sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
-  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
+"@babel/plugin-transform-function-name@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
+  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-json-strings@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0"
-  integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==
+"@babel/plugin-transform-json-strings@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
+  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
-  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
+"@babel/plugin-transform-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
+  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c"
-  integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==
+"@babel/plugin-transform-logical-assignment-operators@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
+  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
-  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
+"@babel/plugin-transform-member-expression-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
+  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
-  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
+"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
+  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.19.6", "@babel/plugin-transform-modules-commonjs@^7.21.5", "@babel/plugin-transform-modules-commonjs@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
-  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
+"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
+  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
-  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
+"@babel/plugin-transform-modules-systemjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81"
+  integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/plugin-transform-modules-umd@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
-  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
+"@babel/plugin-transform-modules-umd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
+  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
@@ -1859,25 +1468,25 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
-  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
+"@babel/plugin-transform-new-target@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
+  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381"
-  integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11", "@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
+  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-numeric-separator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58"
-  integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==
+"@babel/plugin-transform-numeric-separator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
+  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
@@ -1889,100 +1498,100 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-rest-spread@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1"
-  integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==
+"@babel/plugin-transform-object-rest-spread@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
+  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
   dependencies:
-    "@babel/compat-data" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/compat-data" "^7.23.3"
+    "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-parameters" "^7.23.3"
 
-"@babel/plugin-transform-object-super@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
-  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
+"@babel/plugin-transform-object-super@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
+  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
 
-"@babel/plugin-transform-optional-catch-binding@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333"
-  integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==
+"@babel/plugin-transform-optional-catch-binding@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
+  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.22.10", "@babel/plugin-transform-optional-chaining@^7.22.5":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz#076d28a7e074392e840d4ae587d83445bac0372a"
-  integrity sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==
+"@babel/plugin-transform-optional-chaining@^7.23.0", "@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
+  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
-  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
+"@babel/plugin-transform-parameters@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
+  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-private-methods@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
-  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
+"@babel/plugin-transform-private-methods@^7.22.5", "@babel/plugin-transform-private-methods@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
+  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-private-property-in-object@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32"
-  integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==
+"@babel/plugin-transform-private-property-in-object@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
+  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
-  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
+"@babel/plugin-transform-property-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
+  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-react-jsx-self@^7.18.6", "@babel/plugin-transform-react-jsx-self@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz#ca2fdc11bc20d4d46de01137318b13d04e481d8e"
-  integrity sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==
+"@babel/plugin-transform-react-jsx-self@^7.18.6", "@babel/plugin-transform-react-jsx-self@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz#ed3e7dadde046cce761a8e3cf003a13d1a7972d9"
+  integrity sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-react-jsx-source@^7.19.6", "@babel/plugin-transform-react-jsx-source@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz#49af1615bfdf6ed9d3e9e43e425e0b2b65d15b6c"
-  integrity sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==
+"@babel/plugin-transform-react-jsx-source@^7.19.6", "@babel/plugin-transform-react-jsx-source@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz#03527006bdc8775247a78643c51d4e715fe39a3e"
+  integrity sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca"
-  integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==
+"@babel/plugin-transform-regenerator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
+  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-reserved-words@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
-  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+"@babel/plugin-transform-reserved-words@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
+  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
@@ -1998,51 +1607,51 @@
     babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
-  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
+"@babel/plugin-transform-shorthand-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
+  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
-  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
+"@babel/plugin-transform-spread@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
+  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
-  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
+"@babel/plugin-transform-sticky-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
+  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
-  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
+"@babel/plugin-transform-template-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
+  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
-  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
+"@babel/plugin-transform-typeof-symbol@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
+  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.20.13", "@babel/plugin-transform-typescript@^7.21.3":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz#aadd98fab871f0bb5717bcc24c31aaaa455af923"
-  integrity sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==
+"@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.20.13", "@babel/plugin-transform-typescript@^7.23.3":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.5.tgz#83da13ef62a1ebddf2872487527094b31c9adb84"
+  integrity sha512-2fMkXEJkrmwgu2Bsv1Saxgj30IXZdJ+84lQcKKI7sm719oXs0BBw2ZENKdJdR1PjWndgLCEBNXJOri0fk7RYQA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.10"
+    "@babel/helper-create-class-features-plugin" "^7.23.5"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-typescript" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.23.3"
 
 "@babel/plugin-transform-typescript@~7.4.0":
   version "7.4.5"
@@ -2070,35 +1679,35 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-typescript" "^7.8.3"
 
-"@babel/plugin-transform-unicode-escapes@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9"
-  integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==
+"@babel/plugin-transform-unicode-escapes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
+  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-property-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
-  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
+"@babel/plugin-transform-unicode-property-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
+  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
-  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
+"@babel/plugin-transform-unicode-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
+  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
-  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
+"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
+  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/polyfill@^7.11.5":
@@ -2109,25 +1718,26 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7", "@babel/preset-env@^7.20.2", "@babel/preset-env@^7.22.9":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.10.tgz#3263b9fe2c8823d191d28e61eac60a79f9ce8a0f"
-  integrity sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==
+"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7", "@babel/preset-env@^7.20.2", "@babel/preset-env@^7.23.2":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.5.tgz#350a3aedfa9f119ad045b068886457e895ba0ca1"
+  integrity sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-compilation-targets" "^7.22.10"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.22.5"
-    "@babel/plugin-syntax-import-attributes" "^7.22.5"
+    "@babel/plugin-syntax-import-assertions" "^7.23.3"
+    "@babel/plugin-syntax-import-attributes" "^7.23.3"
     "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -2139,70 +1749,69 @@
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.22.10"
-    "@babel/plugin-transform-async-to-generator" "^7.22.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.22.10"
-    "@babel/plugin-transform-class-properties" "^7.22.5"
-    "@babel/plugin-transform-class-static-block" "^7.22.5"
-    "@babel/plugin-transform-classes" "^7.22.6"
-    "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.22.10"
-    "@babel/plugin-transform-dotall-regex" "^7.22.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
-    "@babel/plugin-transform-dynamic-import" "^7.22.5"
-    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
-    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
-    "@babel/plugin-transform-for-of" "^7.22.5"
-    "@babel/plugin-transform-function-name" "^7.22.5"
-    "@babel/plugin-transform-json-strings" "^7.22.5"
-    "@babel/plugin-transform-literals" "^7.22.5"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
-    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
-    "@babel/plugin-transform-modules-umd" "^7.22.5"
+    "@babel/plugin-transform-arrow-functions" "^7.23.3"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.4"
+    "@babel/plugin-transform-async-to-generator" "^7.23.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
+    "@babel/plugin-transform-block-scoping" "^7.23.4"
+    "@babel/plugin-transform-class-properties" "^7.23.3"
+    "@babel/plugin-transform-class-static-block" "^7.23.4"
+    "@babel/plugin-transform-classes" "^7.23.5"
+    "@babel/plugin-transform-computed-properties" "^7.23.3"
+    "@babel/plugin-transform-destructuring" "^7.23.3"
+    "@babel/plugin-transform-dotall-regex" "^7.23.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
+    "@babel/plugin-transform-dynamic-import" "^7.23.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
+    "@babel/plugin-transform-export-namespace-from" "^7.23.4"
+    "@babel/plugin-transform-for-of" "^7.23.3"
+    "@babel/plugin-transform-function-name" "^7.23.3"
+    "@babel/plugin-transform-json-strings" "^7.23.4"
+    "@babel/plugin-transform-literals" "^7.23.3"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.23.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
+    "@babel/plugin-transform-modules-amd" "^7.23.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.3"
+    "@babel/plugin-transform-modules-umd" "^7.23.3"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
-    "@babel/plugin-transform-new-target" "^7.22.5"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
-    "@babel/plugin-transform-numeric-separator" "^7.22.5"
-    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
-    "@babel/plugin-transform-object-super" "^7.22.5"
-    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.10"
-    "@babel/plugin-transform-parameters" "^7.22.5"
-    "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
-    "@babel/plugin-transform-property-literals" "^7.22.5"
-    "@babel/plugin-transform-regenerator" "^7.22.10"
-    "@babel/plugin-transform-reserved-words" "^7.22.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
-    "@babel/plugin-transform-spread" "^7.22.5"
-    "@babel/plugin-transform-sticky-regex" "^7.22.5"
-    "@babel/plugin-transform-template-literals" "^7.22.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
-    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
-    "@babel/plugin-transform-unicode-regex" "^7.22.5"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.23.3"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4"
+    "@babel/plugin-transform-numeric-separator" "^7.23.4"
+    "@babel/plugin-transform-object-rest-spread" "^7.23.4"
+    "@babel/plugin-transform-object-super" "^7.23.3"
+    "@babel/plugin-transform-optional-catch-binding" "^7.23.4"
+    "@babel/plugin-transform-optional-chaining" "^7.23.4"
+    "@babel/plugin-transform-parameters" "^7.23.3"
+    "@babel/plugin-transform-private-methods" "^7.23.3"
+    "@babel/plugin-transform-private-property-in-object" "^7.23.4"
+    "@babel/plugin-transform-property-literals" "^7.23.3"
+    "@babel/plugin-transform-regenerator" "^7.23.3"
+    "@babel/plugin-transform-reserved-words" "^7.23.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
+    "@babel/plugin-transform-spread" "^7.23.3"
+    "@babel/plugin-transform-sticky-regex" "^7.23.3"
+    "@babel/plugin-transform-template-literals" "^7.23.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
+    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
+    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
-    "@babel/types" "^7.22.10"
-    babel-plugin-polyfill-corejs2 "^0.4.5"
-    babel-plugin-polyfill-corejs3 "^0.8.3"
-    babel-plugin-polyfill-regenerator "^0.5.2"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
     core-js-compat "^3.31.0"
     semver "^6.3.1"
 
-"@babel/preset-flow@^7.13.13":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.21.4.tgz#a5de2a1cafa61f0e0b3af9b30ff0295d38d3608f"
-  integrity sha512-F24cSq4DIBmhq4OzK3dE63NHagb27OPE3eWR+HLekt4Z3Y5MzIIUGF3LlLgV0gN8vzbDViSY7HnrReNVCJXTeA==
+"@babel/preset-flow@^7.22.15":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.23.3.tgz#8084e08b9ccec287bd077ab288b286fab96ffab1"
+  integrity sha512-7yn6hl8RIv+KNk6iIrGZ+D06VhVY35wLVf23Cz/mMu1zOr7u4MMP4j0nZ9tLf8+4ZFpnib8cFYgB/oYg9hfswA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-transform-flow-strip-types" "^7.23.3"
 
 "@babel/preset-modules@0.1.6-no-external-plugins":
   version "0.1.6-no-external-plugins"
@@ -2213,21 +1822,21 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-typescript@^7.13.0":
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.5.tgz#68292c884b0e26070b4d66b202072d391358395f"
-  integrity sha512-iqe3sETat5EOrORXiQ6rWfoOg2y68Cs75B9wNxdPW4kixJxh7aXQE1KPdWLDniC24T/6dSnguF33W9j/ZZQcmA==
+"@babel/preset-typescript@^7.23.0":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz#14534b34ed5b6d435aa05f1ae1c5e7adcc01d913"
+  integrity sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.21.5"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-syntax-jsx" "^7.21.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.5"
-    "@babel/plugin-transform-typescript" "^7.21.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-syntax-jsx" "^7.23.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
+    "@babel/plugin-transform-typescript" "^7.23.3"
 
-"@babel/register@^7.13.16":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz#c97bf56c2472e063774f31d344c592ebdcefa132"
-  integrity sha512-9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw==
+"@babel/register@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.22.15.tgz#c2c294a361d59f5fa7bcc8b97ef7319c32ecaec7"
+  integrity sha512-V3Q3EqoQdn65RCgTLwauZaTfd1ShhwPmbBv+1dkZV/HpCGMKVyn6oFcRlI7RaKqiDQjX2Qd3AuoEguBgdjIKlg==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -2247,45 +1856,45 @@
   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":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
-  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
+"@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.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.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7"
+  integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@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==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.22.5"
-    "@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"
-    debug "^4.1.0"
+"@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.24.7", "@babel/template@^7.3.3":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315"
+  integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.18.9", "@babel/traverse@^7.23.2", "@babel/traverse@^7.24.7", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5"
+  integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-hoist-variables" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
+    debug "^4.3.1"
     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":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.18.9", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.21.5", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
+  integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
   dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
 "@base2/pretty-print-object@1.0.1":
@@ -2298,10 +1907,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@breejs/later@4.1.0", "@breejs/later@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@breejs/later/-/later-4.1.0.tgz#9246907f46cc9e9c9af37d791ab468d98921bcc1"
-  integrity sha512-QgGnZ9b7o4k0Ai1ZbTJWwZpZcFK9d+Gb+DyNt4UT9x6IEIs5HVu0iIlmgzGqN+t9MoJSpSPo9S/Mm51UtHr3JA==
+"@breejs/later@4.2.0", "@breejs/later@^4.1.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@breejs/later/-/later-4.2.0.tgz#669661f3a02535ef900f360c74e48c3f5483c786"
+  integrity sha512-EVMD0SgJtOuFeg0lAVbCwa+qeTKILb87jqvLyUtQswGD9+ce2nB52Y5zbTF1Hc0MDFfbydcMcxb47jSdhikVHA==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
@@ -2342,10 +1951,10 @@
     "@lezer/common" "^1.0.2"
     "@lezer/css" "^1.0.0"
 
-"@codemirror/lang-html@^6.4.5":
-  version "6.4.6"
-  resolved "https://registry.yarnpkg.com/@codemirror/lang-html/-/lang-html-6.4.6.tgz#25c1c71591da80e75dceb67ceeab41e87bde29a5"
-  integrity sha512-E4C8CVupBksXvgLSme/zv31x91g06eZHSph7NczVxZW+/K+3XgJGWNT//2WLzaKSBoxpAjaOi5ZnPU1SHhjh3A==
+"@codemirror/lang-html@6.4.9":
+  version "6.4.9"
+  resolved "https://registry.yarnpkg.com/@codemirror/lang-html/-/lang-html-6.4.9.tgz#d586f2cc9c341391ae07d1d7c545990dfa069727"
+  integrity sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==
   dependencies:
     "@codemirror/autocomplete" "^6.0.0"
     "@codemirror/lang-css" "^6.0.0"
@@ -2429,14 +2038,6 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@contrast/fn-inspect@^3.3.0":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@contrast/fn-inspect/-/fn-inspect-3.3.1.tgz#3e8f7d297ce12742a4d54c7c7fea50a86e1ed5ed"
-  integrity sha512-BqsC5YslFxX/jgUzjAFEqnI0ngXXmUAFHUrhLSJu7lFYwTB7U1bLCUcjsZVnaO2bh0QDrmGAL/W0pe1Eu7PIIQ==
-  dependencies:
-    nan "^2.16.0"
-    node-gyp-build "^4.4.0"
-
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
@@ -2588,20 +2189,20 @@
     ee-log "^3.0.0"
     section-tests "^1.3.0"
 
-"@dnd-kit/accessibility@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/accessibility/-/accessibility-3.0.1.tgz#3ccbefdfca595b0a23a5dc57d3de96bc6935641c"
-  integrity sha512-HXRrwS9YUYQO9lFRc/49uO/VICbM+O+ZRpFDe9Pd1rwVv2PCNkRiTZRdxrDgng/UkvdC3Re9r2vwPpXXrWeFzg==
+"@dnd-kit/accessibility@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/accessibility/-/accessibility-3.1.0.tgz#1054e19be276b5f1154ced7947fc0cb5d99192e0"
+  integrity sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==
   dependencies:
     tslib "^2.0.0"
 
-"@dnd-kit/core@6.0.8":
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-6.0.8.tgz#040ae13fea9787ee078e5f0361f3b49b07f3f005"
-  integrity sha512-lYaoP8yHTQSLlZe6Rr9qogouGUz9oRUj4AHhDQGQzq/hqaJRpFo65X+JKsdHf8oUFBzx5A+SJPUvxAwTF2OabA==
+"@dnd-kit/core@6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-6.1.0.tgz#e81a3d10d9eca5d3b01cbf054171273a3fe01def"
+  integrity sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==
   dependencies:
-    "@dnd-kit/accessibility" "^3.0.0"
-    "@dnd-kit/utilities" "^3.2.1"
+    "@dnd-kit/accessibility" "^3.1.0"
+    "@dnd-kit/utilities" "^3.2.2"
     tslib "^2.0.0"
 
 "@dnd-kit/sortable@7.0.2":
@@ -2612,35 +2213,35 @@
     "@dnd-kit/utilities" "^3.2.0"
     tslib "^2.0.0"
 
-"@dnd-kit/utilities@^3.2.0", "@dnd-kit/utilities@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.2.1.tgz#53f9e2016fd2506ec49e404c289392cfff30332a"
-  integrity sha512-OOXqISfvBw/1REtkSK2N3Fi2EQiLMlWUlqnOK/UpOISqBZPWpE6TqL+jcPtMOkE8TqYGiURvRdPSI9hltNUjEA==
+"@dnd-kit/utilities@^3.2.0", "@dnd-kit/utilities@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.2.2.tgz#5a32b6af356dc5f74d61b37d6f7129a4040ced7b"
+  integrity sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==
   dependencies:
     tslib "^2.0.0"
 
-"@doist/react-interpolate@0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@doist/react-interpolate/-/react-interpolate-0.4.1.tgz#696d14e90ffc849e94a4e3e94578c5eade1590b8"
-  integrity sha512-JxBJMpDlXByMrA7T6Z+tRdCqXlbnM1ikfasLaqMrWvV4TvvrPuD7dngU/X01iP9tpAycfxasNvbNKFs/QehViQ==
+"@doist/react-interpolate@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@doist/react-interpolate/-/react-interpolate-1.1.1.tgz#0e9d2a25a1551b3eb9b7980ee57a2444c85b6e9e"
+  integrity sha512-pbexANYp1BZY9fVMlD2FmRxLNeBx+t8VtNRhnsiTyONnEF/MYIe8Prz/2FYv0+4/CD45YxNehL0Z7tqL9NVV/w==
 
 "@ebay/nice-modal-react@1.2.13":
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/@ebay/nice-modal-react/-/nice-modal-react-1.2.13.tgz#7e8229fe3a48a11f27cd7f5e21190d82d6f609ce"
   integrity sha512-jx8xIWe/Up4tpNuM02M+rbnLoxdngTGk3Y8LjJsLGXXcSoKd/+eZStZcAlIO/jwxyz/bhPZnpqPJZWAmhOofuA==
 
-"@elastic/elasticsearch@8.10.0", "@elastic/elasticsearch@8.5.0":
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.5.0.tgz#407aee0950a082ee76735a567f2571cf4301d4ea"
-  integrity sha512-iOgr/3zQi84WmPhAplnK2W13R89VXD2oc6WhlQmH3bARQwmI+De23ZJKBEn7bvuG/AHMAqasPXX7uJIiJa2MqQ==
+"@elastic/elasticsearch@8.13.1":
+  version "8.13.1"
+  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.13.1.tgz#0fbe8318cf7f21c599165bb901277428639d57ec"
+  integrity sha512-2G4Vu6OHw4+XTrp7AGIcOEezpPEoVrWg2JTK1v/exEKSLYquZkUdd+m4yOL3/UZ6bTj7hmXwrmYzW76BnLCkJQ==
   dependencies:
-    "@elastic/transport" "^8.2.0"
+    "@elastic/transport" "~8.4.1"
     tslib "^2.4.0"
 
-"@elastic/transport@^8.2.0":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.3.4.tgz#43c852e848dc8502bbd7f23f2d61bd5665cded99"
-  integrity sha512-+0o8o74sbzu3BO7oOZiP9ycjzzdOt4QwmMEjFc1zfO7M0Fh7QX1xrpKqZbSd8vBwihXNlSq/EnMPfgD2uFEmFg==
+"@elastic/transport@~8.4.1":
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.4.1.tgz#f98c5a5e2156bcb3f01170b4aca7e7de4d8b61b8"
+  integrity sha512-/SXVuVnuU5b4dq8OFY4izG+dmGla185PcoqgK6+AJMpmOeY1QYVNbWtCwvSvoAANN5D/wV+EBU8+x7Vf9EphbA==
   dependencies:
     debug "^4.3.4"
     hpagent "^1.0.0"
@@ -2813,14 +2414,14 @@
     jquery "^3.5.0"
     resolve "^1.15.1"
 
-"@ember/optional-features@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-2.0.0.tgz#c809abd5a27d5b0ef3c6de3941334ab6153313f0"
-  integrity sha512-4gkvuGRYfpAh1nwAz306cmMeC1mG7wxZnbsBZ09mMaMX/W7IyKOKc/38JwrDPUFUalmNEM7q7JEPcmew2M3Dog==
+"@ember/optional-features@2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-2.1.0.tgz#8e15672ca342b5ca6d4d8a00558dc696db0d6f16"
+  integrity sha512-IXjDpTFhsjPk9h3OXwXjlRfhM/Wjtw2E71Xos/81ZsTTwZMB9H+DWhsxePXOkzYy7Jvw4TIzKbMfcnT8mrtwWQ==
   dependencies:
-    chalk "^4.1.0"
-    ember-cli-version-checker "^5.1.1"
-    glob "^7.1.6"
+    chalk "^4.1.2"
+    ember-cli-version-checker "^5.1.2"
+    glob "^7.1.7"
     inquirer "^7.3.3"
     mkdirp "^1.0.4"
     silent-error "^1.1.1"
@@ -2849,6 +2450,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"
@@ -2875,10 +2483,10 @@
     ember-cli-htmlbars-inline-precompile "^2.1.0"
     ember-test-waiters "^1.1.1"
 
-"@ember/test-waiters@^3.0.0", "@ember/test-waiters@^3.0.1":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f"
-  integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ==
+"@ember/test-waiters@3.1.0", "@ember/test-waiters@^3.0.0", "@ember/test-waiters@^3.0.1":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.1.0.tgz#61399919cbf793978da0b8bfdfdb7bca0cb80e9e"
+  integrity sha512-bb9h95ktG2wKY9+ja1sdsFBdOms2lB19VWs8wmNpzgHv1NCetonBoV5jHBV4DHt0uS1tg9z66cZqhUVlYs96KQ==
   dependencies:
     calculate-cache-key-for-tree "^2.0.0"
     ember-cli-babel "^7.26.6"
@@ -2977,12 +2585,12 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/macros@1.13.2", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.12.2", "@embroider/macros@^1.2.0", "@embroider/macros@^1.8.0", "@embroider/macros@^1.8.3", "@embroider/macros@^1.9.0":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.2.tgz#07dda11313a2539f403404881b729e622a80ca17"
-  integrity sha512-AUgJ71xG8kjuTx8XB1AQNBiebJuXRfhcHr318dCwnQz9VRXdYSnEEqf38XRvGYIoCvIyn/3c72LrSwzaJqknOA==
+"@embroider/macros@1.13.4", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.12.2", "@embroider/macros@^1.2.0", "@embroider/macros@^1.8.0", "@embroider/macros@^1.8.3", "@embroider/macros@^1.9.0":
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.4.tgz#4fefb79d68bcfbc4619551572b2ca3040a224fb5"
+  integrity sha512-A6tXvfwnscx66QO0R3c2dIJwEltfsTL4ihsYjMtgP9ODCCmQlCaRlZDQYw5Drta0ER9Fj3nXntu4naV5Wt5XLA==
   dependencies:
-    "@embroider/shared-internals" "2.5.0"
+    "@embroider/shared-internals" "2.5.1"
     assert-never "^1.2.1"
     babel-import-util "^2.0.0"
     ember-cli-babel "^7.26.6"
@@ -3017,10 +2625,10 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@embroider/shared-internals@2.5.0", "@embroider/shared-internals@^2.0.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.0.tgz#4a0b5127c589718fae60fc22f81374ed558b944a"
-  integrity sha512-7qzrb7GVIyNqeY0umxoeIvjDC+ay1b+wb2yCVuYTUYrFfLAkLEy9FNI3iWCi3RdQ9OFjgcAxAnwsAiPIMZZ3pQ==
+"@embroider/shared-internals@2.5.1", "@embroider/shared-internals@^2.0.0":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.1.tgz#a4d8c057cbff293ef6eb29ee6537f263d206b444"
+  integrity sha512-b+TWDBisH1p6HeTbJIO8pgu1WzfTP0ZSAlZBqjXwOyrS0ZxP1qNYRrEX+IxyzIibEFjXBxeLakiejz3DJvZX5A==
   dependencies:
     babel-import-util "^2.0.0"
     debug "^4.3.2"
@@ -3174,225 +2782,230 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6"
   integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==
 
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
+
 "@esbuild/android-arm64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.14.tgz#d86197e6ff965a187b2ea2704915f596a040ed4b"
   integrity sha512-rZ2v+Luba5/3D6l8kofWgTnqE+qsC/L5MleKIKFyllHTKHrNBMqeRCnZI1BtRx8B24xMYxeU32iIddRQqMsOsg==
 
-"@esbuild/android-arm64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.0.tgz#c5ea635bdbe9b83d1f78a711120814e716439029"
-  integrity sha512-AzsozJnB+RNaDncBCs3Ys5g3kqhPFUueItfEaCpp89JH2naFNX2mYDIvUgPYMqqjm8hiFoo+jklb3QHZyR3ubw==
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
 
 "@esbuild/android-arm@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.14.tgz#ed59310c0e6ec6df8b17e363d33a954ecf870f4f"
   integrity sha512-blODaaL+lngG5bdK/t4qZcQvq2BBqrABmYwqPPcS5VRxrCSGHb9R/rA3fqxh7R18I7WU4KKv+NYkt22FDfalcg==
 
-"@esbuild/android-arm@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.0.tgz#6eb6e1fbc0dbfafa035aaef8b5ecde25b539fcf9"
-  integrity sha512-GAkjUyHgWTYuex3evPd5V7uV/XS4LMKr1PWHRPW1xNyy/Jx08x3uTrDFRefBYLKT/KpaWM8/YMQcwbp5a3yIDA==
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
 
 "@esbuild/android-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.14.tgz#e01b387f1db3dd2596a44e8c577aa2609750bc82"
   integrity sha512-qSwh8y38QKl+1Iqg+YhvCVYlSk3dVLk9N88VO71U4FUjtiSFylMWK3Ugr8GC6eTkkP4Tc83dVppt2n8vIdlSGg==
 
-"@esbuild/android-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.0.tgz#99f154f71f5b92e778468bcf0f425d166c17bf20"
-  integrity sha512-SUG8/qiVhljBDpdkHQ9DvOWbp7hFFIP0OzxOTptbmVsgBgzY6JWowmMd6yJuOhapfxmj/DrvwKmjRLvVSIAKZg==
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
 
 "@esbuild/darwin-arm64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.14.tgz#e92fbdeb9ff209a762cf107df3026c1b3e04ab85"
   integrity sha512-9Hl2D2PBeDYZiNbnRKRWuxwHa9v5ssWBBjisXFkVcSP5cZqzZRFBUWEQuqBHO4+PKx4q4wgHoWtfQ1S7rUqJ2Q==
 
-"@esbuild/darwin-arm64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.0.tgz#2fcc11abf95fbabbf9167db6a11d899385bd777b"
-  integrity sha512-HkxZ8k3Jvcw0FORPNTavA8BMgQjLOB6AajT+iXmil7BwY3gU1hWvJJAyWyEogCmA4LdbGvKF8vEykdmJ4xNJJQ==
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
 
 "@esbuild/darwin-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.14.tgz#bc1884d9f812647e2078fa4c46e4bffec53c7c09"
   integrity sha512-ZnI3Dg4ElQ6tlv82qLc/UNHtFsgZSKZ7KjsUNAo1BF1SoYDjkGKHJyCrYyWjFecmXpvvG/KJ9A/oe0H12odPLQ==
 
-"@esbuild/darwin-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.0.tgz#b5bbde35468db093fdf994880b0eb4b62613b67c"
-  integrity sha512-9IRWJjqpWFHM9a5Qs3r3bK834NCFuDY5ZaLrmTjqE+10B6w65UMQzeZjh794JcxpHolsAHqwsN/33crUXNCM2Q==
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
 
 "@esbuild/freebsd-arm64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.14.tgz#1fa876f627536b5037f4aed90545ccc330fd509b"
   integrity sha512-h3OqR80Da4oQCIa37zl8tU5MwHQ7qgPV0oVScPfKJK21fSRZEhLE4IIVpmcOxfAVmqjU6NDxcxhYaM8aDIGRLw==
 
-"@esbuild/freebsd-arm64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.0.tgz#3f64c76dc590f79cc40acef6b22dd5eb89fc2125"
-  integrity sha512-s7i2WcXcK0V1PJHVBe7NsGddsL62a9Vhpz2U7zapPrwKoFuxPP9jybwX8SXnropR/AOj3ppt2ern4ItblU6UQQ==
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
 
 "@esbuild/freebsd-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.14.tgz#effaa4c5d7bab695b5e6fae459eaf49121fbc7c3"
   integrity sha512-ha4BX+S6CZG4BoH9tOZTrFIYC1DH13UTCRHzFc3GWX74nz3h/N6MPF3tuR3XlsNjMFUazGgm35MPW5tHkn2lzQ==
 
-"@esbuild/freebsd-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.0.tgz#14d497e9e858fba2bb9b16130602b7f5944bc09c"
-  integrity sha512-NMdBSSdgwHCqCsucU5k1xflIIRU0qi1QZnM6+vdGy5fvxm1c8rKh50VzsWsIVTFUG3l91AtRxVwoz3Lcvy3I5w==
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
 
 "@esbuild/linux-arm64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.14.tgz#24bb4b1836fe7900e1ffda78aa6875a4eb500e3a"
   integrity sha512-IXORRe22In7U65NZCzjwAUc03nn8SDIzWCnfzJ6t/8AvGx5zBkcLfknI+0P+hhuftufJBmIXxdSTbzWc8X/V4w==
 
-"@esbuild/linux-arm64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.0.tgz#0f2f4d8889f7dc89681c306d7312aa76445a5f65"
-  integrity sha512-I4zvE2srSZxRPapFnNqj+NL3sDJ1wkvEZqt903OZUlBBgigrQMvzUowvP/TTTu2OGYe1oweg5MFilfyrElIFag==
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
 
 "@esbuild/linux-arm@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.14.tgz#7f3490320a4627f4c850a8613385bdf3ffb82285"
   integrity sha512-5+7vehI1iqru5WRtJyU2XvTOvTGURw3OZxe3YTdE9muNNIdmKAVmSHpB3Vw2LazJk2ifEdIMt/wTWnVe5V98Kg==
 
-"@esbuild/linux-arm@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.0.tgz#0b0f79dc72884f0ad02c0aabfc969a0bee7f6775"
-  integrity sha512-2F1+lH7ZBcCcgxiSs8EXQV0PPJJdTNiNcXxDb61vzxTRJJkXX1I/ye9mAhfHyScXzHaEibEXg1Jq9SW586zz7w==
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
 
 "@esbuild/linux-ia32@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.14.tgz#91f1e82f92ffaff8d72f9d90a0f209022529031a"
   integrity sha512-BfHlMa0nibwpjG+VXbOoqJDmFde4UK2gnW351SQ2Zd4t1N3zNdmUEqRkw/srC1Sa1DRBE88Dbwg4JgWCbNz/FQ==
 
-"@esbuild/linux-ia32@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.0.tgz#dfcece1f5e74d0e7db090475e48b28d9aa270687"
-  integrity sha512-dz2Q7+P92r1Evc8kEN+cQnB3qqPjmCrOZ+EdBTn8lEc1yN8WDgaDORQQiX+mxaijbH8npXBT9GxUqE52Gt6Y+g==
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
 
 "@esbuild/linux-loong64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.14.tgz#cd5cb806af6361578800af79919c5cfd53401a17"
   integrity sha512-j2/Ex++DRUWIAaUDprXd3JevzGtZ4/d7VKz+AYDoHZ3HjJzCyYBub9CU1wwIXN+viOP0b4VR3RhGClsvyt/xSw==
 
-"@esbuild/linux-loong64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.0.tgz#710f5bd55db3f5d9ebac8773ea49795261a35ca7"
-  integrity sha512-IcVJovJVflih4oFahhUw+N7YgNbuMSVFNr38awb0LNzfaiIfdqIh518nOfYaNQU3aVfiJnOIRVJDSAP4k35WxA==
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
 
 "@esbuild/linux-mips64el@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.14.tgz#c635b6c0b8b4f9b4bff3aaafad59fa8cc07b354a"
   integrity sha512-qn2+nc+ZCrJmiicoAnJXJJkZWt8Nwswgu1crY7N+PBR8ChBHh89XRxj38UU6Dkthl2yCVO9jWuafZ24muzDC/A==
 
-"@esbuild/linux-mips64el@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.0.tgz#a918b310f9bf31fced3853ca52fee6e7acc09824"
-  integrity sha512-bZGRAGySMquWsKw0gIdsClwfvgbsSq/7oq5KVu1H1r9Il+WzOcfkV1hguntIuBjRVL8agI95i4AukjdAV2YpUw==
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
 
 "@esbuild/linux-ppc64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.14.tgz#9b2bb80b7e30667a81ffbcddb74ad8e79330cc94"
   integrity sha512-aGzXzd+djqeEC5IRkDKt3kWzvXoXC6K6GyYKxd+wsFJ2VQYnOWE954qV2tvy5/aaNrmgPTb52cSCHFE+Z7Z0yg==
 
-"@esbuild/linux-ppc64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.0.tgz#104771ef6ce2719ac17031f6b9ed8aa98f8e5faf"
-  integrity sha512-3LC6H5/gCDorxoRBUdpLV/m7UthYSdar0XcCu+ypycQxMS08MabZ06y1D1yZlDzL/BvOYliRNRWVG/YJJvQdbg==
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
 
 "@esbuild/linux-riscv64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.14.tgz#9520d34a4ecbf404e56f4cebdcc686c83b66babc"
   integrity sha512-8C6vWbfr0ygbAiMFLS6OPz0BHvApkT2gCboOGV76YrYw+sD/MQJzyITNsjZWDXJwPu9tjrFQOVG7zijRzBCnLw==
 
-"@esbuild/linux-riscv64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.0.tgz#83beafa472ad4224adcd4d7469e3a17ba1fbd976"
-  integrity sha512-jfvdKjWk+Cp2sgLtEEdSHXO7qckrw2B2eFBaoRdmfhThqZs29GMMg7q/LsQpybA7BxCLLEs4di5ucsWzZC5XPA==
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
 
 "@esbuild/linux-s390x@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.14.tgz#3987e30f807b8faf20815b2b2f0a4919084d4e7c"
   integrity sha512-G/Lf9iu8sRMM60OVGOh94ZW2nIStksEcITkXdkD09/T6QFD/o+g0+9WVyR/jajIb3A0LvBJ670tBnGe1GgXMgw==
 
-"@esbuild/linux-s390x@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.0.tgz#edc26cb41d8745716bda9c26bac1f0001eaad029"
-  integrity sha512-ofcucfNLkoXmcnJaw9ugdEOf40AWKGt09WBFCkpor+vFJVvmk/8OPjl/qRtks2Z7BuZbG3ztJuK1zS9z5Cgx9A==
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
 
 "@esbuild/linux-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.14.tgz#51c727dc7045c47ab8c08fe6c09cda3e170d99f3"
   integrity sha512-TBgStYBQaa3EGhgqIDM+ECnkreb0wkcKqL7H6m+XPcGUoU4dO7dqewfbm0mWEQYH3kzFHrzjOFNpSAVzDZRSJw==
 
-"@esbuild/linux-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.0.tgz#80a6b5e55ad454e0c0af5bdb267335287e331007"
-  integrity sha512-Fpf7zNDBti3xrQKQKLdXT0hTyOxgFdRJIMtNy8x1az9ATR9/GJ1brYbB/GLWoXhKiHsoWs+2DLkFVNNMTCLEwA==
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
 
 "@esbuild/netbsd-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.14.tgz#4677bf88b489d5ffe1b5f0abbb85812996455479"
   integrity sha512-stvCcjyCQR2lMTroqNhAbvROqRjxPEq0oQ380YdXxA81TaRJEucH/PzJ/qsEtsHgXlWFW6Ryr/X15vxQiyRXVg==
 
-"@esbuild/netbsd-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.0.tgz#2e6e8d869b58aea34bab9c0c47f15ae1bda29a90"
-  integrity sha512-AMQAp/5oENgDOvVhvOlbhVe1pWii7oFAMRHlmTjSEMcpjTpIHtFXhv9uAFgUERHm3eYtNvS9Vf+gT55cwuI6Aw==
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
 
 "@esbuild/openbsd-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.14.tgz#939902897e533162450f69266f32ef1325ba98fd"
   integrity sha512-apAOJF14CIsN5ht1PA57PboEMsNV70j3FUdxLmA2liZ20gEQnfTG5QU0FhENo5nwbTqCB2O3WDsXAihfODjHYw==
 
-"@esbuild/openbsd-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.0.tgz#ca0817d3ab332afb0d8d96a2eb42b4d8ebaa8715"
-  integrity sha512-fDztEve1QUs3h/Dw2AUmBlWGkNQbhDoD05ppm5jKvzQv+HVuV13so7m5RYeiSMIC2XQy7PAjZh+afkxAnCRZxA==
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
 
 "@esbuild/sunos-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.14.tgz#a50721d47b93586249bd63250bd4b7496fc9957b"
   integrity sha512-fYRaaS8mDgZcGybPn2MQbn1ZNZx+UXFSUoS5Hd2oEnlsyUcr/l3c6RnXf1bLDRKKdLRSabTmyCy7VLQ7VhGdOQ==
 
-"@esbuild/sunos-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.0.tgz#8de27de2563cb3eb6c1af066b6d7fcb1229fe3d4"
-  integrity sha512-bKZzJ2/rvUjDzA5Ddyva2tMk89WzNJEibZEaq+wY6SiqPlwgFbqyQLimouxLHiHh1itb5P3SNCIF1bc2bw5H9w==
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
 
 "@esbuild/win32-arm64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.14.tgz#d8531d370e6fd0e0e40f40e016f996bbe4fd5ebf"
   integrity sha512-1c44RcxKEJPrVj62XdmYhxXaU/V7auELCmnD+Ri+UCt+AGxTvzxl9uauQhrFso8gj6ZV1DaORV0sT9XSHOAk8Q==
 
-"@esbuild/win32-arm64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.0.tgz#67c2b410ff8862be2cd61145ad21e11be00fb914"
-  integrity sha512-NQJ+4jmnA79saI+sE+QzcEls19uZkoEmdxo7r//PDOjIpX8pmoWtTnWg6XcbnO7o4fieyAwb5U2LvgWynF4diA==
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
 
 "@esbuild/win32-ia32@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.14.tgz#dcbf75e4e65d2921cd4be14ed67cec7360440e46"
   integrity sha512-EXAFttrdAxZkFQmpvcAQ2bywlWUsONp/9c2lcfvPUhu8vXBBenCXpoq9YkUvVP639ld3YGiYx0YUQ6/VQz3Maw==
 
-"@esbuild/win32-ia32@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.0.tgz#cac8992219c6d943bb22226e4afeb3774a29cca1"
-  integrity sha512-uyxiZAnsfu9diHm9/rIH2soecF/HWLXYUhJKW4q1+/LLmNQ+55lRjvSUDhUmsgJtSUscRJB/3S4RNiTb9o9mCg==
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
 
 "@esbuild/win32-x64@0.18.14":
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.14.tgz#43f66032e0f189b6f394d4dbc903a188bb0c969f"
   integrity sha512-K0QjGbcskx+gY+qp3v4/940qg8JitpXbdxFhRDA1aYoNaPff88+aEwoq45aqJ+ogpxQxmU0ZTjgnrQD/w8iiUg==
 
-"@esbuild/win32-x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.0.tgz#fa5f12c96811cec3233a53bdbf61d1a05ba9018f"
-  integrity sha512-jl+NXUjK2StMgqnZnqgNjZuerFG8zQqWXMBZdMMv4W/aO1ZKQaYWZBxTrtWKphkCBVEMh0wMVfGgOd2BjOZqUQ==
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
 "@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
@@ -3668,34 +3281,42 @@
     "@glimmer/interfaces" "^0.42.2"
     "@glimmer/util" "^0.42.2"
 
-"@grpc/grpc-js@^1.8.10":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.9.1.tgz#d6df7943cd2875a4feaf725f85ff605c08ac245d"
-  integrity sha512-AvDEPQT4teS+J8++cTE5tku4rYCwpPwPguESJUummLs/Ug/O5Bouofnc1mxaDORmwA9QkrJ+PfRQ1Qs7adQgJg==
+"@grpc/grpc-js@^1.7.1":
+  version "1.10.7"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.10.7.tgz#1abce1a8c4c90b79dbbe57d7e4310f3b0ce72899"
+  integrity sha512-ZMBVjSeDAz3tFSehyO6Pd08xZT1HfIwq3opbeM4cDlBh52gmwp0wVIPcQur53NN0ac68HMZ/7SF2rGRD5KmVmg==
   dependencies:
-    "@grpc/proto-loader" "^0.7.8"
-    "@types/node" ">=12.12.47"
+    "@grpc/proto-loader" "^0.7.13"
+    "@js-sdsl/ordered-map" "^4.4.2"
 
-"@grpc/proto-loader@^0.7.5", "@grpc/proto-loader@^0.7.8":
-  version "0.7.9"
-  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.9.tgz#3ca68236f1a0d77566dafa53c715eb31d096279a"
-  integrity sha512-YJsOehVXzgurc+lLAxYnlSMc1p/Gu6VAvnfx0ATi2nzvr0YZcjhmZDeY8SeAKv1M7zE3aEJH0Xo9mK1iZ8GYoQ==
+"@grpc/proto-loader@^0.7.13":
+  version "0.7.13"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.13.tgz#f6a44b2b7c9f7b609f5748c6eac2d420e37670cf"
+  integrity sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==
   dependencies:
     lodash.camelcase "^4.3.0"
     long "^5.0.0"
-    protobufjs "^7.2.4"
+    protobufjs "^7.2.5"
     yargs "^17.7.2"
 
+"@gulpjs/to-absolute-glob@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz#1fc2460d3953e1d9b9f2dfdb4bcc99da4710c021"
+  integrity sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==
+  dependencies:
+    is-negated-glob "^1.0.0"
+
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
-"@headlessui/react@1.7.17":
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.17.tgz#a0ec23af21b527c030967245fd99776aa7352bc6"
-  integrity sha512-4am+tzvkqDSSgiwrsEpGWqgGo9dz8qU5M3znCkC4PgkpY4HcCZzEDEvozltGGGHIKl9jbXbZPSH5TWn4sWJdow==
+"@headlessui/react@1.7.19":
+  version "1.7.19"
+  resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.19.tgz#91c78cf5fcb254f4a0ebe96936d48421caf75f40"
+  integrity sha512-Ll+8q3OlMJfJbAKM/+/Y2q6PPYbryqNTXDbryx7SXLIDamkF6iQFbriYHga0dY44PvDhvvBWCx1Xj4U5+G4hOw==
   dependencies:
+    "@tanstack/react-virtual" "^3.0.0-beta.60"
     client-only "^0.0.1"
 
 "@html-next/vertical-collection@3.0.0":
@@ -3748,18 +3369,6 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
 "@isaacs/ttlcache@1.4.1":
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz#21fb23db34e9b6220c6ba023a0118a2dd3461ea2"
@@ -3781,6 +3390,62 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
+"@jest/console@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
+  integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    slash "^3.0.0"
+
+"@jest/core@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
+  integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/reporters" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.7.0"
+    jest-config "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-resolve-dependencies "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    jest-watcher "^29.7.0"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
+"@jest/environment@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
+  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
+  dependencies:
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-mock "^29.7.0"
+
 "@jest/expect-utils@^28.0.1", "@jest/expect-utils@^28.1.3":
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525"
@@ -3788,12 +3453,12 @@
   dependencies:
     jest-get-type "^28.0.2"
 
-"@jest/expect-utils@^29.3.1", "@jest/expect-utils@^29.5.0":
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036"
-  integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==
+"@jest/expect-utils@^29.3.1", "@jest/expect-utils@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
   dependencies:
-    jest-get-type "^29.4.3"
+    jest-get-type "^29.6.3"
 
 "@jest/expect@^28.0.1":
   version "28.1.3"
@@ -3803,6 +3468,66 @@
     expect "^28.1.3"
     jest-snapshot "^28.1.3"
 
+"@jest/expect@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
+  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
+  dependencies:
+    expect "^29.7.0"
+    jest-snapshot "^29.7.0"
+
+"@jest/fake-timers@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
+  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@types/node" "*"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+
+"@jest/globals@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
+  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    jest-mock "^29.7.0"
+
+"@jest/reporters@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
+  integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^6.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
+    slash "^3.0.0"
+    string-length "^4.0.1"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
+
 "@jest/schemas@^28.1.3":
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
@@ -3810,13 +3535,42 @@
   dependencies:
     "@sinclair/typebox" "^0.24.1"
 
-"@jest/schemas@^29.6.0", "@jest/schemas@^29.6.3":
+"@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
   integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
   dependencies:
     "@sinclair/typebox" "^0.27.8"
 
+"@jest/source-map@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
+  integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.18"
+    callsites "^3.0.0"
+    graceful-fs "^4.2.9"
+
+"@jest/test-result@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
+  integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
+"@jest/test-sequencer@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
+  integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
+  dependencies:
+    "@jest/test-result" "^29.7.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    slash "^3.0.0"
+
 "@jest/transform@^28.1.3":
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
@@ -3838,26 +3592,26 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.1"
 
-"@jest/transform@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d"
-  integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==
+"@jest/transform@^29.3.1", "@jest/transform@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
+  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^29.3.1"
-    "@jridgewell/trace-mapping" "^0.3.15"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.3.1"
-    jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
+    jest-haste-map "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
-    write-file-atomic "^4.0.1"
+    write-file-atomic "^4.0.2"
 
 "@jest/types@^27.5.1":
   version "27.5.1"
@@ -3882,51 +3636,46 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jest/types@^29.3.1", "@jest/types@^29.5.0", "@jest/types@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.1.tgz#ae79080278acff0a6af5eb49d063385aaa897bf2"
-  integrity sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
   dependencies:
-    "@jest/schemas" "^29.6.0"
+    "@jest/schemas" "^29.6.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@joshwooding/vite-plugin-react-docgen-typescript@0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@joshwooding/vite-plugin-react-docgen-typescript/-/vite-plugin-react-docgen-typescript-0.2.1.tgz#930f6f0382520e4ba349eea1b152f9ae49364516"
-  integrity sha512-ou4ZJSXMMWHqGS4g8uNRbC5TiTWxAgQZiVucoUrOCWuPrTbkpJbmVyIi9jU72SBry7gQtuMEDp4YR8EEXAg7VQ==
+"@joshwooding/vite-plugin-react-docgen-typescript@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@joshwooding/vite-plugin-react-docgen-typescript/-/vite-plugin-react-docgen-typescript-0.3.0.tgz#67599fca260c2eafdaf234a944f9d471e6d53b08"
+  integrity sha512-2D6y7fNvFmsLmRt6UCOFJPvFoPMJGT0Uh1Wg0RaigUp7kdQPs6yYn8Dmx6GZkOH/NW0yMTwRz/p0SRMMRo50vA==
   dependencies:
     glob "^7.2.0"
     glob-promise "^4.2.0"
     magic-string "^0.27.0"
     react-docgen-typescript "^2.2.2"
 
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/set-array" "^1.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/resolve-uri@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@jridgewell/resolve-uri@^3.0.3":
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
   integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
 
-"@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
 "@jridgewell/source-map@^0.3.3":
   version "0.3.5"
@@ -3936,12 +3685,7 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.15":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
@@ -3954,13 +3698,18 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@js-sdsl/ordered-map@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
+  integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
 
 "@juggle/resize-observer@^3.3.1":
   version "3.4.0"
@@ -3973,89 +3722,90 @@
   integrity sha512-IXQp8N68L2fkk7p7RckBBhT/KwAX04GooIGjwzmY5THQanQvsmJpYgwC7A1Io2XDXBJzlGelQkP/C1SRM/aq8w==
 
 "@keyvhq/core@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@keyvhq/core/-/core-2.0.0.tgz#518311a59dbc4d6b6fd56852c15f483edb9fc7c9"
-  integrity sha512-fi3+F7GNImn1j4r6UFhsHRwN8a05uhUlrbNWZgnkX0h1NzcBEPNNqqMOE4KSASJwH2e9Eh/jm+bEfto58csNgg==
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/@keyvhq/core/-/core-2.1.1.tgz#438ea23a6a7af183af8fa6a194e1b334512c428d"
+  integrity sha512-wVnnVFWmtAvQP8v/Ugm8KSl4glrVZjb5uqVc1n5tbGzj45lZhG7F/YxCJ6qHGDfBtDEw5cp1nJ2qImdmaG/JEQ==
   dependencies:
     json-buffer "~3.0.1"
 
 "@keyvhq/memoize@~2.0.3":
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@keyvhq/memoize/-/memoize-2.0.3.tgz#7833170048f0f1dbf808ec727a4dce33d29e9a36"
+  resolved "https://registry.npmjs.org/@keyvhq/memoize/-/memoize-2.0.3.tgz#7833170048f0f1dbf808ec727a4dce33d29e9a36"
   integrity sha512-ID5Br2OshdhyD4G0g1dm7915Ol2ee6RmCPMDSEh7QFtkbHrtzkgJfYS60na6tGWRBqViAMrCByBfD6uSinjAgg==
   dependencies:
     "@keyvhq/core" "^2.0.0"
     mimic-fn "~3.0.0"
 
-"@lexical/clipboard@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/clipboard/-/clipboard-0.12.2.tgz#cfa74da178673624ecd835eb9449545885cbefc7"
-  integrity sha512-RldmfZquuJJJCJ5WquCyoJ1/eZ+AnNgdksqvd+G+Yn/GyJl/+O3dnHM0QVaDSPvh/PynLFcCtz/57ySLo2kQxQ==
+"@lexical/clipboard@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/clipboard/-/clipboard-0.13.1.tgz#ca132306129974ea2c9e51d6a8637f8fcffcdb3d"
+  integrity sha512-gMSbVeqb7S+XAi/EMMlwl+FCurLPugN2jAXcp5k5ZaUd7be8B+iupbYdoKkjt4qBhxmvmfe9k46GoC0QOPl/nw==
   dependencies:
-    "@lexical/html" "0.12.2"
-    "@lexical/list" "0.12.2"
-    "@lexical/selection" "0.12.2"
-    "@lexical/utils" "0.12.2"
+    "@lexical/html" "0.13.1"
+    "@lexical/list" "0.13.1"
+    "@lexical/selection" "0.13.1"
+    "@lexical/utils" "0.13.1"
 
-"@lexical/code@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/code/-/code-0.12.2.tgz#2484511cb9c3688bb85f477d448444250939986d"
-  integrity sha512-w2JeJdnMUtYnC/Fx78sL3iJBt9Ug8pFSDOcI9ay/BkMQFQV8oqq1iyuLLBBJSG4FAM8b2DXrVdGklRQ+jTfTVw==
+"@lexical/code@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/code/-/code-0.13.1.tgz#e13688390582a4b63a639daff1f16bcb82aa854d"
+  integrity sha512-QK77r3QgEtJy96ahYXNgpve8EY64BQgBSnPDOuqVrLdl92nPzjqzlsko2OZldlrt7gjXcfl9nqfhZ/CAhStfOg==
   dependencies:
-    "@lexical/utils" "0.12.2"
+    "@lexical/utils" "0.13.1"
     prismjs "^1.27.0"
 
-"@lexical/headless@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/headless/-/headless-0.12.2.tgz#300d5399d5d45e6f0bdc677c9ccaaf287d372572"
-  integrity sha512-fgAPcNG8z/uL++eplR5u5RZQU62n/aOf/znEnMn0toM73yzZQm3+V9Jx/Q5U/QfFuWVwQddVLZ32DGqMCW1/8w==
+"@lexical/headless@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/headless/-/headless-0.13.1.tgz#61e475495de49a4c5732e383e1d5f75fc5e39664"
+  integrity sha512-W2mLUuWPrsyf2n73NWM8nKiBI11lEpVVzKE0OzMsjTskv5+AAMaeu1wQ7M1508vKdCcUZwA6AOh3To/hstLEpw==
 
-"@lexical/html@0.12.2", "@lexical/html@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/html/-/html-0.12.2.tgz#6df09c362688b666da0f474d132d889415dbae8a"
-  integrity sha512-LWUO6OKhDtDZa9X1spHAqzsp+4EF01exis4cz5H9y2sHi7EofogXnRCadZ+fa07NVwPVTZWsStkk5qdSe/NEzg==
+"@lexical/html@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/html/-/html-0.13.1.tgz#e56035d0c6528ffb932390e0d3d357c82f69253a"
+  integrity sha512-XkZrnCSHIUavtpMol6aG8YsJ5KqC9hMxEhAENf3HTGi3ocysCByyXOyt1EhEYpjJvgDG4wRqt25xGDbLjj1/sA==
   dependencies:
-    "@lexical/selection" "0.12.2"
+    "@lexical/selection" "0.13.1"
+    "@lexical/utils" "0.13.1"
 
-"@lexical/link@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/link/-/link-0.12.2.tgz#33bf3ecdd98c2b27b2bdd67a8885649e1f528fc2"
-  integrity sha512-etOIONa7uyRDmwg8GN52kDlf8thD2Zk1LOFLeocHWz1V8fe3i2unGUek5s/rNPkc6ynpPpNsHdN1VEghOLCCmw==
+"@lexical/link@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/link/-/link-0.13.1.tgz#f1c4c12c828c0251e5d7fb4fb336f2d62380fc57"
+  integrity sha512-7E3B2juL2UoMj2n+CiyFZ7tlpsdViAoIE7MpegXwfe/VQ66wFwk/VxGTa/69ng2EoF7E0kh+SldvGQDrWAWb1g==
   dependencies:
-    "@lexical/utils" "0.12.2"
+    "@lexical/utils" "0.13.1"
 
-"@lexical/list@0.12.2", "@lexical/list@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/list/-/list-0.12.2.tgz#7afdd13026f936144ff93d40382f21924e8e6908"
-  integrity sha512-3CyWtYQC+IlK4cK/oiD8Uz1gSXD8UcKGOF2vVsDXkMU06O6zvHNmHZOnVJqA0JVNgZAoR9dMR1fi2xd4iuCAiw==
+"@lexical/list@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/list/-/list-0.13.1.tgz#461cb989157bdf4a43eaa8596fdb09df60d114ee"
+  integrity sha512-6U1pmNZcKLuOWiWRML8Raf9zSEuUCMlsOye82niyF6I0rpPgYo5UFghAAbGISDsyqzM1B2L4BgJ6XrCk/dJptg==
   dependencies:
-    "@lexical/utils" "0.12.2"
+    "@lexical/utils" "0.13.1"
 
-"@lexical/rich-text@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/rich-text/-/rich-text-0.12.2.tgz#9ef44e54777fc222ac8df344adb0d7428c784b25"
-  integrity sha512-igsEuv7CwBOAj5c8jeE41cnx6zkhI/Bkbu4W7shT6S6lNA/3cnyZpAMlgixwyK5RoqjGRCT+IJK5l6yBxQfNkw==
+"@lexical/rich-text@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/rich-text/-/rich-text-0.13.1.tgz#8251e81a3985a4d76bef027cf6c0dc90c661e4ec"
+  integrity sha512-HliB9Ync06mv9DBg/5j0lIsTJp+exLHlaLJe+n8Zq1QNTzZzu2LsIT/Crquk50In7K/cjtlaQ/d5RB0LkjMHYg==
 
-"@lexical/selection@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/selection/-/selection-0.12.2.tgz#87e30b953b02923d1691f61d5189eb1be81a19ae"
-  integrity sha512-h+g3oOnihHKIyLTyG6uLCEVR/DmUEVdCcZO1iAoGsuW7nwWiWNPWj6oZ3Cw5J1Mk5u62DHnkkVDQsVSZbAwmtg==
+"@lexical/selection@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/selection/-/selection-0.13.1.tgz#466d7cd0ee1b04680bd949112f1f5cb6a6618efa"
+  integrity sha512-Kt9eSwjxPznj7yzIYipu9yYEgmRJhHiq3DNxHRxInYcZJWWNNHum2xKyxwwcN8QYBBzgfPegfM/geqQEJSV1lQ==
 
-"@lexical/table@0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/table/-/table-0.12.2.tgz#59be2fd0413a9125017bb119aa950050bf92717b"
-  integrity sha512-tiAmTq6RKHDVER9v589Ajm9/RL+WTF1WschrH6HHVCtil6cfJfTJeJ+MF45+XEzB9fkqy2LfrScAfWxqLjVePA==
+"@lexical/table@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/table/-/table-0.13.1.tgz#814d3b8a2afb821aff151c92cce831809f9d67a1"
+  integrity sha512-VQzgkfkEmnvn6C64O/kvl0HI3bFoBh3WA/U67ALw+DS11Mb5CKjbt0Gzm/258/reIxNMpshjjicpWMv9Miwauw==
   dependencies:
-    "@lexical/utils" "0.12.2"
+    "@lexical/utils" "0.13.1"
 
-"@lexical/utils@0.12.2", "@lexical/utils@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@lexical/utils/-/utils-0.12.2.tgz#b8325f1a1a0d043fd2b40d59cd00c4d7c038474b"
-  integrity sha512-xW4y4l2Yd37+qLwkBvBGyzsKCA9wnh1ljphBJeR2vreT193i2gaIwuku2ZKlER14VHw4192qNJF7vUoAEmwurQ==
+"@lexical/utils@0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@lexical/utils/-/utils-0.13.1.tgz#f2a72f71c859933781294830b38b25b5b33122a9"
+  integrity sha512-AtQQKzYymkbOaQxaBXjRBS8IPxF9zWQnqwHTUTrJqJ4hX71aIQd/thqZbfQETAFJfC8pNBZw5zpxN6yPHk23dQ==
   dependencies:
-    "@lexical/list" "0.12.2"
-    "@lexical/selection" "0.12.2"
-    "@lexical/table" "0.12.2"
+    "@lexical/list" "0.13.1"
+    "@lexical/selection" "0.13.1"
+    "@lexical/table" "0.13.1"
 
 "@lezer/common@^1.0.0", "@lezer/common@^1.0.2":
   version "1.0.3"
@@ -4101,47 +3851,6 @@
   dependencies:
     "@lezer/common" "^1.0.0"
 
-"@linaria/core@4.2.9":
-  version "4.2.9"
-  resolved "https://registry.yarnpkg.com/@linaria/core/-/core-4.2.9.tgz#4917bde18d064a29cff4fd86aa99621f953a2a2c"
-  integrity sha512-ELcu37VNVOT/PU0L6WDIN+aLzNFyJrqoBYT0CucGOCAmODbojUMCv8oJYRbWzA3N34w1t199dN4UFdfRWFG2rg==
-  dependencies:
-    "@linaria/logger" "^4.0.0"
-    "@linaria/tags" "^4.3.4"
-    "@linaria/utils" "^4.3.3"
-
-"@linaria/logger@^4.0.0", "@linaria/logger@^4.5.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@linaria/logger/-/logger-4.5.0.tgz#e5de815ffe7806822f47a559a512b98f66acea13"
-  integrity sha512-XdQLk242Cpcsc9a3Cz1ktOE5ysTo2TpxdeFQEPwMm8Z/+F/S6ZxBDdHYJL09srXWz3hkJr3oS2FPuMZNH1HIxw==
-  dependencies:
-    debug "^4.1.1"
-    picocolors "^1.0.0"
-
-"@linaria/tags@^4.3.4":
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/@linaria/tags/-/tags-4.5.2.tgz#e62d67e4d2cf03c07beb3f64a75515398a4ec849"
-  integrity sha512-ougIJrket1Q1qBc/JlBBt63dzFZwrDxx51MsVeYQ0lagbfLLHCfdVKFrsQy2YBQkBFw5hAHDP9+0uPvBy662ng==
-  dependencies:
-    "@babel/generator" "^7.20.4"
-    "@linaria/logger" "^4.5.0"
-    "@linaria/utils" "^4.5.1"
-
-"@linaria/utils@^4.3.3", "@linaria/utils@^4.5.1":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@linaria/utils/-/utils-4.5.1.tgz#f221891191a3ddd35ea0b145afb12ad2002e67fa"
-  integrity sha512-BvVEDuwltfsia3tT72EFoqQvlkockii4rRdexBV5QOxmxVLFPo2jp+cqIybpa8aBtSpiflCdgwYvz+YlLR5ZCg==
-  dependencies:
-    "@babel/core" "^7.20.2"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.2"
-    "@linaria/logger" "^4.5.0"
-    babel-merge "^3.0.0"
-    find-up "^5.0.0"
-
 "@lint-todo/utils@^13.0.3":
   version "13.0.3"
   resolved "https://registry.yarnpkg.com/@lint-todo/utils/-/utils-13.0.3.tgz#ca222f38738b43eb43384d56e7292ba9cab3e891"
@@ -4155,20 +3864,10 @@
     tslib "^2.3.1"
     upath "^2.0.1"
 
-"@mapbox/node-pre-gyp@^1.0.0":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c"
-  integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==
-  dependencies:
-    detect-libc "^2.0.0"
-    https-proxy-agent "^5.0.0"
-    make-dir "^3.1.0"
-    node-fetch "^2.6.7"
-    nopt "^5.0.0"
-    npmlog "^5.0.1"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.11"
+"@lukeed/csprng@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@lukeed/csprng/-/csprng-1.1.0.tgz#1e3e4bd05c1cc7a0b2ddbd8a03f39f6e4b5e6cfe"
+  integrity sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==
 
 "@mdx-js/react@^2.1.5":
   version "2.3.0"
@@ -4178,31 +3877,32 @@
     "@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.40.0", "@metascraper/helpers@^5.45.10":
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.45.10.tgz#59ced77f599767cb9a53ff231de81ef5b9b1cfe9"
+  integrity sha512-IyEAvhCmsjXu5+PC5Lyce5neC0cHHfqBqcVgv0H6+PtNYqfiZ+5a4QWez+PqSsNFWVV58FKAxkFm2nJg2AKOXA==
   dependencies:
     audio-extensions "0.0.0"
-    chrono-node "~2.6.4"
+    chrono-node "~2.7.6"
     condense-whitespace "~2.0.0"
+    data-uri-utils "~1.0.8"
     entities "~4.5.0"
     file-extension "~4.0.5"
     has-values "~2.0.1"
     image-extensions "~1.1.0"
     is-relative-url "~3.0.0"
-    is-uri "~1.2.4"
+    is-uri "~1.2.6"
     iso-639-3 "~2.2.0"
     isostring "0.0.1"
-    jsdom "~22.1.0"
+    jsdom "~24.1.0"
     lodash "~4.17.21"
     memoize-one "~6.0.0"
     microsoft-capitalize "~1.0.5"
     mime "~3.0.0"
     normalize-url "~6.1.0"
-    re2 "~1.20.1"
+    re2 "~1.21.0"
     smartquotes "~2.3.2"
-    tldts "~6.0.12"
+    tldts "~6.1.24"
     url-regex-safe "~4.0.0"
     video-extensions "~1.2.0"
 
@@ -4220,57 +3920,44 @@
     pump "^3.0.0"
     tar-fs "^2.1.1"
 
-"@newrelic/aws-sdk@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@newrelic/aws-sdk/-/aws-sdk-7.0.0.tgz#b9584ed133b6a0a6e0cae2a50ae72c6a7eeaa27e"
-  integrity sha512-/14Y9qYomDEzFrdXogqms2CGMI9hEJECzNBSqBLT53FY/uZh6SdI4Tr5u0sEOghjCdNyF2rseW7u63bAn09Pxw==
-
-"@newrelic/koa@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@newrelic/koa/-/koa-8.0.0.tgz#ef940e332f563b0f1d37c056d9d6f5d1182cf142"
-  integrity sha512-aaqEVLnRk12DzChCGbWthVQR4PxomqeNVVxnBF3txfHCMhDL2rkOjjcu8VYVoLkhVXrNtY0M226sYN/uqzQ+bQ==
+"@nestjs/common@10.3.10":
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-10.3.10.tgz#d8825d55a50a04e33080c9188e6a5b03235d19f2"
+  integrity sha512-H8k0jZtxk1IdtErGDmxFRy0PfcOAUg41Prrqpx76DQusGGJjsaovs1zjXVD1rZWaVYchfT1uczJ6L4Kio10VNg==
+  dependencies:
+    uid "2.0.2"
+    iterare "1.2.1"
+    tslib "2.6.3"
 
-"@newrelic/native-metrics@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@newrelic/native-metrics/-/native-metrics-10.0.0.tgz#9e2aecf77b3f712e17f0fe9151dd33211db776d5"
-  integrity sha512-0AFPPnj/wFT32mWK6vjc6LY0dZUOcHludZqPkHj2e3m+Zto3pWGk8PmRr1m3OGi+yVdHlEWbgHEAJ3T9lSAMBA==
+"@nestjs/core@10.3.10":
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/@nestjs/core/-/core-10.3.10.tgz#508090c3ca36488a8e24a9e5939c2f37426e48f4"
+  integrity sha512-ZbQ4jovQyzHtCGCrzK5NdtW1SYO2fHSsgSY1+/9WdruYCUra+JDkWEXgZ4M3Hv480Dl3OXehAmY1wCOojeMyMQ==
   dependencies:
-    https-proxy-agent "^5.0.1"
-    nan "^2.17.0"
-    semver "^7.5.2"
+    uid "2.0.2"
+    "@nuxtjs/opencollective" "0.3.2"
+    fast-safe-stringify "2.1.1"
+    iterare "1.2.1"
+    path-to-regexp "3.2.0"
+    tslib "2.6.3"
 
-"@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==
+"@nestjs/platform-express@10.3.10":
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-10.3.10.tgz#45fa006605913d5aaa31bf99073136ad639939b4"
+  integrity sha512-wK2ow3CZI2KFqWeEpPmoR300OB6BcBLxARV1EiClJLCj4S1mZsoCmS0YWgpk3j1j6mo0SI8vNLi/cC2iZPEPQA==
   dependencies:
-    "@aws-sdk/client-lambda" "^3.363.0"
-    axios "0.21.4"
-    check-disk-space "3.3.1"
-    content-type "^1.0.5"
-    fast-safe-stringify "^2.1.1"
-    find-package-json "^1.2.0"
-    hash.js "^1.1.7"
-    html-entities "^2.3.6"
-    is-invalid-path "^1.0.2"
-    js-yaml "^4.1.0"
-    jsonschema "^1.4.1"
-    lodash "^4.17.21"
-    log4js "^6.9.1"
-    pretty-bytes "^5.6.0"
-    request-ip "^3.3.0"
-    ringbufferjs "^2.0.0"
-    semver "^7.5.4"
-    sync-request "^6.1.0"
-    unescape "^1.0.1"
-    unescape-js "^1.1.4"
-    uuid "^9.0.0"
-    ws "^7.5.9"
+    body-parser "1.20.2"
+    cors "2.8.5"
+    express "4.19.2"
+    multer "1.4.4-lts.1"
+    tslib "2.6.3"
 
-"@newrelic/superagent@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@newrelic/superagent/-/superagent-7.0.0.tgz#e289336aebd23a3e6930290f59d9c1721aac623a"
-  integrity sha512-fNB4NC+pJYYrFZRLcXaTb4Z7XFEfHi7fVQ3O9Qh10m/9CBM2W+Qc/6yyK9M1liRfgUGo5NOILRdjA23SS7720A==
+"@nestjs/testing@10.3.10":
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/@nestjs/testing/-/testing-10.3.10.tgz#6ed3c821fddf868665cc5ddc8591ee6eaab8a916"
+  integrity sha512-i3HAtVQJijxNxJq1k39aelyJlyEIBRONys7IipH/4r8W0J+M1V+y5EKDOyi4j1SdNSb/vmNyWpZ2/ewZjl3kRA==
+  dependencies:
+    tslib "2.6.3"
 
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
@@ -4300,6 +3987,17 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@npmcli/agent@^2.0.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.0.tgz#e81f00fdb2a670750ff7731bbefb47ecbf0ccf44"
+  integrity sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==
+  dependencies:
+    agent-base "^7.1.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.1"
+    lru-cache "^10.0.1"
+    socks-proxy-agent "^8.0.1"
+
 "@npmcli/fs@^1.0.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
@@ -4331,6 +4029,15 @@
     nx "16.8.1"
     tslib "^2.3.0"
 
+"@nuxtjs/opencollective@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz#620ce1044f7ac77185e825e1936115bb38e2681c"
+  integrity sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==
+  dependencies:
+    chalk "^4.1.0"
+    consola "^2.15.0"
+    node-fetch "^2.6.1"
+
 "@nx/nx-darwin-arm64@16.8.1":
   version "16.8.1"
   resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.8.1.tgz#fd85ed007d63d232700272cd07138ecac046525d"
@@ -4381,6 +4088,218 @@
   resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.8.1.tgz#6ec1930aaf4d9dea19149d6b3d100b2c7e69d582"
   integrity sha512-yHZ5FAcx54rVc31R0yIpniepkHMPwaxG23l8E/ZYbL1iPwE/Wc1HeUzUvxUuSXtguRp7ihcRhaUEPkcSl2EAVw==
 
+"@opentelemetry/api-logs@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.52.1.tgz#52906375da4d64c206b0c4cb8ffa209214654ecc"
+  integrity sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==
+  dependencies:
+    "@opentelemetry/api" "^1.0.0"
+
+"@opentelemetry/api@1.9.0", "@opentelemetry/api@^1.0.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
+  integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
+
+"@opentelemetry/context-async-hooks@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.25.1.tgz#810bff2fcab84ec51f4684aff2d21f6c057d9e73"
+  integrity sha512-UW/ge9zjvAEmRWVapOP0qyCvPulWU6cQxGxDbWEFfGOj1VBBZAuOqTo3X6yWmDTD3Xe15ysCZChHncr2xFMIfQ==
+
+"@opentelemetry/core@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.25.1.tgz#ff667d939d128adfc7c793edae2f6bca177f829d"
+  integrity sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==
+  dependencies:
+    "@opentelemetry/semantic-conventions" "1.25.1"
+
+"@opentelemetry/exporter-prometheus@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-prometheus/-/exporter-prometheus-0.52.1.tgz#615021fffd511d4424edf9347b119d814cc94e89"
+  integrity sha512-hwK0QnjtqAxGpQAXMNUY+kTT5CnHyz1I0lBA8SFySvaFtExZm7yQg/Ua/i+RBqgun7WkUbkUVJzEi3lKpJ7WdA==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/sdk-metrics" "1.25.1"
+
+"@opentelemetry/exporter-trace-otlp-grpc@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.52.1.tgz#8b59c93a5833484ba19a7f424632c6ced5ea1d3b"
+  integrity sha512-pVkSH20crBwMTqB3nIN4jpQKUEoB0Z94drIHpYyEqs7UBr+I0cpYyOR3bqjA/UasQUMROb3GX8ZX4/9cVRqGBQ==
+  dependencies:
+    "@grpc/grpc-js" "^1.7.1"
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/otlp-grpc-exporter-base" "0.52.1"
+    "@opentelemetry/otlp-transformer" "0.52.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/sdk-trace-base" "1.25.1"
+
+"@opentelemetry/exporter-trace-otlp-http@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.52.1.tgz#99549e05f581050d0df2c1c684d1a819c480ebc6"
+  integrity sha512-05HcNizx0BxcFKKnS5rwOV+2GevLTVIRA0tRgWYyw4yCgR53Ic/xk83toYKts7kbzcI+dswInUg/4s8oyA+tqg==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/otlp-exporter-base" "0.52.1"
+    "@opentelemetry/otlp-transformer" "0.52.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/sdk-trace-base" "1.25.1"
+
+"@opentelemetry/exporter-trace-otlp-proto@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-proto/-/exporter-trace-otlp-proto-0.52.1.tgz#7b68268cd4d46b7d89ee7c97720031ca80919fd6"
+  integrity sha512-pt6uX0noTQReHXNeEslQv7x311/F1gJzMnp1HD2qgypLRPbXDeMzzeTngRTUaUbP6hqWNtPxuLr4DEoZG+TcEQ==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/otlp-exporter-base" "0.52.1"
+    "@opentelemetry/otlp-transformer" "0.52.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/sdk-trace-base" "1.25.1"
+
+"@opentelemetry/exporter-zipkin@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-zipkin/-/exporter-zipkin-1.25.1.tgz#81bb3b3aa16500676277c2fd6d50159eaf6c081a"
+  integrity sha512-RmOwSvkimg7ETwJbUOPTMhJm9A9bG1U8s7Zo3ajDh4zM7eYcycQ0dM7FbLD6NXWbI2yj7UY4q8BKinKYBQksyw==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/sdk-trace-base" "1.25.1"
+    "@opentelemetry/semantic-conventions" "1.25.1"
+
+"@opentelemetry/instrumentation-runtime-node@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-runtime-node/-/instrumentation-runtime-node-0.6.0.tgz#6d547f42222c54987411404cae06912a08d94575"
+  integrity sha512-sbDGvUFL3pGwiaSazQ9v259uVHu3WtApMeo8vMMEKHb+z1IVN6/prJffCBs4OA+4skmhf3iFTV531mVwtwWbTA==
+  dependencies:
+    "@opentelemetry/instrumentation" "^0.52.0"
+
+"@opentelemetry/instrumentation@0.52.1", "@opentelemetry/instrumentation@^0.52.0":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.52.1.tgz#2e7e46a38bd7afbf03cf688c862b0b43418b7f48"
+  integrity sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==
+  dependencies:
+    "@opentelemetry/api-logs" "0.52.1"
+    "@types/shimmer" "^1.0.2"
+    import-in-the-middle "^1.8.1"
+    require-in-the-middle "^7.1.1"
+    semver "^7.5.2"
+    shimmer "^1.2.1"
+
+"@opentelemetry/otlp-exporter-base@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.52.1.tgz#657d9b27c55bd42ab6a8bb181006b57f9c84b91d"
+  integrity sha512-z175NXOtX5ihdlshtYBe5RpGeBoTXVCKPPLiQlD6FHvpM4Ch+p2B0yWKYSrBfLH24H9zjJiBdTrtD+hLlfnXEQ==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/otlp-transformer" "0.52.1"
+
+"@opentelemetry/otlp-grpc-exporter-base@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-grpc-exporter-base/-/otlp-grpc-exporter-base-0.52.1.tgz#e1fdfd979289a87faec1c7cf303100c75e49a284"
+  integrity sha512-zo/YrSDmKMjG+vPeA9aBBrsQM9Q/f2zo6N04WMB3yNldJRsgpRBeLLwvAt/Ba7dpehDLOEFBd1i2JCoaFtpCoQ==
+  dependencies:
+    "@grpc/grpc-js" "^1.7.1"
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/otlp-exporter-base" "0.52.1"
+    "@opentelemetry/otlp-transformer" "0.52.1"
+
+"@opentelemetry/otlp-transformer@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.52.1.tgz#779b7ebf0e3791eebeaa64caff06914fe3577948"
+  integrity sha512-I88uCZSZZtVa0XniRqQWKbjAUm73I8tpEy/uJYPPYw5d7BRdVk0RfTBQw8kSUl01oVWEuqxLDa802222MYyWHg==
+  dependencies:
+    "@opentelemetry/api-logs" "0.52.1"
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/sdk-logs" "0.52.1"
+    "@opentelemetry/sdk-metrics" "1.25.1"
+    "@opentelemetry/sdk-trace-base" "1.25.1"
+    protobufjs "^7.3.0"
+
+"@opentelemetry/propagator-b3@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-b3/-/propagator-b3-1.25.1.tgz#653ee5f3f0f223c000907c1559c89c0a208819f7"
+  integrity sha512-p6HFscpjrv7//kE+7L+3Vn00VEDUJB0n6ZrjkTYHrJ58QZ8B3ajSJhRbCcY6guQ3PDjTbxWklyvIN2ojVbIb1A==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+
+"@opentelemetry/propagator-jaeger@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/propagator-jaeger/-/propagator-jaeger-1.25.1.tgz#7eae165921e65dce6f8d87339379880125dab765"
+  integrity sha512-nBprRf0+jlgxks78G/xq72PipVK+4or9Ypntw0gVZYNTCSK8rg5SeaGV19tV920CMqBD/9UIOiFr23Li/Q8tiA==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+
+"@opentelemetry/resources@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.25.1.tgz#bb9a674af25a1a6c30840b755bc69da2796fefbb"
+  integrity sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/semantic-conventions" "1.25.1"
+
+"@opentelemetry/sdk-logs@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.52.1.tgz#5653faa2d81cae574729bdeb4298b95dc10ae736"
+  integrity sha512-MBYh+WcPPsN8YpRHRmK1Hsca9pVlyyKd4BxOC4SsgHACnl/bPp4Cri9hWhVm5+2tiQ9Zf4qSc1Jshw9tOLGWQA==
+  dependencies:
+    "@opentelemetry/api-logs" "0.52.1"
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/resources" "1.25.1"
+
+"@opentelemetry/sdk-metrics@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.25.1.tgz#50c985ec15557a9654334e7fa1018dc47a8a56b7"
+  integrity sha512-9Mb7q5ioFL4E4dDrc4wC/A3NTHDat44v4I3p2pLPSxRvqUbDIQyMVr9uK+EU69+HWhlET1VaSrRzwdckWqY15Q==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/resources" "1.25.1"
+    lodash.merge "^4.6.2"
+
+"@opentelemetry/sdk-node@0.52.1":
+  version "0.52.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-node/-/sdk-node-0.52.1.tgz#984f8a679a966b065504ccfe4b811359e417dd30"
+  integrity sha512-uEG+gtEr6eKd8CVWeKMhH2olcCHM9dEK68pe0qE0be32BcCRsvYURhHaD1Srngh1SQcnQzZ4TP324euxqtBOJA==
+  dependencies:
+    "@opentelemetry/api-logs" "0.52.1"
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/exporter-trace-otlp-grpc" "0.52.1"
+    "@opentelemetry/exporter-trace-otlp-http" "0.52.1"
+    "@opentelemetry/exporter-trace-otlp-proto" "0.52.1"
+    "@opentelemetry/exporter-zipkin" "1.25.1"
+    "@opentelemetry/instrumentation" "0.52.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/sdk-logs" "0.52.1"
+    "@opentelemetry/sdk-metrics" "1.25.1"
+    "@opentelemetry/sdk-trace-base" "1.25.1"
+    "@opentelemetry/sdk-trace-node" "1.25.1"
+    "@opentelemetry/semantic-conventions" "1.25.1"
+
+"@opentelemetry/sdk-trace-base@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.1.tgz#cbc1e60af255655d2020aa14cde17b37bd13df37"
+  integrity sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==
+  dependencies:
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/resources" "1.25.1"
+    "@opentelemetry/semantic-conventions" "1.25.1"
+
+"@opentelemetry/sdk-trace-node@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-1.25.1.tgz#856063bef1167ae74139199338c24fb958838ff3"
+  integrity sha512-nMcjFIKxnFqoez4gUmihdBrbpsEnAX/Xj16sGvZm+guceYE0NE00vLhpDVK6f3q8Q4VFI5xG8JjlXKMB/SkTTQ==
+  dependencies:
+    "@opentelemetry/context-async-hooks" "1.25.1"
+    "@opentelemetry/core" "1.25.1"
+    "@opentelemetry/propagator-b3" "1.25.1"
+    "@opentelemetry/propagator-jaeger" "1.25.1"
+    "@opentelemetry/sdk-trace-base" "1.25.1"
+    semver "^7.5.2"
+
+"@opentelemetry/semantic-conventions@1.25.1":
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.1.tgz#0deecb386197c5e9c2c28f2f89f51fb8ae9f145e"
+  integrity sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==
+
 "@parcel/watcher@2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
@@ -4411,10 +4330,24 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
-"@prisma/prisma-fmt-wasm@^4.17.0-16.27eb2449f178cd9fe1a4b892d732cc4795f75085":
-  version "4.17.0-16.27eb2449f178cd9fe1a4b892d732cc4795f75085"
-  resolved "https://registry.yarnpkg.com/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.17.0-16.27eb2449f178cd9fe1a4b892d732cc4795f75085.tgz#030f8a4448892c345b3c5c0558ca0ebf4642f3de"
-  integrity sha512-zYz3rFwPB82mVlHGknAPdnSY/a308dhPOblxQLcZgZTDRtDXOE1MgxoRAys+jekwR4/bm3+rZDPs1xsFMsPZig==
+"@probe.gl/bench@4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@probe.gl/bench/-/bench-4.0.9.tgz#169fb15e6d50ebfee06d0234cd85cd96b9c07aa3"
+  integrity sha512-FgyruqcFW++pOQ0YaOreKDPFtw9cTVO5YLPlBpuuZMaJ2nkri6bEsG/UPJQPiFsqP7dYmNrg2r20p4KcY8drGw==
+  dependencies:
+    "@probe.gl/log" "4.0.9"
+
+"@probe.gl/env@4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-4.0.9.tgz#cd0ed5214ed68021f3facc82cd885faebad21642"
+  integrity sha512-AOmVMD0/j78mX+k4+qX7ZhE0sY9H+EaJgIO6trik0BwV6VcrwxTGCGFAeuRsIGhETDnye06tkLXccYatYxAYwQ==
+
+"@probe.gl/log@4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-4.0.9.tgz#5971bb12558c470634f7e30b490252965af22c2a"
+  integrity sha512-ebuZaodSRE9aC+3bVC7cKRHT8garXeT1jTbj1R5tQRqQYc9iGeT3iemVOHx5bN9Q6gAs/0j54iPI+1DvWMAW4A==
+  dependencies:
+    "@probe.gl/env" "4.0.9"
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -4483,6 +4416,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/primitive@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"
+  integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==
+
 "@radix-ui/react-arrow@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz#c24f7968996ed934d57fe6cde5d6ec7266e1d25d"
@@ -4491,6 +4429,37 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
+"@radix-ui/react-arrow@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.1.0.tgz#744f388182d360b86285217e43b6c63633f39e7a"
+  integrity sha512-FmlW1rCg7hBpEBwFbjHwCW6AmWLQM6g/v0Sn8XbP9NvmSZ2San1FpQeyPtufzOMSIx7Y4dzjlHoifhp+7NkZhw==
+  dependencies:
+    "@radix-ui/react-primitive" "2.0.0"
+
+"@radix-ui/react-avatar@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-avatar/-/react-avatar-1.1.0.tgz#457c81334c93f4608df15f081e7baa286558d6a2"
+  integrity sha512-Q/PbuSMk/vyAd/UoIShVGZ7StHHeRFYU7wXmi5GV+8cLXflZAEpHL/F697H1klrzxKXNtZ97vWiC0q3RKUH8UA==
+  dependencies:
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
+"@radix-ui/react-checkbox@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-checkbox/-/react-checkbox-1.1.1.tgz#a559c4303957d797acee99914480b755aa1f27d6"
+  integrity sha512-0i/EKJ222Afa1FE0C6pNJxDq1itzcl3HChE9DwskA4th4KRse8ojx8a1nVcOjwJdbpDLcz7uol77yYnQNMHdKw==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-presence" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/react-use-previous" "1.1.0"
+    "@radix-ui/react-use-size" "1.1.0"
+
 "@radix-ui/react-collection@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.0.3.tgz#9595a66e09026187524a36c6e7e9c7d286469159"
@@ -4502,6 +4471,16 @@
     "@radix-ui/react-primitive" "1.0.3"
     "@radix-ui/react-slot" "1.0.2"
 
+"@radix-ui/react-collection@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.0.tgz#f18af78e46454a2360d103c2251773028b7724ed"
+  integrity sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-slot" "1.1.0"
+
 "@radix-ui/react-compose-refs@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz#7ed868b66946aa6030e580b1ffca386dd4d21989"
@@ -4509,6 +4488,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-compose-refs@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74"
+  integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==
+
 "@radix-ui/react-context@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.1.tgz#fe46e67c96b240de59187dcb7a1a50ce3e2ec00c"
@@ -4516,6 +4500,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-context@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.0.tgz#6df8d983546cfd1999c8512f3a8ad85a6e7fcee8"
+  integrity sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==
+
 "@radix-ui/react-direction@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.0.1.tgz#9cb61bf2ccf568f3421422d182637b7f47596c9b"
@@ -4523,6 +4512,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-direction@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.1.0.tgz#a7d39855f4d077adc2a1922f9c353c5977a09cdc"
+  integrity sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==
+
 "@radix-ui/react-dismissable-layer@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.4.tgz#883a48f5f938fa679427aa17fcba70c5494c6978"
@@ -4535,6 +4529,17 @@
     "@radix-ui/react-use-callback-ref" "1.0.1"
     "@radix-ui/react-use-escape-keydown" "1.0.3"
 
+"@radix-ui/react-dismissable-layer@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.0.tgz#2cd0a49a732372513733754e6032d3fb7988834e"
+  integrity sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-escape-keydown" "1.1.0"
+
 "@radix-ui/react-focus-guards@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz#1ea7e32092216b946397866199d892f71f7f98ad"
@@ -4542,6 +4547,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-focus-guards@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.0.tgz#8e9abb472a9a394f59a1b45f3dd26cfe3fc6da13"
+  integrity sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==
+
 "@radix-ui/react-focus-scope@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz#9c2e8d4ed1189a1d419ee61edd5c1828726472f9"
@@ -4552,6 +4562,28 @@
     "@radix-ui/react-primitive" "1.0.3"
     "@radix-ui/react-use-callback-ref" "1.0.1"
 
+"@radix-ui/react-focus-scope@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz#ebe2891a298e0a33ad34daab2aad8dea31caf0b2"
+  integrity sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+
+"@radix-ui/react-form@0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-form/-/react-form-0.0.3.tgz#328e7163e723ccc748459d66a2d685d7b4f85d5a"
+  integrity sha512-kgE+Z/haV6fxE5WqIXj05KkaXa3OkZASoTDy25yX2EIp/x0c54rOH/vFr5nOZTg7n7T1z8bSyXmiVIFP9bbhPQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-id" "1.0.1"
+    "@radix-ui/react-label" "2.0.2"
+    "@radix-ui/react-primitive" "1.0.3"
+
 "@radix-ui/react-id@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.0.1.tgz#73cdc181f650e4df24f0b6a5b7aa426b912c88c0"
@@ -4560,6 +4592,42 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-use-layout-effect" "1.0.1"
 
+"@radix-ui/react-id@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.1.0.tgz#de47339656594ad722eb87f94a6b25f9cffae0ed"
+  integrity sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==
+  dependencies:
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
+"@radix-ui/react-label@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-label/-/react-label-2.0.2.tgz#9c72f1d334aac996fdc27b48a8bdddd82108fb6d"
+  integrity sha512-N5ehvlM7qoTLx7nWPodsPYPgMzA5WM8zZChQg8nyFJKnDO5WHdba1vv5/H6IO5LtJMfD2Q3wh1qHFGNtK0w3bQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "1.0.3"
+
+"@radix-ui/react-popover@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-popover/-/react-popover-1.1.1.tgz#604b783cdb3494ed4f16a58c17f0e81e61ab7775"
+  integrity sha512-3y1A3isulwnWhvTTwmIreiB8CF4L+qRjZnK1wYLO7pplddzXKby/GnZ2M7OZY3qgnl6p9AodUIHRYGXNah8Y7g==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-dismissable-layer" "1.1.0"
+    "@radix-ui/react-focus-guards" "1.1.0"
+    "@radix-ui/react-focus-scope" "1.1.0"
+    "@radix-ui/react-id" "1.1.0"
+    "@radix-ui/react-popper" "1.2.0"
+    "@radix-ui/react-portal" "1.1.1"
+    "@radix-ui/react-presence" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-slot" "1.1.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    aria-hidden "^1.1.1"
+    react-remove-scroll "2.5.7"
+
 "@radix-ui/react-popper@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.1.2.tgz#4c0b96fcd188dc1f334e02dba2d538973ad842e9"
@@ -4577,6 +4645,22 @@
     "@radix-ui/react-use-size" "1.0.1"
     "@radix-ui/rect" "1.0.1"
 
+"@radix-ui/react-popper@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.2.0.tgz#a3e500193d144fe2d8f5d5e60e393d64111f2a7a"
+  integrity sha512-ZnRMshKF43aBxVWPWvbj21+7TQCvhuULWJ4gNIKYpRlQt5xGRhLx66tMp8pya2UkGHTSlhpXwmjqltDYHhw7Vg==
+  dependencies:
+    "@floating-ui/react-dom" "^2.0.0"
+    "@radix-ui/react-arrow" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+    "@radix-ui/react-use-rect" "1.1.0"
+    "@radix-ui/react-use-size" "1.1.0"
+    "@radix-ui/rect" "1.1.0"
+
 "@radix-ui/react-portal@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.3.tgz#ffb961244c8ed1b46f039e6c215a6c4d9989bda1"
@@ -4585,14 +4669,53 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
-"@radix-ui/react-primitive@1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz#d49ea0f3f0b2fe3ab1cb5667eb03e8b843b914d0"
-  integrity sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==
+"@radix-ui/react-portal@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.1.tgz#1957f1eb2e1aedfb4a5475bd6867d67b50b1d15f"
+  integrity sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==
+  dependencies:
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
+"@radix-ui/react-presence@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.0.tgz#227d84d20ca6bfe7da97104b1a8b48a833bfb478"
+  integrity sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
+"@radix-ui/react-primitive@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz#d49ea0f3f0b2fe3ab1cb5667eb03e8b843b914d0"
+  integrity sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==
   dependencies:
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-slot" "1.0.2"
 
+"@radix-ui/react-primitive@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884"
+  integrity sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==
+  dependencies:
+    "@radix-ui/react-slot" "1.1.0"
+
+"@radix-ui/react-radio-group@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-radio-group/-/react-radio-group-1.2.0.tgz#f937dd6b9436ded80c4bebdf3901c20cb8bcbb5a"
+  integrity sha512-yv+oiLaicYMBpqgfpSPw6q+RyXlLdIpQWDHZbUKURxe+nEh53hFXPPlfhfQQtYkS5MMK/5IWIa76SksleQZSzw==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-direction" "1.1.0"
+    "@radix-ui/react-presence" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-roving-focus" "1.1.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/react-use-previous" "1.1.0"
+    "@radix-ui/react-use-size" "1.1.0"
+
 "@radix-ui/react-roving-focus@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.4.tgz#e90c4a6a5f6ac09d3b8c1f5b5e81aab2f0db1974"
@@ -4609,6 +4732,21 @@
     "@radix-ui/react-use-callback-ref" "1.0.1"
     "@radix-ui/react-use-controllable-state" "1.0.1"
 
+"@radix-ui/react-roving-focus@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.0.tgz#b30c59daf7e714c748805bfe11c76f96caaac35e"
+  integrity sha512-EA6AMGeq9AEeQDeSH0aZgG198qkfHSbvWTf1HvoDmOB5bBG/qTxjYMWUKMnYiV6J/iP/J8MEFSuB2zRU2n7ODA==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-collection" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-direction" "1.1.0"
+    "@radix-ui/react-id" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+
 "@radix-ui/react-select@^1.2.2":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-1.2.2.tgz#caa981fa0d672cf3c1b2a5240135524e69b32181"
@@ -4645,6 +4783,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
+"@radix-ui/react-separator@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-separator/-/react-separator-1.1.0.tgz#ee0f4d86003b0e3ea7bc6ccab01ea0adee32663e"
+  integrity sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==
+  dependencies:
+    "@radix-ui/react-primitive" "2.0.0"
+
 "@radix-ui/react-slot@1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab"
@@ -4653,6 +4798,40 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-compose-refs" "1.0.1"
 
+"@radix-ui/react-slot@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84"
+  integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+
+"@radix-ui/react-switch@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-switch/-/react-switch-1.1.0.tgz#fcf8e778500f1d60d4b2bec2fc3fad77a7c118e3"
+  integrity sha512-OBzy5WAj641k0AOSpKQtreDMe+isX0MQJ1IVyF03ucdF3DunOnROVrjWs8zsXUxC3zfZ6JL9HFVCUlMghz9dJw==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/react-use-previous" "1.1.0"
+    "@radix-ui/react-use-size" "1.1.0"
+
+"@radix-ui/react-tabs@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-tabs/-/react-tabs-1.1.0.tgz#0a6db1caed56776a1176aae68532060e301cc1c0"
+  integrity sha512-bZgOKB/LtZIij75FSuPzyEti/XBhJH52ExgtdVqjCIh+Nx/FW+LhnbXtbCzIi34ccyMsyOja8T0thCzoHFXNKA==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-direction" "1.1.0"
+    "@radix-ui/react-id" "1.1.0"
+    "@radix-ui/react-presence" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-roving-focus" "1.1.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+
 "@radix-ui/react-toggle-group@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-toggle-group/-/react-toggle-group-1.0.4.tgz#f5b5c8c477831b013bec3580c55e20a68179d6ec"
@@ -4691,6 +4870,24 @@
     "@radix-ui/react-separator" "1.0.3"
     "@radix-ui/react-toggle-group" "1.0.4"
 
+"@radix-ui/react-tooltip@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.1.2.tgz#c42db2ffd7dcc6ff3d65407c8cb70490288f518d"
+  integrity sha512-9XRsLwe6Yb9B/tlnYCPVUd/TFS4J7HuOZW345DCeC6vKIxQGMZdx21RK4VoZauPD5frgkXTYVS5y90L+3YBn4w==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-dismissable-layer" "1.1.0"
+    "@radix-ui/react-id" "1.1.0"
+    "@radix-ui/react-popper" "1.2.0"
+    "@radix-ui/react-portal" "1.1.1"
+    "@radix-ui/react-presence" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-slot" "1.1.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/react-visually-hidden" "1.1.0"
+
 "@radix-ui/react-use-callback-ref@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz#f4bb1f27f2023c984e6534317ebc411fc181107a"
@@ -4698,6 +4895,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-use-callback-ref@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz#bce938ca413675bc937944b0d01ef6f4a6dc5bf1"
+  integrity sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==
+
 "@radix-ui/react-use-controllable-state@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz#ecd2ced34e6330caf89a82854aa2f77e07440286"
@@ -4706,6 +4908,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-use-callback-ref" "1.0.1"
 
+"@radix-ui/react-use-controllable-state@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz#1321446857bb786917df54c0d4d084877aab04b0"
+  integrity sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==
+  dependencies:
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+
 "@radix-ui/react-use-escape-keydown@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz#217b840c250541609c66f67ed7bab2b733620755"
@@ -4714,6 +4923,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-use-callback-ref" "1.0.1"
 
+"@radix-ui/react-use-escape-keydown@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz#31a5b87c3b726504b74e05dac1edce7437b98754"
+  integrity sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==
+  dependencies:
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+
 "@radix-ui/react-use-layout-effect@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz#be8c7bc809b0c8934acf6657b577daf948a75399"
@@ -4721,6 +4937,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-use-layout-effect@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz#3c2c8ce04827b26a39e442ff4888d9212268bd27"
+  integrity sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==
+
 "@radix-ui/react-use-previous@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-previous/-/react-use-previous-1.0.1.tgz#b595c087b07317a4f143696c6a01de43b0d0ec66"
@@ -4728,6 +4949,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-use-previous@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz#d4dd37b05520f1d996a384eb469320c2ada8377c"
+  integrity sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==
+
 "@radix-ui/react-use-rect@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz#fde50b3bb9fd08f4a1cd204572e5943c244fcec2"
@@ -4736,6 +4962,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/rect" "1.0.1"
 
+"@radix-ui/react-use-rect@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz#13b25b913bd3e3987cc9b073a1a164bb1cf47b88"
+  integrity sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==
+  dependencies:
+    "@radix-ui/rect" "1.1.0"
+
 "@radix-ui/react-use-size@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-1.0.1.tgz#1c5f5fea940a7d7ade77694bb98116fb49f870b2"
@@ -4744,6 +4977,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-use-layout-effect" "1.0.1"
 
+"@radix-ui/react-use-size@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz#b4dba7fbd3882ee09e8d2a44a3eed3a7e555246b"
+  integrity sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==
+  dependencies:
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
 "@radix-ui/react-visually-hidden@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.3.tgz#51aed9dd0fe5abcad7dee2a234ad36106a6984ac"
@@ -4752,6 +4992,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
+"@radix-ui/react-visually-hidden@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.0.tgz#ad47a8572580f7034b3807c8e6740cd41038a5a2"
+  integrity sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==
+  dependencies:
+    "@radix-ui/react-primitive" "2.0.0"
+
 "@radix-ui/rect@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.0.1.tgz#bf8e7d947671996da2e30f4904ece343bc4a883f"
@@ -4759,40 +5006,15 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
-"@remirror/core-constants@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.1.tgz#19b4ae221880762cd98452f44288fcc66baaec0f"
-  integrity sha512-ZR4aihtnnT9lMbhh5DEbsriJRlukRXmLZe7HmM+6ufJNNUDoazc75UX26xbgQlNUqgAqMcUdGFAnPc1JwgAdLQ==
-  dependencies:
-    "@babel/runtime" "^7.21.0"
-
-"@remirror/core-helpers@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@remirror/core-helpers/-/core-helpers-2.0.3.tgz#fa4a0224a612016b9f16052ed0c5d817c69daa39"
-  integrity sha512-LqIPF4stGG69l9qu/FFicv9d9B+YaItzgDMC5A0CEvDQfKkGD3BfabLmfpnuWbsc06oKGdTduilgWcALLZoYLg==
-  dependencies:
-    "@babel/runtime" "^7.21.0"
-    "@linaria/core" "4.2.9"
-    "@remirror/core-constants" "^2.0.1"
-    "@remirror/types" "^1.0.1"
-    "@types/object.omit" "^3.0.0"
-    "@types/object.pick" "^1.3.2"
-    "@types/throttle-debounce" "^2.1.0"
-    case-anything "^2.1.10"
-    dash-get "^1.0.2"
-    deepmerge "^4.3.1"
-    fast-deep-equal "^3.1.3"
-    make-error "^1.3.6"
-    object.omit "^3.0.0"
-    object.pick "^1.3.0"
-    throttle-debounce "^3.0.1"
+"@radix-ui/rect@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.1.0.tgz#f817d1d3265ac5415dadc67edab30ae196696438"
+  integrity sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==
 
-"@remirror/types@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@remirror/types/-/types-1.0.1.tgz#768502497a0fbbc23338a1586b893f729310cf70"
-  integrity sha512-VlZQxwGnt1jtQ18D6JqdIF+uFZo525WEqrfp9BOc3COPpK4+AWCgdnAWL+ho6imWcoINlGjR/+3b6y5C1vBVEA==
-  dependencies:
-    type-fest "^2.19.0"
+"@remirror/core-constants@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.2.tgz#f05eccdc69e3a65e7d524b52548f567904a11a1a"
+  integrity sha512-dyHY+sMF0ihPus3O27ODd4+agdHMEmuRdyiZJ2CCWjPV5UFmn17ZbElvk6WOGVE4rdCJKZQCrPV2BcikOMLUGQ==
 
 "@rollup/pluginutils@^5.0.2", "@rollup/pluginutils@^5.0.4":
   version "5.0.4"
@@ -4803,14 +5025,6 @@
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
-"@segment/loosely-validate-event@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz#87dfc979e5b4e7b82c5f1d8b722dfd5d77644681"
-  integrity sha512-ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw==
-  dependencies:
-    component-type "^1.2.1"
-    join-component "^1.1.0"
-
 "@selderee/plugin-htmlparser2@^0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz#27e994afd1c2cb647ceb5406a185a5574188069d"
@@ -4819,155 +5033,222 @@
     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/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/feedback@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.119.0.tgz#429b3ea0fd34e928d2e7de5dcbe9377272a3f221"
+  integrity sha512-om8TkAU5CQGO8nkmr7qsSBVkP+/vfeS4JgtW3sjoTK0fhj26+DljR6RlfCGWtYQdPSP6XV7atcPTjbSnsmG9FQ==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry-internal/replay-canvas@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.119.0.tgz#85669d184ba79150e64d05de02f5e2b616e68371"
+  integrity sha512-NL02VQx6ekPxtVRcsdp1bp5Tb5w6vnfBKSIfMKuDRBy5A10Uc3GSoy/c3mPyHjOxB84452A+xZSx6bliEzAnuA==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/replay" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry-internal/tracing@7.114.0":
+  version "7.114.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.114.0.tgz#bdcd364f511e2de45db6e3004faf5685ca2e0f86"
+  integrity sha512-dOuvfJN7G+3YqLlUY4HIjyWHaRP8vbOgF+OsE5w2l7ZEn1rMAaUbPntAR8AF9GBA6j2zWNoSo8e7GjbJxVofSg==
+  dependencies:
+    "@sentry/core" "7.114.0"
+    "@sentry/types" "7.114.0"
+    "@sentry/utils" "7.114.0"
+
+"@sentry-internal/tracing@7.116.0":
+  version "7.116.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.116.0.tgz#af3e4e264c440aa5525b5877a10b9a0f870b40e3"
+  integrity sha512-y5ppEmoOlfr77c/HqsEXR72092qmGYS4QE5gSz5UZFn9CiinEwGfEorcg2xIrrCuU7Ry/ZU2VLz9q3xd04drRA==
+  dependencies:
+    "@sentry/core" "7.116.0"
+    "@sentry/types" "7.116.0"
+    "@sentry/utils" "7.116.0"
+
+"@sentry-internal/tracing@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.119.0.tgz#201561af2a4ad1837333287c26050a5e688537ca"
+  integrity sha512-oKdFJnn+56f0DHUADlL8o9l8jTib3VDLbWQBVkjD9EprxfaCwt2m8L5ACRBdQ8hmpxCEo4I8/6traZ7qAdBUqA==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry/browser@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.119.0.tgz#65004015c107be5d2f49a852ebcffc5d19d90e0d"
+  integrity sha512-WwmW1Y4D764kVGeKmdsNvQESZiAn9t8LmCWO0ucBksrjL2zw9gBPtOpRcO6l064sCLeSxxzCN+kIxhRm1gDFEA==
+  dependencies:
+    "@sentry-internal/feedback" "7.119.0"
+    "@sentry-internal/replay-canvas" "7.119.0"
+    "@sentry-internal/tracing" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/integrations" "7.119.0"
+    "@sentry/replay" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry/core@7.114.0":
+  version "7.114.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.114.0.tgz#3efe86b92a5379c44dfd0fd4685266b1a30fa898"
+  integrity sha512-YnanVlmulkjgZiVZ9BfY9k6I082n+C+LbZo52MTvx3FY6RE5iyiPMpaOh67oXEZRWcYQEGm+bKruRxLVP6RlbA==
+  dependencies:
+    "@sentry/types" "7.114.0"
+    "@sentry/utils" "7.114.0"
+
+"@sentry/core@7.116.0":
+  version "7.116.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.116.0.tgz#7cff43134878a696b2b3b981ae384ec3db9ac8c3"
+  integrity sha512-J6Wmjjx+o7RwST0weTU1KaKUAlzbc8MGkJV1rcHM9xjNTWTva+nrcCM3vFBagnk2Gm/zhwv3h0PvWEqVyp3U1Q==
+  dependencies:
+    "@sentry/types" "7.116.0"
+    "@sentry/utils" "7.116.0"
+
+"@sentry/core@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.119.0.tgz#a6e41119bb03ec27689f9ad04e79d1fba5b7fc37"
+  integrity sha512-CS2kUv9rAJJEjiRat6wle3JATHypB0SyD7pt4cpX5y0dN5dZ1JrF57oLHRMnga9fxRivydHz7tMTuBhSSwhzjw==
+  dependencies:
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry/ember@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/ember/-/ember-7.119.0.tgz#b795df5c7dcb3fa35b9db3cfdc0d148f1c66ccc2"
+  integrity sha512-1c3sM+FkfNkrtVwIAIeX9iaJAGlk6EbQadoswO4dtLE8XgbMu/Mp0L0HCdWFqpTfBOJKf+LYjl0SS0iLQD6NQg==
   dependencies:
     "@embroider/macros" "^1.9.0"
-    "@sentry/browser" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
+    "@sentry/browser" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.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/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==
-  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"
-    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/integrations@7.114.0":
+  version "7.114.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.114.0.tgz#baf249cfa9e359510f41e486a75bf184db18927d"
+  integrity sha512-BJIBWXGKeIH0ifd7goxOS29fBA8BkEgVVCahs6xIOXBjX1IRS6PmX0zYx/GP23nQTfhJiubv2XPzoYOlZZmDxg==
+  dependencies:
+    "@sentry/core" "7.114.0"
+    "@sentry/types" "7.114.0"
+    "@sentry/utils" "7.114.0"
+    localforage "^1.8.1"
+
+"@sentry/integrations@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.119.0.tgz#5b25c603026dbacfe1ae7bb8d768506a129149fb"
+  integrity sha512-OHShvtsRW0A+ZL/ZbMnMqDEtJddPasndjq+1aQXw40mN+zeP7At/V1yPZyFaURy86iX7Ucxw5BtmzuNy7hLyTA==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+    localforage "^1.8.1"
+
+"@sentry/node@7.119.0", "@sentry/node@^7.73.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.119.0.tgz#d429ecbba9ce22caf05e811cb666a045e167b6d7"
+  integrity sha512-9PFzN8xS6U0oZCflpVxS2SSIsHkCaj7qYBlsvHj4CTGWfao9ImwrU6+smy4qoG6oxwPfoVb5pOOMb4WpWOvXcQ==
+  dependencies:
+    "@sentry-internal/tracing" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/integrations" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry/profiling-node@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/profiling-node/-/profiling-node-7.119.0.tgz#021263e3167a416b5eb868f5994feddbaadbdf28"
+  integrity sha512-KEJ2kFVWDmg2qi7y24PuSqerlW+iDK4C6pDXpXV6h+GEekUXsnRSAqtKc5H6LJqVGe8ljgFqPy75XIkM1qPBzw==
+  dependencies:
+    detect-libc "^2.0.2"
+    node-abi "^3.61.0"
+
+"@sentry/react@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.119.0.tgz#79f2c9d94322a3afbfa8af9f5b872f7c2e9b0820"
+  integrity sha512-cf8Cei+qdSA26gx+IMAuc/k44PeBImNzIpXi3930SLhUe44ypT5OZ/44L6xTODHZzTIyMSJPduf59vT2+eW9yg==
+  dependencies:
+    "@sentry/browser" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+    hoist-non-react-statics "^3.3.2"
 
-"@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/replay@7.116.0":
+  version "7.116.0"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.116.0.tgz#cde921133c8927be92d60baf03c2b0aea73380f1"
+  integrity sha512-OrpDtV54pmwZuKp3g7PDiJg6ruRMJKOCzK08TF7IPsKrr4x4UQn56rzMOiABVuTjuS8lNfAWDar6c6vxXFz5KA==
   dependencies:
-    "@sentry/browser" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
-    hoist-non-react-statics "^3.3.2"
-    tslib "^2.4.1 || ^1.9.3"
+    "@sentry-internal/tracing" "7.116.0"
+    "@sentry/core" "7.116.0"
+    "@sentry/types" "7.116.0"
+    "@sentry/utils" "7.116.0"
 
-"@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.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.119.0.tgz#50881079d013c77f87a994331d8bcad1d49e0960"
+  integrity sha512-BnNsYL+X5I4WCH6wOpY6HQtp4MgVt0NVlhLUsEyrvMUiTs0bPkDBrulsgZQBUKJsbOr3l9nHrFoNVB/0i6WNLA==
   dependencies:
-    "@sentry/core" "7.70.0"
-    "@sentry/types" "7.70.0"
-    "@sentry/utils" "7.70.0"
+    "@sentry-internal/tracing" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.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.114.0":
+  version "7.114.0"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.114.0.tgz#32a3438b0f2d02fb7b7359fe7712c5a349a2a329"
+  integrity sha512-eldEYGADReZ4jWdN5u35yxLUSTOvjsiZAYd4KBEpf+Ii65n7g/kYOKAjNl7tHbrEG1EsMW4nDPWStUMk1w+tfg==
   dependencies:
-    "@sentry-internal/tracing" "7.70.0"
+    "@sentry-internal/tracing" "7.114.0"
+
+"@sentry/types@7.114.0":
+  version "7.114.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.114.0.tgz#ab8009d5f6df23b7342121083bed34ee2452e856"
+  integrity sha512-tsqkkyL3eJtptmPtT0m9W/bPLkU7ILY7nvwpi1hahA5jrM7ppoU0IMaQWAgTD+U3rzFH40IdXNBFb8Gnqcva4w==
 
-"@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.116.0":
+  version "7.116.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.116.0.tgz#0be3434e7e53c86db4993e668af1c3a65bfb7519"
+  integrity sha512-QCCvG5QuQrwgKzV11lolNQPP2k67Q6HHD9vllZ/C4dkxkjoIym8Gy+1OgAN3wjsR0f/kG9o5iZyglgNpUVRapQ==
 
-"@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/types@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.119.0.tgz#8b3d7a1405c362e75cd900d46089df4e70919d2a"
+  integrity sha512-27qQbutDBPKGbuJHROxhIWc1i0HJaGLA90tjMu11wt0E4UNxXRX+UQl4Twu68v4EV3CPvQcEpQfgsViYcXmq+w==
 
-"@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.114.0":
+  version "7.114.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.114.0.tgz#59d30a79f4acff3c9268de0b345f0bcbc6335112"
+  integrity sha512-319N90McVpupQ6vws4+tfCy/03AdtsU0MurIE4+W5cubHME08HtiEWlfacvAxX+yuKFhvdsO4K4BB/dj54ideg==
   dependencies:
-    "@sentry/types" "7.70.0"
-    tslib "^2.4.1 || ^1.9.3"
+    "@sentry/types" "7.114.0"
 
-"@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==
+"@sentry/utils@7.116.0":
+  version "7.116.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.116.0.tgz#f32463ab10f76f464274233a9df202e5357d17ff"
+  integrity sha512-Vn9fcvwTq91wJvCd7WTMWozimqMi+dEZ3ie3EICELC2diONcN16ADFdzn65CQQbYwmUzRjN9EjDN2k41pKZWhQ==
   dependencies:
-    "@sentry/types" "7.73.0"
-    tslib "^2.4.1 || ^1.9.3"
+    "@sentry/types" "7.116.0"
 
-"@sidvind/better-ajv-errors@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@sidvind/better-ajv-errors/-/better-ajv-errors-2.1.0.tgz#54f4216d2200d60e90ec25c6a27c1ea3afdc6cdf"
-  integrity sha512-JuIb009FhHuL9priFBho2kv7QmZOydj0LgYvj+h1t0mMCmhM/YmQNRlJR5wVtBZya6wrVFK5Hi5TIbv5BKEx7w==
+"@sentry/utils@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.119.0.tgz#debe29020f6ef3786a5bd855cf1b97116b7be826"
+  integrity sha512-ZwyXexWn2ZIe2bBoYnXJVPc2esCSbKpdc6+0WJa8eutXfHq3FRKg4ohkfCBpfxljQGEfP1+kfin945lA21Ka+A==
+  dependencies:
+    "@sentry/types" "7.119.0"
+
+"@sidvind/better-ajv-errors@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@sidvind/better-ajv-errors/-/better-ajv-errors-2.1.3.tgz#3975ad1648479e81b8419b4a7f1043f13576dbb1"
+  integrity sha512-lWuod/rh7Xz5uXiEGSfm2Sd5PG7K/6yJfoAZVqzsEswjPJhUz15R7Gn/o8RczA041QS15hBd/BCSeu9vwPArkA==
   dependencies:
     "@babel/code-frame" "^7.16.0"
     chalk "^4.1.0"
@@ -5028,6 +5309,11 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-5.6.0.tgz#41dd6093d34652cddb5d5bdeee04eafc33826668"
   integrity sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==
 
+"@sindresorhus/merge-streams@^2.1.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958"
+  integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==
+
 "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -5042,19 +5328,19 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/commons@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
-  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
+"@sinonjs/commons@^3.0.0", "@sinonjs/commons@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
+  integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-11.0.0.tgz#14100fe7e5dc74973bc458eb7205537038d60b58"
-  integrity sha512-bqiI/5ur6ZOozG06BeJjbplIqHY/KftV1zaewbZHORH902GrHURKwl7H1G/4OC5EaxDYQJlrD0OLJ1XD6x01dQ==
+"@sinonjs/fake-timers@11.3.1", "@sinonjs/fake-timers@^11.2.2":
+  version "11.3.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz#51d6e8d83ca261ff02c0ab0e68e9db23d5cd5999"
+  integrity sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==
   dependencies:
-    "@sinonjs/commons" "^3.0.0"
+    "@sinonjs/commons" "^3.0.1"
 
 "@sinonjs/fake-timers@^10.0.2", "@sinonjs/fake-timers@^10.3.0":
   version "10.3.0"
@@ -5093,388 +5379,11 @@
   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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-config-provider" "^2.0.0"
-    "@smithy/util-middleware" "^2.0.0"
-    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==
-  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"
-    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==
-  dependencies:
-    "@aws-crypto/crc32" "3.0.0"
-    "@smithy/types" "^2.2.2"
-    "@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==
-  dependencies:
-    "@smithy/eventstream-serde-universal" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/eventstream-serde-universal" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/eventstream-codec" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/querystring-builder" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    "@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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
-"@smithy/is-array-buffer@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz#8fa9b8040651e7ba0b2f6106e636a91354ff7d34"
-  integrity sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==
-  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==
-  dependencies:
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    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"
-    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"
-    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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    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==
-  dependencies:
-    "@smithy/property-provider" "^2.0.5"
-    "@smithy/shared-ini-file-loader" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/abort-controller" "^2.0.5"
-    "@smithy/protocol-http" "^2.0.5"
-    "@smithy/querystring-builder" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    "@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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    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":
-  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==
-  dependencies:
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
-"@smithy/signature-v4@^2.0.0":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.0.5.tgz#48fbc1a25f2f44bbd9217927518c8fe439419f4d"
-  integrity sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==
-  dependencies:
-    "@smithy/eventstream-codec" "^2.0.5"
-    "@smithy/is-array-buffer" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-hex-encoding" "^2.0.0"
-    "@smithy/util-middleware" "^2.0.0"
-    "@smithy/util-uri-escape" "^2.0.0"
-    "@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==
-  dependencies:
-    "@smithy/middleware-stack" "^2.0.0"
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-stream" "^2.0.5"
-    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==
-  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==
-  dependencies:
-    "@smithy/querystring-parser" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    tslib "^2.5.0"
-
-"@smithy/util-base64@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.0.0.tgz#1beeabfb155471d1d41c8d0603be1351f883c444"
-  integrity sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==
-  dependencies:
-    "@smithy/util-buffer-from" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/util-body-length-browser@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz#5447853003b4c73da3bc5f3c5e82c21d592d1650"
-  integrity sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/util-body-length-node@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz#313a5f7c5017947baf5fa018bfc22628904bbcfa"
-  integrity sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/util-buffer-from@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz#7eb75d72288b6b3001bc5f75b48b711513091deb"
-  integrity sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==
-  dependencies:
-    "@smithy/is-array-buffer" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/util-config-provider@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz#4dd6a793605559d94267312fd06d0f58784b4c38"
-  integrity sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==
-  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==
-  dependencies:
-    "@smithy/property-provider" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    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==
-  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"
-    tslib "^2.5.0"
-
-"@smithy/util-hex-encoding@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz#0aa3515acd2b005c6d55675e377080a7c513b59e"
-  integrity sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==
-  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==
-  dependencies:
-    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==
-  dependencies:
-    "@smithy/service-error-classification" "^2.0.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==
-  dependencies:
-    "@smithy/fetch-http-handler" "^2.0.5"
-    "@smithy/node-http-handler" "^2.0.5"
-    "@smithy/types" "^2.2.2"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-buffer-from" "^2.0.0"
-    "@smithy/util-hex-encoding" "^2.0.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/util-uri-escape@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz#19955b1a0f517a87ae77ac729e0e411963dfda95"
-  integrity sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/util-utf8@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.0.0.tgz#b4da87566ea7757435e153799df9da717262ad42"
-  integrity sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==
-  dependencies:
-    "@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/types@^2.5.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.6.0.tgz#a09c40b512e2df213229a20a43d0d9cfcf55ca3e"
+  integrity sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==
   dependencies:
-    "@smithy/abort-controller" "^2.0.5"
-    "@smithy/types" "^2.2.2"
     tslib "^2.5.0"
 
 "@socket.io/component-emitter@~3.1.0":
@@ -5482,1099 +5391,955 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
-"@stdlib/array-float32@^0.0.x":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-float32/-/array-float32-0.0.6.tgz#7a1c89db3c911183ec249fa32455abd9328cfa27"
-  integrity sha512-QgKT5UaE92Rv7cxfn7wBKZAlwFFHPla8eXsMFsTGt5BiL4yUy36lwinPUh4hzybZ11rw1vifS3VAPuk6JP413Q==
+"@stdlib/array-float32@^0.2.1", "@stdlib/array-float32@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-float32/-/array-float32-0.2.2.tgz#88dcbb6cb138da3f3b4bc565423a0afc4dec4e1b"
+  integrity sha512-pTcy1FNQrrJLL1LMxJjuVpcKJaibbGCFFTe41iCSXpSOC8SuTBuNohrO6K9+xR301Ruxxn4yrzjJJ6Fa3nQJ2g==
   dependencies:
-    "@stdlib/assert-has-float32array-support" "^0.0.x"
+    "@stdlib/assert-has-float32array-support" "^0.2.2"
 
-"@stdlib/array-float64@^0.0.x":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-float64/-/array-float64-0.0.6.tgz#02d1c80dd4c38a0f1ec150ddfefe706e148bfc10"
-  integrity sha512-oE8y4a84LyBF1goX5//sU1mOjet8gLI0/6wucZcjg+j/yMmNV1xFu84Az9GOGmFSE6Ze6lirGOhfBeEWNNNaJg==
+"@stdlib/array-float64@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-float64/-/array-float64-0.2.2.tgz#66b3a6fd0e030da1b3d9ba195b865791486ec3a7"
+  integrity sha512-ZmV5wcacGrhT0maw9dfLXNv4N3ZwFUV3D7ItFfZFGFnKIJbubrWzwtaYnxzIXigrDc8g3F6FVHRpsQLMxq0/lA==
   dependencies:
-    "@stdlib/assert-has-float64array-support" "^0.0.x"
+    "@stdlib/assert-has-float64array-support" "^0.2.2"
 
-"@stdlib/array-int16@^0.0.x":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-int16/-/array-int16-0.0.6.tgz#01ce2a8f5b1d3e4dfeaec257a48d8d201bdc9bff"
-  integrity sha512-WLx0PivdjosNAp+4ZWPlsBh/nUn50j+7H+SLxASPIILv217muLUGvttMyFCEmJE7Fs2cP51SHDR1EPAfypvY+g==
+"@stdlib/array-int16@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-int16/-/array-int16-0.2.2.tgz#00855f829f68aad659049de86b9180c662b1f6a7"
+  integrity sha512-kHxyQ1INGtga38Grr/5MnDVAuJgnerh+MsJQcpT5jxxnc9QAnVc7O6DRv8i/hfOOxUOH15C/MeoBs+zim4CnLQ==
   dependencies:
-    "@stdlib/assert-has-int16array-support" "^0.0.x"
+    "@stdlib/assert-has-int16array-support" "^0.2.2"
 
-"@stdlib/array-int32@^0.0.x":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-int32/-/array-int32-0.0.6.tgz#2ab3dc8fb018a36151728324bb6b686bde52bada"
-  integrity sha512-BKYOoqNsFwEOiPjZp9jKLY4UE5Rp+Liwuwd91QpZW6/cTUeOpTnwZheFWjMFuY06JYRIMaEBwcnr0RfaMetH6Q==
+"@stdlib/array-int32@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-int32/-/array-int32-0.2.2.tgz#50b6b6cf8e5f4a11a8c3bcec22dd41e26d2b95a8"
+  integrity sha512-+jFqht43oPJ8YnlyCZ7cSf9Z8xenIIsJDgLZ9zW+gh8o13SSfF+ukm0AGAdnKnKGR3zPBLnSso7JXyDe2r134g==
   dependencies:
-    "@stdlib/assert-has-int32array-support" "^0.0.x"
+    "@stdlib/assert-has-int32array-support" "^0.2.2"
 
-"@stdlib/array-int8@^0.0.x":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-int8/-/array-int8-0.0.6.tgz#1720035f12afe571b144395f7f678888b208dc0c"
-  integrity sha512-ZZsAQixtzk7v80DAFUZDn58AhDXpUtDjVFdOKnEw5td9nGBv3vXCM2y7zz48n/NUZOOeoGc5GTVR72anJ/Vi4g==
+"@stdlib/array-int8@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-int8/-/array-int8-0.2.2.tgz#ca1adf97fe04ab1f4c87a608d04a0273d7c42d91"
+  integrity sha512-UW3KlKt7Lww1XML5Gzj+YYHRXD8+RIUrnlPcTwYH9O8j+/m5vyvGYlBIJD2MDO1fgUl2skgmpNkK9ULfsBlIRA==
   dependencies:
-    "@stdlib/assert-has-int8array-support" "^0.0.x"
+    "@stdlib/assert-has-int8array-support" "^0.2.2"
 
-"@stdlib/array-uint16@^0.0.x":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-uint16/-/array-uint16-0.0.6.tgz#2545110f0b611a1d55b01e52bd9160aaa67d6973"
-  integrity sha512-/A8Tr0CqJ4XScIDRYQawosko8ha1Uy+50wsTgJhjUtXDpPRp7aUjmxvYkbe7Rm+ImYYbDQVix/uCiPAFQ8ed4Q==
+"@stdlib/array-uint16@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-uint16/-/array-uint16-0.2.2.tgz#d9647ec67f86dcb032b4e72659df818874498959"
+  integrity sha512-z5c/Izw43HkKfb1pTgEUMAS8GFvhtHkkHZSjX3XJN+17P0VjknxjlSvPiCBGqaDX9jXtlWH3mn1LSyDKtJQoeA==
   dependencies:
-    "@stdlib/assert-has-uint16array-support" "^0.0.x"
+    "@stdlib/assert-has-uint16array-support" "^0.2.2"
 
-"@stdlib/array-uint32@^0.0.x":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-uint32/-/array-uint32-0.0.6.tgz#5a923576475f539bfb2fda4721ea7bac6e993949"
-  integrity sha512-2hFPK1Fg7obYPZWlGDjW9keiIB6lXaM9dKmJubg/ergLQCsJQJZpYsG6mMAfTJi4NT1UF4jTmgvyKD+yf0D9cA==
+"@stdlib/array-uint32@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-uint32/-/array-uint32-0.2.2.tgz#0e772f971706e7060fa1878f81b0fe05b86c8f07"
+  integrity sha512-3T894I9C2MqZJJmRCYFTuJp4Qw9RAt+GzYnVPyIXoK1h3TepUXe9VIVx50cUFIibdXycgu0IFGASeAb3YMyupw==
   dependencies:
-    "@stdlib/assert-has-uint32array-support" "^0.0.x"
+    "@stdlib/assert-has-uint32array-support" "^0.2.2"
 
-"@stdlib/array-uint8@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-uint8/-/array-uint8-0.0.7.tgz#56f82b361da6bd9caad0e1d05e7f6ef20af9c895"
-  integrity sha512-qYJQQfGKIcky6TzHFIGczZYTuVlut7oO+V8qUBs7BJC9TwikVnnOmb3hY3jToY4xaoi5p9OvgdJKPInhyIhzFg==
+"@stdlib/array-uint8@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-uint8/-/array-uint8-0.2.2.tgz#4add6fc8fd574c6330a6162aac1ebb421f8a0a82"
+  integrity sha512-Ip9MUC8+10U9x0crMKWkpvfoUBBhWzc6k5SI4lxx38neFVmiJ3f+5MBADEagjpoKSBs71vlY2drnEZe+Gs2Ytg==
   dependencies:
-    "@stdlib/assert-has-uint8array-support" "^0.0.x"
+    "@stdlib/assert-has-uint8array-support" "^0.2.2"
 
-"@stdlib/array-uint8c@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/array-uint8c/-/array-uint8c-0.0.8.tgz#ce9298512dfa25dca559b72b080d3e906b2289b3"
-  integrity sha512-gKc6m6QUpcUrMJsWe9na7Mb20Cswdu1ul31kxq+MKRtkV5eCTVksh69Q9FKjaNdEy0A19sR413sGV7YY8ZvdSQ==
+"@stdlib/array-uint8c@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/array-uint8c/-/array-uint8c-0.2.2.tgz#91c79bdf4d755c08b8fc6c9ff150216ee0fb9d86"
+  integrity sha512-uBEJ1yKLZjwgmCV7iSNLkr/SGCxL7qVwnb+f4avVSBxlIv/k29oIO/sibgkHbZMBlBSw39dWQzIKD0UQJWDVDQ==
   dependencies:
-    "@stdlib/assert-has-uint8clampedarray-support" "^0.0.x"
+    "@stdlib/assert-has-uint8clampedarray-support" "^0.2.2"
 
-"@stdlib/assert-has-float32array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-float32array-support/-/assert-has-float32array-support-0.0.8.tgz#77371183726e26ca9e6f9db41d34543607074067"
-  integrity sha512-Yrg7K6rBqwCzDWZ5bN0VWLS5dNUWcoSfUeU49vTERdUmZID06J069CDc07UUl8vfQWhFgBWGocH3rrpKm1hi9w==
+"@stdlib/assert-has-float32array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-float32array-support/-/assert-has-float32array-support-0.2.2.tgz#dacf3439d9a91be30c5637144a2f9afc342ef258"
+  integrity sha512-pi2akQl8mVki43fF1GNQVLYW0bHIPp2HuRNThX9GjB3OFQTpvrV8/3zPSh4lOxQa5gRiabgf0+Rgeu3AOhEw9A==
   dependencies:
-    "@stdlib/assert-is-float32array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/constants-float64-pinf" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-float32array" "^0.2.2"
+    "@stdlib/constants-float64-pinf" "^0.2.2"
 
-"@stdlib/assert-has-float64array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-float64array-support/-/assert-has-float64array-support-0.0.8.tgz#4d154994d348f5d894f63b3fbb9d7a6e2e4e5311"
-  integrity sha512-UVQcoeWqgMw9b8PnAmm/sgzFnuWkZcNhJoi7xyMjbiDV/SP1qLCrvi06mq86cqS3QOCma1fEayJdwgteoXyyuw==
+"@stdlib/assert-has-float64array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-float64array-support/-/assert-has-float64array-support-0.2.2.tgz#228ed3c8a174c4a467b6daccb24b6c9c307cbab5"
+  integrity sha512-8L3GuKY1o0dJARCOsW9MXcugXapaMTpSG6dGxyNuUVEvFfY5UOzcj9/JIDal5FjqSgqVOGL5qZl2qtRwub34VA==
   dependencies:
-    "@stdlib/assert-is-float64array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-float64array" "^0.2.2"
 
-"@stdlib/assert-has-int16array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-int16array-support/-/assert-has-int16array-support-0.0.8.tgz#1adf8a4341788a56b50a3ab2000feb065bede794"
-  integrity sha512-w/5gByEPRWpbEWfzvcBbDHAkzK0tp8ExzF00N+LY6cJR1BxcBIXXtLfhY3G6jchs3Od3Pn89rhnsAxygumuw4w==
+"@stdlib/assert-has-int16array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-int16array-support/-/assert-has-int16array-support-0.2.2.tgz#8cec13b0406e9e361861e44cbb9246a6bfdf5af8"
+  integrity sha512-rIrJ2371vd4kg5sHb/bz0xX1dlwyElT6kivnFPtZUXMaMS1breSUIpwPkUPXdr1AbmQdeJYv0c/YBtKB0PCo2g==
   dependencies:
-    "@stdlib/assert-is-int16array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/constants-int16-max" "^0.0.x"
-    "@stdlib/constants-int16-min" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-int16array" "^0.2.2"
+    "@stdlib/constants-int16-max" "^0.2.2"
+    "@stdlib/constants-int16-min" "^0.2.2"
 
-"@stdlib/assert-has-int32array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-int32array-support/-/assert-has-int32array-support-0.0.8.tgz#efd01955b4c11feb5d1703fdd994c17413fede97"
-  integrity sha512-xFbbDTp8pNMucuL45mhr0p10geTXE2A46/uor1l6riAP61c3qPRTKbe+0YapEjR9E6JyL134IX8AYQlqjYdBnQ==
+"@stdlib/assert-has-int32array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-int32array-support/-/assert-has-int32array-support-0.2.2.tgz#bab04f3378db0ad45b85898a7fd3c240b7dbdab9"
+  integrity sha512-3o/6PuZ+z6+cimb9L1f0d4LGP2GJO4EUVlD6oz8I6vKz35438coM5CduXOMVWvdzm4Rku4ty5mi1Gz0U53pC4Q==
   dependencies:
-    "@stdlib/assert-is-int32array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/constants-int32-max" "^0.0.x"
-    "@stdlib/constants-int32-min" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-int32array" "^0.2.2"
+    "@stdlib/constants-int32-max" "^0.3.0"
+    "@stdlib/constants-int32-min" "^0.2.2"
 
-"@stdlib/assert-has-int8array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-int8array-support/-/assert-has-int8array-support-0.0.8.tgz#4e65306197e75e136920241a98b8934022564ddd"
-  integrity sha512-c+6eq8OtUBtJrn1HaBfT+zk+FjkNA2JG9GqI2/eq8c/l6fUI1TCKmKAML63rp95aJhosCCAMMLJmnG4jFkGG1g==
+"@stdlib/assert-has-int8array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-int8array-support/-/assert-has-int8array-support-0.2.2.tgz#3995dbcd3beb62f579c474adc9c6e8dbb0bf3695"
+  integrity sha512-QUasYxAqQdgqDglQTwV9dZSwMXvLzLpVC4FcN+kia/+nX1HGjYUBq95fBj0vigW+SC2OiuepJkNiB/PlhA08+g==
   dependencies:
-    "@stdlib/assert-is-int8array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/constants-int8-max" "^0.0.x"
-    "@stdlib/constants-int8-min" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-int8array" "^0.2.2"
+    "@stdlib/constants-int8-max" "^0.2.2"
+    "@stdlib/constants-int8-min" "^0.2.2"
 
-"@stdlib/assert-has-node-buffer-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-node-buffer-support/-/assert-has-node-buffer-support-0.0.8.tgz#5564d8e797c850f6ffc522b720eab1f6cba9c814"
-  integrity sha512-fgI+hW4Yg4ciiv4xVKH+1rzdV7e5+6UKgMnFbc1XDXHcxLub3vOr8+H6eDECdAIfgYNA7X0Dxa/DgvX9dwDTAQ==
+"@stdlib/assert-has-node-buffer-support@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-node-buffer-support/-/assert-has-node-buffer-support-0.2.2.tgz#cb6b1a2a2927ef40dc4c8368a6c0d36854ccb70f"
+  integrity sha512-9ReyJGYe9BEZXbUxeRBima0nYy6GwFLVBj7eQ+UUzfG8w7LYYUCpWk954yDpd0v/u+XZQvp1M8EQC2gJLd/i0g==
   dependencies:
-    "@stdlib/assert-is-buffer" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-buffer" "^0.2.2"
 
-"@stdlib/assert-has-own-property@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-own-property/-/assert-has-own-property-0.0.7.tgz#8b55b38e25db8366b028cb871905ac09c9c253fb"
-  integrity sha512-3YHwSWiUqGlTLSwxAWxrqaD1PkgcJniGyotJeIt5X0tSNmSW0/c9RWroCImTUUB3zBkyBJ79MyU9Nf4Qgm59fQ==
-
-"@stdlib/assert-has-symbol-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-symbol-support/-/assert-has-symbol-support-0.0.8.tgz#8606b247f0d023f2a7a6aa8a6fe5e346aa802a8f"
-  integrity sha512-PoQ9rk8DgDCuBEkOIzGGQmSnjtcdagnUIviaP5YskB45/TJHXseh4NASWME8FV77WFW9v/Wt1MzKFKMzpDFu4Q==
-  dependencies:
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+"@stdlib/assert-has-own-property@^0.2.1", "@stdlib/assert-has-own-property@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-own-property/-/assert-has-own-property-0.2.2.tgz#072661539bb79c353dc5e62ae9252ce428adb5f1"
+  integrity sha512-m5rV4Z2/iNkwx2vRsNheM6sQZMzc8rQQOo90LieICXovXZy8wA5jNld4kRKjMNcRt/TjrNP7i2Rhh8hruRDlHg==
 
-"@stdlib/assert-has-tostringtag-support@^0.0.x":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-tostringtag-support/-/assert-has-tostringtag-support-0.0.9.tgz#1080ef0a4be576a72d19a819498719265456f170"
-  integrity sha512-UTsqdkrnQ7eufuH5BeyWOJL3ska3u5nvDWKqw3onNNZ2mvdgkfoFD7wHutVGzAA2rkTsSJAMBHVwWLsm5SbKgw==
-  dependencies:
-    "@stdlib/assert-has-symbol-support" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+"@stdlib/assert-has-symbol-support@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-symbol-support/-/assert-has-symbol-support-0.2.2.tgz#ed7abecb6ae513c5f52dbd14d4601f3d707ab19f"
+  integrity sha512-vCsGGmDZz5dikGgdF26rIL0y0nHvH7qaVf89HLLTybceuZijAqFSJEqcB3Gpl5uaeueLNAWExHi2EkoUVqKHGg==
 
-"@stdlib/assert-has-uint16array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint16array-support/-/assert-has-uint16array-support-0.0.8.tgz#083828067d55e3cc896796bc63cbf5726f67eecf"
-  integrity sha512-vqFDn30YrtzD+BWnVqFhB130g3cUl2w5AdOxhIkRkXCDYAM5v7YwdNMJEON+D4jI8YB4D5pEYjqKweYaCq4nyg==
+"@stdlib/assert-has-tostringtag-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-tostringtag-support/-/assert-has-tostringtag-support-0.2.2.tgz#4e5053b69571aca325b9ccf26f8e6acbf8190acb"
+  integrity sha512-bSHGqku11VH0swPEzO4Y2Dr+lTYEtjSWjamwqCTC8udOiOIOHKoxuU4uaMGKJjVfXG1L+XefLHqzuO5azxdRaA==
   dependencies:
-    "@stdlib/assert-is-uint16array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/constants-uint16-max" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-has-symbol-support" "^0.2.1"
 
-"@stdlib/assert-has-uint32array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint32array-support/-/assert-has-uint32array-support-0.0.8.tgz#a98c431fee45743088adb9602ef753c7552f9155"
-  integrity sha512-tJtKuiFKwFSQQUfRXEReOVGXtfdo6+xlshSfwwNWXL1WPP2LrceoiUoQk7zMCMT6VdbXgGH92LDjVcPmSbH4Xw==
+"@stdlib/assert-has-uint16array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint16array-support/-/assert-has-uint16array-support-0.2.2.tgz#b94f9adf53292151129e46a4f2aae2629c679a86"
+  integrity sha512-aL188V7rOkkEH4wYjfpB+1waDO4ULxo5ppGEK6X0kG4YiXYBL2Zyum53bjEQvo0Nkn6ixe18dNzqqWWytBmDeg==
   dependencies:
-    "@stdlib/assert-is-uint32array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/constants-uint32-max" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-uint16array" "^0.2.1"
+    "@stdlib/constants-uint16-max" "^0.2.2"
 
-"@stdlib/assert-has-uint8array-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint8array-support/-/assert-has-uint8array-support-0.0.8.tgz#9bed19de9834c3ced633551ed630982f0f424724"
-  integrity sha512-ie4vGTbAS/5Py+LLjoSQi0nwtYBp+WKk20cMYCzilT0rCsBI/oez0RqHrkYYpmt4WaJL4eJqC+/vfQ5NsI7F5w==
+"@stdlib/assert-has-uint32array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint32array-support/-/assert-has-uint32array-support-0.2.2.tgz#d5b70c4c068cff8dec176fcd71868690e47abee9"
+  integrity sha512-+UHKP3mZOACkJ9CQjeKNfbXHm5HGQB862V5nV5q3UQlHPzhslnXKyG1SwAxTx+0g88C/2vlDLeqG8H4TH2UTFA==
   dependencies:
-    "@stdlib/assert-is-uint8array" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/constants-uint8-max" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-uint32array" "^0.2.1"
+    "@stdlib/constants-uint32-max" "^0.2.2"
 
-"@stdlib/assert-has-uint8clampedarray-support@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint8clampedarray-support/-/assert-has-uint8clampedarray-support-0.0.8.tgz#07aa0274a5ce78c12fb30b00dde5e2dfcf568120"
-  integrity sha512-Z6ZeUZqsfZ48rTE7o58k4DXP8kP6rrlmPCpDaMlBqP/yZcmt8qSLtdT68PiAJ/gzURbRbHYD1hwLWPJDzhRS9g==
+"@stdlib/assert-has-uint8array-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint8array-support/-/assert-has-uint8array-support-0.2.2.tgz#33af366594a8540a643360763aada11a1d837075"
+  integrity sha512-VfzrB0BMik9MvPyKcMDJL3waq4nM30RZUrr2EuuQ/RbUpromRWSDbzGTlRq5SfjtJrHDxILPV3rytDCc03dgWA==
   dependencies:
-    "@stdlib/assert-is-uint8clampedarray" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+    "@stdlib/assert-is-uint8array" "^0.2.1"
+    "@stdlib/constants-uint8-max" "^0.2.2"
 
-"@stdlib/assert-is-arguments@^0.0.x":
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-arguments/-/assert-is-arguments-0.0.14.tgz#5a7266634df0e30be1c06fed1aa62c1e28ea67b3"
-  integrity sha512-jhMkdQsCHcAUQmk0t8Dof/I1sThotcJ3vcFigqwTEzVS7DQb2BVQ5egHtwdHFRyNf46u0Yfm8b2r6es+uYdWOQ==
+"@stdlib/assert-has-uint8clampedarray-support@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-has-uint8clampedarray-support/-/assert-has-uint8clampedarray-support-0.2.2.tgz#8b1ee4ab857b19747290f4448ac9a69e2ec5695f"
+  integrity sha512-/zT8Piv1UUFUpelBo0LuTE4V9BOEW7DTwfGlPvez93lk72XtaIYhTHkj+Z9YBGfAMV2PbL6eteqFffMVzUgnXg==
   dependencies:
-    "@stdlib/assert-has-own-property" "^0.0.x"
-    "@stdlib/assert-is-array" "^0.0.x"
-    "@stdlib/assert-is-enumerable-property" "^0.0.x"
-    "@stdlib/constants-uint32-max" "^0.0.x"
-    "@stdlib/math-base-assert-is-integer" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-is-uint8clampedarray" "^0.2.1"
 
-"@stdlib/assert-is-array@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-array/-/assert-is-array-0.0.7.tgz#7f30904f88a195d918c588540a6807d1ae639d79"
-  integrity sha512-/o6KclsGkNcZ5hiROarsD9XUs6xQMb4lTwF6O71UHbKWTtomEF/jD0rxLvlvj0BiCxfKrReddEYd2CnhUyskMA==
+"@stdlib/assert-is-arguments@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-arguments/-/assert-is-arguments-0.2.2.tgz#32e13d3723987d13afb580840a56835e24142aab"
+  integrity sha512-SejXrHpneNcn0nDot2K49XoTzPQQUvCFQj+2vc4UtJdtFFzB5r1fYgvtL7RqkhVglD7zNJG1acJYa7PiZCpZog==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-has-own-property" "^0.2.2"
+    "@stdlib/assert-is-array" "^0.2.2"
+    "@stdlib/assert-is-enumerable-property" "^0.2.2"
+    "@stdlib/constants-uint32-max" "^0.2.2"
+    "@stdlib/math-base-assert-is-integer" "^0.2.5"
+    "@stdlib/utils-native-class" "^0.2.2"
 
-"@stdlib/assert-is-boolean@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-boolean/-/assert-is-boolean-0.0.8.tgz#6b38c2e799e4475d7647fb0e44519510e67080ce"
-  integrity sha512-PRCpslMXSYqFMz1Yh4dG2K/WzqxTCtlKbgJQD2cIkAtXux4JbYiXCtepuoV7l4Wv1rm0a1eU8EqNPgnOmWajGw==
+"@stdlib/assert-is-array@^0.2.1", "@stdlib/assert-is-array@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-array/-/assert-is-array-0.2.2.tgz#ba820d24dd914fe8c29bd61033417ab5a2c2c34f"
+  integrity sha512-aJyTX2U3JqAGCATgaAX9ygvDHc97GCIKkIhiZm/AZaLoFHPtMA1atQ4bKcefEC8Um9eefryxTHfFPfSr9CoNQQ==
   dependencies:
-    "@stdlib/assert-has-tostringtag-support" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-buffer@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-buffer/-/assert-is-buffer-0.0.8.tgz#633b98bc342979e9ed8ed71c3a0f1366782d1412"
-  integrity sha512-SYmGwOXkzZVidqUyY1IIx6V6QnSL36v3Lcwj8Rvne/fuW0bU2OomsEBzYCFMvcNgtY71vOvgZ9VfH3OppvV6eA==
+"@stdlib/assert-is-boolean@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-boolean/-/assert-is-boolean-0.2.2.tgz#1d6361f66a25cd81ae12085da6ce1457311758ee"
+  integrity sha512-3KFLRTYZpX6u95baZ6PubBvjehJs2xBU6+zrenR0jx8KToUYCnJPxqqj7JXRhSD+cOURmcjj9rocVaG9Nz18Pg==
   dependencies:
-    "@stdlib/assert-is-object-like" "^0.0.x"
+    "@stdlib/assert-has-tostringtag-support" "^0.2.2"
+    "@stdlib/boolean-ctor" "^0.2.2"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-collection@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-collection/-/assert-is-collection-0.0.8.tgz#5710cd14010a83007922b0c66c8b605b9db0b8af"
-  integrity sha512-OyKXC8OgvxqLUuJPzVX58j26puOVqnIG2OsxxwtZQ5rwFIcwirYy0LrBfSaF0JX+njau6zb5de+QEURA+mQIgA==
+"@stdlib/assert-is-buffer@^0.2.1", "@stdlib/assert-is-buffer@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-buffer/-/assert-is-buffer-0.2.2.tgz#f32894cc86103c151e144cf3dbac63ef9e3f8f15"
+  integrity sha512-4/WMFTEcDYlVbRhxY8Wlqag4S70QCnn6WmQ4wmfiLW92kqQHsLvTNvdt/qqh/SDyDV31R/cpd3QPsVN534dNEA==
   dependencies:
-    "@stdlib/constants-array-max-typed-array-length" "^0.0.x"
-    "@stdlib/math-base-assert-is-integer" "^0.0.x"
+    "@stdlib/assert-is-object-like" "^0.2.1"
 
-"@stdlib/assert-is-enumerable-property@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-enumerable-property/-/assert-is-enumerable-property-0.0.7.tgz#0eb71ff950278d22de5ad337ee4a8d79228a81cd"
-  integrity sha512-jkhuJgpaiJlTxxkAvacbFl23PI5oO41ecmz1UcngVYI6bMeWZLNdkvFQri0W3ZaDem4zyXi6Kw3G/ohkIHq92g==
+"@stdlib/assert-is-collection@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-collection/-/assert-is-collection-0.2.2.tgz#398c8138202c2334a32254edb00ea74a614c6768"
+  integrity sha512-tbh6ySMqzTkHjFzcNkwtfnJgt65qWeu+0Wv3N0D9QEd3gnJfWq4mJJS3DyJ5n91VoB7RXppB/giDxDUCw/Y+KQ==
   dependencies:
-    "@stdlib/assert-is-integer" "^0.0.x"
-    "@stdlib/assert-is-nan" "^0.0.x"
-    "@stdlib/assert-is-string" "^0.0.x"
+    "@stdlib/constants-array-max-typed-array-length" "^0.2.2"
+    "@stdlib/math-base-assert-is-integer" "^0.2.5"
 
-"@stdlib/assert-is-error@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-error/-/assert-is-error-0.0.8.tgz#9161fb469292314231d0c56565efa94ee65ce7c3"
-  integrity sha512-844/g+vprVw2QP4VzgJZdlZ2hVDvC72vTKMEZFLJL7Rlx0bC+CXxi0rN2BE9txnkn3ILkBYbi9VYH1UREsP/hQ==
+"@stdlib/assert-is-enumerable-property@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-enumerable-property/-/assert-is-enumerable-property-0.2.2.tgz#c6f6460ea0a01712bc8bca26049523294e13d486"
+  integrity sha512-An5QM9Zb3bjKZp5XVdsHTv6/8pJMJvnweHDdLPQhEtLve3YIM4Xo0CQ3TlvKgTr6Lz2UO/+yx8rrDdN5i9Dp5Q==
   dependencies:
-    "@stdlib/utils-get-prototype-of" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-is-integer" "^0.2.2"
+    "@stdlib/assert-is-nan" "^0.2.2"
+    "@stdlib/assert-is-string" "^0.2.2"
 
-"@stdlib/assert-is-float32array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-float32array/-/assert-is-float32array-0.0.8.tgz#a43f6106a2ef8797496ab85aaf6570715394654a"
-  integrity sha512-Phk0Ze7Vj2/WLv5Wy8Oo7poZIDMSTiTrEnc1t4lBn3Svz2vfBXlvCufi/i5d93vc4IgpkdrOEwfry6nldABjNQ==
+"@stdlib/assert-is-error@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-error/-/assert-is-error-0.2.2.tgz#07e56ad03cb55ac8630dd8ecac842e00568e8182"
+  integrity sha512-HKw/vTJvXG8OvDSWSRA5nCKAgKxvzG7xack0xjCUTw1Xh3q8mMmQtCTjwkRtFyvSFDd0DeacMc/Ur5sU5bzOgg==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-get-prototype-of" "^0.2.1"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-float64array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-float64array/-/assert-is-float64array-0.0.8.tgz#8c27204ae6cf309e16f0bbad1937f8aa06c2a812"
-  integrity sha512-UC0Av36EEYIgqBbCIz1lj9g7qXxL5MqU1UrWun+n91lmxgdJ+Z77fHy75efJbJlXBf6HXhcYXECIsc0u3SzyDQ==
+"@stdlib/assert-is-float32array@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-float32array/-/assert-is-float32array-0.2.2.tgz#8b6187136f95e3ef8ba8acad33197736e4844bfb"
+  integrity sha512-hxEKz/Y4m1NYuOaiQKoqQA1HeAYwNXFqSk3FJ4hC71DuGNit2tuxucVyck3mcWLpLmqo0+Qlojgwo5P9/C/9MQ==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-function@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-function/-/assert-is-function-0.0.8.tgz#e4925022b7dd8c4a67e86769691d1d29ab159db9"
-  integrity sha512-M55Dt2njp5tnY8oePdbkKBRIypny+LpCMFZhEjJIxjLE4rA6zSlHs1yRMqD4PmW+Wl9WTeEM1GYO4AQHl1HAjA==
+"@stdlib/assert-is-float64array@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-float64array/-/assert-is-float64array-0.2.2.tgz#c69a894d85a0a9c71f8b68b3aea1ea35bd3ebe85"
+  integrity sha512-3R1wLi6u/IHXsXMtaLnvN9BSpqAJ8tWhwjOOr6kadDqCWsU7Odc7xKLeAXAInAxwnV8VDpO4ifym4A3wehazPQ==
   dependencies:
-    "@stdlib/utils-type-of" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-int16array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-int16array/-/assert-is-int16array-0.0.8.tgz#af4aaabb74a81b5eb52e534f4508b587664ee70e"
-  integrity sha512-liepMcQ58WWLQdBv9bz6Ium2llUlFzr3ximhCSaswpAAUQw3Zpd+vY3mEzG+b6hDhQoj3bBllUkaN2kkCUCwMw==
+"@stdlib/assert-is-function@^0.2.1", "@stdlib/assert-is-function@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-function/-/assert-is-function-0.2.2.tgz#97b54f449e54fd15913054cc69c7385ea9baab81"
+  integrity sha512-whY69DUYWljCJ79Cvygp7VzWGOtGTsh3SQhzNuGt+ut6EsOW+8nwiRkyBXYKf/MOF+NRn15pxg8cJEoeRgsPcA==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-type-of" "^0.2.1"
 
-"@stdlib/assert-is-int32array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-int32array/-/assert-is-int32array-0.0.8.tgz#226a6dd57807dafe298a14f8feedd834b33b1c9b"
-  integrity sha512-bsrGwVNiaasGnQgeup1RLFRSEk8GE/cm0iKvvPZLlzTBC+NJ1wUZgjLSiEh+ccy4JdgfMddJf4j7zSqOxoFWxw==
+"@stdlib/assert-is-int16array@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-int16array/-/assert-is-int16array-0.2.2.tgz#2358c371ff651231a3d0ccf4a0cd1edf13cfef77"
+  integrity sha512-HQ9yyX1di07pWreBk6njw9x1sipJKSP4SCSkidLfUHKxaooxeUprAFONfMiEMdNBbn7f3awfs23h1bpN/Z6Vmg==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-int8array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-int8array/-/assert-is-int8array-0.0.8.tgz#43e29e8b1f57b80543e5e46a37100e05dc40e8de"
-  integrity sha512-hzJAFSsG702hHO0nkMkog8nelK6elJdBNsuHWDciMd7iTIIjernGL1GbB8712Yg9xPGYgm8n6tXonDEEQ5loIw==
+"@stdlib/assert-is-int32array@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-int32array/-/assert-is-int32array-0.2.2.tgz#64a948b9b23b0943c39930d4e59f55e2917715c4"
+  integrity sha512-YomgTwoJD/ci8K9mWNCyqSDtkYfHNplMYw+B9rmcxrjX//1LVZkrzgwWEc6dC3RlY0Ou+uDHJpKeKL9G2fj4GQ==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-integer@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-integer/-/assert-is-integer-0.0.8.tgz#7a2b5778a9ec530a12031b6a6ff7c58c6892e50f"
-  integrity sha512-gCjuKGglSt0IftXJXIycLFNNRw0C+8235oN0Qnw3VAdMuEWauwkNhoiw0Zsu6Arzvud8MQJY0oBGZtvLUC6QzQ==
+"@stdlib/assert-is-int8array@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-int8array/-/assert-is-int8array-0.2.2.tgz#9fc5063c8a3ed70feee357fe3b8fa01bde376e89"
+  integrity sha512-Y1QP3uIZ+CG+rFrD6nOO/N/8O1rRbXgG+iVo5aj8xNRUtfg1iYekUspfNKqxeZUJ95Ocv705m7/vsGlvI1MugQ==
   dependencies:
-    "@stdlib/assert-is-number" "^0.0.x"
-    "@stdlib/constants-float64-ninf" "^0.0.x"
-    "@stdlib/constants-float64-pinf" "^0.0.x"
-    "@stdlib/math-base-assert-is-integer" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-nan@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-nan/-/assert-is-nan-0.0.8.tgz#91d5289c088a03063f9d603de2bd99d3dec6d40d"
-  integrity sha512-K57sjcRzBybdRpCoiuqyrn/d+R0X98OVlmXT4xEk3VPYqwux8e0NModVFHDehe+zuhmZLvYM50mNwp1TQC2AxA==
+"@stdlib/assert-is-integer@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-integer/-/assert-is-integer-0.2.2.tgz#2b0b76e11926b7530b510c80e2f3e3fdf271a368"
+  integrity sha512-2d4CioQmnPcNDvNfC3Q6+xAJLwYYcSUamnxP0bSBJ1oAazWaVArdXNUAUxufek2Uaq6TVIM2gNSMyivIKIJd2w==
   dependencies:
-    "@stdlib/assert-is-number" "^0.0.x"
-    "@stdlib/math-base-assert-is-nan" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/assert-is-number" "^0.2.2"
+    "@stdlib/constants-float64-ninf" "^0.2.2"
+    "@stdlib/constants-float64-pinf" "^0.2.2"
+    "@stdlib/math-base-assert-is-integer" "^0.2.4"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/assert-is-nonnegative-integer@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-nonnegative-integer/-/assert-is-nonnegative-integer-0.0.7.tgz#e6aa304dbca14020e87ea05687eccd696ef27035"
-  integrity sha512-+5SrGM3C1QRpzmi+JnyZF9QsH29DCkSONm2558yOTdfCLClYOXDs++ktQo/8baCBFSi9JnFaLXVt1w1sayQeEQ==
+"@stdlib/assert-is-nan@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-nan/-/assert-is-nan-0.2.2.tgz#8d1a65a4ea0c5db87dadb0778bb1eef97b007826"
+  integrity sha512-Wh7KPIVfi6UVBRuPgkjVnoJP6mVtDNg+Y4m3Hko86TSf78KqFXfyZy/m6hnlYBWZRkNJDKo1J/7A/zpPwcEUVg==
   dependencies:
-    "@stdlib/assert-is-integer" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/assert-is-number" "^0.2.2"
+    "@stdlib/math-base-assert-is-nan" "^0.2.1"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/assert-is-number@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-number/-/assert-is-number-0.0.7.tgz#82b07cda4045bd0ecc846d3bc26d39dca7041c61"
-  integrity sha512-mNV4boY1cUOmoWWfA2CkdEJfXA6YvhcTvwKC0Fzq+HoFFOuTK/scpTd9HanUyN6AGBlWA8IW+cQ1ZwOT3XMqag==
+"@stdlib/assert-is-nonnegative-integer@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-nonnegative-integer/-/assert-is-nonnegative-integer-0.2.2.tgz#c47a7afabede723bfc05ed02b28a590163ec03f9"
+  integrity sha512-4t2FoZQeZ5nMYHYSeTVlgAp/HLEMYqe9qMcJgbvj63KTrGCDsuIpTE0S+UTxAc6Oc3Ftgb0ygjBFJQ0mxwN0Ow==
   dependencies:
-    "@stdlib/assert-has-tostringtag-support" "^0.0.x"
-    "@stdlib/number-ctor" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-is-integer" "^0.2.2"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/assert-is-object-like@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-object-like/-/assert-is-object-like-0.0.8.tgz#f6fc36eb7b612d650c6201d177214733426f0c56"
-  integrity sha512-pe9selDPYAu/lYTFV5Rj4BStepgbzQCr36b/eC8EGSJh6gMgRXgHVv0R+EbdJ69KNkHvKKRjnWj0A/EmCwW+OA==
+"@stdlib/assert-is-number@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-number/-/assert-is-number-0.2.2.tgz#269ab5bf779a26a2cec7575c9a47e163f5bb74b2"
+  integrity sha512-sWpJ59GqGbmlcdYSUV/OYkmQW8k47w10+E0K0zPu1x1VKzhjgA5ZB2sJcpgI8Vt3ckRLjdhuc62ZHJkrJujG7A==
   dependencies:
-    "@stdlib/assert-tools-array-function" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/assert-has-tostringtag-support" "^0.2.2"
+    "@stdlib/number-ctor" "^0.2.2"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-object@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-object/-/assert-is-object-0.0.8.tgz#0220dca73bc3df044fc43e73b02963d5ef7ae489"
-  integrity sha512-ooPfXDp9c7w+GSqD2NBaZ/Du1JRJlctv+Abj2vRJDcDPyrnRTb1jmw+AuPgcW7Ca7op39JTbArI+RVHm/FPK+Q==
+"@stdlib/assert-is-object-like@^0.2.1", "@stdlib/assert-is-object-like@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-object-like/-/assert-is-object-like-0.2.2.tgz#3bd47386addeb7ccb4ac82b9d924ddaa5fddde57"
+  integrity sha512-MjQBpHdEebbJwLlxh/BKNH8IEHqY0YlcCMRKOQU0UOlILSJg0vG+GL4fDDqtx9FSXxcTqC+w3keHx8kAKvQhzg==
   dependencies:
-    "@stdlib/assert-is-array" "^0.0.x"
+    "@stdlib/assert-tools-array-function" "^0.2.1"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/assert-is-plain-object@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-plain-object/-/assert-is-plain-object-0.0.7.tgz#0c3679faf61b03023363f1ce30f8d00f8ed1c37b"
-  integrity sha512-t/CEq2a083ajAgXgSa5tsH8l3kSoEqKRu1qUwniVLFYL4RGv3615CrpJUDQKVtEX5S/OKww5q0Byu3JidJ4C5w==
+"@stdlib/assert-is-object@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-object/-/assert-is-object-0.2.2.tgz#671297efc43788aa5368ce59ede28a8089387a7f"
+  integrity sha512-sNnphJuHyMDHHHaonlx6vaCKMe4sHOn0ag5Ck4iW3kJtM2OZB2J4h8qFcwKzlMk7fgFu7vYNGCZtpm1dYbbUfQ==
   dependencies:
-    "@stdlib/assert-has-own-property" "^0.0.x"
-    "@stdlib/assert-is-function" "^0.0.x"
-    "@stdlib/assert-is-object" "^0.0.x"
-    "@stdlib/utils-get-prototype-of" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-is-array" "^0.2.1"
 
-"@stdlib/assert-is-regexp-string@^0.0.x":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-regexp-string/-/assert-is-regexp-string-0.0.9.tgz#424f77b4aaa46a19f4b60ba4b671893a2e5df066"
-  integrity sha512-FYRJJtH7XwXEf//X6UByUC0Eqd0ZYK5AC8or5g5m5efQrgr2lOaONHyDQ3Scj1A2D6QLIJKZc9XBM4uq5nOPXA==
-  dependencies:
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
-    "@stdlib/process-read-stdin" "^0.0.x"
-    "@stdlib/regexp-eol" "^0.0.x"
-    "@stdlib/regexp-regexp" "^0.0.x"
-    "@stdlib/streams-node-stdin" "^0.0.x"
-
-"@stdlib/assert-is-regexp@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-regexp/-/assert-is-regexp-0.0.7.tgz#430fe42417114e7ea01d21399a70ed9c4cbae867"
-  integrity sha512-ty5qvLiqkDq6AibHlNJe0ZxDJ9Mg896qolmcHb69mzp64vrsORnPPOTzVapAq0bEUZbXoypeijypLPs9sCGBSQ==
+"@stdlib/assert-is-plain-object@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-plain-object/-/assert-is-plain-object-0.2.2.tgz#90b67c33ec6430ee5ca5a4c053ef5843550a3435"
+  integrity sha512-o4AFWgBsSNzZAOOfIrxoDFYTqnLuGiaHDFwIeZGUHdpQeav2Fll+sGeaqOcekF7yKawoswnwWdJqTsjapb4Yzw==
   dependencies:
-    "@stdlib/assert-has-tostringtag-support" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-has-own-property" "^0.2.1"
+    "@stdlib/assert-is-function" "^0.2.1"
+    "@stdlib/assert-is-object" "^0.2.1"
+    "@stdlib/utils-get-prototype-of" "^0.2.1"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-string@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-string/-/assert-is-string-0.0.8.tgz#b07e4a4cbd93b13d38fa5ebfaa281ccd6ae9e43f"
-  integrity sha512-Uk+bR4cglGBbY0q7O7HimEJiW/DWnO1tSzr4iAGMxYgf+VM2PMYgI5e0TLy9jOSOzWon3YS39lc63eR3a9KqeQ==
+"@stdlib/assert-is-regexp@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-regexp/-/assert-is-regexp-0.2.2.tgz#4d0f24c5ab189da3839ceca7e6955d263d7b798d"
+  integrity sha512-2JtiUtRJxPaVXL7dkWoV3n5jouI65DwYDXsDXg3xo23TXlTNGgU/HhKO4FWC1Yqju7YMZi0hcZSW6E9v8ISqeQ==
   dependencies:
-    "@stdlib/assert-has-tostringtag-support" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-has-tostringtag-support" "^0.2.2"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-uint16array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint16array/-/assert-is-uint16array-0.0.8.tgz#770cc5d86906393d30d387a291e81df0a984fdfb"
-  integrity sha512-M+qw7au+qglRXcXHjvoUZVLlGt1mPjuKudrVRto6KL4+tDsP2j+A89NDP3Fz8/XIUD+5jhj+65EOKHSMvDYnng==
+"@stdlib/assert-is-string@^0.2.1", "@stdlib/assert-is-string@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-string/-/assert-is-string-0.2.2.tgz#2f3099045f5c9bdb85bf7620c021c17e5be19f2f"
+  integrity sha512-SOkFg4Hq443hkadM4tzcwTHWvTyKP9ULOZ8MSnnqmU0nBX1zLVFLFGY8jnF6Cary0dL0V7QQBCfuxqKFM6u2PQ==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-has-tostringtag-support" "^0.2.2"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-uint32array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint32array/-/assert-is-uint32array-0.0.8.tgz#2a7f1265db25d728e3fc084f0f59be5f796efac5"
-  integrity sha512-cnZi2DicYcplMnkJ3dBxBVKsRNFjzoGpmG9A6jXq4KH5rFl52SezGAXSVY9o5ZV7bQGaF5JLyCLp6n9Y74hFGg==
+"@stdlib/assert-is-uint16array@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint16array/-/assert-is-uint16array-0.2.2.tgz#85346d95d8fd08c879a0b33a210d9224f54a2d4b"
+  integrity sha512-w3+HeTiXGLJGw5nCqr0WbvgArNMEj7ulED1Yd19xXbmmk2W1ZUB+g9hJDOQTiKsTU4AVyH4/As+aA8eDVmWtmg==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-uint8array@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint8array/-/assert-is-uint8array-0.0.8.tgz#4521054b5d3a2206b406cad7368e0a50eaee4dec"
-  integrity sha512-8cqpDQtjnJAuVtRkNAktn45ixq0JHaGJxVsSiK79k7GRggvMI6QsbzO6OvcLnZ/LimD42FmgbLd13Yc2esDmZw==
+"@stdlib/assert-is-uint32array@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint32array/-/assert-is-uint32array-0.2.2.tgz#37f35526101e5847c54cb8c9952976d1888a0bb8"
+  integrity sha512-3F4nIHg1Qp0mMIsImWUC8DwQ3qBK5vdIJTjS2LufLbFBhHNmv5kK1yJiIXQDTLkENU0STZe05TByo01ZNLOmDQ==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-is-uint8clampedarray@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint8clampedarray/-/assert-is-uint8clampedarray-0.0.8.tgz#e0206354dd3055e170a8c998ca1d0663d3799ab9"
-  integrity sha512-CkXVpivLTkfrPBJf/60tJLHCzMEjVdwzKxNSybdSJ5w8lXVXIp7jgs44mXqIHJm09XgPEc3ljEyXUf5FcJTIvw==
+"@stdlib/assert-is-uint8array@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint8array/-/assert-is-uint8array-0.2.2.tgz#2d46b13d58b8d1b6aa4e4841fbb6903c6cd07a08"
+  integrity sha512-51WnDip6H2RrN0CbqWmfqySAjam8IZ0VjlfUDc3PtcgrZGrKKjVgyHAsT/L3ZDydwF+aB94uvYJu5QyrCPNaZw==
   dependencies:
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/assert-tools-array-function@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/assert-tools-array-function/-/assert-tools-array-function-0.0.7.tgz#34e9e5a3fca62ea75da99fc9995ba845ba514988"
-  integrity sha512-3lqkaCIBMSJ/IBHHk4NcCnk2NYU52tmwTYbbqhAmv7vim8rZPNmGfj3oWkzrCsyCsyTF7ooD+In2x+qTmUbCtQ==
+"@stdlib/assert-is-uint8clampedarray@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-is-uint8clampedarray/-/assert-is-uint8clampedarray-0.2.2.tgz#3b4cbbe0c74326967fe868ab1d1288ce02cbbc83"
+  integrity sha512-MjHhOxjOXesqUNgoDGOiO9vib1HV3uCNoYQfiEDWAv30pVAty70wEcwDQ7cdQs1ZGfGC/355ob8AR2Z8lY4ryw==
   dependencies:
-    "@stdlib/assert-is-array" "^0.0.x"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/buffer-ctor@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/buffer-ctor/-/buffer-ctor-0.0.7.tgz#d05b7f4a6ef26defe6cdd41ca244a927b96c55ec"
-  integrity sha512-4IyTSGijKUQ8+DYRaKnepf9spvKLZ+nrmZ+JrRcB3FrdTX/l9JDpggcUcC/Fe+A4KIZOnClfxLn6zfIlkCZHNA==
+"@stdlib/assert-tools-array-function@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/assert-tools-array-function/-/assert-tools-array-function-0.2.2.tgz#aba9b71b5164e97872cd2d6b16b221e01bd8c5e0"
+  integrity sha512-FYeT7X9x0C8Nh+MN6IJUDz+7i7yB6mio2/SDlrvyepjyPSU/cfHfwW0GEOnQhxZ+keLZC/YqDD930WjRODwMdA==
   dependencies:
-    "@stdlib/assert-has-node-buffer-support" "^0.0.x"
+    "@stdlib/assert-is-array" "^0.2.1"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
 
-"@stdlib/buffer-from-buffer@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/buffer-from-buffer/-/buffer-from-buffer-0.0.7.tgz#871d2eb4307776b5c14d57175d1f57ed8a058d54"
-  integrity sha512-ytFnWFXdkrpiFNb/ZlyJrqRyiGMGuv9zDa/IbbotcbEwfmjvvLa+nvKS5B57HfFrcBxq6L0oWYmZ2uYctKckyg==
-  dependencies:
-    "@stdlib/assert-is-buffer" "^0.0.x"
-    "@stdlib/assert-is-function" "^0.0.x"
-    "@stdlib/buffer-ctor" "^0.0.x"
+"@stdlib/boolean-ctor@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/boolean-ctor/-/boolean-ctor-0.2.2.tgz#d0add4760adeca22631625dd95bb9ca32abb931a"
+  integrity sha512-qIkHzmfxDvGzQ3XI9R7sZG97QSaWG5TvWVlrvcysOGT1cs6HtQgnf4D//SRzZ52VLm8oICP+6OKtd8Hpm6G7Ww==
 
-"@stdlib/buffer-from-string@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/buffer-from-string/-/buffer-from-string-0.0.8.tgz#0901a6e66c278db84836e483a7278502e2a33994"
-  integrity sha512-Dws5ZbK2M9l4Bkn/ODHFm3lNZ8tWko+NYXqGS/UH/RIQv3PGp+1tXFUSvjwjDneM6ppjQVExzVedUH1ftABs9A==
+"@stdlib/buffer-ctor@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/buffer-ctor/-/buffer-ctor-0.2.2.tgz#8469a6d301b4b11e08763b3238b949b2aa132841"
+  integrity sha512-Q/FkXxyZUzCA1fwOl7sa8ZYg6e60fTksCYr01nJv8fvmr9l9Ju6MKmm20n833yE7KA5jDDtZW9lB1V7552fLMA==
   dependencies:
-    "@stdlib/assert-is-function" "^0.0.x"
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/buffer-ctor" "^0.0.x"
-    "@stdlib/string-format" "^0.0.x"
+    "@stdlib/assert-has-node-buffer-support" "^0.2.1"
 
-"@stdlib/cli-ctor@^0.0.x":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@stdlib/cli-ctor/-/cli-ctor-0.0.3.tgz#5b0a6d253217556c778015eee6c14be903f82c2b"
-  integrity sha512-0zCuZnzFyxj66GoF8AyIOhTX5/mgGczFvr6T9h4mXwegMZp8jBC/ZkOGMwmp+ODLBTvlcnnDNpNFkDDyR6/c2g==
+"@stdlib/buffer-from-buffer@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/buffer-from-buffer/-/buffer-from-buffer-0.2.2.tgz#10e277a9856f457017f78ada38177b7dd2178e98"
+  integrity sha512-EU/Mju7j3Hw/z6xxlZ14h6ZEyhiarR4nXhDQwycJ4NcFb7Oi+KaeNvX5rRQgf/k04cpcq8VkQiM1xOMrKPCvqA==
   dependencies:
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
-    "@stdlib/utils-noop" "^0.0.x"
-    minimist "^1.2.0"
+    "@stdlib/assert-is-buffer" "^0.2.2"
+    "@stdlib/assert-is-function" "^0.2.2"
+    "@stdlib/buffer-ctor" "^0.2.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
 
-"@stdlib/complex-float32@^0.0.7", "@stdlib/complex-float32@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/complex-float32/-/complex-float32-0.0.7.tgz#fb9a0c34254eaf3ed91c39983e19ef131fc18bc1"
-  integrity sha512-POCtQcBZnPm4IrFmTujSaprR1fcOFr/MRw2Mt7INF4oed6b1nzeG647K+2tk1m4mMrMPiuXCdvwJod4kJ0SXxQ==
+"@stdlib/complex-float32-ctor@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/complex-float32-ctor/-/complex-float32-ctor-0.0.2.tgz#57f6d3f0217c1ae1f83ea12b044a80e951a215d3"
+  integrity sha512-QsTLynhTRmDT0mSkfdHj0FSqQSxh2nKx+vvrH3Y0/Cd/r0WoHFZwyibndDxshfkf9B7nist8QKyvV82I3IZciA==
   dependencies:
-    "@stdlib/assert-is-number" "^0.0.x"
-    "@stdlib/number-float64-base-to-float32" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
-    "@stdlib/utils-define-property" "^0.0.x"
-    "@stdlib/utils-library-manifest" "^0.0.x"
+    "@stdlib/assert-is-number" "^0.2.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/number-float64-base-to-float32" "^0.2.1"
+    "@stdlib/string-format" "^0.2.2"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
+    "@stdlib/utils-define-property" "^0.2.4"
 
-"@stdlib/complex-float64@^0.0.8", "@stdlib/complex-float64@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/complex-float64/-/complex-float64-0.0.8.tgz#00ee3a0629d218a01b830a20406aea7d7aff6fb3"
-  integrity sha512-lUJwsXtGEziOWAqCcnKnZT4fcVoRsl6t6ECaCJX45Z7lAc70yJLiwUieLWS5UXmyoADHuZyUXkxtI4oClfpnaw==
+"@stdlib/complex-float32-reim@^0.1.1":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/complex-float32-reim/-/complex-float32-reim-0.1.2.tgz#095fcd9e4c2657d58c294eeeaeb5d46591d844bc"
+  integrity sha512-24H+t1xwQF6vhOoMZdDA3TFB4M+jb5Swm/FwNaepovlzVIG2NlthUZs6mZg1T3oegqesIRQRwhpn4jIPjuGiTw==
   dependencies:
-    "@stdlib/assert-is-number" "^0.0.x"
-    "@stdlib/complex-float32" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
-    "@stdlib/utils-define-property" "^0.0.x"
-    "@stdlib/utils-library-manifest" "^0.0.x"
+    "@stdlib/array-float32" "^0.2.2"
+    "@stdlib/complex-float32-ctor" "^0.0.2"
 
-"@stdlib/complex-reim@^0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@stdlib/complex-reim/-/complex-reim-0.0.6.tgz#9657971e36f2a1f1930a21249c1934c8c5087efd"
-  integrity sha512-28WXfPSIFMtHb0YgdatkGS4yxX5sPYea5MiNgqPv3E78+tFcg8JJG52NQ/MviWP2wsN9aBQAoCPeu8kXxSPdzA==
+"@stdlib/complex-float64-ctor@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@stdlib/complex-float64-ctor/-/complex-float64-ctor-0.0.3.tgz#740fdb24f5d1d5db82fa7800b91037e552a47bb6"
+  integrity sha512-oixCtBif+Uab2rKtgedwQTbQTEC+wVSu4JQH935eJ8Jo0eL6vXUHHlVrkLgYKlCDLvq5px1QQn42Czg/ixh6Gw==
   dependencies:
-    "@stdlib/array-float64" "^0.0.x"
-    "@stdlib/complex-float64" "^0.0.x"
-    "@stdlib/types" "^0.0.x"
-    "@stdlib/utils-library-manifest" "^0.0.x"
+    "@stdlib/assert-is-number" "^0.2.2"
+    "@stdlib/complex-float32-ctor" "^0.0.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
+    "@stdlib/utils-define-property" "^0.2.4"
 
-"@stdlib/complex-reimf@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@stdlib/complex-reimf/-/complex-reimf-0.0.1.tgz#6797bc1bfb668a30511611f2544d0cff4d297775"
-  integrity sha512-P9zu05ZW2i68Oppp3oHelP7Tk0D7tGBL0hGl1skJppr2vY9LltuNbeYI3C96tQe/7Enw/5GyAWgxoQI4cWccQA==
+"@stdlib/complex-float64-reim@^0.1.1":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/complex-float64-reim/-/complex-float64-reim-0.1.2.tgz#22276ea7feef9d61c5bc0d4b0d0137386c57960e"
+  integrity sha512-q6RnfgbUunApAYuGmkft1oOM3x3xVMVJwNRlRgfIXwKDb8pYt+S/CeIwi3Su5SF6ay3AqA1s+ze7m21osXAJyw==
   dependencies:
-    "@stdlib/array-float32" "^0.0.x"
-    "@stdlib/complex-float32" "^0.0.x"
-    "@stdlib/types" "^0.0.x"
-    "@stdlib/utils-library-manifest" "^0.0.x"
+    "@stdlib/array-float64" "^0.2.2"
+    "@stdlib/complex-float64-ctor" "^0.0.3"
 
-"@stdlib/constants-array-max-typed-array-length@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-array-max-typed-array-length/-/constants-array-max-typed-array-length-0.0.7.tgz#b6e4cd8e46f4a1ae2b655646d46393ba3d8d5c2b"
-  integrity sha512-KoQtZUGxP+ljOjUfc/dpH9dEZmqxXaLs7HV1D0W+Gnwa8GnuPJijTwmYZwglmjtbeWIzlaLksqPAvlQE7rj2jg==
+"@stdlib/constants-array-max-typed-array-length@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-array-max-typed-array-length/-/constants-array-max-typed-array-length-0.2.2.tgz#1cf750d8f0732a88159f2bc6a9c881fcb816add0"
+  integrity sha512-uAoBItVIfuzR4zKK1F57Znrn2frKL0U9gqJkg30BXuno3YlUvbhIfVP3VsUmGJCmi9ztgYLqX10yqb0KvlM2Ig==
 
-"@stdlib/constants-float64-ninf@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-float64-ninf/-/constants-float64-ninf-0.0.8.tgz#4a83691d4d46503e2339fa3ec21d0440877b5bb7"
-  integrity sha512-bn/uuzCne35OSLsQZJlNrkvU1/40spGTm22g1+ZI1LL19J8XJi/o4iupIHRXuLSTLFDBqMoJlUNphZlWQ4l8zw==
+"@stdlib/constants-float64-ninf@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-float64-ninf/-/constants-float64-ninf-0.2.2.tgz#d7f5c5d445701dca25d39c14cac7a17acd7c5ee0"
+  integrity sha512-Iu+wZs/vgudAKVg9FEcRY3FadkmvsWuq/wJ3jIHjhaP5xcnoF3XJUO4IneEndybHwehfJL65NShnDsJcg1gicw==
   dependencies:
-    "@stdlib/number-ctor" "^0.0.x"
-    "@stdlib/utils-library-manifest" "^0.0.x"
+    "@stdlib/number-ctor" "^0.2.2"
 
-"@stdlib/constants-float64-pinf@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-float64-pinf/-/constants-float64-pinf-0.0.8.tgz#ad3d5b267b142b0927363f6eda74c94b8c4be8bf"
-  integrity sha512-I3R4rm2cemoMuiDph07eo5oWZ4ucUtpuK73qBJiJPDQKz8fSjSe4wJBAigq2AmWYdd7yJHsl5NJd8AgC6mP5Qw==
-  dependencies:
-    "@stdlib/utils-library-manifest" "^0.0.x"
+"@stdlib/constants-float64-pinf@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-float64-pinf/-/constants-float64-pinf-0.2.2.tgz#e568ccfc63f8788f48acb55821bc9f0a7403ec5d"
+  integrity sha512-UcwnWaSkUMD8QyKADwkXPlY7yOosCPZpE2EDXf/+WOzuWi5vpsec+JaasD5ggAN8Rv8OTVmexTFs1uZfrHgqVQ==
 
-"@stdlib/constants-int16-max@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-int16-max/-/constants-int16-max-0.0.7.tgz#7f62b6dc93aa468f51a5907d4da894c2b696deef"
-  integrity sha512-VCJVtehM+b27PB1+KcK97MCNfp9xhVaJQ+EJAi6sDIVtuMkx4HGW4GDmJB8vzBqqWaWo3M9bjNvuXHN/TQHZsA==
+"@stdlib/constants-int16-max@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-int16-max/-/constants-int16-max-0.2.2.tgz#151a4ba8cd09176f201c308e0d5bc15100b94043"
+  integrity sha512-w7XnWFxYXRyAnbKOxur3981FeaSlhKvHlhETwH5ZhtOQerk3Jn/iJFdtbN8CD0he1Kml4DWhnoKB7P9PcOaTIw==
 
-"@stdlib/constants-int16-min@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-int16-min/-/constants-int16-min-0.0.7.tgz#bef88532974e57aa60e060474d6314ba9bb457e6"
-  integrity sha512-HzuhrBMmkpR9vMsmYKFC3MSsx+cWOXDtKrg/L7OUK32dr1hFrlMJrFbjq83FgfGEdGO1hw519vZvKpZd4wJx6A==
+"@stdlib/constants-int16-min@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-int16-min/-/constants-int16-min-0.2.2.tgz#4e2162619b551f8f552a9625149340e73ac65092"
+  integrity sha512-zn15vCgNoyD97z7mNQMChEneyc6xQudVGj1BOv5vZl827vHAs+KV6xeCI7VGY8Lpd6V22piDoGG3Mvj/43u9vQ==
 
-"@stdlib/constants-int32-max@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-int32-max/-/constants-int32-max-0.0.7.tgz#83e55486670c1dad5c568640efe9742dc0ee0b2b"
-  integrity sha512-um/tgiIotQy7jkN6b7GzaOMQT4PN/o7Z6FR0CJn0cHIZfWCNKyVObfaR68uDX1nDwYGfNrO7BkCbU4ccrtflDA==
+"@stdlib/constants-int32-max@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-int32-max/-/constants-int32-max-0.3.0.tgz#e575c365738d81b5fa1273877893312d3597af2c"
+  integrity sha512-jYN84QfG/yP2RYw98OR6UYehFFs0PsGAihV6pYU0ey+WF9IOXgSjRP56KMoZ7ctHwl4wsnj9I+qB2tGuEXr+pQ==
 
-"@stdlib/constants-int32-min@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-int32-min/-/constants-int32-min-0.0.7.tgz#97d50ecca6f2a3e8b2f1cc7cf50926ae9e287009"
-  integrity sha512-/I7rK7sIhFOqz20stP9H6wVE+hfAcVKRKGBvNRsxbTiEcXnM3RjD6LxPGa/4dl6q/bq2ypJti8kfR8bKvepeDQ==
+"@stdlib/constants-int32-min@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-int32-min/-/constants-int32-min-0.2.2.tgz#5ba8b290dad74a1f5cb4adb49ea59082df537ac9"
+  integrity sha512-4QMOTpo5QykiWp52Wtugu1WK1wV/Bi2Hjj9L97dfZ3BPB1Oa9ykiUZvTsq3GBNCMu2YHPv1ugbV91C3p3bw+Aw==
 
-"@stdlib/constants-int8-max@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-int8-max/-/constants-int8-max-0.0.7.tgz#71e1eb536f1c4e5594a18d7ad2fc68760825f6c4"
-  integrity sha512-4qkN6H9PqBCkt/PEW/r6/RoLr3144mJuiyhxoUJ5kLmKPjjKJKKdTxORQFGOon/NykLS9EqjZdK16/n1FXJPqA==
+"@stdlib/constants-int8-max@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-int8-max/-/constants-int8-max-0.2.2.tgz#b92848bf8281e02af0eb4df2e20ef9187952c02a"
+  integrity sha512-zp1L61S/ycOmkILmvuXEKvtXrEJ0QUAwP65sNAWMJOtdT0mhGMfGpXKvCK84TC3+jP5Wk4LU13cgO2bf/pmGTw==
 
-"@stdlib/constants-int8-min@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-int8-min/-/constants-int8-min-0.0.7.tgz#736942d0321fcfde901660d6842da32d8c6ccb28"
-  integrity sha512-Ux1P8v+KijoG3MgEeIWFggK8MsT1QhSkWBoT0evVyO1ftK+51WXqC+0uAwPoP06nhW4UTW3i4eJS9BVyyz7Beg==
+"@stdlib/constants-int8-min@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-int8-min/-/constants-int8-min-0.2.2.tgz#7355f162229b2a774e817f88e4255e753bb5c093"
+  integrity sha512-nxPloZUqbGuyuOPC0U3xQOn9YdyRq2g9uc1dzcw6k0XBhql9mlz9kCbdC74HeMm4K9Dyyb7IlAZLCezdv60s6g==
 
-"@stdlib/constants-uint16-max@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-uint16-max/-/constants-uint16-max-0.0.7.tgz#c20dbe90cf3825f03f5f44b9ee7e8cbada26f4f1"
-  integrity sha512-7TPoku7SlskA67mAm7mykIAjeEnkQJemw1cnKZur0mT5W4ryvDR6iFfL9xBiByVnWYq/+ei7DHbOv6/2b2jizw==
+"@stdlib/constants-uint16-max@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-uint16-max/-/constants-uint16-max-0.2.2.tgz#8bba489909ea11a468a01afe57be912cbce57f56"
+  integrity sha512-qaFXbxgFnAkt73P5Ch7ODb0TsOTg0LEBM52hw6qt7+gTMZUdS0zBAiy5J2eEkTxA9rD9X3nIyUtLf2C7jafNdw==
 
-"@stdlib/constants-uint32-max@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-uint32-max/-/constants-uint32-max-0.0.7.tgz#60bda569b226120a5d2e01f3066da8e2d3b8e21a"
-  integrity sha512-8+NK0ewqc1vnEZNqzwFJgFSy3S543Eft7i8WyW/ygkofiqEiLAsujvYMHzPAB8/3D+PYvjTSe37StSwRwvQ6uw==
+"@stdlib/constants-uint32-max@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-uint32-max/-/constants-uint32-max-0.2.2.tgz#354b3c0f78ad54ff565087f01d9d8c337af63831"
+  integrity sha512-2G44HQgIKDrh3tJUkmvtz+eM+uwDvOMF+2I3sONcTHacANb+zP7la4LDYiTp+HFkPJyfh/kPapXBiHpissAb1A==
 
-"@stdlib/constants-uint8-max@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/constants-uint8-max/-/constants-uint8-max-0.0.7.tgz#d50affeaeb6e67a0f39059a8f5122f3fd5ff4447"
-  integrity sha512-fqV+xds4jgwFxwWu08b8xDuIoW6/D4/1dtEjZ1sXVeWR7nf0pjj1cHERq4kdkYxsvOGu+rjoR3MbjzpFc4fvSw==
+"@stdlib/constants-uint8-max@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/constants-uint8-max/-/constants-uint8-max-0.2.2.tgz#1187e326b5f03d94a72051cace560ef156ac609d"
+  integrity sha512-ZTBQq3fqS/Y4ll6cPY5SKaS266EfmKP9PW3YLJaTELmYIzVo9w2RFtfCqN05G3olTQ6Le9MUEE/C6VFgZNElDQ==
 
-"@stdlib/fs-exists@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/fs-exists/-/fs-exists-0.0.8.tgz#391b2cee3e014a3b20266e5d047847f68ef82331"
-  integrity sha512-mZktcCxiLmycCJefm1+jbMTYkmhK6Jk1ShFmUVqJvs+Ps9/2EEQXfPbdEniLoVz4HeHLlcX90JWobUEghOOnAQ==
-  dependencies:
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
-    "@stdlib/process-cwd" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+"@stdlib/error-tools-fmtprodmsg@^0.2.1", "@stdlib/error-tools-fmtprodmsg@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/error-tools-fmtprodmsg/-/error-tools-fmtprodmsg-0.2.2.tgz#0b42240fc5131b460f1120b77da8345dd22ee2dd"
+  integrity sha512-2IliQfTes4WV5odPidZFGD5eYDswZrPXob7oOu95Q69ERqImo8WzSwnG2EDbHPyOyYCewuMfM5Ha6Ggf+u944Q==
 
-"@stdlib/fs-read-file@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/fs-read-file/-/fs-read-file-0.0.8.tgz#2f12669fa6dd2d330fb5006a94dc8896f0aaa0e0"
-  integrity sha512-pIZID/G91+q7ep4x9ECNC45+JT2j0+jdz/ZQVjCHiEwXCwshZPEvxcPQWb9bXo6coOY+zJyX5TwBIpXBxomWFg==
+"@stdlib/fs-exists@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/fs-exists/-/fs-exists-0.2.2.tgz#ccb289c0784f765796c27593abe6e398fb1bbdd2"
+  integrity sha512-uGLqc7izCIam2aTyv0miyktl4l8awgRkCS39eIEvvvnKIaTBF6pxfac7FtFHeEQKE3XhtKsOmdQ/yJjUMChLuA==
   dependencies:
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/fs-resolve-parent-path@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/fs-resolve-parent-path/-/fs-resolve-parent-path-0.0.8.tgz#628119952dfaae78afe3916dca856408a4f5c1eb"
-  integrity sha512-ok1bTWsAziChibQE3u7EoXwbCQUDkFjjRAHSxh7WWE5JEYVJQg1F0o3bbjRr4D/wfYYPWLAt8AFIKBUDmWghpg==
-  dependencies:
-    "@stdlib/assert-has-own-property" "^0.0.x"
-    "@stdlib/assert-is-function" "^0.0.x"
-    "@stdlib/assert-is-plain-object" "^0.0.x"
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-exists" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
-    "@stdlib/process-cwd" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
-
-"@stdlib/math-base-assert-is-integer@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/math-base-assert-is-integer/-/math-base-assert-is-integer-0.0.7.tgz#d70faf41bed1bd737333877eb21660bf0ee779df"
-  integrity sha512-swIEKQJZOwzacYDiX5SSt5/nHd6PYJkLlVKZiVx/GCpflstQnseWA0TmudG7XU5HJnxDGV/w6UL02dEyBH7VEw==
+"@stdlib/fs-resolve-parent-path@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/fs-resolve-parent-path/-/fs-resolve-parent-path-0.2.2.tgz#434fa93c067894fea7632aa4b93fba41d7a58cf5"
+  integrity sha512-ZG78ouZc+pdPLtU+sSpYTvbKTiLUgn6NTtlVFYmcmkYRFn+fGOOakwVuhYMcYG6ti10cLD6WzB/YujxIt8f+nA==
+  dependencies:
+    "@stdlib/assert-has-own-property" "^0.2.2"
+    "@stdlib/assert-is-function" "^0.2.2"
+    "@stdlib/assert-is-plain-object" "^0.2.2"
+    "@stdlib/assert-is-string" "^0.2.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/fs-exists" "^0.2.2"
+    "@stdlib/process-cwd" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
+
+"@stdlib/math-base-assert-is-integer@^0.2.4", "@stdlib/math-base-assert-is-integer@^0.2.5":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@stdlib/math-base-assert-is-integer/-/math-base-assert-is-integer-0.2.5.tgz#fa30a62ee27a90bf5cf598f78d7c0de50b582413"
+  integrity sha512-Zi8N66GbWtSCR3OUsRdBknjNlX+aBN8w6CaVEP5+Jy/a7MgMYzevS52TNS5sm8jqzKBlFhZlPLex+Zl2GlPvSA==
   dependencies:
-    "@stdlib/math-base-special-floor" "^0.0.x"
+    "@stdlib/math-base-special-floor" "^0.2.3"
+    "@stdlib/utils-library-manifest" "^0.2.2"
 
-"@stdlib/math-base-assert-is-nan@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/math-base-assert-is-nan/-/math-base-assert-is-nan-0.0.8.tgz#0cd6a546ca1e758251f04898fc906f6fce9e0f80"
-  integrity sha512-m+gCVBxLFW8ZdAfdkATetYMvM7sPFoMKboacHjb1pe21jHQqVb+/4bhRSDg6S7HGX7/8/bSzEUm9zuF7vqK5rQ==
+"@stdlib/math-base-assert-is-nan@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/math-base-assert-is-nan/-/math-base-assert-is-nan-0.2.2.tgz#84289029340e0002a3795e640b7c46be3c3e1696"
+  integrity sha512-QVS8rpWdkR9YmHqiYLDVLsCiM+dASt/2feuTl4T/GSdou3Y/PS/4j/tuDvCDoHDNfDkULUW+FCVjKYpbyoeqBQ==
   dependencies:
-    "@stdlib/utils-library-manifest" "^0.0.x"
+    "@stdlib/utils-library-manifest" "^0.2.1"
 
-"@stdlib/math-base-napi-unary@^0.0.x":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@stdlib/math-base-napi-unary/-/math-base-napi-unary-0.0.9.tgz#3a70fa64128aca7011c5a477110d2682d06c8ea8"
-  integrity sha512-2WNKhjCygkGMp0RgjaD7wAHJTqPZmuVW7yPOc62Tnz2U+Ad8q/tcOcN+uvq2dtKsAGr1HDMIQxZ/XrrThMePyA==
+"@stdlib/math-base-napi-unary@^0.2.1":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@stdlib/math-base-napi-unary/-/math-base-napi-unary-0.2.3.tgz#57862685d6ce037aa927020d272e8d74cc243320"
+  integrity sha512-BCyJmpq2S8EFo2yMt1z+v1EL7nn8RHcM6jn7fa8n3BTP679K0MSlawIh3A0CFogfrTdjPM4G44VO1ddsdLExcg==
   dependencies:
-    "@stdlib/complex-float32" "^0.0.7"
-    "@stdlib/complex-float64" "^0.0.8"
-    "@stdlib/complex-reim" "^0.0.6"
-    "@stdlib/complex-reimf" "^0.0.1"
-    "@stdlib/utils-library-manifest" "^0.0.8"
+    "@stdlib/complex-float32-ctor" "^0.0.2"
+    "@stdlib/complex-float32-reim" "^0.1.1"
+    "@stdlib/complex-float64-ctor" "^0.0.3"
+    "@stdlib/complex-float64-reim" "^0.1.1"
+    "@stdlib/utils-library-manifest" "^0.2.2"
 
-"@stdlib/math-base-special-floor@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/math-base-special-floor/-/math-base-special-floor-0.0.8.tgz#c0bbde6f984aa132917a47c8bcc71b31ed0cbf26"
-  integrity sha512-VwpaiU0QhQKB8p+r9p9mNzhrjU5ZVBnUcLjKNCDADiGNvO5ACI/I+W++8kxBz5XSp5PAQhaFCH4MpRM1tSkd/w==
+"@stdlib/math-base-special-floor@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@stdlib/math-base-special-floor/-/math-base-special-floor-0.2.3.tgz#978f69d99f298e571cadf00d8d4b92111db4644d"
+  integrity sha512-zTkxVRawtWwJ4NmAT/1e+ZsIoBj1JqUquGOpiNVGNIKtyLOeCONZlZSbN7zuxPkshvmcSjpQ/VLKR8Tw/37E9A==
   dependencies:
-    "@stdlib/math-base-napi-unary" "^0.0.x"
-    "@stdlib/utils-library-manifest" "^0.0.x"
+    "@stdlib/math-base-napi-unary" "^0.2.1"
+    "@stdlib/utils-library-manifest" "^0.2.2"
 
-"@stdlib/number-ctor@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/number-ctor/-/number-ctor-0.0.7.tgz#e97a66664639c9853b6c80bc7a15f7d67a2fc991"
-  integrity sha512-kXNwKIfnb10Ro3RTclhAYqbE3DtIXax+qpu0z1/tZpI2vkmTfYDQLno2QJrzJsZZgdeFtXIws+edONN9kM34ow==
+"@stdlib/number-ctor@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/number-ctor/-/number-ctor-0.2.2.tgz#64f76c5b5e2adcde7f089e9fd6625881e35a6fb0"
+  integrity sha512-98pL4f1uiXVIw9uRV6t4xecMFUYRRTUoctsqDDV8MSRtKEYDzqkWCNz/auupJFJ135L1ejzkejh73fASsgcwKQ==
 
-"@stdlib/number-float64-base-to-float32@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/number-float64-base-to-float32/-/number-float64-base-to-float32-0.0.7.tgz#c7b82bb26cb7404017ede32cebe5864fd84c0e35"
-  integrity sha512-PNUSi6+cqfFiu4vgFljUKMFY2O9PxI6+T+vqtIoh8cflf+PjSGj3v4QIlstK9+6qU40eGR5SHZyLTWdzmNqLTQ==
+"@stdlib/number-float64-base-to-float32@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/number-float64-base-to-float32/-/number-float64-base-to-float32-0.2.2.tgz#5cb3bd9bf59fddd5747d50b5d54913178c562c3a"
+  integrity sha512-T5snDkVNZY6pomrSW/qLWQfZ9JHgqCFLi8jaaarfNj2o+5NMUuvvRifLUIacTm8/uC96xB0j3+wKTh1zbIV5ig==
   dependencies:
-    "@stdlib/array-float32" "^0.0.x"
+    "@stdlib/array-float32" "^0.2.1"
 
-"@stdlib/process-cwd@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/process-cwd/-/process-cwd-0.0.8.tgz#5eef63fb75ffb5fc819659d2f450fa3ee2aa10bf"
-  integrity sha512-GHINpJgSlKEo9ODDWTHp0/Zc/9C/qL92h5Mc0QlIFBXAoUjy6xT4FB2U16wCNZMG3eVOzt5+SjmCwvGH0Wbg3Q==
-  dependencies:
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
+"@stdlib/object-ctor@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@stdlib/object-ctor/-/object-ctor-0.2.1.tgz#a3e261cd65eecffcb03e2cc7472aa5058efba48f"
+  integrity sha512-HEIBBpfdQS9Nh5mmIqMk9fzedx6E0tayJrVa2FD7No86rVuq/Ikxq1QP7qNXm+i6z9iNUUS/lZq7BmJESWO/Zg==
 
-"@stdlib/process-read-stdin@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/process-read-stdin/-/process-read-stdin-0.0.7.tgz#684ad531759c6635715a67bdd8721fc249baa200"
-  integrity sha512-nep9QZ5iDGrRtrZM2+pYAvyCiYG4HfO0/9+19BiLJepjgYq4GKeumPAQo22+1xawYDL7Zu62uWzYszaVZcXuyw==
-  dependencies:
-    "@stdlib/assert-is-function" "^0.0.x"
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/buffer-ctor" "^0.0.x"
-    "@stdlib/buffer-from-string" "^0.0.x"
-    "@stdlib/streams-node-stdin" "^0.0.x"
-    "@stdlib/utils-next-tick" "^0.0.x"
+"@stdlib/process-cwd@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/process-cwd/-/process-cwd-0.2.2.tgz#228df717417c335da7eeda37b6cc2b90fc3205f1"
+  integrity sha512-8Q/nA/ud5d5PEzzG6ZtKzcOw+RMLm5CWR8Wd+zVO5vcPj+JD7IV7M2lBhbzfUzr63Torrf/vEhT3cob8vUHV/A==
 
-"@stdlib/regexp-eol@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/regexp-eol/-/regexp-eol-0.0.7.tgz#cf1667fdb5da1049c2c2f8d5c47dcbaede8650a4"
-  integrity sha512-BTMpRWrmlnf1XCdTxOrb8o6caO2lmu/c80XSyhYCi1DoizVIZnqxOaN5yUJNCr50g28vQ47PpsT3Yo7J3SdlRA==
+"@stdlib/regexp-extended-length-path@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/regexp-extended-length-path/-/regexp-extended-length-path-0.2.2.tgz#5ea1664bc07de520236f8ab8201b160c9d9bffcd"
+  integrity sha512-z3jqauEsaxpsQU3rj1A1QnOgu17pyW5kt+Az8QkoTk7wqNE8HhPikI6k4o7XBHV689rSFWZCl4c4W+7JAiNObQ==
   dependencies:
-    "@stdlib/assert-has-own-property" "^0.0.x"
-    "@stdlib/assert-is-boolean" "^0.0.x"
-    "@stdlib/assert-is-plain-object" "^0.0.x"
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/regexp-extended-length-path@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/regexp-extended-length-path/-/regexp-extended-length-path-0.0.7.tgz#7f76641c29895771e6249930e1863e7e137a62e0"
-  integrity sha512-z6uqzMWq3WPDKbl4MIZJoNA5ZsYLQI9G3j2TIvhU8X2hnhlku8p4mvK9F+QmoVvgPxKliwNnx/DAl7ltutSDKw==
+"@stdlib/regexp-function-name@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/regexp-function-name/-/regexp-function-name-0.2.2.tgz#e85e4e94eb382c9c8416b18ffe712c934c2b2b1f"
+  integrity sha512-0z/KRsgHJJ3UQkmBeLH+Nin0hXIeA+Fw1T+mnG2V5CHnTA6FKlpxJxWrvwLEsRX7mR/DNtDp06zGyzMFE/4kig==
   dependencies:
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/regexp-function-name@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/regexp-function-name/-/regexp-function-name-0.0.7.tgz#e8dc6c7fe9276f0a8b4bc7f630a9e32ba9f37250"
-  integrity sha512-MaiyFUUqkAUpUoz/9F6AMBuMQQfA9ssQfK16PugehLQh4ZtOXV1LhdY8e5Md7SuYl9IrvFVg1gSAVDysrv5ZMg==
+"@stdlib/regexp-regexp@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/regexp-regexp/-/regexp-regexp-0.2.2.tgz#624d7c64529016986ef1493b7db621766b1f74cd"
+  integrity sha512-LlWqVH7wou4rJ2vovmn8ZZf4Z5/sMYxGQkmUcURvdCDMSL4pt91uPMi9I2hLECcIYXLiKUD87VSR56Y5luaafg==
   dependencies:
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.2.2"
 
-"@stdlib/regexp-regexp@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/regexp-regexp/-/regexp-regexp-0.0.8.tgz#50221b52088cd427ef19fae6593977c1c3f77e87"
-  integrity sha512-S5PZICPd/XRcn1dncVojxIDzJsHtEleuJHHD7ji3o981uPHR7zI2Iy9a1eV2u7+ABeUswbI1Yuix6fXJfcwV1w==
-  dependencies:
-    "@stdlib/utils-define-nonenumerable-read-only-property" "^0.0.x"
+"@stdlib/string-base-format-interpolate@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/string-base-format-interpolate/-/string-base-format-interpolate-0.2.2.tgz#67c22f0ca93ccffd0eb7e1c7276e487b26e786c6"
+  integrity sha512-i9nU9rAB2+o/RR66TS9iQ8x+YzeUDL1SGiAo6GY3hP6Umz5Dx9Qp/v8T69gWVsb4a1YSclz5+YeCWaFgwvPjKA==
 
-"@stdlib/streams-node-stdin@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/streams-node-stdin/-/streams-node-stdin-0.0.7.tgz#65ff09a2140999702a1ad885e6505334d947428f"
-  integrity sha512-gg4lgrjuoG3V/L29wNs32uADMCqepIcmoOFHJCTAhVe0GtHDLybUVnLljaPfdvmpPZmTvmusPQtIcscbyWvAyg==
+"@stdlib/string-base-format-tokenize@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/string-base-format-tokenize/-/string-base-format-tokenize-0.2.2.tgz#3ef9e49f6619ce39d9ba8399c9f4f63b3199289a"
+  integrity sha512-kXq2015i+LJjqth5dN+hYnvJXBSzRm8w0ABWB5tYAsIuQTpQK+mSo2muM8JBEFEnqUHAwpUsu2qNTK/9o8lsJg==
 
-"@stdlib/string-base-format-interpolate@^0.0.x":
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/@stdlib/string-base-format-interpolate/-/string-base-format-interpolate-0.0.4.tgz#297eeb23c76f745dcbb3d9dbd24e316773944538"
-  integrity sha512-8FC8+/ey+P5hf1B50oXpXzRzoAgKI1rikpyKZ98Xmjd5rcbSq3NWYi8TqOF8mUHm9hVZ2CXWoNCtEe2wvMQPMg==
+"@stdlib/string-base-lowercase@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@stdlib/string-base-lowercase/-/string-base-lowercase-0.4.0.tgz#079b55c30be8f2ea5b63c7a24707852e63a8d1b8"
+  integrity sha512-IH35Z5e4T+S3b3SfYY39mUhrD2qvJVp4VS7Rn3+jgj4+C3syocuAPsJ8C4OQXWGfblX/N9ymizbpFBCiVvMW8w==
 
-"@stdlib/string-base-format-tokenize@^0.0.x":
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/@stdlib/string-base-format-tokenize/-/string-base-format-tokenize-0.0.4.tgz#c1fc612ee0c0de5516dbf083e88c11d14748c30e"
-  integrity sha512-+vMIkheqAhDeT/iF5hIQo95IMkt5IzC68eR3CxW1fhc48NMkKFE2UfN73ET8fmLuOanLo/5pO2E90c2G7PExow==
+"@stdlib/string-base-replace@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/string-base-replace/-/string-base-replace-0.2.2.tgz#d5f8967600d530b2b2938ba1a8c1b333b6be8c1f"
+  integrity sha512-Y4jZwRV4Uertw7AlA/lwaYl1HjTefSriN5+ztRcQQyDYmoVN3gzoVKLJ123HPiggZ89vROfC+sk/6AKvly+0CA==
 
-"@stdlib/string-format@^0.0.x":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@stdlib/string-format/-/string-format-0.0.3.tgz#e916a7be14d83c83716f5d30b1b1af94c4e105b9"
-  integrity sha512-1jiElUQXlI/tTkgRuzJi9jUz/EjrO9kzS8VWHD3g7gdc3ZpxlA5G9JrIiPXGw/qmZTi0H1pXl6KmX+xWQEQJAg==
+"@stdlib/string-format@^0.2.1", "@stdlib/string-format@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/string-format/-/string-format-0.2.2.tgz#5f2ac8cfb06e1b11be9ac8fc546075d0c77ec938"
+  integrity sha512-GUa50uxgMAtoItsxTbMmwkyhIwrCxCrsjzk3nAbLnt/1Kt1EWOWMwsALqZdD6K4V/xSJ4ns6PZur3W6w+vKk9g==
   dependencies:
-    "@stdlib/string-base-format-interpolate" "^0.0.x"
-    "@stdlib/string-base-format-tokenize" "^0.0.x"
+    "@stdlib/string-base-format-interpolate" "^0.2.1"
+    "@stdlib/string-base-format-tokenize" "^0.2.2"
 
-"@stdlib/string-lowercase@^0.0.x":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@stdlib/string-lowercase/-/string-lowercase-0.0.9.tgz#487361a10364bd0d9b5ee44f5cc654c7da79b66d"
-  integrity sha512-tXFFjbhIlDak4jbQyV1DhYiSTO8b1ozS2g/LELnsKUjIXECDKxGFyWYcz10KuyAWmFotHnCJdIm8/blm2CfDIA==
-  dependencies:
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
-    "@stdlib/process-read-stdin" "^0.0.x"
-    "@stdlib/streams-node-stdin" "^0.0.x"
-    "@stdlib/string-format" "^0.0.x"
-
-"@stdlib/string-replace@^0.0.x":
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/@stdlib/string-replace/-/string-replace-0.0.11.tgz#5e8790cdf4d9805ab78cc5798ab3d364dfbf5016"
-  integrity sha512-F0MY4f9mRE5MSKpAUfL4HLbJMCbG6iUTtHAWnNeAXIvUX1XYIw/eItkA58R9kNvnr1l5B08bavnjrgTJGIKFFQ==
-  dependencies:
-    "@stdlib/assert-is-function" "^0.0.x"
-    "@stdlib/assert-is-regexp" "^0.0.x"
-    "@stdlib/assert-is-regexp-string" "^0.0.x"
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
-    "@stdlib/process-read-stdin" "^0.0.x"
-    "@stdlib/regexp-eol" "^0.0.x"
-    "@stdlib/streams-node-stdin" "^0.0.x"
-    "@stdlib/string-format" "^0.0.x"
-    "@stdlib/utils-escape-regexp-string" "^0.0.x"
-    "@stdlib/utils-regexp-from-string" "^0.0.x"
-
-"@stdlib/types@^0.0.x":
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/@stdlib/types/-/types-0.0.14.tgz#02d3aab7a9bfaeb86e34ab749772ea22f7b2f7e0"
-  integrity sha512-AP3EI9/il/xkwUazcoY+SbjtxHRrheXgSbWZdEGD+rWpEgj6n2i63hp6hTOpAB5NipE0tJwinQlDGOuQ1lCaCw==
+"@stdlib/string-replace@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/string-replace/-/string-replace-0.2.2.tgz#c4a526abdec7ec031beeb87f98c4c9356fdce969"
+  integrity sha512-czNS5IU7sBuHjac45Y3VWUTsUoi82yc8JsMZrOMcjgSrEuDrVmA6sNJg7HC1DuSpdPjm/v9uUk102s1gIfk3Nw==
+  dependencies:
+    "@stdlib/assert-is-function" "^0.2.2"
+    "@stdlib/assert-is-regexp" "^0.2.2"
+    "@stdlib/assert-is-string" "^0.2.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-base-replace" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
+    "@stdlib/utils-escape-regexp-string" "^0.2.2"
+
+"@stdlib/symbol-ctor@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/symbol-ctor/-/symbol-ctor-0.2.2.tgz#07a1477df50d9c54f4b79f810a0f0667e52c24d6"
+  integrity sha512-XsmiTfHnTb9jSPf2SoK3O0wrNOXMxqzukvDvtzVur1XBKfim9+seaAS4akmV1H3+AroAXQWVtde885e1B6jz1w==
 
-"@stdlib/utils-constructor-name@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-constructor-name/-/utils-constructor-name-0.0.8.tgz#ef63d17466c555b58b348a0c1175cee6044b8848"
-  integrity sha512-GXpyNZwjN8u3tyYjL2GgGfrsxwvfogUC3gg7L7NRZ1i86B6xmgfnJUYHYOUnSfB+R531ET7NUZlK52GxL7P82Q==
+"@stdlib/utils-constructor-name@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-constructor-name/-/utils-constructor-name-0.2.2.tgz#3462fb107196d00698604aac32089353273c82a2"
+  integrity sha512-TBtO3MKDAf05ij5ajmyBCbpKKt0Lfahn5tu18gqds4PkFltgcw5tVZfSHY5DZ2HySJQ2GMMYjPW2Kbg6yPCSVg==
   dependencies:
-    "@stdlib/assert-is-buffer" "^0.0.x"
-    "@stdlib/regexp-function-name" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-is-buffer" "^0.2.1"
+    "@stdlib/regexp-function-name" "^0.2.2"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/utils-convert-path@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-convert-path/-/utils-convert-path-0.0.8.tgz#a959d02103eee462777d222584e72eceef8c223b"
-  integrity sha512-GNd8uIswrcJCctljMbmjtE4P4oOjhoUIfMvdkqfSrRLRY+ZqPB2xM+yI0MQFfUq/0Rnk/xtESlGSVLz9ZDtXfA==
-  dependencies:
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-read-file" "^0.0.x"
-    "@stdlib/process-read-stdin" "^0.0.x"
-    "@stdlib/regexp-eol" "^0.0.x"
-    "@stdlib/regexp-extended-length-path" "^0.0.x"
-    "@stdlib/streams-node-stdin" "^0.0.x"
-    "@stdlib/string-lowercase" "^0.0.x"
-    "@stdlib/string-replace" "^0.0.x"
-
-"@stdlib/utils-copy@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-copy/-/utils-copy-0.0.7.tgz#e2c59993a0833e20ccedd8efaf9081043bd61d76"
-  integrity sha512-nGwWpKOwKw5JnY4caefhZtOglopK6vLlJiqKAjSLK0jz7g5ziyOZAc3ps1E6U5z+xtVhWaXa3VxiG42v9U/TSA==
-  dependencies:
-    "@stdlib/array-float32" "^0.0.x"
-    "@stdlib/array-float64" "^0.0.x"
-    "@stdlib/array-int16" "^0.0.x"
-    "@stdlib/array-int32" "^0.0.x"
-    "@stdlib/array-int8" "^0.0.x"
-    "@stdlib/array-uint16" "^0.0.x"
-    "@stdlib/array-uint32" "^0.0.x"
-    "@stdlib/array-uint8" "^0.0.x"
-    "@stdlib/array-uint8c" "^0.0.x"
-    "@stdlib/assert-has-own-property" "^0.0.x"
-    "@stdlib/assert-is-array" "^0.0.x"
-    "@stdlib/assert-is-buffer" "^0.0.x"
-    "@stdlib/assert-is-error" "^0.0.x"
-    "@stdlib/assert-is-nonnegative-integer" "^0.0.x"
-    "@stdlib/buffer-from-buffer" "^0.0.x"
-    "@stdlib/constants-float64-pinf" "^0.0.x"
-    "@stdlib/utils-define-property" "^0.0.x"
-    "@stdlib/utils-get-prototype-of" "^0.0.x"
-    "@stdlib/utils-index-of" "^0.0.x"
-    "@stdlib/utils-keys" "^0.0.x"
-    "@stdlib/utils-property-descriptor" "^0.0.x"
-    "@stdlib/utils-property-names" "^0.0.x"
-    "@stdlib/utils-regexp-from-string" "^0.0.x"
-    "@stdlib/utils-type-of" "^0.0.x"
-
-"@stdlib/utils-define-nonenumerable-read-only-property@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-define-nonenumerable-read-only-property/-/utils-define-nonenumerable-read-only-property-0.0.7.tgz#ee74540c07bfc3d997ef6f8a1b2df267ea0c07ca"
-  integrity sha512-c7dnHDYuS4Xn3XBRWIQBPcROTtP/4lkcFyq0FrQzjXUjimfMgHF7cuFIIob6qUTnU8SOzY9p0ydRR2QJreWE6g==
+"@stdlib/utils-convert-path@^0.2.1":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-convert-path/-/utils-convert-path-0.2.2.tgz#7ffcd09a4f2384e0421a4154e31fe520ee0a62b7"
+  integrity sha512-8nNuAgt23Np9NssjShUrPK42c6gRTweGuoQw+yTpTfBR9VQv8WFyt048n8gRGUlAHizrdMNpEY9VAb7IBzpVYw==
   dependencies:
-    "@stdlib/types" "^0.0.x"
-    "@stdlib/utils-define-property" "^0.0.x"
+    "@stdlib/assert-is-string" "^0.2.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/regexp-extended-length-path" "^0.2.2"
+    "@stdlib/string-base-lowercase" "^0.4.0"
+    "@stdlib/string-format" "^0.2.2"
+    "@stdlib/string-replace" "^0.2.1"
 
-"@stdlib/utils-define-property@^0.0.x":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-define-property/-/utils-define-property-0.0.9.tgz#2f40ad66e28099714e3774f3585db80b13816e76"
-  integrity sha512-pIzVvHJvVfU/Lt45WwUAcodlvSPDDSD4pIPc9WmIYi4vnEBA9U7yHtiNz2aTvfGmBMTaLYTVVFIXwkFp+QotMA==
+"@stdlib/utils-copy@^0.2.0":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-copy/-/utils-copy-0.2.2.tgz#d7359e59de632a0dd1a315feb0ccff7e0c96e42a"
+  integrity sha512-DM8O5tgOHHyhaERDJKa/ThDhIewDyo5SxoFJnmxSriAlJsV9uAmzF8rm7vY969TPRACb+Uxj2GXUoYlmUcHTmA==
+  dependencies:
+    "@stdlib/array-float32" "^0.2.2"
+    "@stdlib/array-float64" "^0.2.2"
+    "@stdlib/array-int16" "^0.2.2"
+    "@stdlib/array-int32" "^0.2.2"
+    "@stdlib/array-int8" "^0.2.2"
+    "@stdlib/array-uint16" "^0.2.2"
+    "@stdlib/array-uint32" "^0.2.2"
+    "@stdlib/array-uint8" "^0.2.2"
+    "@stdlib/array-uint8c" "^0.2.2"
+    "@stdlib/assert-has-own-property" "^0.2.2"
+    "@stdlib/assert-is-array" "^0.2.2"
+    "@stdlib/assert-is-buffer" "^0.2.2"
+    "@stdlib/assert-is-error" "^0.2.2"
+    "@stdlib/assert-is-nonnegative-integer" "^0.2.2"
+    "@stdlib/buffer-from-buffer" "^0.2.2"
+    "@stdlib/constants-float64-pinf" "^0.2.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
+    "@stdlib/utils-define-property" "^0.2.4"
+    "@stdlib/utils-get-prototype-of" "^0.2.2"
+    "@stdlib/utils-index-of" "^0.2.2"
+    "@stdlib/utils-keys" "^0.2.2"
+    "@stdlib/utils-property-descriptor" "^0.2.2"
+    "@stdlib/utils-property-names" "^0.2.2"
+    "@stdlib/utils-regexp-from-string" "^0.2.2"
+    "@stdlib/utils-type-of" "^0.2.2"
+
+"@stdlib/utils-define-nonenumerable-read-only-property@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-define-nonenumerable-read-only-property/-/utils-define-nonenumerable-read-only-property-0.2.2.tgz#80be97888609d1e471d20812cc5ba83a01f92e88"
+  integrity sha512-V3mpAesJemLYDKG376CsmoczWPE/4LKsp8xBvUxCt5CLNAx3J/1W39iZQyA5q6nY1RStGinGn1/dYZwa8ig0Uw==
   dependencies:
-    "@stdlib/types" "^0.0.x"
+    "@stdlib/utils-define-property" "^0.2.3"
 
-"@stdlib/utils-escape-regexp-string@^0.0.x":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-escape-regexp-string/-/utils-escape-regexp-string-0.0.9.tgz#36f25d78b2899384ca6c97f4064a8b48edfedb6e"
-  integrity sha512-E+9+UDzf2mlMLgb+zYrrPy2FpzbXh189dzBJY6OG+XZqEJAXcjWs7DURO5oGffkG39EG5KXeaQwDXUavcMDCIw==
+"@stdlib/utils-define-property@^0.2.3", "@stdlib/utils-define-property@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-define-property/-/utils-define-property-0.2.4.tgz#a8b6e120c829ee99ed81cf0111bb4c76ef85da9e"
+  integrity sha512-XlMdz7xwuw/sqXc9LbsV8XunCzZXjbZPC+OAdf4t4PBw4ZRwGzlTI6WED+f4PYR5Tp9F1cHgLPyMYCIBfA2zRg==
   dependencies:
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/string-format" "^0.0.x"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.1"
+    "@stdlib/string-format" "^0.2.1"
 
-"@stdlib/utils-get-prototype-of@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-get-prototype-of/-/utils-get-prototype-of-0.0.7.tgz#f677132bcbc0ec89373376637148d364435918df"
-  integrity sha512-fCUk9lrBO2ELrq+/OPJws1/hquI4FtwG0SzVRH6UJmJfwb1zoEFnjcwyDAy+HWNVmo3xeRLsrz6XjHrJwer9pg==
+"@stdlib/utils-escape-regexp-string@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-escape-regexp-string/-/utils-escape-regexp-string-0.2.2.tgz#dd407c9324c1da4fa7b25e5c862502e8dc6d61ab"
+  integrity sha512-areCibzgpmvm6pGKBg+mXkSDJW4NxtS5jcAT7RtunGMdAYhA/I5whISMPaeJkIT2XhjjFkjKBaIs5pF6aPr4fQ==
   dependencies:
-    "@stdlib/assert-is-function" "^0.0.x"
-    "@stdlib/utils-native-class" "^0.0.x"
+    "@stdlib/assert-is-string" "^0.2.1"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
 
-"@stdlib/utils-global@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-global/-/utils-global-0.0.7.tgz#0d99dcd11b72ad10b97dfb43536ff50436db6fb4"
-  integrity sha512-BBNYBdDUz1X8Lhfw9nnnXczMv9GztzGpQ88J/6hnY7PHJ71av5d41YlijWeM9dhvWjnH9I7HNE3LL7R07yw0kA==
+"@stdlib/utils-get-prototype-of@^0.2.1", "@stdlib/utils-get-prototype-of@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-get-prototype-of/-/utils-get-prototype-of-0.2.2.tgz#a65def101deece8d81f3bbf892ababe4d61114bb"
+  integrity sha512-eDb1BAvt7GW/jduBkfuQrUsA9p09mV8RW20g0DWPaxci6ORYg/UB0tdbAA23aZz2QUoxdYY5s/UJxlq/GHwoKQ==
   dependencies:
-    "@stdlib/assert-is-boolean" "^0.0.x"
+    "@stdlib/assert-is-function" "^0.2.1"
+    "@stdlib/object-ctor" "^0.2.1"
+    "@stdlib/utils-native-class" "^0.2.1"
 
-"@stdlib/utils-index-of@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-index-of/-/utils-index-of-0.0.8.tgz#e0cebb11e76b017b9c8bd38e4482e5336392306c"
-  integrity sha512-tz8pL9CgEYp73xWp0hQIR5vLjvM0jnoX5cCpRjn7SHzgDb4/fkpfJX4c0HznK+cCA35jvVVNhM2J0M4Y0IPg2A==
+"@stdlib/utils-global@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-global/-/utils-global-0.2.2.tgz#61f875ef4ed74a091ed841127262961edef2d973"
+  integrity sha512-A4E8VFHn+1bpfJ4PA8H2b62CMQpjv2A+H3QDEBrouLFWne0wrx0TNq8vH6VYHxx9ZRxhgWQjfHiSAxtUJobrbQ==
   dependencies:
-    "@stdlib/assert-is-collection" "^0.0.x"
-    "@stdlib/assert-is-integer" "^0.0.x"
-    "@stdlib/assert-is-nan" "^0.0.x"
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/types" "^0.0.x"
+    "@stdlib/assert-is-boolean" "^0.2.1"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
 
-"@stdlib/utils-keys@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-keys/-/utils-keys-0.0.7.tgz#7e1545ed728b0f4de31f7b8475307ab36ff7ced1"
-  integrity sha512-9qzmetloJ0A6iO71n3f9F4cAs/Hq0E7bYHlYNnXwS03wmwI97x3QSzWVoL5o0qpluQVidSQIxeNXPHNEvEa04A==
-  dependencies:
-    "@stdlib/assert-has-own-property" "^0.0.x"
-    "@stdlib/assert-is-arguments" "^0.0.x"
-    "@stdlib/assert-is-enumerable-property" "^0.0.x"
-    "@stdlib/assert-is-object-like" "^0.0.x"
-    "@stdlib/utils-index-of" "^0.0.x"
-    "@stdlib/utils-noop" "^0.0.x"
-    "@stdlib/utils-type-of" "^0.0.x"
-
-"@stdlib/utils-library-manifest@^0.0.8", "@stdlib/utils-library-manifest@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-library-manifest/-/utils-library-manifest-0.0.8.tgz#61d3ed283e82c8f14b7f952d82cfb8e47d036825"
-  integrity sha512-IOQSp8skSRQn9wOyMRUX9Hi0j/P5v5TvD8DJWTqtE8Lhr8kVVluMBjHfvheoeKHxfWAbNHSVpkpFY/Bdh/SHgQ==
+"@stdlib/utils-index-of@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-index-of/-/utils-index-of-0.2.2.tgz#9c60f95bb480dbe5a5107daaf6b12d61da69dc89"
+  integrity sha512-yVnjPk3Arzf3no+Ju5ys4ZVG4aKHA8xV4g53Ni+FO8c0AStKq9F8O+E/aFxluCKqLz6jGLaLea7996e0Hcw9mQ==
+  dependencies:
+    "@stdlib/assert-is-collection" "^0.2.1"
+    "@stdlib/assert-is-integer" "^0.2.2"
+    "@stdlib/assert-is-nan" "^0.2.2"
+    "@stdlib/assert-is-string" "^0.2.2"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
+
+"@stdlib/utils-keys@^0.2.1", "@stdlib/utils-keys@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-keys/-/utils-keys-0.2.2.tgz#efdd5b14370468d146bb4fdd3819caa0f76699e0"
+  integrity sha512-mvmvhpewElNalx5YotZ/jI57CiYHc9y6N8SGxJiOUs04NkWMkW8rnXRvJEi0rPj2BOIJReEGZ1WaZpdL68DUcQ==
+  dependencies:
+    "@stdlib/assert-has-own-property" "^0.2.2"
+    "@stdlib/assert-is-arguments" "^0.2.1"
+    "@stdlib/assert-is-enumerable-property" "^0.2.2"
+    "@stdlib/assert-is-object-like" "^0.2.2"
+    "@stdlib/utils-index-of" "^0.2.2"
+    "@stdlib/utils-noop" "^0.2.2"
+    "@stdlib/utils-type-of" "^0.2.2"
+
+"@stdlib/utils-library-manifest@^0.2.1", "@stdlib/utils-library-manifest@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-library-manifest/-/utils-library-manifest-0.2.2.tgz#1908504dbdbb665a8b72ff40c4f426afefbd7fd2"
+  integrity sha512-YqzVLuBsB4wTqzdUtRArAjBJoT3x61iop2jFChXexhl6ejV3vDpHcukEEkqIOcJKut+1cG5TLJdexgHNt1C0NA==
   dependencies:
-    "@stdlib/cli-ctor" "^0.0.x"
-    "@stdlib/fs-resolve-parent-path" "^0.0.x"
-    "@stdlib/utils-convert-path" "^0.0.x"
+    "@stdlib/fs-resolve-parent-path" "^0.2.1"
+    "@stdlib/utils-convert-path" "^0.2.1"
     debug "^2.6.9"
     resolve "^1.1.7"
 
-"@stdlib/utils-native-class@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-native-class/-/utils-native-class-0.0.8.tgz#2e79de97f85d88a2bb5baa7a4528add71448d2be"
-  integrity sha512-0Zl9me2V9rSrBw/N8o8/9XjmPUy8zEeoMM0sJmH3N6C9StDsYTjXIAMPGzYhMEWaWHvGeYyNteFK2yDOVGtC3w==
+"@stdlib/utils-native-class@^0.2.1", "@stdlib/utils-native-class@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-native-class/-/utils-native-class-0.2.2.tgz#dbb00a84e8c583cdd1bc40b163f1786dc44c4f09"
+  integrity sha512-cSn/FozbEpfR/FlJAoceQtZ8yUJFhZ8RFkbEsxW/7+H4o09yln3lBS0HSfUJISYNtpTNN/2/Fup88vmvwspvwA==
   dependencies:
-    "@stdlib/assert-has-own-property" "^0.0.x"
-    "@stdlib/assert-has-tostringtag-support" "^0.0.x"
-
-"@stdlib/utils-next-tick@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-next-tick/-/utils-next-tick-0.0.8.tgz#72345745ec3b3aa2cedda056338ed95daae9388c"
-  integrity sha512-l+hPl7+CgLPxk/gcWOXRxX/lNyfqcFCqhzzV/ZMvFCYLY/wI9lcWO4xTQNMALY2rp+kiV+qiAiO9zcO+hewwUg==
+    "@stdlib/assert-has-own-property" "^0.2.1"
+    "@stdlib/assert-has-tostringtag-support" "^0.2.2"
+    "@stdlib/symbol-ctor" "^0.2.2"
 
-"@stdlib/utils-noop@^0.0.x":
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-noop/-/utils-noop-0.0.14.tgz#8a2077fae0877c4c9e4c5f72f3c9284ca109d4c3"
-  integrity sha512-A5faFEUfszMgd93RCyB+aWb62hQxgP+dZ/l9rIOwNWbIrCYNwSuL4z50lNJuatnwwU4BQ4EjQr+AmBsnvuLcyQ==
+"@stdlib/utils-noop@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-noop/-/utils-noop-0.2.2.tgz#527404ec9875f5e45ec295810bc462a32e3ce4d2"
+  integrity sha512-QlHCBCExrFlNFFqDBOvxPeHkvAuMBHsbQYWRjSG2FD6QumEDn9EqBAcJZNr+xYdkw/6SVRJ0ySTyroReg5vcAA==
 
-"@stdlib/utils-property-descriptor@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-property-descriptor/-/utils-property-descriptor-0.0.7.tgz#f9ea361ad29f5d398c5b6716bb1788c18d0b55be"
-  integrity sha512-pi72eRantil7+5iyIwvB7gg3feI1ox8T6kbHoZCgHKwFdr9Bjp6lBHPzfiHBHgQQ0n54sU8EDmrVlLFmmG/qSg==
+"@stdlib/utils-property-descriptor@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-property-descriptor/-/utils-property-descriptor-0.2.2.tgz#88d9b55c0a17d22ccd50ad9fbf47544a7b4a1c9a"
+  integrity sha512-iq0jFOOX5OmaOC1uyO8POjWPPA6GxbFFcDzH4QsyhKWN2P5ZDvnKMRfH6TuMmaLEA5vSzeNwGfcBPQMRBRphUg==
   dependencies:
-    "@stdlib/assert-has-own-property" "^0.0.x"
+    "@stdlib/assert-has-own-property" "^0.2.1"
 
-"@stdlib/utils-property-names@^0.0.x":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-property-names/-/utils-property-names-0.0.7.tgz#1f67de736278d53a2dce7f5e8425c7f4a5435a27"
-  integrity sha512-Yr3z9eO6olGiEEcaR3lHAhB7FCT0RUB+u3FyExwOhyT3PXoH0CJwWHuzpNpVVxpp57JDhvKIhNqHHyqZI8n42w==
+"@stdlib/utils-property-names@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-property-names/-/utils-property-names-0.2.2.tgz#a24852878f8c7b1d8bfa9288b14f720fac67bf1b"
+  integrity sha512-LlHK467gOxvD6T5yzSy/DnDPzeG00Qj1lrowapAOP7HbGMPvs3RI8Re32IqUke5OE698jXW3tL0VDu6yLi2e1A==
   dependencies:
-    "@stdlib/utils-keys" "^0.0.x"
+    "@stdlib/object-ctor" "^0.2.1"
+    "@stdlib/utils-keys" "^0.2.1"
 
-"@stdlib/utils-regexp-from-string@^0.0.x":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-regexp-from-string/-/utils-regexp-from-string-0.0.9.tgz#fe4745a9a000157b365971c513fd7d4b2cb9ad6e"
-  integrity sha512-3rN0Mcyiarl7V6dXRjFAUMacRwe0/sYX7ThKYurf0mZkMW9tjTP+ygak9xmL9AL0QQZtbrFFwWBrDO+38Vnavw==
+"@stdlib/utils-regexp-from-string@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-regexp-from-string/-/utils-regexp-from-string-0.2.2.tgz#0eeac962b9e43f8587b5eaf25a235f4380976fdb"
+  integrity sha512-xvyX44wYAn7DUSTwfIdzohFFo2J+kkzZf1I3cQZr09k8364/1x2Ro7bhPVXX/fEUJ1LbbPF3PAcGa44cvN8Nzg==
   dependencies:
-    "@stdlib/assert-is-string" "^0.0.x"
-    "@stdlib/regexp-regexp" "^0.0.x"
-    "@stdlib/string-format" "^0.0.x"
+    "@stdlib/assert-is-string" "^0.2.1"
+    "@stdlib/error-tools-fmtprodmsg" "^0.2.2"
+    "@stdlib/regexp-regexp" "^0.2.2"
+    "@stdlib/string-format" "^0.2.2"
 
-"@stdlib/utils-type-of@^0.0.x":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@stdlib/utils-type-of/-/utils-type-of-0.0.8.tgz#c62ed3fcf629471fe80d83f44c4e325860109cbe"
-  integrity sha512-b4xqdy3AnnB7NdmBBpoiI67X4vIRxvirjg3a8BfhM5jPr2k0njby1jAbG9dUxJvgAV6o32S4kjUgfIdjEYpTNQ==
+"@stdlib/utils-type-of@^0.2.1", "@stdlib/utils-type-of@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@stdlib/utils-type-of/-/utils-type-of-0.2.2.tgz#517de513c043d7c0a48743593be41f67f0d51a9f"
+  integrity sha512-RLGFxPNgY9AtVVrFGdKO6Y3pOd/Ov2WA4O2/czZN/AbgYzbPdoF0KkfvHRIney6k+TtvoyYB8YqZXJ4G88f9BQ==
   dependencies:
-    "@stdlib/utils-constructor-name" "^0.0.x"
-    "@stdlib/utils-global" "^0.0.x"
+    "@stdlib/utils-constructor-name" "^0.2.1"
+    "@stdlib/utils-global" "^0.2.2"
 
-"@storybook/addon-actions@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.4.0.tgz#709988f46422b85b3672d2e6f90bf623af59faa9"
-  integrity sha512-0lHLLUlrGE7CBFrfmAXrBKu7fUIsiQlnNekuE3cIAjSgVR481bJEzYHUUoMATqpPC4GGErBdP1CZxVDDwWV8jA==
+"@storybook/addon-actions@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.6.20.tgz#4264d1fba6e889f28f717ebb23c55b7d774a2f60"
+  integrity sha512-c/GkEQ2U9BC/Ew/IMdh+zvsh4N6y6n7Zsn2GIhJgcu9YEAa5aF2a9/pNgEGBMOABH959XE8DAOMERw/5qiLR8g==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-events" "7.4.0"
+    "@storybook/core-events" "7.6.20"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@types/uuid" "^9.0.1"
     dequal "^2.0.2"
-    lodash "^4.17.21"
     polished "^4.2.2"
-    prop-types "^15.7.2"
-    react-inspector "^6.0.0"
-    telejson "^7.2.0"
-    ts-dedent "^2.0.0"
     uuid "^9.0.0"
 
-"@storybook/addon-backgrounds@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.4.0.tgz#7d3048329b8ef73145a2e9b435b7b35004a65f86"
-  integrity sha512-cEO/Tp/eRE+5bf1FGN4wKLqLDBv3EYp9enJyXV7B3cFdciqtoE7VJPZuFZkzjJN1rRcOKSZp8g5agsx+x9uNGQ==
+"@storybook/addon-backgrounds@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.20.tgz#a84758c07b236181f2d67966a7c159d0b3bc1abb"
+  integrity sha512-a7ukoaXT42vpKsMxkseIeO3GqL0Zst2IxpCTq5dSlXiADrcemSF/8/oNpNW9C4L6F1Zdt+WDtECXslEm017FvQ==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-events" "7.4.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
     memoizerific "^1.11.3"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-controls@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.4.0.tgz#b212d60fd74d69f6b63c53e4d52ab6c77ee51247"
-  integrity sha512-tYDfqpTR+c9y4kElmr3aWNHPot6kYd+nruYb697LpkCdy4lFErqSo0mhvPyZfMZp2KEajfp6YJAurhQWbvbj/A==
-  dependencies:
-    "@storybook/blocks" "7.4.0"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
+"@storybook/addon-controls@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.6.20.tgz#5487064259a71f10b0aab04a4b7745ecf948e4cc"
+  integrity sha512-06ZT5Ce1sZW52B0s6XuokwjkKO9GqHlTUHvuflvd8wifxKlCmRvNUxjBvwh+ccGJ49ZS73LbMSLFgtmBEkCxbg==
+  dependencies:
+    "@storybook/blocks" "7.6.20"
     lodash "^4.17.21"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-docs@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.4.0.tgz#e07233c264eaec149a0fcca0e27c586d4e80b403"
-  integrity sha512-LJE92LUeVTgi8W4tLBEbSvCqF54snmBfTFCr46vhCFov2CE2VBgEvIX1XT3dfUgYUOtPu3RXR2C89fYgU6VYZw==
+"@storybook/addon-docs@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.6.20.tgz#0bff85bdbdca58c9535384a4ded69dadb2fe7e4e"
+  integrity sha512-XNfYRhbxH5JP7B9Lh4W06PtMefNXkfpV39Gaoih5HuqngV3eoSL4RikZYOMkvxRGQ738xc6axySU3+JKcP1OZg==
   dependencies:
     "@jest/transform" "^29.3.1"
     "@mdx-js/react" "^2.1.5"
-    "@storybook/blocks" "7.4.0"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/csf-plugin" "7.4.0"
-    "@storybook/csf-tools" "7.4.0"
+    "@storybook/blocks" "7.6.20"
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/components" "7.6.20"
+    "@storybook/csf-plugin" "7.6.20"
+    "@storybook/csf-tools" "7.6.20"
     "@storybook/global" "^5.0.0"
     "@storybook/mdx2-csf" "^1.0.0"
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/postinstall" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/react-dom-shim" "7.4.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/node-logger" "7.6.20"
+    "@storybook/postinstall" "7.6.20"
+    "@storybook/preview-api" "7.6.20"
+    "@storybook/react-dom-shim" "7.6.20"
+    "@storybook/theming" "7.6.20"
+    "@storybook/types" "7.6.20"
     fs-extra "^11.1.0"
     remark-external-links "^8.0.0"
     remark-slug "^6.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-essentials@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.4.0.tgz#b5d19c60233e5bd5e1a29b76b51059c889f18d52"
-  integrity sha512-nZmNM9AKw2JXxnYUXyFKLeUF/cL7Z9E1WTeZyOFTDtU2aITRt8+LvaepwjchtPqu2B0GcQxLB5FRDdhy0I19nw==
-  dependencies:
-    "@storybook/addon-actions" "7.4.0"
-    "@storybook/addon-backgrounds" "7.4.0"
-    "@storybook/addon-controls" "7.4.0"
-    "@storybook/addon-docs" "7.4.0"
-    "@storybook/addon-highlight" "7.4.0"
-    "@storybook/addon-measure" "7.4.0"
-    "@storybook/addon-outline" "7.4.0"
-    "@storybook/addon-toolbars" "7.4.0"
-    "@storybook/addon-viewport" "7.4.0"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
+"@storybook/addon-essentials@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.6.20.tgz#149c22b51a7abd8977acaaf2e1941c5b5dcb2fd5"
+  integrity sha512-hCupSOiJDeOxJKZSgH0x5Mb2Xqii6mps21g5hpxac1XjhQtmGflShxi/xOHhK3sNqrbgTSbScfpUP3hUlZO/2Q==
+  dependencies:
+    "@storybook/addon-actions" "7.6.20"
+    "@storybook/addon-backgrounds" "7.6.20"
+    "@storybook/addon-controls" "7.6.20"
+    "@storybook/addon-docs" "7.6.20"
+    "@storybook/addon-highlight" "7.6.20"
+    "@storybook/addon-measure" "7.6.20"
+    "@storybook/addon-outline" "7.6.20"
+    "@storybook/addon-toolbars" "7.6.20"
+    "@storybook/addon-viewport" "7.6.20"
+    "@storybook/core-common" "7.6.20"
+    "@storybook/manager-api" "7.6.20"
+    "@storybook/node-logger" "7.6.20"
+    "@storybook/preview-api" "7.6.20"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-highlight@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.4.0.tgz#ea33826a7f610f5e76cfa59ff22283e01cfd76cd"
-  integrity sha512-kpYSb3oXI9t/1+aRJhToDZ0/1W4mu+SzTBfv9Bl2d/DogEkFzgJricoy5LtvS5EpcXUmKO1FJsw/DCm9buSL2g==
+"@storybook/addon-highlight@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.6.20.tgz#d118e4cce549238d866bbbe4d49b9509afda01a7"
+  integrity sha512-7/x7xFdFyqCki5Dm3uBePldUs9l98/WxJ7rTHQuYqlX7kASwyN5iXPzuhmMRUhlMm/6G6xXtLabIpzwf1sFurA==
   dependencies:
-    "@storybook/core-events" "7.4.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.4.0"
 
-"@storybook/addon-interactions@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-7.4.0.tgz#d0c15303999ac1e8f33705146e9a0a6db6df339c"
-  integrity sha512-nEWP+Ib0Y/ShXfpCm40FBTbBy1/MT8XxTEAhcNN+3ZJ07Vhhkrb8GMlWHTKQv2PyghEVBYEoPFHhElUJQOe00g==
+"@storybook/addon-interactions@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-7.6.20.tgz#9471575cb3699d12a7011299ce6bca1cb8aea252"
+  integrity sha512-uH+OIxLtvfnnmdN3Uf8MwzfEFYtaqSA6Hir6QNPc643se0RymM8mULN0rzRyvspwd6OagWdtOxsws3aHk02KTA==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/core-events" "7.4.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/instrumenter" "7.4.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/types" "7.6.20"
     jest-mock "^27.0.6"
     polished "^4.2.2"
     ts-dedent "^2.2.0"
 
-"@storybook/addon-links@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-7.4.0.tgz#f10ba388143d0de75150a27e94241d5fb4dfba7e"
-  integrity sha512-lFj8fiokWKk3jx5YUQ4anQo1uCNDMP1y6nJ/92Y85vnOd1vJr3w4GlLy8eOWMABRE33AKLI5Yp6wcpWZDe7hhQ==
+"@storybook/addon-links@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-7.6.20.tgz#c6bedc7bdc0112ce4cb3f1bfc701445df696598d"
+  integrity sha512-iomSnBD90CA4MinesYiJkFX2kb3P1Psd/a1Y0ghlFEsHD4uMId9iT6sx2s16DYMja0SlPkrbWYnGukqaCjZpRw==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/csf" "^0.1.0"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/router" "7.4.0"
-    "@storybook/types" "7.4.0"
-    prop-types "^15.7.2"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-measure@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.4.0.tgz#61bc0d0af5af8c22e81b70e1690b2f58262944cd"
-  integrity sha512-8YjBqm6jPOBgkRn9YnJkLN0+ghgJiukdHOa0VB3qhiT+oww4ZOZ7mc2aQRwXQoFb05UbVVG9UNxE7lhyTyaG2w==
+"@storybook/addon-measure@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.6.20.tgz#c764009ce3e980b5b67e462ad0de5986c38cdfab"
+  integrity sha512-i2Iq08bGfI7gZbG6Lb8uF/L287tnaGUR+2KFEmdBjH6+kgjWLiwfpanoPQpy4drm23ar0gUjX+L3Ri03VI5/Xg==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-events" "7.4.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/types" "7.4.0"
     tiny-invariant "^1.3.1"
 
-"@storybook/addon-outline@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.4.0.tgz#63fef45815f209a3ad7ac2b3765f0734093af668"
-  integrity sha512-CCAWFC3bfkmYPzFjOemfH/kjpqJOHt+SdJgBKmwujDy+zum0DHlUL/7rd+U32cEpezCA8bapd0hlWn59C4agHQ==
+"@storybook/addon-outline@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.6.20.tgz#0ebe829b6d8d269f691a110f3b34884b1df8ee74"
+  integrity sha512-TdsIQZf/TcDsGoZ1XpO+9nBc4OKqcMIzY4SrI8Wj9dzyFLQ37s08gnZr9POci8AEv62NTUOVavsxcafllkzqDQ==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-events" "7.4.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/types" "7.4.0"
     ts-dedent "^2.0.0"
 
 "@storybook/addon-styling@1.3.7":
@@ -6601,31 +6366,17 @@
     sass-loader "^13.2.2"
     style-loader "^3.3.2"
 
-"@storybook/addon-toolbars@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.4.0.tgz#db1a3bc1d6e6aa0142b62aaf8c44d5a9f82fd6b7"
-  integrity sha512-00PDLchlQXI3ZClQHU0YQBfikAAxHOhVNv2QKW54yFKmxPl+P2c/VIeir9LcPhA04smKrJTD1u+Nszd66A9xAA==
-  dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/theming" "7.4.0"
-
-"@storybook/addon-viewport@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.4.0.tgz#a9bc167b822d31491cec6aad21cc0a420f1ae5b7"
-  integrity sha512-Bfoilf9eJV/C7tR8XHDxz3h8JlZ+iggoESp2Tc0bW9tlRvz+PsCqeyHhF/IgHY+gLnPal2PkK/PIM+ruO45HXA==
-  dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/theming" "7.4.0"
+"@storybook/addon-toolbars@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.6.20.tgz#c1cd31c6a8f98d3ec4853157134ca143d065d31a"
+  integrity sha512-5Btg4i8ffWTDHsU72cqxC8nIv9N3E3ObJAc6k0llrmPBG/ybh3jxmRfs8fNm44LlEXaZ5qrK/petsXX3UbpIFg==
+
+"@storybook/addon-viewport@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.6.20.tgz#882571f4b0f405e1cf2cfad9a1f74b30d22f9a93"
+  integrity sha512-i8mIw8BjLWAVHEQsOTE6UPuEGQvJDpsu1XZnOCkpfTfPMz73m+3td/PmLG7mMT2wPnLu9IZncKLCKTAZRbt/YQ==
+  dependencies:
     memoizerific "^1.11.3"
-    prop-types "^15.7.2"
 
 "@storybook/api@^7.0.12":
   version "7.0.20"
@@ -6635,22 +6386,22 @@
     "@storybook/client-logger" "7.0.20"
     "@storybook/manager-api" "7.0.20"
 
-"@storybook/blocks@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.4.0.tgz#6a9240e2b58bac99a998c559d719be7ff4e19dcc"
-  integrity sha512-YQznNjJm+l32fCfPxrZso9+MbcyG0pWZSpx3RKI1+pxDMsAs4mbXsIw4//jKfjoDP/6/Cz/FJcSx8LT7i4BJ2w==
-  dependencies:
-    "@storybook/channels" "7.4.0"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/components" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/docs-tools" "7.4.0"
+"@storybook/blocks@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.6.20.tgz#1cc142f1c238616f0f3a9f900965c651e7ee7c52"
+  integrity sha512-xADKGEOJWkG0UD5jbY4mBXRlmj2C+CIupDL0/hpzvLvwobxBMFPKZIkcZIMvGvVnI/Ui+tJxQxLSuJ5QsPthUw==
+  dependencies:
+    "@storybook/channels" "7.6.20"
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/components" "7.6.20"
+    "@storybook/core-events" "7.6.20"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/docs-tools" "7.6.20"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/manager-api" "7.6.20"
+    "@storybook/preview-api" "7.6.20"
+    "@storybook/theming" "7.6.20"
+    "@storybook/types" "7.6.20"
     "@types/lodash" "^4.14.167"
     color-convert "^2.0.1"
     dequal "^2.0.2"
@@ -6664,15 +6415,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/builder-manager@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.4.0.tgz#80cf72ea83f88e16d585c5bdb40d563874c7d8ca"
-  integrity sha512-4fuxVzBIBbZh2aVBizSOU5EJ8b74IhR6x2TAZjifZZf5Gdxgfgio8sAyrrd/C78vrFOFhFEgmQhMqZRuCLHxvQ==
+"@storybook/builder-manager@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.6.20.tgz#d550a3f209012e4e383e61320ea756cddfdb416e"
+  integrity sha512-e2GzpjLaw6CM/XSmc4qJRzBF8GOoOyotyu3JrSPTYOt4RD8kjUsK4QlismQM1DQRu8i39aIexxmRbiJyD74xzQ==
   dependencies:
     "@fal-works/esbuild-plugin-global-externals" "^2.1.2"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/manager" "7.4.0"
-    "@storybook/node-logger" "7.4.0"
+    "@storybook/core-common" "7.6.20"
+    "@storybook/manager" "7.6.20"
+    "@storybook/node-logger" "7.6.20"
     "@types/ejs" "^3.1.1"
     "@types/find-cache-dir" "^3.2.1"
     "@yarnpkg/esbuild-plugin-pnp" "^3.0.0-rc.10"
@@ -6686,20 +6437,19 @@
     process "^0.11.10"
     util "^0.12.4"
 
-"@storybook/builder-vite@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-vite/-/builder-vite-7.4.0.tgz#a5e6919c48b825df418eae8ee58f0411275a29f1"
-  integrity sha512-2hE+Q5zoSFQvmiPKsRaZWUX5v6vRaSp0+kgZo3EOg0DvAACiC/Cd+sdnv7wxigvSnVRMbWvBVguPyePRjke8KA==
-  dependencies:
-    "@storybook/channels" "7.4.0"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/csf-plugin" "7.4.0"
-    "@storybook/mdx2-csf" "^1.0.0"
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/preview" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/types" "7.4.0"
+"@storybook/builder-vite@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-vite/-/builder-vite-7.6.4.tgz#a9baaf41731c1da63a9f70bd015975b638f95bc5"
+  integrity sha512-eqb3mLUfuXd4a7+46cWevQ9qH81FvHy1lrAbZGwp4bQ/Tj0YF8Ej7lKBbg7zoIwiu2zDci+BbMiaDOY1kPtILw==
+  dependencies:
+    "@storybook/channels" "7.6.4"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/csf-plugin" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/preview" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/find-cache-dir" "^3.2.1"
     browser-assert "^1.2.1"
     es-module-lexer "^0.9.3"
@@ -6707,8 +6457,6 @@
     find-cache-dir "^3.0.0"
     fs-extra "^11.1.0"
     magic-string "^0.30.0"
-    remark-external-links "^8.0.0"
-    remark-slug "^6.0.0"
     rollup "^2.25.0 || ^3.3.0"
 
 "@storybook/channels@7.0.20":
@@ -6716,34 +6464,47 @@
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.20.tgz#a681c3d463b4099b001dae9edeb3a607a8f4854a"
   integrity sha512-AL5GGSQ8WTDUoh3gitKEzo3fu7Vq5okXq2pAknAZlQA2Oio+HHO5nMeXvOfGdvo/tzbpNE3n5utmCJz006xrCA==
 
-"@storybook/channels@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.4.0.tgz#4ab69fce09c0fe7299f1595628b3de10b0fdcd8f"
-  integrity sha512-/1CU0s3npFumzVHLGeubSyPs21O3jNqtSppOjSB9iDTyV2GtQrjh5ntVwebfKpCkUSitx3x7TkCb9dylpEZ8+w==
+"@storybook/channels@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.6.20.tgz#33d8292b1b16d7f504bf751c57a792477d1c3a9e"
+  integrity sha512-4hkgPSH6bJclB2OvLnkZOGZW1WptJs09mhQ6j6qLjgBZzL/ZdD6priWSd7iXrmPiN5TzUobkG4P4Dp7FjkiO7A==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-events" "7.4.0"
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/core-events" "7.6.20"
     "@storybook/global" "^5.0.0"
     qs "^6.10.0"
     telejson "^7.2.0"
     tiny-invariant "^1.3.1"
 
-"@storybook/cli@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.4.0.tgz#a50f435d55e3056547c983c0bfacb2eed63cd692"
-  integrity sha512-yn27cn3LzhTqpEVX6CzUz13KTJ3jPLA2eM4bO1t7SYUqpDlzw3lET9DIcYIaUAIiL+0r2Js3jW2BsyN/5KmO5w==
+"@storybook/channels@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.6.4.tgz#d0af47f1f049c3ad77bcdefec54253f56b3b0a47"
+  integrity sha512-Z4PY09/Czl70ap4ObmZ4bgin+EQhPaA3HdrEDNwpnH7A9ttfEO5u5KThytIjMq6kApCCihmEPDaYltoVrfYJJA==
   dependencies:
-    "@babel/core" "^7.22.9"
-    "@babel/preset-env" "^7.22.9"
-    "@babel/types" "^7.22.5"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-events" "7.6.4"
+    "@storybook/global" "^5.0.0"
+    qs "^6.10.0"
+    telejson "^7.2.0"
+    tiny-invariant "^1.3.1"
+
+"@storybook/cli@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.6.20.tgz#498625db5f2447e8e1ad34827a7803c5940527f0"
+  integrity sha512-ZlP+BJyqg7HlnXf7ypjG2CKMI/KVOn03jFIiClItE/jQfgR6kRFgtjRU7uajh427HHfjv9DRiur8nBzuO7vapA==
+  dependencies:
+    "@babel/core" "^7.23.2"
+    "@babel/preset-env" "^7.23.2"
+    "@babel/types" "^7.23.0"
     "@ndelangen/get-tarball" "^3.0.7"
-    "@storybook/codemod" "7.4.0"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/core-server" "7.4.0"
-    "@storybook/csf-tools" "7.4.0"
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/telemetry" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/codemod" "7.6.20"
+    "@storybook/core-common" "7.6.20"
+    "@storybook/core-events" "7.6.20"
+    "@storybook/core-server" "7.6.20"
+    "@storybook/csf-tools" "7.6.20"
+    "@storybook/node-logger" "7.6.20"
+    "@storybook/telemetry" "7.6.20"
+    "@storybook/types" "7.6.20"
     "@types/semver" "^7.3.4"
     "@yarnpkg/fslib" "2.10.3"
     "@yarnpkg/libzip" "2.3.0"
@@ -6760,7 +6521,7 @@
     get-port "^5.1.1"
     giget "^1.0.0"
     globby "^11.0.2"
-    jscodeshift "^0.14.0"
+    jscodeshift "^0.15.1"
     leven "^3.1.0"
     ora "^5.4.1"
     prettier "^2.8.0"
@@ -6768,7 +6529,6 @@
     puppeteer-core "^2.1.1"
     read-pkg-up "^7.0.1"
     semver "^7.3.7"
-    simple-update-notifier "^2.0.0"
     strip-json-comments "^3.0.1"
     tempy "^1.0.1"
     ts-dedent "^2.0.0"
@@ -6781,71 +6541,116 @@
   dependencies:
     "@storybook/global" "^5.0.0"
 
-"@storybook/client-logger@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.4.0.tgz#f90aa5ee29d540074f6e4890bae71836ac87273c"
-  integrity sha512-4pBnf7+df1wXEVcF1civqxbrtccGGHQkfWQkJo49s53RXvF7SRTcif6XTx0V3cQV0v7I1C5mmLm0LNlmjPRP1Q==
+"@storybook/client-logger@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.6.20.tgz#1d6e93443091cccd50e269371aa786172d0c4659"
+  integrity sha512-NwG0VIJQCmKrSaN5GBDFyQgTAHLNishUPLW1NrzqTDNAhfZUoef64rPQlinbopa0H4OXmlB+QxbQIb3ubeXmSQ==
   dependencies:
     "@storybook/global" "^5.0.0"
 
-"@storybook/codemod@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.4.0.tgz#c23ef80253b5a5998c83e49e74bd6ff62683d27a"
-  integrity sha512-XqNhv5bec+L7TJ5tXdsMalmJazwaFMVVxoNlnb0f9zKhovAEF2F6hl6+Pnd2avRomH9+1q7EM+GwrTCAvzAfzg==
+"@storybook/client-logger@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.6.4.tgz#7533f5194903f554c297b0d327efee04c5accfbb"
+  integrity sha512-vJwMShC98tcoFruRVQ4FphmFqvAZX1FqZqjFyk6IxtFumPKTVSnXJjlU1SnUIkSK2x97rgdUMqkdI+wAv/tugQ==
   dependencies:
-    "@babel/core" "^7.22.9"
-    "@babel/preset-env" "^7.22.9"
-    "@babel/types" "^7.22.5"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/csf-tools" "7.4.0"
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/global" "^5.0.0"
+
+"@storybook/codemod@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.6.20.tgz#0aa7e0c1aacc605c7691b4b06baef0a9abefe114"
+  integrity sha512-8vmSsksO4XukNw0TmqylPmk7PxnfNfE21YsxFa7mnEBmEKQcZCQsNil4ZgWfG0IzdhTfhglAN4r++Ew0WE+PYA==
+  dependencies:
+    "@babel/core" "^7.23.2"
+    "@babel/preset-env" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/csf-tools" "7.6.20"
+    "@storybook/node-logger" "7.6.20"
+    "@storybook/types" "7.6.20"
     "@types/cross-spawn" "^6.0.2"
     cross-spawn "^7.0.3"
     globby "^11.0.2"
-    jscodeshift "^0.14.0"
+    jscodeshift "^0.15.1"
     lodash "^4.17.21"
     prettier "^2.8.0"
     recast "^0.23.1"
 
-"@storybook/components@7.4.0", "@storybook/components@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.4.0.tgz#0cc83ff89dd9cdcde3eaeeb7b3fbcf2036ba6fb8"
-  integrity sha512-GGnQrI4NXwri/PqNjhO1vNv4tC7RBjY87ce9WHBq1ueat3kBakdqV97NzScoldXarkkKK6grBqmhw9jE5PfzhQ==
+"@storybook/components@7.6.20", "@storybook/components@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.6.20.tgz#09d044923142d2e087a1c4a43dec6731a42d2871"
+  integrity sha512-0d8u4m558R+W5V+rseF/+e9JnMciADLXTpsILrG+TBhwECk0MctIWW18bkqkujdCm8kDZr5U2iM/5kS1Noy7Ug==
   dependencies:
     "@radix-ui/react-select" "^1.2.2"
     "@radix-ui/react-toolbar" "^1.0.4"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/csf" "^0.1.0"
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/theming" "7.6.20"
+    "@storybook/types" "7.6.20"
     memoizerific "^1.11.3"
     use-resize-observer "^9.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/core-client@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.4.0.tgz#b2b683ebc44d0dfaa7a886f7bb1a5fc74a3d0965"
-  integrity sha512-AhysJS2HnydB8Jc+BMVzK5VLHa1liJjxroNsd+ZTgGUhD7R8wvozrswQgY4MLFtcaLwN/wDWlK2YavSBqmc94Q==
+"@storybook/core-client@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.6.20.tgz#831681d64194e4d604a859ed3eb452981f6824c5"
+  integrity sha512-upQuQQinLmlOPKcT8yqXNtwIucZ4E4qegYZXH5HXRWoLAL6GQtW7sUVSIuFogdki8OXRncr/dz8OA+5yQyYS4w==
+  dependencies:
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/preview-api" "7.6.20"
+
+"@storybook/core-client@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.6.4.tgz#d38ddb80bbc6119017a8ba15b88c030cf03d27e0"
+  integrity sha512-0msqdGd+VYD1dRgAJ2StTu4d543Wveb7LVVujX3PwD/QCxmCaVUHuAoZrekM/H7jZLw546ZIbLZo0xWrADAUMw==
+  dependencies:
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+
+"@storybook/core-common@7.6.20", "@storybook/core-common@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.6.20.tgz#3a2a3ae570bd13dc34726178c0eb36cf6a64e2a4"
+  integrity sha512-8H1zPWPjcmeD4HbDm4FDD0WLsfAKGVr566IZ4hG+h3iWVW57II9JW9MLBtiR2LPSd8u7o0kw64lwRGmtCO1qAw==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
+    "@storybook/core-events" "7.6.20"
+    "@storybook/node-logger" "7.6.20"
+    "@storybook/types" "7.6.20"
+    "@types/find-cache-dir" "^3.2.1"
+    "@types/node" "^18.0.0"
+    "@types/node-fetch" "^2.6.4"
+    "@types/pretty-hrtime" "^1.0.0"
+    chalk "^4.1.0"
+    esbuild "^0.18.0"
+    esbuild-register "^3.5.0"
+    file-system-cache "2.3.0"
+    find-cache-dir "^3.0.0"
+    find-up "^5.0.0"
+    fs-extra "^11.1.0"
+    glob "^10.0.0"
+    handlebars "^4.7.7"
+    lazy-universal-dotenv "^4.0.0"
+    node-fetch "^2.0.0"
+    picomatch "^2.3.0"
+    pkg-dir "^5.0.0"
+    pretty-hrtime "^1.0.3"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
 
-"@storybook/core-common@7.4.0", "@storybook/core-common@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.4.0.tgz#da71afd79a12cfb5565351f184f6797214a5da79"
-  integrity sha512-QKrBL46ZFdfTjlZE3f7b59Q5+frOHWIJ64sC9BZ2PHkZkGjFeYRDdJJ6EHLYBb+nToynl33dYN1GQz+hQn2vww==
+"@storybook/core-common@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.6.4.tgz#8ee282058ea4dd8fc0a053c30759f4bf65dab86b"
+  integrity sha512-qes4+mXqINu0kCgSMFjk++GZokmYjb71esId0zyJsk0pcIPkAiEjnhbSEQkMhbUfcvO1lztoaQTBW2P7Rd1tag==
   dependencies:
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/core-events" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/find-cache-dir" "^3.2.1"
-    "@types/node" "^16.0.0"
+    "@types/node" "^18.0.0"
     "@types/node-fetch" "^2.6.4"
     "@types/pretty-hrtime" "^1.0.0"
     chalk "^4.1.0"
     esbuild "^0.18.0"
-    esbuild-register "^3.4.0"
+    esbuild-register "^3.5.0"
     file-system-cache "2.3.0"
     find-cache-dir "^3.0.0"
     find-up "^5.0.0"
@@ -6865,35 +6670,42 @@
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.20.tgz#53878b736463c30141115ccdfba401bcf2645cba"
   integrity sha512-gUBQsbcDmRufmg8LdH7D57c/9BQ+cPi2vBcXdudmxeJFafGwDmLRu1mlv9rxlW4kicn/LZWJjKXtq4XXzF4OGg==
 
-"@storybook/core-events@7.4.0", "@storybook/core-events@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.4.0.tgz#0d50d254d65a678065d5906ac1dcab64396f2f6a"
-  integrity sha512-JavEo4dw7TQdF5pSKjk4RtqLgsG2R/eWRI8vZ3ANKa0ploGAnQR/eMTfSxf6TUH3ElBWLJhi+lvUCkKXPQD+dw==
+"@storybook/core-events@7.6.20", "@storybook/core-events@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.6.20.tgz#6648d661d1c96841a4c2a710a35759b01b6a06a1"
+  integrity sha512-tlVDuVbDiNkvPDFAu+0ou3xBBYbx9zUURQz4G9fAq0ScgBOs/bpzcRrFb4mLpemUViBAd47tfZKdH4MAX45KVQ==
+  dependencies:
+    ts-dedent "^2.0.0"
+
+"@storybook/core-events@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.6.4.tgz#55405545dbc9ae5715654d2198ee1f1a3cc34ef7"
+  integrity sha512-i3xzcJ19ILSy4oJL5Dz9y0IlyApynn5RsGhAMIsW+mcfri+hGfeakq1stNCo0o7jW4Y3A7oluFTtIoK8DOxQdQ==
   dependencies:
     ts-dedent "^2.0.0"
 
-"@storybook/core-server@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.4.0.tgz#9e624789ff30d9538ac014b038c48fac0ebb7272"
-  integrity sha512-AcbfXatHVx1by4R2CiPIMgjQlOL3sUbVarkhmgUcL0AWT0zC0SCQWUZdo22en+jZhAraazgXyLGNCVP7A+6Tqg==
+"@storybook/core-server@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.6.20.tgz#fa143fbcad64fb7b0f0dc6d555d083c506a44ab4"
+  integrity sha512-qC5BdbqqwMLTdCwMKZ1Hbc3+3AaxHYWLiJaXL9e8s8nJw89xV8c8l30QpbJOGvcDmsgY6UTtXYaJ96OsTr7MrA==
   dependencies:
     "@aw-web-design/x-default-browser" "1.4.126"
     "@discoveryjs/json-ext" "^0.5.3"
-    "@storybook/builder-manager" "7.4.0"
-    "@storybook/channels" "7.4.0"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/csf-tools" "7.4.0"
+    "@storybook/builder-manager" "7.6.20"
+    "@storybook/channels" "7.6.20"
+    "@storybook/core-common" "7.6.20"
+    "@storybook/core-events" "7.6.20"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/csf-tools" "7.6.20"
     "@storybook/docs-mdx" "^0.1.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager" "7.4.0"
-    "@storybook/node-logger" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/telemetry" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/manager" "7.6.20"
+    "@storybook/node-logger" "7.6.20"
+    "@storybook/preview-api" "7.6.20"
+    "@storybook/telemetry" "7.6.20"
+    "@storybook/types" "7.6.20"
     "@types/detect-port" "^1.3.0"
-    "@types/node" "^16.0.0"
+    "@types/node" "^18.0.0"
     "@types/pretty-hrtime" "^1.0.0"
     "@types/semver" "^7.3.4"
     better-opn "^3.0.2"
@@ -6904,14 +6716,12 @@
     express "^4.17.3"
     fs-extra "^11.1.0"
     globby "^11.0.2"
-    ip "^2.0.0"
     lodash "^4.17.21"
     open "^8.4.0"
     pretty-hrtime "^1.0.3"
     prompts "^2.4.0"
     read-pkg-up "^7.0.1"
     semver "^7.3.7"
-    serve-favicon "^2.5.0"
     telejson "^7.2.0"
     tiny-invariant "^1.3.1"
     ts-dedent "^2.0.0"
@@ -6920,33 +6730,56 @@
     watchpack "^2.2.0"
     ws "^8.2.3"
 
-"@storybook/csf-plugin@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.4.0.tgz#f25ebb30affbc9b4dd61b1fdb12c4a4257a275dc"
-  integrity sha512-X1L3l/dpz2UYjCEQlFLkW7w1A13pmzDZpJ0lotkV79PALlakMXBeoX3I2E0VMjJATV8wC9RSj56COBAs6HsPeg==
+"@storybook/csf-plugin@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.6.20.tgz#0e79e58d5ed47dfb472b1dc202b0e754c21ec33b"
+  integrity sha512-dzBzq0dN+8WLDp6NxYS4G7BCe8+vDeDRBRjHmM0xb0uJ6xgQViL8SDplYVSGnk3bXE/1WmtvyRzQyTffBnaj9Q==
   dependencies:
-    "@storybook/csf-tools" "7.4.0"
+    "@storybook/csf-tools" "7.6.20"
     unplugin "^1.3.1"
 
-"@storybook/csf-tools@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.4.0.tgz#db5c97ee603da9a68511192d701534e356f9e592"
-  integrity sha512-bKyOmWPyvT50Neq2wCRr2PmVGLVVm6pOw8WL5t5jueD8sRRzo9QdfhEkqmuSyqdsBdt3SiJKL5oA6dqY5Vl9ww==
+"@storybook/csf-plugin@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.6.4.tgz#5d18cffc1c92dfd12d8571b2ba9d1456de58d8b2"
+  integrity sha512-7g9p8s2ITX+Z9iThK5CehPhJOcusVN7JcUEEW+gVF5PlYT+uk/x+66gmQno+scQuNkV9+8UJD6RLFjP+zg2uCA==
   dependencies:
-    "@babel/generator" "^7.22.9"
-    "@babel/parser" "^7.22.7"
-    "@babel/traverse" "^7.22.8"
-    "@babel/types" "^7.22.5"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/csf-tools" "7.6.4"
+    unplugin "^1.3.1"
+
+"@storybook/csf-tools@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.6.20.tgz#fdd9fa9459720a627e83e31d3839721dbc655f22"
+  integrity sha512-rwcwzCsAYh/m/WYcxBiEtLpIW5OH1ingxNdF/rK9mtGWhJxXRDV8acPkFrF8rtFWIVKoOCXu5USJYmc3f2gdYQ==
+  dependencies:
+    "@babel/generator" "^7.23.0"
+    "@babel/parser" "^7.23.0"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/types" "7.6.20"
     fs-extra "^11.1.0"
     recast "^0.23.1"
     ts-dedent "^2.0.0"
 
-"@storybook/csf@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.0.tgz#62315bf9704f3aa4e0d4d909b9033833774ddfbe"
-  integrity sha512-uk+jMXCZ8t38jSTHk2o5btI+aV2Ksbvl6DoOv3r6VaCM1KZqeuMwtwywIQdflkA8/6q/dKT8z8L+g8hC4GC3VQ==
+"@storybook/csf-tools@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.6.4.tgz#4c1ef7a79ecd6f96d7fc1cb092cf2ed942cd65e2"
+  integrity sha512-6sLayuhgReIK3/QauNj5BW4o4ZfEMJmKf+EWANPEM/xEOXXqrog6Un8sjtBuJS9N1DwyhHY6xfkEiPAwdttwqw==
+  dependencies:
+    "@babel/generator" "^7.23.0"
+    "@babel/parser" "^7.23.0"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/types" "7.6.4"
+    fs-extra "^11.1.0"
+    recast "^0.23.1"
+    ts-dedent "^2.0.0"
+
+"@storybook/csf@^0.1.0", "@storybook/csf@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.2.tgz#8e7452f0097507f5841b5ade3f5da1525bc9afb2"
+  integrity sha512-ePrvE/pS1vsKR9Xr+o+YwdqNgHUyXvg+1Xjx0h9LrVx7Zq4zNe06pd63F5EvzTbCbJsHj7GHr9tkiaqm7U8WRA==
   dependencies:
     type-fest "^2.19.0"
 
@@ -6955,15 +6788,29 @@
   resolved "https://registry.yarnpkg.com/@storybook/docs-mdx/-/docs-mdx-0.1.0.tgz#33ba0e39d1461caf048b57db354b2cc410705316"
   integrity sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==
 
-"@storybook/docs-tools@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.4.0.tgz#d9109c9c8ec4e90bb24d1acfcc16834a252618eb"
-  integrity sha512-DzXmt4JorAOePoS+sjQznf8jLPI9D5mdB1eSXjfvmGBQyyehKTZv5+TXuxYvT3iPN4rW4OPrIrQCSIrbULFdwA==
+"@storybook/docs-tools@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.6.20.tgz#2a6dd402c880e24ec6bec8411beee89cfe69f932"
+  integrity sha512-Bw2CcCKQ5xGLQgtexQsI1EGT6y5epoFzOINi0FSTGJ9Wm738nRp5LH3dLk1GZLlywIXcYwOEThb2pM+pZeRQxQ==
   dependencies:
-    "@storybook/core-common" "7.4.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/core-common" "7.6.20"
+    "@storybook/preview-api" "7.6.20"
+    "@storybook/types" "7.6.20"
     "@types/doctrine" "^0.0.3"
+    assert "^2.1.0"
+    doctrine "^3.0.0"
+    lodash "^4.17.21"
+
+"@storybook/docs-tools@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.6.4.tgz#504b8654f348a109b69cc77cdab556f0bf9c2304"
+  integrity sha512-2eGam43aD7O3cocA72Z63kRi7t/ziMSpst0qB218QwBWAeZjT4EYDh8V6j/Xhv6zVQL3msW7AglrQP5kCKPvPA==
+  dependencies:
+    "@storybook/core-common" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/types" "7.6.4"
+    "@types/doctrine" "^0.0.3"
+    assert "^2.1.0"
     doctrine "^3.0.0"
     lodash "^4.17.21"
 
@@ -6972,17 +6819,6 @@
   resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed"
   integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==
 
-"@storybook/instrumenter@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/instrumenter/-/instrumenter-7.4.0.tgz#197335f25a45ecdc2c5f458bff1c2481d7ffe08c"
-  integrity sha512-jZKxLK0lGKxY8LEul6GP7s+PDlNuXT4JU6MnPY9+SVSo23lP0pAOxo/ojV8WTLf48tcoyL3ztSfbYhxnaJvBfw==
-  dependencies:
-    "@storybook/channels" "7.4.0"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.4.0"
-
 "@storybook/manager-api@7.0.20":
   version "7.0.20"
   resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.0.20.tgz#37070ca26c0a44944329e9452f716b637b06b373"
@@ -7004,58 +6840,82 @@
     telejson "^7.0.3"
     ts-dedent "^2.0.0"
 
-"@storybook/manager-api@7.4.0", "@storybook/manager-api@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.4.0.tgz#aee0153df1583459b7e1e64e1d8c46fb49a584c8"
-  integrity sha512-sBfkkt0eZGTozeKrbzMtWLEOQrgqdk24OUJlkc2IDaucR1CBNjoCMjNeYg7cLDw0rXE8W3W3AdWtJnfsUbLMAQ==
+"@storybook/manager-api@7.6.20", "@storybook/manager-api@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.6.20.tgz#225ff7dea3dbdb2e82bb5568babdaace4071c32e"
+  integrity sha512-gOB3m8hO3gBs9cBoN57T7jU0wNKDh+hi06gLcyd2awARQlAlywnLnr3s1WH5knih6Aq+OpvGBRVKkGLOkaouCQ==
   dependencies:
-    "@storybook/channels" "7.4.0"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/csf" "^0.1.0"
+    "@storybook/channels" "7.6.20"
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/core-events" "7.6.20"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/router" "7.4.0"
-    "@storybook/theming" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/router" "7.6.20"
+    "@storybook/theming" "7.6.20"
+    "@storybook/types" "7.6.20"
     dequal "^2.0.2"
     lodash "^4.17.21"
     memoizerific "^1.11.3"
-    semver "^7.3.7"
     store2 "^2.14.2"
     telejson "^7.2.0"
     ts-dedent "^2.0.0"
 
-"@storybook/manager@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.4.0.tgz#21a825c9145f56ca6c38d3e9d3546b311a6db14e"
-  integrity sha512-uOSdPBEBKg8WORUZ5HKHb4KnKcTyA5j5Q8MWy/NBaRd22JR3fQkZiKuHer9WJIOQTU+fb6KDmzhZbCTKg5Euog==
+"@storybook/manager@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.6.20.tgz#eb619fe8d33446e581a7b1c3050644c196364d39"
+  integrity sha512-0Cf6WN0t7yEG2DR29tN5j+i7H/TH5EfPppg9h9/KiQSoFHk+6KLoy2p5do94acFU+Ro4+zzxvdCGbcYGKuArpg==
 
 "@storybook/mdx2-csf@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@storybook/mdx2-csf/-/mdx2-csf-1.1.0.tgz#97f6df04d0bf616991cc1005a073ac004a7281e5"
   integrity sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw==
 
-"@storybook/node-logger@7.4.0", "@storybook/node-logger@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.4.0.tgz#808ed8a63e3bc2f97a2d276b4e8ddaa72b79deb0"
-  integrity sha512-tWSWkYyAvp6SxjIBaTklg29avzv/3Lv4c0dOG2o5tz79PyZkq9v6sQtwLLoI8EJA9Mo8Z08vaJp8NZyDQ9RCuA==
+"@storybook/node-logger@7.6.20", "@storybook/node-logger@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.6.20.tgz#c0ca90cf68cf31d84cdcf53c76cec22769407ece"
+  integrity sha512-l2i4qF1bscJkOplNffcRTsgQWYR7J51ewmizj5YrTM8BK6rslWT1RntgVJWB1RgPqvx6VsCz1gyP3yW1oKxvYw==
 
-"@storybook/postinstall@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.4.0.tgz#81f3bef31b566e26d616f9c3ce567f07ff143cc7"
-  integrity sha512-ZVBZggqkuj7ysfuHSCd/J7ovWV06zY9uWf+VU+Zw7ZeojDT8QHFrCurPsN7D9679j9vRU1/kSzqvAiStALS33g==
+"@storybook/node-logger@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.6.4.tgz#e471ee117bbd329522113dd98e5a42e83e259f9c"
+  integrity sha512-GDkEnnDj4Op+PExs8ZY/P6ox3wg453CdEIaR8PR9TxF/H/T2fBL6puzma3hN2CMam6yzfAL8U+VeIIDLQ5BZdQ==
+
+"@storybook/postinstall@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.6.20.tgz#5a77ce7913375b11bd7c72388798854bd8507b91"
+  integrity sha512-AN4WPeNma2xC2/K/wP3I/GMbBUyeSGD3+86ZFFJFO1QmE/Zea6E+1aVlTd1iKHQUcNkZ9bZTrqkhPGVYx10pIw==
+
+"@storybook/preview-api@7.6.20", "@storybook/preview-api@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.6.20.tgz#688a435ee2cfe57eeb1e3053c18025a9e0a03bbb"
+  integrity sha512-3ic2m9LDZEPwZk02wIhNc3n3rNvbi7VDKn52hDXfAxnL5EYm7yDICAkaWcVaTfblru2zn0EDJt7ROpthscTW5w==
+  dependencies:
+    "@storybook/channels" "7.6.20"
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/core-events" "7.6.20"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/global" "^5.0.0"
+    "@storybook/types" "7.6.20"
+    "@types/qs" "^6.9.5"
+    dequal "^2.0.2"
+    lodash "^4.17.21"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    synchronous-promise "^2.0.15"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
 
-"@storybook/preview-api@7.4.0", "@storybook/preview-api@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.4.0.tgz#46818910545735bef43965651eef380a6f481f4b"
-  integrity sha512-ndXO0Nx+eE7ktVE4EqHpQZ0guX7yYBdruDdJ7B739C0+OoPWsJN7jAzUqq0NXaBcYrdaU5gTy+KnWJUt8R+OyA==
+"@storybook/preview-api@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.6.4.tgz#df103fbdfada5ceee540f6ea68001c0d2c718113"
+  integrity sha512-KhisNdQX5NdfAln+spLU4B82d804GJQp/CnI5M1mm/taTnjvMgs/wTH9AmR89OPoq+tFZVW0vhy2zgPS3ar71A==
   dependencies:
-    "@storybook/channels" "7.4.0"
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-events" "7.4.0"
-    "@storybook/csf" "^0.1.0"
+    "@storybook/channels" "7.6.4"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-events" "7.6.4"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/types" "7.6.4"
     "@types/qs" "^6.9.5"
     dequal "^2.0.2"
     lodash "^4.17.21"
@@ -7065,45 +6925,76 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/preview@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.4.0.tgz#a58756ac9b12ea21f203032eca47991946257b53"
-  integrity sha512-R4LMTvUrVAbcUetRbAXpY3frkwD0eysqHrByiR73040+ngzDwtZOBAy0JfO3jw3WrWv2dn3kWlao5aEwVc9Exw==
+"@storybook/preview@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.6.4.tgz#36cca1d10fd3729f1a68789d95bfc400e33aa616"
+  integrity sha512-p9xIvNkgXgTpSRphOMV9KpIiNdkymH61jBg3B0XyoF6IfM1S2/mQGvC89lCVz1dMGk2SrH4g87/WcOapkU5ArA==
+
+"@storybook/react-dom-shim@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.6.20.tgz#20b902663474b731c22b211ec29c7fd0e86b4b7f"
+  integrity sha512-SRvPDr9VWcS24ByQOVmbfZ655y5LvjXRlsF1I6Pr9YZybLfYbu3L5IicfEHT4A8lMdghzgbPFVQaJez46DTrkg==
 
-"@storybook/react-dom-shim@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.4.0.tgz#12f137f00f2a209cb49a4084475dd93f23e0678a"
-  integrity sha512-TLpb8a2hnWJoRLqoXpMADh82BFfRZll6JI2Waf1FjnvJ4SF9eS0zBbxybrjW3lFAHWy2XJi+rwcK8FiPj0iBoQ==
+"@storybook/react-dom-shim@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.6.4.tgz#d1f5440c8f1ccd95abcc01117872ce46d0ab9dc3"
+  integrity sha512-wGJfomlDEBnowNmhmumWDu/AcUInxSoPqUUJPgk2f5oL0EW17fR9fDP/juG3XOEdieMDM0jDX48GML7lyvL2fg==
 
-"@storybook/react-vite@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/react-vite/-/react-vite-7.4.0.tgz#c8f3fae9fc46f1b9c62bbbc83304b734efaf0638"
-  integrity sha512-ps1FUyD2j0plCSprBI8z6RvavMvcDarIMFNofV48vSjVFzenRmgJfSbYywTnw7NusplJyZlYqldHreDzwVX1dQ==
+"@storybook/react-vite@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/react-vite/-/react-vite-7.6.4.tgz#a319711d32376909a0abaa44f41965e025e2f948"
+  integrity sha512-1NYzCJRO6k/ZyoMzpu1FQiaUaiLNjAvTAB1x3HE7oY/tEIT8kGpzXGYH++LJVWvyP/5dSWlUnRSy2rJvySraiw==
   dependencies:
-    "@joshwooding/vite-plugin-react-docgen-typescript" "0.2.1"
+    "@joshwooding/vite-plugin-react-docgen-typescript" "0.3.0"
     "@rollup/pluginutils" "^5.0.2"
-    "@storybook/builder-vite" "7.4.0"
-    "@storybook/react" "7.4.0"
+    "@storybook/builder-vite" "7.6.4"
+    "@storybook/react" "7.6.4"
     "@vitejs/plugin-react" "^3.0.1"
-    ast-types "^0.14.2"
     magic-string "^0.30.0"
-    react-docgen "6.0.0-alpha.3"
+    react-docgen "^7.0.0"
+
+"@storybook/react@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.6.20.tgz#e326969851b96e9a6bea6fdd81f624de052ddbb6"
+  integrity sha512-i5tKNgUbTNwlqBWGwPveDhh9ktlS0wGtd97A1ZgKZc3vckLizunlAFc7PRC1O/CMq5PTyxbuUb4RvRD2jWKwDA==
+  dependencies:
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/core-client" "7.6.20"
+    "@storybook/docs-tools" "7.6.20"
+    "@storybook/global" "^5.0.0"
+    "@storybook/preview-api" "7.6.20"
+    "@storybook/react-dom-shim" "7.6.20"
+    "@storybook/types" "7.6.20"
+    "@types/escodegen" "^0.0.6"
+    "@types/estree" "^0.0.51"
+    "@types/node" "^18.0.0"
+    acorn "^7.4.1"
+    acorn-jsx "^5.3.1"
+    acorn-walk "^7.2.0"
+    escodegen "^2.1.0"
+    html-tags "^3.1.0"
+    lodash "^4.17.21"
+    prop-types "^15.7.2"
+    react-element-to-jsx-string "^15.0.0"
+    ts-dedent "^2.0.0"
+    type-fest "~2.19"
+    util-deprecate "^1.0.2"
 
-"@storybook/react@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.4.0.tgz#18d29aa49f0b784b46613d26a243caf473177403"
-  integrity sha512-QWsFw/twsNkcWI6brW06sugQQ5dV+fJm4IrEeI28cA4cBHK9G9HKOwCHoXDUWikzZx48XYMpNfs/WyIkuGmEqg==
+"@storybook/react@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.6.4.tgz#b17c451eb1240399d75c45ccb90a145ab1de44ac"
+  integrity sha512-XYRP+eylH3JqkCuziwtQGY5vOCeDreOibRYJmj5na6k4QbURjGVB44WCIW04gWVlmBXM9SqLAmserUi3HP890Q==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-client" "7.4.0"
-    "@storybook/docs-tools" "7.4.0"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-client" "7.6.4"
+    "@storybook/docs-tools" "7.6.4"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.4.0"
-    "@storybook/react-dom-shim" "7.4.0"
-    "@storybook/types" "7.4.0"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/react-dom-shim" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/escodegen" "^0.0.6"
     "@types/estree" "^0.0.51"
-    "@types/node" "^16.0.0"
+    "@types/node" "^18.0.0"
     acorn "^7.4.1"
     acorn-jsx "^5.3.1"
     acorn-walk "^7.2.0"
@@ -7125,23 +7016,23 @@
     memoizerific "^1.11.3"
     qs "^6.10.0"
 
-"@storybook/router@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.4.0.tgz#627f824bfd9cc4653ee84581fc09373ab1463336"
-  integrity sha512-IATdtFL5C3ryjNQSwaQfrmiOZiVFoVNMevMoBGDC++g0laSW40TGiNK6fUjUDBKuOgbuDt4Svfbl29k21GefEg==
+"@storybook/router@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.6.20.tgz#ffa6a3ba1790e86f1d2364c27d3511f7975742a6"
+  integrity sha512-mCzsWe6GrH47Xb1++foL98Zdek7uM5GhaSlrI7blWVohGa0qIUYbfJngqR4ZsrXmJeeEvqowobh+jlxg3IJh+w==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
+    "@storybook/client-logger" "7.6.20"
     memoizerific "^1.11.3"
     qs "^6.10.0"
 
-"@storybook/telemetry@7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.4.0.tgz#04e47a2d9decf7671273130a9af9d231a8c3d2e8"
-  integrity sha512-oxCB3kIbpiDWuXEtQhk/j6t1/h0KKWAuvxmcwGPxwhEvj/uNtoM+f1qhoDID9waxNo4AccU9Px+1ZJQ+2ejcDg==
+"@storybook/telemetry@7.6.20":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.6.20.tgz#5b3705eb5100b21070d76767dde1040ed5d9b35b"
+  integrity sha512-dmAOCWmOscYN6aMbhCMmszQjoycg7tUPRVy2kTaWg6qX10wtMrvEtBV29W4eMvqdsoRj5kcvoNbzRdYcWBUOHQ==
   dependencies:
-    "@storybook/client-logger" "7.4.0"
-    "@storybook/core-common" "7.4.0"
-    "@storybook/csf-tools" "7.4.0"
+    "@storybook/client-logger" "7.6.20"
+    "@storybook/core-common" "7.6.20"
+    "@storybook/csf-tools" "7.6.20"
     chalk "^4.1.0"
     detect-package-manager "^2.0.1"
     fetch-retry "^5.0.2"
@@ -7167,13 +7058,13 @@
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
 
-"@storybook/theming@7.4.0", "@storybook/theming@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.4.0.tgz#f5d9f8f55c41e08c0f50b57d9fb0e159ed595274"
-  integrity sha512-eLjEf6G3cqlegfutF/iUrec9LrUjKDj7K4ZhGdACWrf7bQcODs99EK62e9/d8GNKr4b+QMSEuM6XNGaqdPnuzQ==
+"@storybook/theming@7.6.20", "@storybook/theming@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.6.20.tgz#c932cd82c27314979d22d0e7867268e301f5f97c"
+  integrity sha512-iT1pXHkSkd35JsCte6Qbanmprx5flkqtSHC6Gi6Umqoxlg9IjiLPmpHbaIXzoC06DSW93hPj5Zbi1lPlTvRC7Q==
   dependencies:
     "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
-    "@storybook/client-logger" "7.4.0"
+    "@storybook/client-logger" "7.6.20"
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
 
@@ -7187,15 +7078,24 @@
     "@types/express" "^4.7.0"
     file-system-cache "^2.0.0"
 
-"@storybook/types@7.4.0", "@storybook/types@^7.0.12":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.4.0.tgz#71ce550d4d469f6aaf9777fc7432db9fb67f53f9"
-  integrity sha512-XyzYkmeklywxvElPrIWLczi/PWtEdgTL6ToT3++FVxptsC2LZKS3Ue+sBcQ9xRZhkRemw4HQHwed5EW3dO8yUg==
+"@storybook/types@7.6.20", "@storybook/types@^7.0.12":
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.6.20.tgz#b8d62b30914b35e6750b1f4937da532432f02890"
+  integrity sha512-GncdY3x0LpbhmUAAJwXYtJDUQEwfF175gsjH0/fxPkxPoV7Sef9TM41jQLJW/5+6TnZoCZP/+aJZTJtq3ni23Q==
+  dependencies:
+    "@storybook/channels" "7.6.20"
+    "@types/babel__core" "^7.0.0"
+    "@types/express" "^4.7.0"
+    file-system-cache "2.3.0"
+
+"@storybook/types@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.6.4.tgz#3bb50b46286cc83484848c3c450c32cc2071eb21"
+  integrity sha512-qyiiXPCvol5uVgfubcIMzJBA0awAyFPU+TyUP1mkPYyiTHnsHYel/mKlSdPjc8a97N3SlJXHOCx41Hde4IyJgg==
   dependencies:
-    "@storybook/channels" "7.4.0"
+    "@storybook/channels" "7.6.4"
     "@types/babel__core" "^7.0.0"
     "@types/express" "^4.7.0"
-    "@types/react" "^16.14.34"
     file-system-cache "2.3.0"
 
 "@svgr/babel-plugin-add-jsx-attribute@8.0.0":
@@ -7302,10 +7202,10 @@
   dependencies:
     defer-to-connect "^2.0.1"
 
-"@tailwindcss/forms@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.6.tgz#29c6c2b032b363e0c5110efed1499867f6d7e868"
-  integrity sha512-Fw+2BJ0tmAwK/w01tEFL5TiaJBX1NLT1/YbWgvm7ws3Qcn11kiXxzNTEQDMs5V3mQemhB56l3u0i9dwdzSQldA==
+"@tailwindcss/forms@0.5.7":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.7.tgz#db5421f062a757b5f828bc9286ba626c6685e821"
+  integrity sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==
   dependencies:
     mini-svg-data-uri "^1.2.3"
 
@@ -7327,6 +7227,18 @@
     "@tanstack/query-core" "4.36.1"
     use-sync-external-store "^1.2.0"
 
+"@tanstack/react-virtual@^3.0.0-beta.60":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.0.1.tgz#b04c492e4dd5733b72b10a974870880f83ff4698"
+  integrity sha512-IFOFuRUTaiM/yibty9qQ9BfycQnYXIDHGP2+cU+0LrFFGNhVxCXSQnaY6wkX8uJVteFEBjUondX0Hmpp7TNcag==
+  dependencies:
+    "@tanstack/virtual-core" "3.0.0"
+
+"@tanstack/virtual-core@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.0.0.tgz#637bee36f0cabf96a1d436887c90f138a7e9378b"
+  integrity sha512-SYXOBTjJb05rXa2vl55TTwO40A6wKu0R5i1qQwhJYNDIqaIGF7D0HsLw+pJAyi2OvntlEIVusx3xtbbgSUi6zg==
+
 "@testing-library/dom@^8.0.0":
   version "8.20.0"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.20.0.tgz#914aa862cef0f5e89b98cc48e3445c4c921010f6"
@@ -7355,21 +7267,6 @@
     lz-string "^1.5.0"
     pretty-format "^27.0.2"
 
-"@testing-library/jest-dom@5.16.5":
-  version "5.16.5"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e"
-  integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==
-  dependencies:
-    "@adobe/css-tools" "^4.0.1"
-    "@babel/runtime" "^7.9.2"
-    "@types/testing-library__jest-dom" "^5.9.1"
-    aria-query "^5.0.0"
-    chalk "^3.0.0"
-    css.escape "^1.5.1"
-    dom-accessibility-api "^0.5.6"
-    lodash "^4.17.15"
-    redent "^3.0.0"
-
 "@testing-library/jest-dom@5.17.0":
   version "5.17.0"
   resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz#5e97c8f9a15ccf4656da00fecab505728de81e0c"
@@ -7385,6 +7282,14 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
+"@testing-library/react-hooks@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-8.0.1.tgz#0924bbd5b55e0c0c0502d1754657ada66947ca12"
+  integrity sha512-Aqhl2IVmLt8IovEVarNDFuJDVWVvhnr9/GCU6UUnrYXwgDFF9h2L2o2P9KBni1AST5sT6riAyoukFLyjQUgD/g==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    react-error-boundary "^3.1.0"
+
 "@testing-library/react@12.1.5":
   version "12.1.5"
   resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b"
@@ -7394,103 +7299,117 @@
     "@testing-library/dom" "^8.0.0"
     "@types/react-dom" "<18.0.0"
 
-"@testing-library/user-event@14.4.3":
-  version "14.4.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591"
-  integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==
+"@testing-library/react@14.3.1":
+  version "14.3.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-14.3.1.tgz#29513fc3770d6fb75245c4e1245c470e4ffdd830"
+  integrity sha512-H99XjUhWQw0lTgyMN05W3xQG1Nh4lq574D8keFf1dDoNTJgp66VbJozRaczoF+wsiaPJNt/TcnfpLGufGxSrZQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@testing-library/dom" "^9.0.0"
+    "@types/react-dom" "^18.0.0"
+
+"@testing-library/user-event@14.5.2", "@testing-library/user-event@^14.4.0":
+  version "14.5.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd"
+  integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==
 
-"@testing-library/user-event@^14.4.0":
-  version "14.5.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.1.tgz#27337d72046d5236b32fd977edee3f74c71d332f"
-  integrity sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==
+"@tinybirdco/charts@0.1.8":
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/@tinybirdco/charts/-/charts-0.1.8.tgz#536bee44d36602f5c123757659c7f8ead3473494"
+  integrity sha512-2iSup8nP0cXbh6LVhD+xoJLCoT0hHUOAYGgN3r7ts1ml6OgL7Vxsg7cVwr0jqtPP4ifSW2DBqob6E6pMd3rThg==
+  dependencies:
+    echarts "^5.5.0"
+    swr "^2.2.5"
 
-"@tiptap/core@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.1.12.tgz#904fdf147e91b5e60561c76e7563c1b5a32f54ab"
-  integrity sha512-ZGc3xrBJA9KY8kln5AYTj8y+GDrKxi7u95xIl2eccrqTY5CQeRu6HRNM1yT4mAjuSaG9jmazyjGRlQuhyxCKxQ==
+"@tiptap/core@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.6.0.tgz#c222f53043abfa69d8d41a081bb3dfc1181fc841"
+  integrity sha512-MG2OXwpMVaiacGuipqZ3VXi36gMvtV3i3ncrtXufsMducWvniENMi8fEonj/Q7nkeVi59OcoW8vD6kqdKkh2Gw==
 
-"@tiptap/extension-blockquote@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.1.12.tgz#97b43419606acf9bfd93b9f482a1827dcac8c3e9"
-  integrity sha512-Qb3YRlCfugx9pw7VgLTb+jY37OY4aBJeZnqHzx4QThSm13edNYjasokbX0nTwL1Up4NPTcY19JUeHt6fVaVVGg==
+"@tiptap/extension-blockquote@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.6.0.tgz#3f0a80ebd82e1f5d174c24f9794e22ac3184c072"
+  integrity sha512-/rYTYnn7fk/LBixLv7R1fEee3JDrDo3VHEJ+gBGuyLXcNaYtzWuRfqdeIraNSOuhzHffWQ5dg1oxpVFrVrd6AQ==
 
-"@tiptap/extension-bubble-menu@^2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.1.12.tgz#4103a21a6433e58690c8f742ece39fad78dc26eb"
-  integrity sha512-gAGi21EQ4wvLmT7klgariAc2Hf+cIjaNU2NWze3ut6Ku9gUo5ZLqj1t9SKHmNf4d5JG63O8GxpErqpA7lHlRtw==
+"@tiptap/extension-bubble-menu@^2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.6.1.tgz#8a6777000cdf74d5319a66dc5c283bdac94e00b4"
+  integrity sha512-lIXilRlvQ2P4rnJ3zp5VM5JB3UG4w/SlSMkXHmOAf8S67aGqH9DHqDI3p2Twp+5ylsg/f0Q3evY/rftD51mNSw==
   dependencies:
     tippy.js "^6.3.7"
 
-"@tiptap/extension-document@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.1.12.tgz#e19e4716dfad60cbeb6abaf2f362fed759963529"
-  integrity sha512-0QNfAkCcFlB9O8cUNSwTSIQMV9TmoEhfEaLz/GvbjwEq4skXK3bU+OQX7Ih07waCDVXIGAZ7YAZogbvrn/WbOw==
+"@tiptap/extension-document@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.6.1.tgz#ff5797960248e32c24e1070b9bdb86349a201a37"
+  integrity sha512-BKuyzzmxzs9Rm/LpwriluMjBQvZhM0kcvtWsIGchzmBdoyPQwOtZxItnqSJeGzgJzqdp5otVeLb6PAP/PlPs3g==
 
-"@tiptap/extension-floating-menu@^2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.1.12.tgz#68a658b2b9bdd3a0fc1afc5165231838061a8fde"
-  integrity sha512-uo0ydCJNg6AWwLT6cMUJYVChfvw2PY9ZfvKRhh9YJlGfM02jS4RUG/bJBts6R37f+a5FsOvAVwg8EvqPlNND1A==
+"@tiptap/extension-floating-menu@^2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.6.1.tgz#af5178fe1c180328ec10ff93434f5edbea62d073"
+  integrity sha512-HVTK9tpFM5umb8J1YbhwJr/Cf7UPSLqZO3dA+MulVxBt9fD4Z+zNbLkhm57rbRZ68DIA0RL57FgFvdxlFCZA4A==
   dependencies:
     tippy.js "^6.3.7"
 
-"@tiptap/extension-hard-break@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.1.12.tgz#54d0c9996e1173594852394975a9356eec98bc9a"
-  integrity sha512-nqKcAYGEOafg9D+2cy1E4gHNGuL12LerVa0eS2SQOb+PT8vSel9OTKU1RyZldsWSQJ5rq/w4uIjmLnrSR2w6Yw==
+"@tiptap/extension-hard-break@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.6.0.tgz#6a475ca5422a53c2739c0b54eaf488098972e6cc"
+  integrity sha512-RX5Xmj2svS7T3QkDs0X8aTekkcDxpnJ3hqHarzR1gK0GdVsrpowVKYhuEAc1zAAUirVa/IBimKXAIkXjDvuvNA==
 
-"@tiptap/extension-link@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.1.12.tgz#a18f83a0b54342e6274ff9e5a5907ef7f15aa723"
-  integrity sha512-Sti5hhlkCqi5vzdQjU/gbmr8kb578p+u0J4kWS+SSz3BknNThEm/7Id67qdjBTOQbwuN07lHjDaabJL0hSkzGQ==
+"@tiptap/extension-link@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.6.0.tgz#2a3f65742fcb2776973541e9f2cea3169ce4a204"
+  integrity sha512-16ckFDnwqt0tYtQRgnVhooAUTLSk7liaqcGgc3NJ35gqWZho8hSnaTOl+72dlyJqUjqwt8D24NHFJsSqB9PSxA==
   dependencies:
     linkifyjs "^4.1.0"
 
-"@tiptap/extension-paragraph@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.1.12.tgz#922447b2aa1c7184787d351ceec593a74d24ed03"
-  integrity sha512-hoH/uWPX+KKnNAZagudlsrr4Xu57nusGekkJWBcrb5MCDE91BS+DN2xifuhwXiTHxnwOMVFjluc0bPzQbkArsw==
-
-"@tiptap/extension-placeholder@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.1.12.tgz#f6267a563d17a5ae8a04da32231eac8d8868519e"
-  integrity sha512-K52o7B1zkP4vaVy3z4ZwHn+tQy6KlXtedj1skLg+796ImwH2GYS5z6MFOTfKzBO2hLncUzLco/s0C5PLCD6SDw==
-
-"@tiptap/extension-text@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.1.12.tgz#466e3244bdd9b2db2304c0c9a1d51ce59f5327d0"
-  integrity sha512-rCNUd505p/PXwU9Jgxo4ZJv4A3cIBAyAqlx/dtcY6cjztCQuXJhuQILPhjGhBTOLEEL4kW2wQtqzCmb7O8i2jg==
-
-"@tiptap/pm@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.1.12.tgz#88a4b19be0eabb13d42ddd540c19ba1bbe74b322"
-  integrity sha512-Q3MXXQABG4CZBesSp82yV84uhJh/W0Gag6KPm2HRWPimSFELM09Z9/5WK9RItAYE0aLhe4Krnyiczn9AAa1tQQ==
-  dependencies:
-    prosemirror-changeset "^2.2.0"
-    prosemirror-collab "^1.3.0"
-    prosemirror-commands "^1.3.1"
-    prosemirror-dropcursor "^1.5.0"
-    prosemirror-gapcursor "^1.3.1"
-    prosemirror-history "^1.3.0"
-    prosemirror-inputrules "^1.2.0"
-    prosemirror-keymap "^1.2.0"
-    prosemirror-markdown "^1.10.1"
-    prosemirror-menu "^1.2.1"
-    prosemirror-model "^1.18.1"
-    prosemirror-schema-basic "^1.2.0"
-    prosemirror-schema-list "^1.2.2"
-    prosemirror-state "^1.4.1"
-    prosemirror-tables "^1.3.0"
-    prosemirror-trailing-node "^2.0.2"
-    prosemirror-transform "^1.7.0"
-    prosemirror-view "^1.28.2"
-
-"@tiptap/react@2.1.12":
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/@tiptap/react/-/react-2.1.12.tgz#23566c7992b9642137171b282335e646922ae559"
-  integrity sha512-RMO4QmmpL7sPR7w8o1Wq0hrUe/ttHzsn5I/eWwqg1d3fGx5y9mOdfCoQ9XBtm49Xzdejy3QVzt4zYp9fX0X/xg==
-  dependencies:
-    "@tiptap/extension-bubble-menu" "^2.1.12"
-    "@tiptap/extension-floating-menu" "^2.1.12"
+"@tiptap/extension-paragraph@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.6.0.tgz#721921477e3785c0a0abf132ea109e67bcea9fae"
+  integrity sha512-ztmgfCSaCGFCR4VudA91WJDEQrpXH2FirQrJSaoOOwk3OfrNSSvcbqAhTmxJHl8e7aFwuR5eH8wbIxKw9In3Kg==
+
+"@tiptap/extension-placeholder@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.6.1.tgz#01f6c83fe0560b5d5ab1e64dc238904e87317d46"
+  integrity sha512-YwgpKaPoZgYZ/56Yig6PylGHJwfcY+IhraifOx4sYphi/ZamUAgSGhsOYz4l9T/0zzIRLvLYlMsHNgtuN6Iupg==
+
+"@tiptap/extension-text@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.6.0.tgz#395cd44456059c11fb5f3e2215093a5c32ba59a3"
+  integrity sha512-Bg/FXGzj6WGvqgCVvFKzTWOpgg8Nl4X2a/bUT7nEmBafpUNAiN6enomMWnniylGTFEqZrywr5KRcvbgl8ubeDQ==
+
+"@tiptap/pm@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.6.0.tgz#b2ef8aba2f5a04ac3f5051e3d891ffe26f37967b"
+  integrity sha512-Oj912Jfowuq/K+oEkqx+pADjuVwBCXroC2hdrRMo4w18bb2gI2Nhse6St1KQ9kWWGF36O81RpDbpLe7L1YQhzQ==
+  dependencies:
+    prosemirror-changeset "^2.2.1"
+    prosemirror-collab "^1.3.1"
+    prosemirror-commands "^1.5.2"
+    prosemirror-dropcursor "^1.8.1"
+    prosemirror-gapcursor "^1.3.2"
+    prosemirror-history "^1.4.1"
+    prosemirror-inputrules "^1.4.0"
+    prosemirror-keymap "^1.2.2"
+    prosemirror-markdown "^1.13.0"
+    prosemirror-menu "^1.2.4"
+    prosemirror-model "^1.22.2"
+    prosemirror-schema-basic "^1.2.3"
+    prosemirror-schema-list "^1.4.1"
+    prosemirror-state "^1.4.3"
+    prosemirror-tables "^1.4.0"
+    prosemirror-trailing-node "^2.0.9"
+    prosemirror-transform "^1.9.0"
+    prosemirror-view "^1.33.9"
+
+"@tiptap/react@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@tiptap/react/-/react-2.6.1.tgz#77d47730fa0054aeba78488b96e8a486eea2fed2"
+  integrity sha512-Mq0zhPiR3YZ3IlCtGhNsrXkyK12df71qgvlbWi3KMtcQFU+JWV18qpOyDMK4PxPpPgicKTYlAn57k7HBqtTZ6w==
+  dependencies:
+    "@tiptap/extension-bubble-menu" "^2.6.1"
+    "@tiptap/extension-floating-menu" "^2.6.1"
+    "@types/use-sync-external-store" "^0.0.6"
+    use-sync-external-store "^1.2.2"
 
 "@tokenizer/token@^0.3.0":
   version "0.3.0"
@@ -7502,114 +7421,109 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  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.12":
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/adapter-base-cache/-/adapter-base-cache-0.1.12.tgz#1773df40d33878d14f6e07c42a9e32062e8880d5"
+  integrity sha512-d1hCu/yQ/5JQy4C+B37ecs91tCDt7C471eauQk5bZMEeXZpmMpWfXSGzXEEdwVc4LQuVe/ubibfjoERpEBro4A==
 
-"@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.5":
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/@tryghost/admin-api-schema/-/admin-api-schema-4.5.5.tgz#7c6ef696ba11faf750887210d4c7734c27ce507b"
+  integrity sha512-2tyzBpOcNB2WR+GLO/MafKI+oK6W7b9AQj8aUaE0fu5wLl1nDg/vO2nO4vf89x5Hlc5ho9qyJGeQRUQAMzSyjA==
   dependencies:
-    "@tryghost/errors" "^1.0.0"
+    "@tryghost/errors" "^1.2.26"
     ajv "^6.12.6"
     lodash "^4.17.11"
 
-"@tryghost/bookshelf-collision@^0.1.37":
-  version "0.1.37"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-collision/-/bookshelf-collision-0.1.37.tgz#dc25f563e9a53b20c626f6187f0ba50f1d26d284"
-  integrity sha512-m/E2iru6Avvb50z9nIiy7mMuMJAiyjKQkzKIbDRv+vfsHTKxgzEGKq0io2M1zMbK8Gv8Bj8oUjZ4JTUBvw4jQg==
+"@tryghost/bookshelf-collision@^0.1.46":
+  version "0.1.46"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-collision/-/bookshelf-collision-0.1.46.tgz#785d583225e4337695fad5ac79e375008ddfa99c"
+  integrity sha512-mLw7RrU5AGopmiQWnTNzeIoHo8Tehw9SSTlHymPzO3YjStDXyXl3ZyOP08QO0eOpavqqRqLaTEFPAgGr/zVKGA==
   dependencies:
-    "@tryghost/errors" "^1.2.26"
+    "@tryghost/errors" "^1.3.6"
     lodash "^4.17.21"
     moment-timezone "^0.5.33"
 
-"@tryghost/bookshelf-custom-query@^0.1.21":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-custom-query/-/bookshelf-custom-query-0.1.21.tgz#79da2f0c762961034ed9757cdd1ae6a155e3d808"
-  integrity sha512-x8jqU9aa6emsBCvUHDzSucHD/IhkftAIQcHvu9mZALyMjZ6Q38hWmTvHlmLfH5OLNuFj/J2EnI1E0OW1A6q34w==
+"@tryghost/bookshelf-custom-query@^0.1.28":
+  version "0.1.28"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-custom-query/-/bookshelf-custom-query-0.1.28.tgz#ae233bca2bcbd3afc9d57db9305f6486fc84c4b4"
+  integrity sha512-FZKJcbF1Rb3BBbHnb/HPS+FmlRR2UPTpNNOk0YBRVmOKakIjkR65u4xpv/6irDObLyDSlgbSTskFxeVlcot2Kw==
 
-"@tryghost/bookshelf-eager-load@^0.1.25":
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-eager-load/-/bookshelf-eager-load-0.1.25.tgz#151212bf12baf0c59db3085ac9150b83279e79f9"
-  integrity sha512-F6slbTyughBsUZX9viZ9cpLdLKhL6YECidDa3TI6AYY8ndFNdqPEBj/fQeJ+phO+yksrkmk0Sxrkx0dP2fM7SQ==
+"@tryghost/bookshelf-eager-load@^0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-eager-load/-/bookshelf-eager-load-0.1.32.tgz#14e0a297b6ce0996628d23a778b4cfda68fa5c73"
+  integrity sha512-0Y+32Z21R6lySqPH1/kYLJ6rBdEdDm8e+ohBsTEDqUKagoVsQ8K2lot9B/Z5D80tn06pN1JzvpDbaiW+eXu3pQ==
   dependencies:
-    "@tryghost/debug" "^0.1.26"
+    "@tryghost/debug" "^0.1.33"
     lodash "^4.17.21"
 
-"@tryghost/bookshelf-filter@^0.5.8":
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-filter/-/bookshelf-filter-0.5.8.tgz#d02f9dd56f482509bbb0fbad7dd94584cc6e6593"
-  integrity sha512-fDvcU5VFFcgrWm2lySs4b57HtAUuH3B95JMzJ2Oo2zXyHGC94NCB3iOKg10bhlKMdyrhsWtwzQzigJXMbcBkbA==
+"@tryghost/bookshelf-filter@^0.5.19":
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-filter/-/bookshelf-filter-0.5.19.tgz#bc43e7823462762b8599a7ac09e82cc281d36301"
+  integrity sha512-q8hF2+Rt35D0v+VIWPqkQlLAPsF5R5R4Mq2q1GhQ+n+OcYerlX7vFR9FKlGfrVeBg9HsLUBTNlZacm407HaLHA==
   dependencies:
-    "@tryghost/debug" "^0.1.26"
-    "@tryghost/errors" "^1.2.26"
-    "@tryghost/nql" "^0.11.0"
-    "@tryghost/tpl" "^0.1.26"
+    "@tryghost/debug" "^0.1.33"
+    "@tryghost/errors" "^1.3.6"
+    "@tryghost/nql" "^0.12.4"
+    "@tryghost/tpl" "^0.1.33"
 
-"@tryghost/bookshelf-has-posts@^0.1.26":
-  version "0.1.26"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-has-posts/-/bookshelf-has-posts-0.1.26.tgz#9898cbc8e082de72245d136ebe46b430b1e42e4e"
-  integrity sha512-tRHxrGOx8GgKXHGo7L9PKxzBbmuTgUGOsT24uslCiMYkVPFEckhM+RDHhWw1iOzdpuSvQDcKE6wfET4COUw+Sg==
+"@tryghost/bookshelf-has-posts@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-has-posts/-/bookshelf-has-posts-0.1.33.tgz#5c5632840478a3b12264092b9ee231fa3d8efd67"
+  integrity sha512-1Zn6+kLX0CzSVR5vk5FJxj8Ln2dw5wwK1w7qKGpCu4Jtnd4Gb3/OBC95WG3jqLWE5qs9yC9GD0Nuw5+DN4+aGg==
   dependencies:
-    "@tryghost/debug" "^0.1.26"
+    "@tryghost/debug" "^0.1.33"
     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.16":
+  version "0.3.16"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-include-count/-/bookshelf-include-count-0.3.16.tgz#d98852499f95ef59283284f8be8113fb0baac5da"
+  integrity sha512-P/YUnxei4uV1tyIltk5ebKaJGj64SeR5nT9uYlslM/3jLuxgN9WPSNyBXpS6IosnOnHwcwkGzOYzV71nAyJzdA==
   dependencies:
-    "@tryghost/debug" "^0.1.26"
+    "@tryghost/debug" "^0.1.33"
     lodash "^4.17.21"
 
-"@tryghost/bookshelf-order@^0.1.21":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-order/-/bookshelf-order-0.1.21.tgz#964cd47424598212f1591262b50d01dd2526bc66"
-  integrity sha512-wJCdAMjldXZGAquDdihlgATUVfc2ckMwybGs7cFThQSbZvhSj4IXa9Ow8RGxfpwjiUuplhsbRib/h7F3eHg9TQ==
+"@tryghost/bookshelf-order@^0.1.28":
+  version "0.1.28"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-order/-/bookshelf-order-0.1.28.tgz#5f56db2aa738879f4f4f4b639a4d5bfe8c950b11"
+  integrity sha512-K37xBu7aylb8cXb0I3XwX31JrQ1bWWcKPuc+Tl83Zz4HOkJf846yXu6PATu1IQUtfk48Ur6sGqIyaO4BwJmUfA==
   dependencies:
     lodash "^4.17.21"
 
-"@tryghost/bookshelf-pagination@^0.1.39":
-  version "0.1.39"
-  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-pagination/-/bookshelf-pagination-0.1.39.tgz#a4c45d62b42357491208fc914359e389e34f5ded"
-  integrity sha512-WK0z9lgtMvGkjDQmA28MIB67NT90Ii9rUPQFzSbt1/30sbqv9UxyYRAIU30ZM59oKYQapmGdvqkuQ2Z3mbUfbg==
+"@tryghost/bookshelf-pagination@^0.1.49":
+  version "0.1.49"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-pagination/-/bookshelf-pagination-0.1.49.tgz#9f4a7c83a7778e13d06a2facef37a634bff46e0c"
+  integrity sha512-nkHM42IqEzNDBOeA1t3DIgygLlmtGkrcOjKjttMHC1pTuD0t7OYB25cq6HPPYPpRWGAtdShF7JvICEQcxdHuPQ==
   dependencies:
-    "@tryghost/errors" "^1.2.26"
-    "@tryghost/tpl" "^0.1.26"
+    "@tryghost/errors" "^1.3.6"
+    "@tryghost/tpl" "^0.1.33"
     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==
-  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-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-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-plugins@0.6.23":
+  version "0.6.23"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-plugins/-/bookshelf-plugins-0.6.23.tgz#3b17f49d397a618911065593c8aa044881491853"
+  integrity sha512-Muuk8J9t3Dv630FpT1cqhan6J6GGIXUjZ7r25IcymQPideUbAvZXt0jEXWN7jpB1pq3+MdbRJSOmw+KrVlWbtg==
+  dependencies:
+    "@tryghost/bookshelf-collision" "^0.1.46"
+    "@tryghost/bookshelf-custom-query" "^0.1.28"
+    "@tryghost/bookshelf-eager-load" "^0.1.32"
+    "@tryghost/bookshelf-filter" "^0.5.19"
+    "@tryghost/bookshelf-has-posts" "^0.1.33"
+    "@tryghost/bookshelf-include-count" "^0.3.16"
+    "@tryghost/bookshelf-order" "^0.1.28"
+    "@tryghost/bookshelf-pagination" "^0.1.49"
+    "@tryghost/bookshelf-search" "^0.1.28"
+    "@tryghost/bookshelf-transaction-events" "^0.2.17"
+
+"@tryghost/bookshelf-search@^0.1.28":
+  version "0.1.28"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-search/-/bookshelf-search-0.1.28.tgz#9f3c8b2cfd344db583dede561cce403a59fdcb27"
+  integrity sha512-73B5KAB6xRX6LpkrWoz2f1r7cWQCyo++sWTOHcf+B9w5j8LLhlwT5g6VhWNCgyPT+71hDN+NetAHTwUz6TLoPA==
+
+"@tryghost/bookshelf-transaction-events@^0.2.17":
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-transaction-events/-/bookshelf-transaction-events-0.2.17.tgz#f6d5a7839be4a1f237e55b7c8fc24bdb32f4cc06"
+  integrity sha512-rplr8pMzSV1hBEQ9Q8eCAOpKdPJuf9/CnykYK6Y5YVwX033TB8rv4pYkGQkfG5HQvQStcO3QzxnJglxdEaJZfA==
 
 "@tryghost/bunyan-rotating-filestream@^0.0.7":
   version "0.0.7"
@@ -7618,17 +7532,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.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/color-utils/-/color-utils-0.2.2.tgz#29db40ec9c0a13cb6112e99ede558fb434d98903"
+  integrity sha512-/QuiczF/Ql811aw5zGf33nRRpIF1/9Ul/h8CVC0yfEk8oOELgKrtaOG8bK1uq5RHKot/U1AhmWKIE+9szpFVSw==
   dependencies:
+    "@types/color" "3.0.6"
     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.12":
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/config-url-helpers/-/config-url-helpers-1.0.12.tgz#7ff5003ce11bad623106450091e688fe9c23c2f9"
+  integrity sha512-l61hlrWErxwf36NFB63UUxV7wWM3XYdHkwxrCmSh+YrqT49sFCXrFjsPBivSTqp7jomXEowboNk19l+yGN8Gkw==
 
 "@tryghost/config@^0.2.18":
   version "0.2.18"
@@ -7638,47 +7553,52 @@
     "@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.21":
+  version "1.11.21"
+  resolved "https://registry.yarnpkg.com/@tryghost/content-api/-/content-api-1.11.21.tgz#3904416b39297dadb8e5430d3f19a512e5ce1214"
+  integrity sha512-ozJqEMHDUO7D0SGxPbUnG+RvwBbzC3zmdGOW8cFvkcKzrhe7uOAmVKyq7/J3kRAM2QthTlmiDpqp7NEo9ZLlKg==
   dependencies:
-    axios "^0.27.0"
+    axios "^1.0.0"
+
+"@tryghost/database-info@0.3.22":
+  version "0.3.22"
+  resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.22.tgz#8db1433f35fcee8fbca182ba8b7ea7e682a45fcd"
+  integrity sha512-AwljcoXFUjSKFIoB/V9uohTLvWY8g+fIaHHjgPLH4Cq1tBZgcAlBIZR2ridhXiY1iDX7m3cws36uAxrN0KnoUw==
 
-"@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/database-info@0.3.27":
+  version "0.3.27"
+  resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.27.tgz#b0f7e4b15eb9923094cf4f37084f8ada932c0883"
+  integrity sha512-0blN+k/NA6c/gZtihx4iyZi1yyPG40GxdYILjtp/8XwGZarmgTTiZGz3HVOVir4+TfL/Z1O5xPsBxO9+KeiH+g==
 
-"@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==
+"@tryghost/debug@0.1.32":
+  version "0.1.32"
+  resolved "https://registry.npmjs.org/@tryghost/debug/-/debug-0.1.32.tgz#a6c1321132708c2e86bd8c47bf28292180fee722"
+  integrity sha512-oU4hy27I3WDA5Zty74QQ+Ki842Ib0aWdXKwfK01YwQ/gqr127mtNOBimkRg39mY27hO4PvE/zvRhtlJ05Jk2cQ==
   dependencies:
-    "@tryghost/root-utils" "^0.3.22"
+    "@tryghost/root-utils" "^0.3.30"
     debug "^4.3.1"
 
-"@tryghost/debug@0.1.26", "@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.26":
-  version "0.1.26"
-  resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.26.tgz#c1a403fb8abfcf5293395f822593b5d6f997f426"
-  integrity sha512-Q0idDUzgPFgUOELED8GwmxEFtp9WjIw6sUayLgc2he4YJfe3hK2LsExt5XSJsa3OSZp1NgX7/OqVHd3vueynlA==
+"@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.26", "@tryghost/debug@^0.1.32", "@tryghost/debug@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.33.tgz#d824ab20d2dffc6ee6c4ec090a79f3804b8acb79"
+  integrity sha512-aYmfmrXDI974G8ahyT4bPHMthpqiEDXgTXGJ685ZKNB5S2ak/6R0pvhOA6c/QhHihocJG40K2ylzlPqcQq/oWg==
   dependencies:
-    "@tryghost/root-utils" "^0.3.24"
+    "@tryghost/root-utils" "^0.3.31"
     debug "^4.3.1"
 
-"@tryghost/elasticsearch@^3.0.12", "@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==
+"@tryghost/elasticsearch@^3.0.21":
+  version "3.0.21"
+  resolved "https://registry.npmjs.org/@tryghost/elasticsearch/-/elasticsearch-3.0.21.tgz#a4acbfccf1577d1f7c9750018cbd30afefa87b3a"
+  integrity sha512-blSWDB1HCFwhmo5tcDWpOWeMJdFTxTrZpfxU1asKVhARVYuLx5Su5+a8C4x43wewyAhMn9dc9e7qSUHsnUq8XQ==
   dependencies:
-    "@elastic/elasticsearch" "8.10.0"
-    "@tryghost/debug" "^0.1.26"
+    "@elastic/elasticsearch" "8.13.1"
+    "@tryghost/debug" "^0.1.32"
     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.8":
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/@tryghost/email-mock-receiver/-/email-mock-receiver-0.3.8.tgz#17480deaa75e8c0e66560969c0f13e39b8ce6196"
+  integrity sha512-olzxRq/xV1mS5flOHmKaFZQ5JFLPMq/9XJqR457fsNvaum/PPUoj/jddjJg/5tG8h++Ea9KqBxszo9vPvdbcCw==
 
 "@tryghost/ember-promise-modals@2.0.1":
   version "2.0.1"
@@ -7696,234 +7616,239 @@
     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":
-  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==
+"@tryghost/errors@1.3.1", "@tryghost/errors@1.3.5", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3", "@tryghost/errors@^1.3.5", "@tryghost/errors@^1.3.6":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.3.5.tgz#f4ef8e5c41a8a37456f2285271124180685827ae"
+  integrity sha512-iOkiHGnYFqSdFM9AVlgiL56Qcx6V9iQ3kbDKxyOAxrhMKq1OnOmOm7tr1CgGK1YDte9XYEZmR9hUZEg+ujn/jQ==
   dependencies:
-    "@stdlib/utils-copy" "^0.0.7"
-    lodash "^4.17.21"
+    "@stdlib/utils-copy" "^0.2.0"
     uuid "^9.0.0"
 
-"@tryghost/express-test@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@tryghost/express-test/-/express-test-0.13.7.tgz#fee867065282298095a194c5e70386e393d21d57"
-  integrity sha512-+SBhiYNuOPjGmv+UIK4h+HjBVgvPG22fhPIr97u67cmntuwcnGWVmo9PZ8hQyquGj3SC5AvBAeoLnsKrQSyG9A==
+"@tryghost/express-test@0.13.15":
+  version "0.13.15"
+  resolved "https://registry.yarnpkg.com/@tryghost/express-test/-/express-test-0.13.15.tgz#a906f6935e9cbf60fd5034a9549de50b76b544ae"
+  integrity sha512-FyugwFZkch76JSr60xkZWqXcyCaAK4VA01g/dZOA05iUvBdWN6qDNOqLXEQ4aRV3VWqt4X4BfqeVsrZQf4VoTw==
   dependencies:
-    "@tryghost/jest-snapshot" "^0.5.7"
+    "@tryghost/jest-snapshot" "^0.5.15"
     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==
-  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/helpers@1.1.90":
+  version "1.1.90"
+  resolved "https://registry.yarnpkg.com/@tryghost/helpers/-/helpers-1.1.90.tgz#a00765fdd235529eea98153db9d21ee29bdb312a"
+  integrity sha512-fHSAF9Sch9AfvZcqkHBV/LInL28HDMbzYqzvcGEP5f1qKzRVyPfyyHO2oGhZba2rHujnlF/MiwZTrNMvfA5Qmg==
   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==
+"@tryghost/html-to-mobiledoc@3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/html-to-mobiledoc/-/html-to-mobiledoc-3.1.2.tgz#aded56f17df3d13824eb4e9a1aaeda6dd87b42e6"
+  integrity sha512-x6C69fA87QhHVO24GI7SPeyNyk7XCNf7tL1RPGzRwt/eiYLEgg/YzbBoSO89dvPIwhimaJUgCCN9+gg8Ll7T3A==
   dependencies:
-    "@tryghost/kg-parser-plugins" "^3.0.36"
+    "@tryghost/kg-parser-plugins" "4.1.1"
     "@tryghost/mobiledoc-kit" "^0.12.4-ghost.1"
-    jsdom "^22.0.0"
+    jsdom "^24.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.17":
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/@tryghost/http-cache-utils/-/http-cache-utils-0.1.17.tgz#9dd01464cfa52947fa0b63ea57ef084106ff42ba"
+  integrity sha512-sO/C2nCX3C4sPz1ysN8/9em8dbhnSUGP0d84CjZsSrs/DYzZmw1nWJGKzDF80mOpYIs34GGL+JhybRRTlOrviA==
 
-"@tryghost/http-stream@^0.1.25":
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.25.tgz#cbe87996c67a2814c4a6706cd7e445a2b069246e"
-  integrity sha512-aeuGSvoXS1rjY+LupkqzJ9osKEkouzs/LrVqvOe7x9b/c8VUWIh6SrQ2KegKXtkvBggI8dBCH39bJiheZea9/Q==
+"@tryghost/http-stream@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.33.tgz#8c74d63c0ad764e0a889709751ed6379d387daab"
+  integrity sha512-6DC/YmpEF/u8aez8e3+Xc4MkihSILP5EfErQsrUCT3QcdaEIxR+3u1JlsH9Qe7U5ld1wN7tzDS45mFDQy96G6Q==
   dependencies:
-    "@tryghost/errors" "^1.2.26"
-    "@tryghost/request" "^1.0.0"
+    "@tryghost/errors" "^1.3.5"
+    "@tryghost/request" "^1.0.8"
 
-"@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.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/image-transform/-/image-transform-1.3.0.tgz#e68e630c4e42e1af193a18894a864e9e2da9fc1f"
+  integrity sha512-WQFSMh1eAWbZqiheMR5TuTOTll4RDRKZ5p/JIOvejiBzgu/OLBLGKrFKpPb9JSVySTFxpj1dInKmMu8z1so7nQ==
   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"
-  resolved "https://registry.yarnpkg.com/@tryghost/jest-snapshot/-/jest-snapshot-0.5.7.tgz#89b23e3c83907530da0deb769575e9c0bab2ceed"
-  integrity sha512-MF9/Bz1YpYkc/VLQqGoV0LOUqUJNXCFsRaMcsXjoEatKK2Ar4f0uBRMr8rE1b9HbwPbe1P/8AIapz7RHEfFKMQ==
+"@tryghost/jest-snapshot@^0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@tryghost/jest-snapshot/-/jest-snapshot-0.5.15.tgz#51b4e0e27450e1804cea8b86e9380a4d7384d890"
+  integrity sha512-HRz/dYX6t96Iv8ZrlIepQa286B2n/y/VnnLvZf3UoPXXKWe4sGcrgELgywP/26gSxfWfSkvK4hlWzCq2AQiiyg==
   dependencies:
     "@jest/expect" "^28.0.1"
     "@jest/expect-utils" "^28.0.1"
-    "@tryghost/errors" "^1.2.26"
+    "@tryghost/errors" "^1.3.5"
     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@5.0.5":
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-5.0.5.tgz#2a7552b5f7ac3bbae99af9dca3da11b95fb4ae1b"
+  integrity sha512-fZumHdEkR6pzc2BLukMNOnSC/tru9SJ+UP5rEaECN9lpLnLGya6B0fU51y8+Jjn+xl1CDCzeWtvII50CSBNLOQ==
+
+"@tryghost/kg-clean-basic-html@4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-4.1.1.tgz#132a019abc6b6b6a0948c7e2d3e3ce37d18983b7"
+  integrity sha512-R654qIHRf//FP/1hHLkehTYxZz/Zp5NXomfEuQSezw4uDmOwGn1ME4yZD5TDi5+8ism71tfMeGVVI5XmLOeDLg==
 
-"@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@4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-4.1.4.tgz#19d80d7ce92c769141672a5ecc31e5446045caf7"
+  integrity sha512-IvP4wfQSq6v08FFPAPE1CWk+pLm/vlyX520UMGoVmZqVsucPNaYyQDvyp3RHZQiRfqqK/cCmG+GLQZTAfzOY9w==
 
-"@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@1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-converters/-/kg-converters-1.0.7.tgz#51e1bb7fa48672bd959e84a74afef2f59372aac6"
+  integrity sha512-aToPdCTv58v/AvseiOkbPJYFAnoF8kJxWD/8bfPX6yD90jSaldCc5XYGvtMa/1Rg28Nb4PlmswWSvhox1YfRhQ==
   dependencies:
     lodash "^4.17.21"
 
-"@tryghost/kg-default-atoms@4.0.3":
-  version "4.0.3"
-  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-atoms@5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-atoms/-/kg-default-atoms-5.0.3.tgz#7d0e5af2191f2e0c61ae11d1666905bf924f67ac"
+  integrity sha512-uPE69rKxaiiMEa1vFsEbfX+LCBG2H5D/nqTkuIPAslEGIHYjQUruaXpBfnwtyVHn+dMLuWcO+wDJl5qET8gKEQ==
 
-"@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@10.0.9":
+  version "10.0.9"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-cards/-/kg-default-cards-10.0.9.tgz#6ea967c3270c4fd895f9f3b7773bc1203370fb45"
+  integrity sha512-y5P5ybNX846PZ7N+z3Gs5curkqKSU0qNVjve0TVwQe5J3kHPwTKH4eMFcqrEQj9Tu3XgIqx0XWxXL3bSN6uWiw==
   dependencies:
-    "@tryghost/kg-markdown-html-renderer" "^6.0.14"
-    "@tryghost/string" "^0.2.0"
-    "@tryghost/url-utils" "^4.0.0"
+    "@tryghost/kg-markdown-html-renderer" "7.0.7"
+    "@tryghost/string" "0.2.12"
+    "@tryghost/url-utils" "4.4.8"
     handlebars "^4.7.6"
-    juice "^9.0.0"
+    juice "^10.0.0"
     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==
-  dependencies:
-    "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-clean-basic-html" "^3.0.39"
-    "@tryghost/kg-markdown-html-renderer" "^6.0.14"
+    luxon "^3.5.0"
+
+"@tryghost/kg-default-nodes@1.1.17":
+  version "1.1.17"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-1.1.17.tgz#f093217d1ba7af40bc6b05dd4b5a8400ab6c87ed"
+  integrity sha512-8asqWT11ULuuTjG9jrdwHqqFyKM80w3YEULO4OSdtNBtu8PbFmN0KdJ9Yo7w9YdpOMqfu/YTzyRJm1+XbRU55Q==
+  dependencies:
+    "@lexical/clipboard" "0.13.1"
+    "@lexical/rich-text" "0.13.1"
+    "@lexical/selection" "0.13.1"
+    "@lexical/utils" "0.13.1"
+    "@tryghost/kg-clean-basic-html" "4.1.4"
+    "@tryghost/kg-markdown-html-renderer" "7.0.7"
     html-minifier "^4.0.0"
-    jsdom "^22.0.0"
-    lexical "^0.12.2"
+    jsdom "^24.1.0"
+    lexical "0.13.1"
     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==
-  dependencies:
-    "@lexical/list" "^0.12.2"
-    "@lexical/rich-text" "^0.12.2"
-    "@lexical/utils" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.6"
-    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==
-  dependencies:
-    "@lexical/clipboard" "^0.12.2"
-    "@lexical/headless" "^0.12.2"
-    "@lexical/html" "^0.12.2"
-    "@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"
-    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==
-  dependencies:
-    "@lexical/clipboard" "^0.12.2"
-    "@lexical/code" "^0.12.2"
-    "@lexical/headless" "^0.12.2"
-    "@lexical/link" "^0.12.2"
-    "@lexical/list" "^0.12.2"
-    "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.6"
-    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==
-  dependencies:
-    "@tryghost/kg-utils" "^1.0.22"
-    markdown-it "^13.0.0"
-    markdown-it-footnote "^3.0.3"
-    markdown-it-image-lazy-loading "^1.1.0"
+    luxon "^3.5.0"
+
+"@tryghost/kg-default-transforms@1.1.18":
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-1.1.18.tgz#07b60f821abe5598ddda9da0da8a5157f0bc1ab7"
+  integrity sha512-oempHDuJPFu8TpOGRmxIJpiVEEO2a68vUMGF5EtMfDTP0wOV0rpX4I1DKfuU/M38UKjVkJ1D9VYwuEPkYsQEqQ==
+  dependencies:
+    "@lexical/list" "0.13.1"
+    "@lexical/rich-text" "0.13.1"
+    "@lexical/utils" "0.13.1"
+    "@tryghost/kg-default-nodes" "1.1.17"
+    lexical "0.13.1"
+
+"@tryghost/kg-html-to-lexical@1.1.18":
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-1.1.18.tgz#c18fa31cf9d9d766715bbba81b14733d926384de"
+  integrity sha512-ERwQGNBnWCwWdbCQRZGFFvqCQ5VlQWCaEnbfMCvPiAzGy7FTHX1XMntUeDQFytB4WJLJpRbrKncwfQH3wL5xQA==
+  dependencies:
+    "@lexical/clipboard" "0.13.1"
+    "@lexical/headless" "0.13.1"
+    "@lexical/html" "0.13.1"
+    "@lexical/link" "0.13.1"
+    "@lexical/list" "0.13.1"
+    "@lexical/rich-text" "0.13.1"
+    "@tryghost/kg-default-nodes" "1.1.17"
+    "@tryghost/kg-default-transforms" "1.1.18"
+    jsdom "^24.1.0"
+    lexical "0.13.1"
+
+"@tryghost/kg-lexical-html-renderer@1.1.20":
+  version "1.1.20"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-1.1.20.tgz#d53a58acde2ee39370058937c8decd4966d6ed13"
+  integrity sha512-XgxB318IJq+rhMLL4zV+2Tqy/MReHT3hSMqa4OkEJNmtVGUSUNs1Jxe6zJdqWn1h+5P3wZ+7oEco3V+MyboZpw==
+  dependencies:
+    "@lexical/clipboard" "0.13.1"
+    "@lexical/code" "0.13.1"
+    "@lexical/headless" "0.13.1"
+    "@lexical/link" "0.13.1"
+    "@lexical/list" "0.13.1"
+    "@lexical/rich-text" "0.13.1"
+    "@tryghost/kg-default-nodes" "1.1.17"
+    "@tryghost/kg-default-transforms" "1.1.18"
+    jsdom "^24.1.0"
+    lexical "0.13.1"
+
+"@tryghost/kg-markdown-html-renderer@7.0.7":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-7.0.7.tgz#c0640f0165a853a8f371edb4a731a04c48ee938e"
+  integrity sha512-hTTEyMeYLhDCq7vXeCiM6SqcozWZEHjK3fZelW3m6E6FxwpZHGURMoZ30UZVpgIpEp/66fMWAT6fD69+tS3TNQ==
+  dependencies:
+    "@tryghost/kg-utils" "1.0.28"
+    markdown-it "^14.0.0"
+    markdown-it-footnote "^4.0.0"
+    markdown-it-image-lazy-loading "^2.0.0"
     markdown-it-lazy-headers "^0.1.3"
-    markdown-it-mark "^3.0.0"
-    markdown-it-sub "^1.0.0"
-    markdown-it-sup "^1.0.0"
-    semver "^7.3.5"
+    markdown-it-mark "^4.0.0"
+    markdown-it-sub "^2.0.0"
+    markdown-it-sup "^2.0.0"
+    semver "^7.6.2"
 
-"@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@7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-7.0.6.tgz#471bcc83546acb4b45dd6d6940709416f2fb28a8"
+  integrity sha512-jpHKpq7nda6fSO7/kEOb2dbY6Y1NOQ+w7l4snhtRV3rcW1epIZ07OhXwW36GV0hGTVFs3yxc6HMWlKlvIZS0uA==
   dependencies:
-    "@tryghost/kg-utils" "^1.0.22"
+    "@tryghost/kg-utils" "1.0.28"
     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@4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-parser-plugins/-/kg-parser-plugins-4.1.1.tgz#a1f74ad3c1de0c940f487145e84212021491681e"
+  integrity sha512-IRhX8k/iIdirSjAt3S4cjpasAQ6Rsspp1oeOP21781DJNlFG7Ld7xiI+f+3/cZzF2GlBgfka0dhcRp2a2MSzrA==
   dependencies:
-    "@tryghost/kg-clean-basic-html" "^3.0.36"
+    "@tryghost/kg-clean-basic-html" "4.1.1"
+
+"@tryghost/kg-unsplash-selector@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-unsplash-selector/-/kg-unsplash-selector-0.2.4.tgz#2a54f5a4ec67dee2bae1c69b22084c6b0e8e6148"
+  integrity sha512-SFD0RduFkvr8K2S5YuHNnlueOx37PnNm6f18umGol+8cw/QohqScCFSfi6ISHbjj4js4qic5Cwaki4C/N88Fhw==
 
-"@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.28":
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-utils/-/kg-utils-1.0.28.tgz#cfdaac6f5cbe6f4375f8771e5b4a014bfb53a689"
+  integrity sha512-OIl+V3j7u9/bWdnkZvnx/cDbRpmCIMI4f9uJbp0sC9dfAgGq83TFg1ZuHXK9QAB6nVCnY36eR2JVawlSYx04PA==
   dependencies:
-    semver "^7.3.5"
+    semver "^7.6.2"
 
-"@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@1.3.23":
+  version "1.3.23"
+  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.3.23.tgz#924545b3abfe721d40236ce26f6f01b439f494ef"
+  integrity sha512-84xN39lce6kx8cgXcWUKz9kmuPYFsZ4t0m0nXGk7azDDAArFurp1QgH9CAuOiEuZqD8eluLe7OsyPj+shmJbXw==
 
-"@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.14":
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/@tryghost/limit-service/-/limit-service-1.2.14.tgz#bd2629900971b231f0beae0e3a4ebeee8db81dc4"
+  integrity sha512-L15PsK9Aq/uFx3dCdjimtYbWP40y26niRe5+MQJZ/txvvJAVJpy8nRt1fufP/GGCJDXHivPJ+Lm0dIPs3VTgIg==
   dependencies:
     "@tryghost/errors" "^1.2.26"
     lodash "^4.17.21"
     luxon "^1.26.0"
 
-"@tryghost/logging@2.4.5", "@tryghost/logging@2.4.8", "@tryghost/logging@^2.4.7":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.8.tgz#a9e9abdbec823f0c6a009aa2f6847ce454b35475"
-  integrity sha512-/pIeTcw9jpqWJ5/VyUn5sa3rsUxUHortykB4oYd5vKr16KgnrVOuGPCg4JqmdGfz2zrkgKaGd9cAsTNE++0Deg==
+"@tryghost/logging@2.4.10", "@tryghost/logging@2.4.18", "@tryghost/logging@^2.4.7":
+  version "2.4.18"
+  resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.18.tgz#5d7ddb2d0a66dc6834a6048ebbf48418420445d5"
+  integrity sha512-mMJkdCFDXa0ohS0FlDTvOrJQd7VamBIqjljGYvNECdVli7BMjdUYgZyWr8bEJ/d7scsq8OE2bVVBJWLxvPxLAg==
   dependencies:
     "@tryghost/bunyan-rotating-filestream" "^0.0.7"
-    "@tryghost/elasticsearch" "^3.0.15"
-    "@tryghost/http-stream" "^0.1.25"
-    "@tryghost/pretty-stream" "^0.1.20"
-    "@tryghost/root-utils" "^0.3.24"
+    "@tryghost/elasticsearch" "^3.0.21"
+    "@tryghost/http-stream" "^0.1.33"
+    "@tryghost/pretty-stream" "^0.1.26"
+    "@tryghost/root-utils" "^0.3.30"
     bunyan "^1.8.15"
     bunyan-loggly "^1.4.2"
     fs-extra "^11.0.0"
@@ -7931,17 +7856,15 @@
     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.34":
+  version "1.0.34"
+  resolved "https://registry.npmjs.org/@tryghost/metrics/-/metrics-1.0.34.tgz#b223b21a61e4e116904872c3860e7e1d1bb1f481"
+  integrity sha512-e45Chvl7RRjzX0MfuEYJrlpVZF1Eh4hjkSxtfzhFitP8zk+43K8sxTJRMUPoOk6HfMN4ac3T+46TFgSk4KMpiA==
   dependencies:
-    "@tryghost/elasticsearch" "^3.0.12"
-    "@tryghost/pretty-stream" "^0.1.18"
-    "@tryghost/root-utils" "^0.3.22"
+    "@tryghost/elasticsearch" "^3.0.21"
+    "@tryghost/pretty-stream" "^0.1.26"
+    "@tryghost/root-utils" "^0.3.30"
     json-stringify-safe "^5.0.1"
-  optionalDependencies:
-    promise.allsettled "^1.0.5"
 
 "@tryghost/mobiledoc-kit@^0.12.4-ghost.1":
   version "0.12.4-ghost.1"
@@ -7951,104 +7874,101 @@
     mobiledoc-dom-renderer "0.7.0"
     mobiledoc-text-renderer "0.4.0"
 
-"@tryghost/mongo-knex@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/mongo-knex/-/mongo-knex-0.8.0.tgz#089a4948bf915a108baf62ead9f2d25d945a756c"
-  integrity sha512-WTsLW7Q6L/mmX9jB7DDHDIR3k7SADjdXTP0dsJAiEwevMFByEQZmGba5bc1FhkTrbNWaVgk0wEnzE/r4SwhXvw==
+"@tryghost/mongo-knex@^0.9.1":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/mongo-knex/-/mongo-knex-0.9.1.tgz#b429952cc01d7ffa2489b37db4008f8a323e40d5"
+  integrity sha512-WqnuGs9TUMxc9/lSyuJ7kB57jDIFSd+Dty5rgjKf6Ts6u5k73FRvOqJL83U0aPCb67r1GC1SKgf40ErISFHHvA==
   dependencies:
     debug "^4.3.3"
     lodash "^4.17.21"
 
-"@tryghost/mongo-utils@0.5.0", "@tryghost/mongo-utils@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/mongo-utils/-/mongo-utils-0.5.0.tgz#4d697b3374ec8dd3ebe206a269907aff661fa3fb"
-  integrity sha512-7eRb+pQdTe+NK+wQ44WUNQxC8DIPdCYg8jTp8Mk0G6BqlvaYdRtbrZU/uqeR7Z6efLiG4uPfLG7BNkNx5MjvMg==
+"@tryghost/mongo-utils@0.6.2", "@tryghost/mongo-utils@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/mongo-utils/-/mongo-utils-0.6.2.tgz#18af1e057aad6876cb7ff61f817df4e90d8055bf"
+  integrity sha512-ewXYg2/EOYNc/ko5zwfvxskYfyLOVjMOPGgRLODJf3jLp9iXK9nfLHOrnAO4Jeh9CLzHm84aWUMaRIFH/XQULg==
   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.45":
+  version "0.3.45"
+  resolved "https://registry.yarnpkg.com/@tryghost/nodemailer/-/nodemailer-0.3.45.tgz#173a9bd378d8f161acee09f0e28abc6cf028bdc0"
+  integrity sha512-vvAjXN/oOpP9fo7T/J+IBSqdkZhdbqPL9OWUP+qulq1/6fIqwGmye+mu9E2aPckgIoVlOGCpHKqMz9G22ZeuIw==
   dependencies:
     "@aws-sdk/client-ses" "^3.31.0"
-    "@tryghost/errors" "^1.2.24"
+    "@tryghost/errors" "^1.3.5"
     nodemailer "^6.6.3"
     nodemailer-direct-transport "^3.3.2"
     nodemailer-mailgun-transport "^2.1.5"
     nodemailer-stub-transport "^1.1.0"
 
-"@tryghost/nql-lang@0.5.0", "@tryghost/nql-lang@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/nql-lang/-/nql-lang-0.5.0.tgz#e34082997eca361a71b9d2de6ea6f7dd5a0654b6"
-  integrity sha512-Nxmz82Zm0uRXy0GL+Bd7G2mvjakoYbT6QDiyj6W1v90zXyzMedRfb9289lMzYX8tUG4VkoVOj9rWzFm5iSdpbw==
+"@tryghost/nql-lang@0.6.1", "@tryghost/nql-lang@^0.6.1":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/nql-lang/-/nql-lang-0.6.1.tgz#830847d71f0b04107f7d20e3ebc91530fa11df16"
+  integrity sha512-0fYuzWuHXYN0qk3EnqBPv7IQykn6IaFFp1XcY3CtB3nfYZqsJzVGylQFNpxx6dhRLN8ZxdycZ00HkRChd0tvjQ==
   dependencies:
     date-fns "^2.28.0"
 
-"@tryghost/nql@0.11.0", "@tryghost/nql@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/nql/-/nql-0.11.0.tgz#137a05aa3e3c733c8f646afc59dcb9eeb2c6269a"
-  integrity sha512-B8AZUC97NVp6atZ2Jg6mL+03AbQf5gzCkqhCgVjhHeeyQh5xvU1uIMyvuio2wq9MFWxHPD8w8cSltidpY9wTuA==
+"@tryghost/nql@0.12.4", "@tryghost/nql@^0.12.0", "@tryghost/nql@^0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@tryghost/nql/-/nql-0.12.4.tgz#ae482a78faa5cdd23da0d440b8248b2c942cfc6c"
+  integrity sha512-t1qTtFwFETjNe2CEZneLWzfDeLO3eQQMhYtyC/LvanOtpr/dn5gn5HCBCQ/MYi+nLwXeYlUMy7Lcjj1V3ToN5Q==
   dependencies:
-    "@tryghost/mongo-knex" "^0.8.0"
-    "@tryghost/mongo-utils" "^0.5.0"
-    "@tryghost/nql-lang" "^0.5.0"
+    "@tryghost/mongo-knex" "^0.9.1"
+    "@tryghost/mongo-utils" "^0.6.2"
+    "@tryghost/nql-lang" "^0.6.1"
     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":
-  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==
+"@tryghost/pretty-cli@1.2.44", "@tryghost/pretty-cli@^1.2.38":
+  version "1.2.44"
+  resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.44.tgz#9ae1923076c3390457ed40df0217e216413b0f1e"
+  integrity sha512-1OVpdWdlkrUNyKwRSdEsfQQ87hR5dRj4GxG7UvJoTkbvxlmZjziUUF3nuDYF5w/4JIvO7w6Z5oxe7KqXv846KQ==
   dependencies:
     chalk "^4.1.0"
     sywac "^1.3.0"
 
-"@tryghost/pretty-stream@^0.1.18", "@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==
+"@tryghost/pretty-stream@^0.1.26":
+  version "0.1.26"
+  resolved "https://registry.npmjs.org/@tryghost/pretty-stream/-/pretty-stream-0.1.26.tgz#1765f5080c37fa338ddd96003462a1da54e57061"
+  integrity sha512-Z56lak7dBiK5rgwFd1vYbSpsHi65gLLAZaCq81UMxo8fulvyTiWpdvoY+7Q5XApSi6kf2eivYmeN0zmZa+zdNg==
   dependencies:
     lodash "^4.17.21"
     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.12":
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.3.12.tgz#90aff21f256767f1d1c06f358f5cf4012552cb34"
+  integrity sha512-0nktnEMM0sSKHYUb+QeVhQau1ziKWmgaqdffhomIItw5UQEnArEvwVCPH0qh+L7xGsrphf6SHSiMibNCtJIvvA==
 
-"@tryghost/request@1.0.0", "@tryghost/request@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-1.0.0.tgz#2fc95c1a119e70a1e1cadd7c173beb810cf49809"
-  integrity sha512-budMHtaaysFZT5gCIkbbsILiSXOxeiPKNGfUNtjKByuheLDhrQnz7E7+C0FWIIniMoJ6nI8FJdbixS9glpDOgQ==
+"@tryghost/promise@0.3.8":
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.3.8.tgz#3134a044e187f6d61393267c680c6cc75235aa96"
+  integrity sha512-ppcnLBWczpbo4sQcGWtjEA82kdZMv4NFF2MvZRi1MBP4lSOSgh9A636eUxlB1/FpIG+D5ixq84xlY4QJMqW2kA==
+
+"@tryghost/request@1.0.8", "@tryghost/request@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-1.0.8.tgz#d2b87fe30bfaa1d9011a8e58152b941161465113"
+  integrity sha512-wto/TG5xQ6xq8sKEI/N66C+dxSFORusk4yjtsqZNV3E4LEFfg/2HzrIYH6YW9Iip15uR4u0uKhFRMs0J1RRCuA==
   dependencies:
-    "@tryghost/errors" "^1.2.26"
-    "@tryghost/validator" "^0.2.6"
-    "@tryghost/version" "^0.1.24"
+    "@tryghost/errors" "^1.3.5"
+    "@tryghost/validator" "^0.2.14"
+    "@tryghost/version" "^0.1.30"
     cacheable-lookup "7.0.0"
     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==
+"@tryghost/root-utils@0.3.30":
+  version "0.3.30"
+  resolved "https://registry.npmjs.org/@tryghost/root-utils/-/root-utils-0.3.30.tgz#766818cd4394b683338f4d9fccc52c435f77b0b5"
+  integrity sha512-Pg9d0Igl3OGGKZ5RrCe6Wq8qAW9ABIjbn31WKlsO6OLLwRlH2ruNZXU8GBjNL3qrPEZwyI2FyNNDjSR+5gKXag==
   dependencies:
     caller "^1.0.1"
     find-root "^1.1.0"
 
-"@tryghost/root-utils@^0.3.22", "@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==
+"@tryghost/root-utils@^0.3.24", "@tryghost/root-utils@^0.3.30", "@tryghost/root-utils@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.31.tgz#68d17b6813970b9c1b32e4fb5b142fea29dfe6cd"
+  integrity sha512-6TKu40lh7Gyxwm3jE3nrfT7mZyUb9rN6q8IgeXqhndRV4CSBZLlVgbTgHpdrWo3mSVuMPU+kzoYyMT6yDWrB/A==
   dependencies:
     caller "^1.0.1"
     find-root "^1.1.0"
@@ -8061,126 +7981,82 @@
     "@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.43":
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/@tryghost/social-urls/-/social-urls-0.1.43.tgz#7900d8235b0a6bfe73cd428c7950ed3041d9cc3a"
+  integrity sha512-hGjGR+4OBauqILz4eoZldX1FmCDY/WSO2pqDuYRiN6DRxW/+9itu8GwBBr/mW/tt7qBlA3k7x79nYyhZjeNlIA==
 
-"@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.12":
+  version "0.2.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/string/-/string-0.2.12.tgz#fc0e06939e7b43922e2471135ed9af4f22ddcd54"
+  integrity sha512-1ygv+nOycupvFX/lwvRbThcGzwlMlwNXUUQn3HqWnKYZmDAA2FOP5SvlcY/BkOLzpPQUlBgSs3PvjOurCIZU7g==
   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/timezone-data@0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/timezone-data/-/timezone-data-0.4.3.tgz#dad18d1c119ebf705b9720417684efe00081f149"
+  integrity sha512-YrPm2m51/Ddqp+/9CclSv+tKqHkbv7iUu3BgiHJofGhs6ek0QQSpahgiBmJmi/o3R6V6DFbG7LT5qVEtkvMzKg==
 
-"@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==
+"@tryghost/tpl@0.1.32":
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.32.tgz#be0ef05abf8f959f459ab9a8fc5e39efaea542a7"
+  integrity sha512-OvUMLn5NoAYXqqwh4i9FInkCdJiVPGgCeaq4kdiZWT5ApP4NMOd84GFO8uitLsYtrLsHZ01UFuzZJt6rpKtjmw==
   dependencies:
     lodash.template "^4.5.0"
 
-"@tryghost/tpl@^0.1.24", "@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==
+"@tryghost/tpl@^0.1.32", "@tryghost/tpl@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.33.tgz#2512900ffe4635eafea0f41fe3ba2dd6b501b651"
+  integrity sha512-wkwLw0SvX3Ex+yQP/wl7w4m1PYOddP/jLEcW5xGUEGaYSuPgpHrHPmu9lvxWmK++q/SPiVHqVSV97FFaIb2oNQ==
   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.8":
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/@tryghost/url-utils/-/url-utils-4.4.8.tgz#fb867d8bd59a640dc67ab61c1a3d921bd12a8c2b"
+  integrity sha512-kheB4cdGZ9WqmWGzDCJ3JMCDO1fQOGIR44FFalbUhukj8Xl7g+QeHFsiwQg77KvrrL58x0nIZ4uwmo9K1aE/Ew==
   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":
-  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==
+"@tryghost/validator@0.2.14", "@tryghost/validator@^0.2.14":
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/@tryghost/validator/-/validator-0.2.14.tgz#7aea2725e23125b23fd3d9203bede8f1559e7b54"
+  integrity sha512-sSTzN8ngVyAQyqbMtNPSX+eGrK9XoGntVCk5m3V6/iRA3VB3NaI1tE4RB/8Tg5zNr0q899jEyrqWSKkx2sBCZw==
   dependencies:
-    "@tryghost/errors" "^1.2.26"
-    "@tryghost/tpl" "^0.1.26"
+    "@tryghost/errors" "^1.3.5"
+    "@tryghost/tpl" "^0.1.32"
     lodash "^4.17.21"
     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":
-  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==
+"@tryghost/version@0.1.30", "@tryghost/version@^0.1.30":
+  version "0.1.30"
+  resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.30.tgz#0f6b0eb5e89edcaf829c9199727b6199977b609b"
+  integrity sha512-WDCVAllBMScplxnyATDgQWHZIrIy/gurK12Tr4pDUtWMujWf/24U/nWZE9dWMrQe1meam5VC4QdqLQWA7eE8UQ==
   dependencies:
-    "@tryghost/root-utils" "^0.3.24"
+    "@tryghost/root-utils" "^0.3.30"
     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.14":
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/@tryghost/webhook-mock-receiver/-/webhook-mock-receiver-0.2.14.tgz#6a62bff89a330e69c0112bd688ab25900df91149"
+  integrity sha512-jPUvercXPR7J5X7QVQJeXeF6tLVBz5bluWRQaDxasIT2I9y8+REqEvqFyaOUtL7tjQp83/8gUPxzR5jAyqaTsg==
   dependencies:
     p-wait-for "3.2.0"
 
-"@tryghost/zip@1.1.38", "@tryghost/zip@^1.1.38":
-  version "1.1.38"
-  resolved "https://registry.yarnpkg.com/@tryghost/zip/-/zip-1.1.38.tgz#fe1ead4aa6188d8bdb8e18c520fb3918ae6c75cd"
-  integrity sha512-cJIsmoeVJau0TUUa70xml91I0/13uAJLsMSAGlwzblDY7cCZu2/deTw36YdNP1oQtXHOZKDRZpqYX3NZ7uXgIQ==
+"@tryghost/zip@1.1.46", "@tryghost/zip@^1.1.42":
+  version "1.1.46"
+  resolved "https://registry.yarnpkg.com/@tryghost/zip/-/zip-1.1.46.tgz#e7c0097b6b6229193a7d6f9b4881eb5640a464a9"
+  integrity sha512-T25d3q1DXrDMWBX8zJ2UoxvKpy3PMahKrikO/1zFCMY9YEUXSKa8FV2YmJzmmmjnFITkVMlH4JXFkWbB8igZ4A==
   dependencies:
-    "@tryghost/errors" "^1.2.26"
+    "@tryghost/errors" "^1.3.5"
     archiver "^5.0.0"
     extract-zip "^2.0.1"
 
@@ -8221,10 +8097,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.1.14", "@types/babel__core@^7.18.0", "@types/babel__core@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
   dependencies:
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
@@ -8247,12 +8123,12 @@
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d"
-  integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6", "@types/babel__traverse@^7.18.0":
+  version "7.20.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.4.tgz#ec2c06fed6549df8bc0eb4615b683749a4a92e1b"
+  integrity sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==
   dependencies:
-    "@babel/types" "^7.3.0"
+    "@babel/types" "^7.20.7"
 
 "@types/body-parser@*":
   version "1.19.2"
@@ -8296,27 +8172,34 @@
   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/component-emitter@^1.2.10":
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
-  integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
+"@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/concat-stream@^1.6.0":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@types/concat-stream/-/concat-stream-1.6.1.tgz#24bcfc101ecf68e886aaedce60dfd74b632a1b74"
-  integrity sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==
+"@types/color@3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.6.tgz#29c27a99d4de2975e1676712679a0bd7f646a3fb"
+  integrity sha512-NMiNcZFRUAiUUCCf7zkAelY8eV3aKqfbzyFQlXpPIEeoNDbsEHGpb854V3gzTsGKYj830I5zPuOwU/TP5/cW6A==
   dependencies:
-    "@types/node" "*"
+    "@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/connect@*":
-  version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
-  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  version "3.4.36"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.36.tgz#e511558c15a39cb29bd5357eebb57bd1459cd1ab"
+  integrity sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==
   dependencies:
     "@types/node" "*"
 
@@ -8325,10 +8208,15 @@
   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/cookiejar@^2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.5.tgz#14a3e83fa641beb169a2dd8422d91c3c345a9a78"
+  integrity sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==
+
+"@types/cookies@0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.9.0.tgz#a2290cfb325f75f0f28720939bee854d4142aee2"
+  integrity sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==
   dependencies:
     "@types/connect" "*"
     "@types/express" "*"
@@ -8357,6 +8245,11 @@
   resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.3.tgz#e892d293c92c9c1d3f9af72c15a554fbc7e0895a"
   integrity sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==
 
+"@types/doctrine@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.9.tgz#d86a5f452a15e3e3113b99e39616a9baa0f9863f"
+  integrity sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==
+
 "@types/ejs@^3.1.1":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.2.tgz#75d277b030bc11b3be38c807e10071f45ebc78d9"
@@ -8396,10 +8289,10 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+"@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/estree@^0.0.51":
   version "0.0.51"
@@ -8415,10 +8308,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"
@@ -8430,13 +8323,6 @@
   resolved "https://registry.yarnpkg.com/@types/find-cache-dir/-/find-cache-dir-3.2.1.tgz#7b959a4b9643a1e6a1a5fe49032693cc36773501"
   integrity sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==
 
-"@types/form-data@0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-0.0.33.tgz#c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8"
-  integrity sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/fs-extra@^5.0.5":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.1.0.tgz#2a325ef97901504a3828718c390d34b8426a10a1"
@@ -8498,10 +8384,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@*":
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.0.tgz#337b90bbcfe42158f39c2fb5619ad044bbb518ac"
-  integrity sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==
+"@types/jest@*", "@types/jest@29.5.12":
+  version "29.5.12"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
+  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
@@ -8511,10 +8397,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.6", "@types/jsonwebtoken@^9", "@types/jsonwebtoken@^9.0.2":
+  version "9.0.6"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.6.tgz#d1af3544d99ad992fb6681bbe60676e06b032bd3"
+  integrity sha512-/5hndP5dCjloafCXns6SZyESp3Ldq7YjH3zwzwczYnjxIT0Fqzk5ROSYVGfFyczIue7IUEj8hkvLbPoLQ18vQw==
   dependencies:
     "@types/node" "*"
 
@@ -8530,21 +8416,33 @@
   dependencies:
     keyv "*"
 
-"@types/lodash@^4.14.165", "@types/lodash@^4.14.167":
-  version "4.14.194"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
-  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
+"@types/lodash-es@4.17.12":
+  version "4.17.12"
+  resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.12.tgz#65f6d1e5f80539aa7cfbfc962de5def0cf4f341b"
+  integrity sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==
+  dependencies:
+    "@types/lodash" "*"
 
-"@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/lodash@*", "@types/lodash@^4.14.165", "@types/lodash@^4.14.167":
+  version "4.17.7"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.7.tgz#2f776bcb53adc9e13b2c0dfd493dfcbd7de43612"
+  integrity sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==
+
+"@types/luxon@3.4.2":
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.4.2.tgz#e4fc7214a420173cea47739c33cdf10874694db7"
+  integrity sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==
 
 "@types/mdx@^2.0.0":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.5.tgz#9a85a8f70c7c4d9e695a21d5ae5c93645eda64b1"
   integrity sha512-76CqzuD6Q7LC+AtbPqrvD9AqsN0k8bsYo2bM2J8pmNldP1aIPAbzUQ7QbobyXL4eLr1wK5x8FZFe8eF/ubRuBg==
 
+"@types/methods@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@types/methods/-/methods-1.1.4.tgz#d3b7ac30ac47c91054ea951ce9eed07b1051e547"
+  integrity sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==
+
 "@types/mime-types@^2.1.0":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1"
@@ -8583,44 +8481,36 @@
     "@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==
+"@types/node@*", "@types/node@20.14.8", "@types/node@>=10.0.0", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
+  version "20.14.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.8.tgz#45c26a2a5de26c3534a9504530ddb3b27ce031ac"
+  integrity sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==
   dependencies:
-    undici-types "~5.25.1"
+    undici-types "~5.26.4"
 
-"@types/node@^10.0.3":
-  version "10.17.60"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
-  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
-
-"@types/node@^16.0.0":
-  version "16.18.58"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.58.tgz#bf66f63983104ed57c754f4e84ccaf16f8235adb"
-  integrity sha512-YGncyA25/MaVtQkjWW9r0EFBukZ+JulsLcVZBlGUfIb96OBMjkoRWwQo5IEWJ8Fj06Go3GHw+bjYDitv6BaGsA==
-
-"@types/node@^8.0.0":
-  version "8.10.66"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3"
-  integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==
+"@types/node@^18.0.0":
+  version "18.18.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.10.tgz#4971bffdf3a43977c4c8166aa714b2c0b05b3256"
+  integrity sha512-luANqZxPmjTll8bduz4ACs/lNTCLuWssCyjqTY9yLdsv1xnViQp3ISKwsEWOIecO13JWUqjVdig/Vjjc09o8uA==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/node@^9.6.0":
   version "9.6.61"
   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.15":
+  version "6.4.15"
+  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.15.tgz#494be695e11c438f7f5df738fb4ab740312a6ed2"
+  integrity sha512-0EBJxawVNjPkng1zm2vopRctuWVCxk34JcIlRuXSf54habUWdz1FB7wHDqOqvDa8Mtpt0Q3LTXQkAs2LNyK5jQ==
   dependencies:
     "@types/node" "*"
 
@@ -8629,16 +8519,6 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/object.omit@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/object.omit/-/object.omit-3.0.0.tgz#0d31e1208eac8fe2ad5c9499a1016a8273bbfafc"
-  integrity sha512-I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw==
-
-"@types/object.pick@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/object.pick/-/object.pick-1.3.2.tgz#9eb28118240ad8f658b9c9c6caf35359fdb37150"
-  integrity sha512-sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -8664,7 +8544,7 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df"
   integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==
 
-"@types/qs@*", "@types/qs@^6.2.31", "@types/qs@^6.9.5":
+"@types/qs@*", "@types/qs@^6.9.5":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
   integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
@@ -8674,10 +8554,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.3.0", "@types/react-dom@^18.0.0":
+  version "18.3.0"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
+  integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
   dependencies:
     "@types/react" "*"
 
@@ -8695,22 +8575,12 @@
   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==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@^16.14.34":
-  version "16.14.46"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.46.tgz#42ac91aece416176e6b6127cd9ec9e381ea67e16"
-  integrity sha512-Am4pyXMrr6cWWw/TN3oqHtEZl0j+G6Up/O8m65+xF/3ZaUgkv1GAtTPWw4yNRmH0HJXmur6xKCKoMo3rBGynuw==
+"@types/react@*", "@types/react@18.3.3", "@types/react@>=16":
+  version "18.3.3"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
+  integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
   dependencies:
     "@types/prop-types" "*"
-    "@types/scheduler" "*"
     csstype "^3.0.2"
 
 "@types/react@^17":
@@ -8722,6 +8592,11 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/resolve@^1.20.2":
+  version "1.20.5"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.5.tgz#7923a0abbac4b6301d51f450db342bd4aff1ac84"
+  integrity sha512-aten5YPFp8G+cMpkTK5MCcUW5GlwZUby+qlt0/3oFgOCooFgzqvZQ9/0tROY49sUYmhEybBBj3jwpkQ/R3rjjw==
+
 "@types/responselike@*", "@types/responselike@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -8755,6 +8630,11 @@
     "@types/mime" "*"
     "@types/node" "*"
 
+"@types/shimmer@^1.0.2":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/shimmer/-/shimmer-1.0.5.tgz#491d8984d4510e550bfeb02d518791d7f59d2b88"
+  integrity sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==
+
 "@types/sinon@10.0.16":
   version "10.0.16"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-10.0.16.tgz#4bf10313bd9aa8eef1e50ec9f4decd3dd455b4d3"
@@ -8762,6 +8642,13 @@
   dependencies:
     "@types/sinonjs__fake-timers" "*"
 
+"@types/sinon@^17.0.3":
+  version "17.0.3"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-17.0.3.tgz#9aa7e62f0a323b9ead177ed23a36ea757141a5fa"
+  integrity sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw==
+  dependencies:
+    "@types/sinonjs__fake-timers" "*"
+
 "@types/sinonjs__fake-timers@*":
   version "8.1.2"
   resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e"
@@ -8772,6 +8659,23 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/superagent@^8.1.0":
+  version "8.1.7"
+  resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-8.1.7.tgz#1153819ed4db34427409a1cc58f3e2f13eeec862"
+  integrity sha512-NmIsd0Yj4DDhftfWvvAku482PZum4DBW7U51OvS8gvOkDDY0WT1jsVyDV3hK+vplrsYw8oDwi9QxOM7U68iwww==
+  dependencies:
+    "@types/cookiejar" "^2.1.5"
+    "@types/methods" "^1.1.4"
+    "@types/node" "*"
+
+"@types/supertest@^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-6.0.2.tgz#2af1c466456aaf82c7c6106c6b5cbd73a5e86588"
+  integrity sha512-137ypx2lk/wTQbW6An6safu9hXmajAifU/s7szAHLN/FeIm5w7yR0Wkl9fdJMRSHwOn4HLAI0DaB2TOORuhPDg==
+  dependencies:
+    "@types/methods" "^1.1.4"
+    "@types/superagent" "^8.1.0"
+
 "@types/symlink-or-copy@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
@@ -8784,25 +8688,25 @@
   dependencies:
     "@types/jest" "*"
 
-"@types/throttle-debounce@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz#1c3df624bfc4b62f992d3012b84c56d41eab3776"
-  integrity sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==
-
-"@types/triple-beam@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8"
-  integrity sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==
-
 "@types/unist@^2.0.0", "@types/unist@^2.0.2":
   version "2.0.6"
   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/use-sync-external-store@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz#60be8d21baab8c305132eb9cb912ed497852aadc"
+  integrity sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==
+
+"@types/uuid@^9.0.1":
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.7.tgz#b14cebc75455eeeb160d5fe23c2fcc0c64f724d8"
+  integrity sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==
+
+"@types/validator@13.12.0":
+  version "13.12.0"
+  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.12.0.tgz#1fe4c3ae9de5cf5193ce64717c99ef2fa7d8756f"
+  integrity sha512-nH45Lk7oPIJ1RVOF6JgFI6Dy0QpHEzq4QecZhvguxYPDwT8c93prCMqAtiIttm39voZ+DDR+qkNnMpJmMBRqag==
 
 "@types/yargs-parser@*":
   version "21.0.0"
@@ -8830,16 +8734,16 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz#19ba09aa34fd504696445100262e5a9e1b1d7024"
-  integrity sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==
+"@typescript-eslint/eslint-plugin@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz#d8ce497dc0ed42066e195c8ecc40d45c7b1254f4"
+  integrity sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.6.0"
-    "@typescript-eslint/type-utils" "6.6.0"
-    "@typescript-eslint/utils" "6.6.0"
-    "@typescript-eslint/visitor-keys" "6.6.0"
+    "@typescript-eslint/scope-manager" "6.9.1"
+    "@typescript-eslint/type-utils" "6.9.1"
+    "@typescript-eslint/utils" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -8847,83 +8751,78 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.6.0.tgz#fe323a7b4eafb6d5ea82b96216561810394a739e"
-  integrity sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==
+"@typescript-eslint/parser@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.9.1.tgz#4f685f672f8b9580beb38d5fb99d52fc3e34f7a3"
+  integrity sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.6.0"
-    "@typescript-eslint/types" "6.6.0"
-    "@typescript-eslint/typescript-estree" "6.6.0"
-    "@typescript-eslint/visitor-keys" "6.6.0"
+    "@typescript-eslint/scope-manager" "6.9.1"
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/typescript-estree" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz#57105d4419d6de971f7d2c30a2ff4ac40003f61a"
-  integrity sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==
+"@typescript-eslint/scope-manager@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz#e96afeb9a68ad1cd816dba233351f61e13956b75"
+  integrity sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==
   dependencies:
-    "@typescript-eslint/types" "6.6.0"
-    "@typescript-eslint/visitor-keys" "6.6.0"
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
 
-"@typescript-eslint/type-utils@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz#14f651d13b884915c4fca0d27adeb652a4499e86"
-  integrity sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==
+"@typescript-eslint/type-utils@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz#efd5db20ed35a74d3c7d8fba51b830ecba09ce32"
+  integrity sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.6.0"
-    "@typescript-eslint/utils" "6.6.0"
+    "@typescript-eslint/typescript-estree" "6.9.1"
+    "@typescript-eslint/utils" "6.9.1"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.6.0.tgz#95e7ea650a2b28bc5af5ea8907114a48f54618c2"
-  integrity sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==
+"@typescript-eslint/types@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.9.1.tgz#a6cfc20db0fcedcb2f397ea728ef583e0ee72459"
+  integrity sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==
 
-"@typescript-eslint/typescript-estree@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz#373c420d2e12c28220f4a83352280a04823a91b7"
-  integrity sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==
+"@typescript-eslint/typescript-estree@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz#8c77910a49a04f0607ba94d78772da07dab275ad"
+  integrity sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==
   dependencies:
-    "@typescript-eslint/types" "6.6.0"
-    "@typescript-eslint/visitor-keys" "6.6.0"
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/visitor-keys" "6.9.1"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.6.0.tgz#2d686c0f0786da6362d909e27a9de1c13ba2e7dc"
-  integrity sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==
+"@typescript-eslint/utils@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.9.1.tgz#763da41281ef0d16974517b5f0d02d85897a1c1e"
+  integrity sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.6.0"
-    "@typescript-eslint/types" "6.6.0"
-    "@typescript-eslint/typescript-estree" "6.6.0"
+    "@typescript-eslint/scope-manager" "6.9.1"
+    "@typescript-eslint/types" "6.9.1"
+    "@typescript-eslint/typescript-estree" "6.9.1"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz#1109088b4346c8b2446f3845db526374d9a3bafc"
-  integrity sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==
+"@typescript-eslint/visitor-keys@6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz#6753a9225a0ba00459b15d6456b9c2780b66707d"
+  integrity sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==
   dependencies:
-    "@typescript-eslint/types" "6.6.0"
+    "@typescript-eslint/types" "6.9.1"
     eslint-visitor-keys "^3.4.1"
 
-"@tyriar/fibonacci-heap@^2.0.7":
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/@tyriar/fibonacci-heap/-/fibonacci-heap-2.0.9.tgz#df3dcbdb1b9182168601f6318366157ee16666e9"
-  integrity sha512-bYuSNomfn4hu2tPiDN+JZtnzCpSpbJ/PNeulmocDy3xN2X5OkJL65zo6rPZp65cPPhLF9vfT/dgE+RtFRCSxOA==
-
-"@uiw/codemirror-extensions-basic-setup@4.21.20":
-  version "4.21.20"
-  resolved "https://registry.yarnpkg.com/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.21.20.tgz#9dbfab401a3168312c3f1d908b0f9b280410c206"
-  integrity sha512-Wyi9q4uw0xGYd/tJ6bULG7tkCLqcUsQT0AQBfCDtnkV3LdiLU0LceTrzJoHJyIKSHsKDJxFQxa1qg3QLt4gIUA==
+"@uiw/codemirror-extensions-basic-setup@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.23.0.tgz#c3c181153335c208a25d59b8ecbc7fc87fe85356"
+  integrity sha512-+k5nkRpUWGaHr1JWT8jcKsVewlXw5qBgSopm9LW8fZ6KnSNZBycz8kHxh0+WSvckmXEESGptkIsb7dlkmJT/hQ==
   dependencies:
     "@codemirror/autocomplete" "^6.0.0"
     "@codemirror/commands" "^6.0.0"
@@ -8933,27 +8832,27 @@
     "@codemirror/state" "^6.0.0"
     "@codemirror/view" "^6.0.0"
 
-"@uiw/react-codemirror@^4.21.9":
-  version "4.21.20"
-  resolved "https://registry.yarnpkg.com/@uiw/react-codemirror/-/react-codemirror-4.21.20.tgz#bbfb57676c9939d880de6c7223c2ed7410271145"
-  integrity sha512-PdyewPvNXnvT3JHj888yjpbWsAGw5qlxW6w1sMdsqJ0R6vPV++ob1iZXCGrM1FVpbqPK0DNfpXvjzp2gIr3lYw==
+"@uiw/react-codemirror@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@uiw/react-codemirror/-/react-codemirror-4.23.0.tgz#5eeadcd5de61213ad76ac3c772fffb7e5b54b465"
+  integrity sha512-MnqTXfgeLA3fsUUQjqjJgemEuNyoGALgsExVm0NQAllAAi1wfj+IoKFeK+h3XXMlTFRCFYOUh4AHDv0YXJLsOg==
   dependencies:
     "@babel/runtime" "^7.18.6"
     "@codemirror/commands" "^6.1.0"
     "@codemirror/state" "^6.1.1"
     "@codemirror/theme-one-dark" "^6.0.0"
-    "@uiw/codemirror-extensions-basic-setup" "4.21.20"
+    "@uiw/codemirror-extensions-basic-setup" "4.23.0"
     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.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz#744d8e4fcb120fc3dbaa471dadd3483f5a304bb9"
+  integrity sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==
   dependencies:
-    "@babel/core" "^7.22.20"
-    "@babel/plugin-transform-react-jsx-self" "^7.22.5"
-    "@babel/plugin-transform-react-jsx-source" "^7.22.5"
-    "@types/babel__core" "^7.20.2"
+    "@babel/core" "^7.23.5"
+    "@babel/plugin-transform-react-jsx-self" "^7.23.3"
+    "@babel/plugin-transform-react-jsx-source" "^7.23.3"
+    "@types/babel__core" "^7.20.5"
     react-refresh "^0.14.0"
 
 "@vitejs/plugin-react@^3.0.1":
@@ -9040,10 +8939,10 @@
     loupe "^2.3.6"
     pretty-format "^29.5.0"
 
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
-  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
   dependencies:
     "@webassemblyjs/helper-numbers" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
@@ -9077,10 +8976,10 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
   integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
 
-"@webassemblyjs/helper-buffer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
-  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
+"@webassemblyjs/helper-buffer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
 
 "@webassemblyjs/helper-buffer@1.9.0":
   version "1.9.0"
@@ -9125,15 +9024,15 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
   integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
 
-"@webassemblyjs/helper-wasm-section@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
-  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
+"@webassemblyjs/helper-wasm-section@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
 
 "@webassemblyjs/helper-wasm-section@1.9.0":
   version "1.9.0"
@@ -9197,26 +9096,26 @@
     "@webassemblyjs/wasm-parser" "1.9.0"
     "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/wasm-edit@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
-  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-opt" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-    "@webassemblyjs/wast-printer" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-opt" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/wast-printer" "1.12.1"
 
-"@webassemblyjs/wasm-gen@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
-  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
+"@webassemblyjs/wasm-gen@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
     "@webassemblyjs/leb128" "1.11.6"
@@ -9233,15 +9132,15 @@
     "@webassemblyjs/leb128" "1.9.0"
     "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wasm-opt@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
-  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
+"@webassemblyjs/wasm-opt@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
 
 "@webassemblyjs/wasm-opt@1.9.0":
   version "1.9.0"
@@ -9253,12 +9152,12 @@
     "@webassemblyjs/wasm-gen" "1.9.0"
     "@webassemblyjs/wasm-parser" "1.9.0"
 
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
-  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@webassemblyjs/helper-api-error" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
@@ -9289,12 +9188,12 @@
     "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
-  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
+"@webassemblyjs/wast-printer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/wast-printer@1.9.0":
@@ -9364,7 +9263,7 @@
   dependencies:
     argparse "^2.0.1"
 
-abab@^2.0.3, abab@^2.0.5, abab@^2.0.6:
+abab@^2.0.3, abab@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
@@ -9374,6 +9273,11 @@ abbrev@1, abbrev@^1.0.0:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abbrev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
+  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
+
 abortcontroller-polyfill@^1.7.3:
   version "1.7.5"
   resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed"
@@ -9409,10 +9313,10 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
 
 acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -9474,14 +9378,14 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agent-base@^7.0.2:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
-  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
   dependencies:
     debug "^4.3.4"
 
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -9584,19 +9488,10 @@ amperize@0.6.1:
     uuid "^7.0.1"
     validator "^12.0.0"
 
-analytics-node@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/analytics-node/-/analytics-node-6.2.0.tgz#8ae2ebc73d85e5b2aac8d366b974ad36996f629d"
-  integrity sha512-NLU4tCHlWt0tzEaFQL7NIoWhq2KmQSmz0JvyS2lYn6fc4fEjTMSabhJUx8H1r5995FX8fE3rZ15uIHU6u+ovlQ==
-  dependencies:
-    "@segment/loosely-validate-event" "^2.0.0"
-    axios "^0.27.2"
-    axios-retry "3.2.0"
-    lodash.isstring "^4.0.1"
-    md5 "^2.2.1"
-    ms "^2.0.0"
-    remove-trailing-slash "^0.1.0"
-    uuid "^8.3.2"
+animejs@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/animejs/-/animejs-3.2.2.tgz#59be98c58834339d5847f4a70ddba74ac75b6afc"
+  integrity sha512-Ao95qWLpDPXXM+WrmwcKbl6uNlC5tjnowlaRYtuVDHHoygjtIPfDUoK9NthrlZsQSKjZXlmji2TrBUAVbiH0LQ==
 
 ansi-colors@4.1.1:
   version "4.1.1"
@@ -9620,12 +9515,12 @@ ansi-escapes@^4.2.1:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-escapes@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6"
-  integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==
+ansi-escapes@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.0.0.tgz#00fc19f491bbb18e1d481b97868204f92109bfe7"
+  integrity sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==
   dependencies:
-    type-fest "^1.0.2"
+    environment "^1.0.0"
 
 ansi-html@^0.0.7:
   version "0.0.7"
@@ -9657,13 +9552,6 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-split@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-split/-/ansi-split-1.0.1.tgz#3cab03754ab6f1d64d4ad13cd10f22fc36db4a45"
-  integrity sha512-RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg==
-  dependencies:
-    ansi-regex "^3.0.0"
-
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -9688,7 +9576,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.0.0, ansi-styles@^6.1.0:
+ansi-styles@^6.0.0, ansi-styles@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
@@ -9718,7 +9606,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.3, anymatch@^3.1.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -9736,13 +9624,6 @@ app-root-path@^2.1.0:
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
   integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
-  integrity sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==
-  dependencies:
-    buffer-equal "^1.0.0"
-
 append-field@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
@@ -9787,14 +9668,6 @@ archiver@^5.0.0:
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
-are-we-there-yet@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
-  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 are-we-there-yet@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
@@ -9933,17 +9806,6 @@ array.prototype.flatmap@^1.3.1:
     es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.map@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.4.tgz#0d97b640cfdd036c1b41cfe706a5e699aa0711f2"
-  integrity sha512-Qds9QnX7A0qISY7JT5WuJO0NJPE9CMlC6JzHQfhpqAAQQzufVRoeH7EzUY5GcPTx72voG8LV/5eo+b8Qi8hmhA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.7"
-
 array.prototype.reduce@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f"
@@ -9971,7 +9833,7 @@ arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
-asap@^2.0.0, asap@~2.0.6:
+asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
@@ -10011,15 +9873,16 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-assert@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
-  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
+assert@^2.0.0, assert@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-2.1.0.tgz#6d92a238d05dc02e7427c881fb8be81c8448b2dd"
+  integrity sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==
   dependencies:
-    es6-object-assign "^1.1.0"
-    is-nan "^1.2.1"
-    object-is "^1.0.1"
-    util "^0.12.0"
+    call-bind "^1.0.2"
+    is-nan "^1.3.2"
+    object-is "^1.1.5"
+    object.assign "^4.1.4"
+    util "^0.12.5"
 
 assertion-error@^1.1.0:
   version "1.1.0"
@@ -10036,20 +9899,6 @@ ast-types@0.13.3:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
   integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
 
-ast-types@0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d"
-  integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==
-  dependencies:
-    tslib "^2.0.1"
-
-ast-types@^0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
-  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
-  dependencies:
-    tslib "^2.0.1"
-
 ast-types@^0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2"
@@ -10148,14 +9997,14 @@ audio-extensions@0.0.0:
   resolved "https://registry.yarnpkg.com/audio-extensions/-/audio-extensions-0.0.0.tgz#d0eefe077fb9eb625898eed9985890548cf1f8d2"
   integrity sha512-yj9C819u3ED3/OyRd9mLKMXGy8wsElaf6bkkv6OqZEKrNAT461TjiznS4IfPBy8Mmh6DWaXCQCVYSq3+VHkpjQ==
 
-autoprefixer@10.4.16, autoprefixer@^10.4.13:
-  version "10.4.16"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8"
-  integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==
+autoprefixer@10.4.19, autoprefixer@^10.4.13:
+  version "10.4.19"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f"
+  integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==
   dependencies:
-    browserslist "^4.21.10"
-    caniuse-lite "^1.0.30001538"
-    fraction.js "^4.3.6"
+    browserslist "^4.23.0"
+    caniuse-lite "^1.0.30001599"
+    fraction.js "^4.3.7"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
@@ -10183,42 +10032,30 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
+aws-ssl-profiles@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.1.tgz#21ef8ad77d753927f6c01b144c5ef4cc4f150cdc"
+  integrity sha512-+H+kuK34PfMaI9PNU/NSjBKL5hh/KDM9J72kwYeYEm0A8B1AC4fuCy3qsjnA7lxklgyXsB68yn8Z2xoZEjgwCQ==
+
 aws4@^1.8.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-axios-retry@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.2.0.tgz#eb48e72f90b177fde62329b2896aa8476cfb90ba"
-  integrity sha512-RK2cLMgIsAQBDhlIsJR5dOhODPigvel18XUv1dDXW+4k1FzebyfRk+C+orot6WPZOYFKSfhLwHPwVmTVOODQ5w==
-  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==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-axios@^0.27.0, 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==
-  dependencies:
-    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==
+axios@^1.0.0, axios@^1.3.3, axios@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
+  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
   dependencies:
-    follow-redirects "^1.15.0"
+    follow-redirects "^1.15.6"
     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"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -10421,6 +10258,19 @@ babel-import-util@^2.0.0:
   resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-2.0.0.tgz#99a2e7424bcde01898bc61bb19700ff4c74379a3"
   integrity sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==
 
+babel-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
+  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
+  dependencies:
+    "@jest/transform" "^29.7.0"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.6.3"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    slash "^3.0.0"
+
 babel-loader@^8.0.6:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
@@ -10431,14 +10281,6 @@ babel-loader@^8.0.6:
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-merge@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/babel-merge/-/babel-merge-3.0.0.tgz#9bd368d48116dab18b8f3e8022835479d80f3b50"
-  integrity sha512-eBOBtHnzt9xvnjpYNI5HmaPp/b2vMveE5XggzqHnQeHJ8mFIBrBv6WZEVIj5jJ2uwTItkqKo9gWzEEcBxEq0yw==
-  dependencies:
-    deepmerge "^2.2.1"
-    object.omit "^3.0.0"
-
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -10535,6 +10377,16 @@ babel-plugin-istanbul@^6.0.0, babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
+babel-plugin-jest-hoist@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
+  integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.1.14"
+    "@types/babel__traverse" "^7.0.6"
+
 babel-plugin-macros@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
@@ -10586,13 +10438,13 @@ babel-plugin-polyfill-corejs2@^0.3.3:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs2@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz#8097b4cb4af5b64a1d11332b6fb72ef5e64a054c"
-  integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==
+babel-plugin-polyfill-corejs2@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313"
+  integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
     semver "^6.3.1"
 
 babel-plugin-polyfill-corejs3@^0.6.0:
@@ -10603,13 +10455,13 @@ babel-plugin-polyfill-corejs3@^0.6.0:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
     core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-corejs3@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52"
-  integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==
+babel-plugin-polyfill-corejs3@^0.8.5:
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz#25c2d20002da91fe328ff89095c85a391d6856cf"
+  integrity sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
-    core-js-compat "^3.31.0"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    core-js-compat "^3.33.1"
 
 babel-plugin-polyfill-regenerator@^0.4.1:
   version "0.4.1"
@@ -10618,12 +10470,12 @@ babel-plugin-polyfill-regenerator@^0.4.1:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
 
-babel-plugin-polyfill-regenerator@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz#80d0f3e1098c080c8b5a65f41e9427af692dc326"
-  integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==
+babel-plugin-polyfill-regenerator@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5"
+  integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
@@ -10960,6 +10812,14 @@ babel-preset-env@^1.7.0:
     invariant "^2.2.2"
     semver "^5.3.0"
 
+babel-preset-jest@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
+  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
+  dependencies:
+    babel-plugin-jest-hoist "^29.6.3"
+    babel-preset-current-node-syntax "^1.0.0"
+
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
@@ -11034,11 +10894,6 @@ backbone@^1.1.2:
   dependencies:
     underscore ">=1.8.3"
 
-backo2@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
-
 bail@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
@@ -11054,16 +10909,16 @@ balanced-match@^2.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
   integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
 
+bare-events@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.2.tgz#a98a41841f98b2efe7ecc5c5468814469b018078"
+  integrity sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==
+
 base-64@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base-64/-/base-64-1.0.0.tgz#09d0f2084e32a3fd08c2475b973788eee6ae8f4a"
   integrity sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==
 
-base64-arraybuffer@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==
-
 base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -11133,11 +10988,6 @@ big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
-bignumber.js@^9.0.0:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c"
-  integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==
-
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
@@ -11169,6 +11019,15 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+bl@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273"
+  integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==
+  dependencies:
+    buffer "^6.0.3"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 bl@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/bl/-/bl-0.8.2.tgz#c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"
@@ -11181,7 +11040,7 @@ blank-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
   integrity sha512-kXQ19Xhoghiyw66CUiGypnuRpWlbHAzY/+NyvqTEdTfhfQGH1/dbEMYiXju7fYKIFePpzp/y9dsu5Cu/PkmawQ==
 
-bluebird@3.7.2, bluebird@^3.1.1, bluebird@^3.4.1, bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
+bluebird@^3.1.1, bluebird@^3.4.1, bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -11196,24 +11055,6 @@ bn.js@^5.0.0, bn.js@^5.1.1:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
 body-parser@1.20.2, body-parser@^1.19.0:
   version "1.20.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
@@ -11242,10 +11083,10 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
-bookshelf-relations@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-2.6.0.tgz#a67fc95893bc045b59a06f9c694450982d88b7db"
-  integrity sha512-AnMlXAHcnu+JXhiStfJ/IsSW44tK65S63qPIOOCpyyAI9CkXrMr8pMLCVQEVb2tLv5GkJQOiiSE+J7icBmY76w==
+bookshelf-relations@2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-2.7.0.tgz#db501a08260059d738ccca9ed4443f486a67782f"
+  integrity sha512-Ia61t8DfqR7rrF9zZfnfsXj6+bAJsBUk5mAR6hPBcVNcQRIFHruHk6xobQK6AGUx7khCXniDVvNzd82vH6gGVw==
   dependencies:
     "@tryghost/debug" "^0.1.13"
     "@tryghost/errors" "^1.2.3"
@@ -11332,12 +11173,12 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3, braces@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 bree@6.5.0:
   version "6.5.0"
@@ -11968,21 +11809,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"
@@ -12119,15 +11960,15 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9:
-  version "4.21.10"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
-  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.22.1, browserslist@^4.22.2, browserslist@^4.23.0, browserslist@^4.23.1:
+  version "4.23.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.1.tgz#ce4af0534b3d37db5c1a4ca98b9080f985041e96"
+  integrity sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==
   dependencies:
-    caniuse-lite "^1.0.30001517"
-    electron-to-chromium "^1.4.477"
-    node-releases "^2.0.13"
-    update-browserslist-db "^1.0.11"
+    caniuse-lite "^1.0.30001629"
+    electron-to-chromium "^1.4.796"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.16"
 
 brute-knex@4.0.1:
   version "4.0.1"
@@ -12137,6 +11978,13 @@ brute-knex@4.0.1:
     express-brute "^1.0.1"
     knex "^0.20"
 
+bs-logger@0.x:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
+  dependencies:
+    fast-json-stable-stringify "2.x"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -12164,12 +12012,7 @@ buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
-
-buffer-equal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
-  integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
 
 buffer-es6@^4.9.2:
   version "4.9.3"
@@ -12264,7 +12107,7 @@ busboy@^0.2.11:
     dicer "0.2.5"
     readable-stream "1.1.x"
 
-busboy@^1.6.0:
+busboy@^1.0.0, busboy@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
   integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
@@ -12286,7 +12129,7 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-c8@7.14.0, c8@^7.6.0:
+c8@7.14.0:
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/c8/-/c8-7.14.0.tgz#f368184c73b125a80565e9ab2396ff0be4d732f3"
   integrity sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==
@@ -12372,21 +12215,20 @@ cacache@^15.2.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^17.0.0:
-  version "17.0.5"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.0.5.tgz#6dbec26c11f1f6a2b558bc11ed3316577c339ebc"
-  integrity sha512-Y/PRQevNSsjAPWykl9aeGz8Pr+OI6BYM9fYDNMvOkuUiG9IhG4LEmaYrZZZvioMUEQ+cBCxT0v8wrnCURccyKA==
+cacache@^18.0.0:
+  version "18.0.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.1.tgz#b026d56ad569e4f73cc07c813b3c66707d0fb142"
+  integrity sha512-g4Uf2CFZPaxtJKre6qr4zqLDOOPU7bNVhWjlNhvzc51xaTOx2noMOLhfFkTAqwtrAZAKQUuDfyjitzilpA8WsQ==
   dependencies:
     "@npmcli/fs" "^3.1.0"
     fs-minipass "^3.0.0"
-    glob "^9.3.1"
-    lru-cache "^7.7.1"
-    minipass "^4.0.0"
-    minipass-collect "^1.0.2"
+    glob "^10.2.2"
+    lru-cache "^10.0.1"
+    minipass "^7.0.3"
+    minipass-collect "^2.0.1"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
     p-map "^4.0.0"
-    promise-inflight "^1.0.1"
     ssri "^10.0.0"
     tar "^6.1.11"
     unique-filename "^3.0.0"
@@ -12478,13 +12320,14 @@ calculate-cache-key-for-tree@^2.0.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
 
 caller-callsite@^2.0.0:
   version "2.0.0"
@@ -12565,10 +12408,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538:
-  version "1.0.30001538"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz#9dbc6b9af1ff06b5eb12350c2012b3af56744f3f"
-  integrity sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001629:
+  version "1.0.30001636"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78"
+  integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -12585,12 +12428,7 @@ cardinal@^1.0.0:
     ansicolors "~0.2.1"
     redeyed "~1.0.0"
 
-case-anything@^2.1.10:
-  version "2.1.13"
-  resolved "https://registry.yarnpkg.com/case-anything/-/case-anything-2.1.13.tgz#0cdc16278cb29a7fcdeb072400da3f342ba329e9"
-  integrity sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==
-
-caseless@^0.12.0, caseless@~0.12.0:
+caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
@@ -12626,11 +12464,6 @@ chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@5.3.0, chalk@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
-  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
-
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -12659,6 +12492,16 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.2.0, chalk@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
 character-entities-html4@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
@@ -12684,11 +12527,6 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-charenc@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
-
 charm@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
@@ -12724,11 +12562,6 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.6.0"
     color-convert "^1.9.3"
 
-check-disk-space@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/check-disk-space/-/check-disk-space-3.3.1.tgz#10c4c8706fdd16d3e5c3572a16aa95efd0b4d40b"
-  integrity sha512-iOrT8yCZjSnyNZ43476FE2rnssvgw5hnuwOM0hm8Nj1qa0v4ieUUEbCyxxsEliaoDUb/75yCOL71zkDiDBLbMQ==
-
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -12830,10 +12663,10 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-chrono-node@~2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/chrono-node/-/chrono-node-2.6.4.tgz#c6532450d03bb41b5bd6f5509909bf158a739d9e"
-  integrity sha512-weCpfagfISvUMleIIqCi12AL9iQYn1ybX/6RB9qolynvHNvYlfdJete51uyB8TmwDTgEeKFEq0I5p/SHhOfhsw==
+chrono-node@~2.7.6:
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/chrono-node/-/chrono-node-2.7.6.tgz#46d338e5c515b4dcedc5b5f56b1239b0217bf4aa"
+  integrity sha512-yugKSRLHc6B6kXxm/DwNc94zhaddAjCSO9IOGH3w7NIWNM+gUoLl/2/XLndiw4I+XhU4H2LOhC5Ab2JjS6JWsA==
   dependencies:
     dayjs "^1.10.0"
 
@@ -12855,10 +12688,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-cjs-module-lexer@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
-  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
+cjs-module-lexer@^1.0.0, cjs-module-lexer@^1.2.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz#c485341ae8fd999ca4ee5af2d7a1c9ae01e0099c"
+  integrity sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==
 
 class-utils@^0.3.5:
   version "0.3.6"
@@ -12937,12 +12770,12 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-cursor@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea"
-  integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==
+cli-cursor@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
+  integrity sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==
   dependencies:
-    restore-cursor "^4.0.0"
+    restore-cursor "^5.0.0"
 
 cli-progress@3.12.0:
   version "3.12.0"
@@ -12977,13 +12810,13 @@ cli-table@^0.3.1:
   dependencies:
     colors "1.0.3"
 
-cli-truncate@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389"
-  integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==
+cli-truncate@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-4.0.0.tgz#6cc28a2924fee9e25ce91e973db56c7066e6172a"
+  integrity sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==
   dependencies:
     slice-ansi "^5.0.0"
-    string-width "^5.0.0"
+    string-width "^7.0.0"
 
 cli-width@^2.0.0:
   version "2.2.1"
@@ -13018,11 +12851,6 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==
-
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -13049,7 +12877,7 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clone@^2.0.0, clone@^2.1.1, clone@^2.1.2:
+clone@^2.0.0, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
@@ -13059,25 +12887,21 @@ clone@~0.1.9:
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.1.19.tgz#613fb68639b26a494ac53253e15b1a6bd88ada85"
   integrity sha512-IO78I0y6JcSpEPHzK4obKdsL7E7oLdRVDVOLwr2Hkbjsb+Eoz0dxW6tef0WizoKu0gLC4oZSZuEF4U2K6w1WQw==
 
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-clsx@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.0.0.tgz#12658f3fd98fafe62075595a5c30e43d18f3d00b"
-  integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
+clsx@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
+  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
 
 cluster-key-slot@1.1.2, cluster-key-slot@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
   integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
 
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
+
 coa@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
@@ -13115,6 +12939,11 @@ collapse-white-space@^1.0.2:
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
   integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
 
+collect-v8-coverage@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -13155,7 +12984,7 @@ color-string@^1.6.0, color-string@^1.9.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.2, color-support@^1.1.3:
+color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -13176,7 +13005,7 @@ color@^4.2.3:
     color-convert "^2.0.1"
     color-string "^1.9.0"
 
-colord@^2.9.1, colord@^2.9.3:
+colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
@@ -13231,11 +13060,6 @@ commander@0.6.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
   integrity sha512-0fLycpl1UMTGX257hRsu/arL/cUbcvQM4zMKwvLvzXtfdezIV4yotPS2dYtknF+NmEfWSoCEF6+hj9XLm/6hEw==
 
-commander@11.0.0, commander@~11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
-  integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
-
 commander@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
@@ -13283,6 +13107,16 @@ commander@^9.1.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
   integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
 
+commander@~11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
+  integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
+
+commander@~12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
+  integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
+
 common-tags@1.8.2, common-tags@^1.8.0, common-tags@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -13298,16 +13132,11 @@ compare-ver@2.0.2:
   resolved "https://registry.yarnpkg.com/compare-ver/-/compare-ver-2.0.2.tgz#8ecb8eb9dbf23ff2d87c56e74cbbb2cb7ffd9d7a"
   integrity sha512-VeznF8KOp4C6rSg22tvnk8vgAveEMxVVgOVuCzqYIzGyzD2hQ4Zm/O5RKfOECcTqmn0BAAkyJKAN0eqkgUvsEA==
 
-component-emitter@^1.2.1, component-emitter@^1.3.0, component-emitter@~1.3.0:
+component-emitter@^1.2.1, component-emitter@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-component-type@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
-  integrity sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==
-
 compress-commons@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d"
@@ -13343,7 +13172,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concat-stream@^1.4.4, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0, concat-stream@^1.6.2:
+concat-stream@^1.4.4, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -13353,16 +13182,6 @@ concat-stream@^1.4.4, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
-  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.0.2"
-    typedarray "^0.0.6"
-
 concurrently@8.2.2:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
@@ -13418,6 +13237,11 @@ connect@^3.6.6:
     parseurl "~1.3.3"
     utils-merge "1.0.1"
 
+consola@^2.15.0:
+  version "2.15.3"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
+  integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
+
 console-browserify@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -13465,7 +13289,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@^1.0.5, content-type@~1.0.4, content-type@~1.0.5:
+content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -13475,7 +13299,7 @@ continuable-cache@^0.3.1:
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
   integrity sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
@@ -13485,12 +13309,12 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-session@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0.tgz#d07aa27822f43619e4342df1342268c849833089"
-  integrity sha512-hKvgoThbw00zQOleSlUr2qpvuNweoqBtxrmx0UFosx6AGi9lYtLoA+RbsvknrEX8Pr6MDbdWAb2j6SnMn+lPsg==
+cookie-session@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.1.0.tgz#ae30b566b2f9f2d8ca2c4936513e6bf181830558"
+  integrity sha512-u73BDmR8QLGcs+Lprs0cfbcAPKl2HnPcjpwRXT41sEV4DRJ2+W0vJEEZkG31ofkx+HZflA70siRIjiTdIodmOQ==
   dependencies:
-    cookies "0.8.0"
+    cookies "0.9.1"
     debug "3.2.7"
     on-headers "~1.0.2"
     safe-buffer "5.2.1"
@@ -13500,25 +13324,30 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.2, cookie@~0.4.1:
+cookie-signature@1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.7.tgz#ab5dd7ab757c54e60f37ef6550f481c426d10454"
+  integrity sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==
+
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+
+cookie@~0.4.1:
   version "0.4.2"
   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:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
-cookiejar@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
-  integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
+cookiejar@^2.1.3, cookiejar@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
+  integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==
 
-cookies@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
-  integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==
+cookies@0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.9.1.tgz#3ffed6f60bb4fb5f146feeedba50acc418af67e3"
+  integrity sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==
   dependencies:
     depd "~2.0.0"
     keygrip "~1.1.0"
@@ -13545,12 +13374,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
-core-js-compat@^3.25.1, core-js-compat@^3.31.0:
-  version "3.31.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.1.tgz#5084ad1a46858df50ff89ace152441a63ba7aae0"
-  integrity sha512-wIDWd2s5/5aJSdpOJHfSibxNODxoGoWOBHt8JSPB41NOE94M7kuTPZCYLOlTtuoXTsBPKobpJ6T+y0SSy5L9SA==
+core-js-compat@^3.25.1, core-js-compat@^3.31.0, core-js-compat@^3.33.1:
+  version "3.33.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.3.tgz#ec678b772c5a2d8a7c60a91c3a81869aa704ae01"
+  integrity sha512-cNzGqFsh3Ot+529GIXacjTJ7kegdt5fPXxCBVS1G0iaZpuo/tBz399ymceLJveQhFFZ8qThHiP3fzuoQjKN2ow==
   dependencies:
-    browserslist "^4.21.9"
+    browserslist "^4.22.1"
 
 core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.12"
@@ -13662,6 +13491,19 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+create-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
+  integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    prompts "^2.0.1"
+
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -13706,11 +13548,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypt@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -13758,10 +13595,10 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-declaration-sorter@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
-  integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==
+css-declaration-sorter@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024"
+  integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==
 
 css-functions-list@^3.2.0:
   version "3.2.0"
@@ -13878,7 +13715,7 @@ css-tree@^1.1.2:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-tree@^2.0.4, css-tree@^2.2.1, css-tree@^2.3.1:
+css-tree@^2.0.4, css-tree@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
   integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
@@ -13960,40 +13797,41 @@ cssnano-preset-default@^4.0.7:
     postcss-svgo "^4.0.3"
     postcss-unique-selectors "^4.0.1"
 
-cssnano-preset-default@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz#2a93247140d214ddb9f46bc6a3562fa9177fe301"
-  integrity sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==
-  dependencies:
-    css-declaration-sorter "^6.3.1"
-    cssnano-utils "^4.0.0"
-    postcss-calc "^9.0.0"
-    postcss-colormin "^6.0.0"
-    postcss-convert-values "^6.0.0"
-    postcss-discard-comments "^6.0.0"
-    postcss-discard-duplicates "^6.0.0"
-    postcss-discard-empty "^6.0.0"
-    postcss-discard-overridden "^6.0.0"
-    postcss-merge-longhand "^6.0.0"
-    postcss-merge-rules "^6.0.1"
-    postcss-minify-font-values "^6.0.0"
-    postcss-minify-gradients "^6.0.0"
-    postcss-minify-params "^6.0.0"
-    postcss-minify-selectors "^6.0.0"
-    postcss-normalize-charset "^6.0.0"
-    postcss-normalize-display-values "^6.0.0"
-    postcss-normalize-positions "^6.0.0"
-    postcss-normalize-repeat-style "^6.0.0"
-    postcss-normalize-string "^6.0.0"
-    postcss-normalize-timing-functions "^6.0.0"
-    postcss-normalize-unicode "^6.0.0"
-    postcss-normalize-url "^6.0.0"
-    postcss-normalize-whitespace "^6.0.0"
-    postcss-ordered-values "^6.0.0"
-    postcss-reduce-initial "^6.0.0"
-    postcss-reduce-transforms "^6.0.0"
-    postcss-svgo "^6.0.0"
-    postcss-unique-selectors "^6.0.0"
+cssnano-preset-default@^7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-7.0.4.tgz#9cfcd25f85bfedc84367b881dad56b75a0f976b5"
+  integrity sha512-jQ6zY9GAomQX7/YNLibMEsRZguqMUGuupXcEk2zZ+p3GUxwCAsobqPYE62VrJ9qZ0l9ltrv2rgjwZPBIFIjYtw==
+  dependencies:
+    browserslist "^4.23.1"
+    css-declaration-sorter "^7.2.0"
+    cssnano-utils "^5.0.0"
+    postcss-calc "^10.0.0"
+    postcss-colormin "^7.0.1"
+    postcss-convert-values "^7.0.2"
+    postcss-discard-comments "^7.0.1"
+    postcss-discard-duplicates "^7.0.0"
+    postcss-discard-empty "^7.0.0"
+    postcss-discard-overridden "^7.0.0"
+    postcss-merge-longhand "^7.0.2"
+    postcss-merge-rules "^7.0.2"
+    postcss-minify-font-values "^7.0.0"
+    postcss-minify-gradients "^7.0.0"
+    postcss-minify-params "^7.0.1"
+    postcss-minify-selectors "^7.0.2"
+    postcss-normalize-charset "^7.0.0"
+    postcss-normalize-display-values "^7.0.0"
+    postcss-normalize-positions "^7.0.0"
+    postcss-normalize-repeat-style "^7.0.0"
+    postcss-normalize-string "^7.0.0"
+    postcss-normalize-timing-functions "^7.0.0"
+    postcss-normalize-unicode "^7.0.1"
+    postcss-normalize-url "^7.0.0"
+    postcss-normalize-whitespace "^7.0.0"
+    postcss-ordered-values "^7.0.1"
+    postcss-reduce-initial "^7.0.1"
+    postcss-reduce-transforms "^7.0.0"
+    postcss-svgo "^7.0.1"
+    postcss-unique-selectors "^7.0.1"
 
 cssnano-util-get-arguments@^4.0.0:
   version "4.0.0"
@@ -14017,10 +13855,10 @@ cssnano-util-same-parent@^4.0.0:
   resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
   integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
 
-cssnano-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.0.tgz#d1da885ec04003ab19505ff0e62e029708d36b08"
-  integrity sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==
+cssnano-utils@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-5.0.0.tgz#b53a0343dd5d21012911882db6ae7d2eae0e3687"
+  integrity sha512-Uij0Xdxc24L6SirFr25MlwC2rCFX6scyUmuKpzI+JQ7cyqDEwD42fJ0xfB3yLfOnRDU5LKGgjQ9FA6LYh76GWQ==
 
 cssnano@4.1.10:
   version "4.1.10"
@@ -14032,13 +13870,13 @@ cssnano@4.1.10:
     is-resolvable "^1.0.0"
     postcss "^7.0.0"
 
-cssnano@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.1.tgz#87c38c4cd47049c735ab756d7e77ac3ca855c008"
-  integrity sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==
+cssnano@7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-7.0.4.tgz#13a4fb4dd14f3b1ee0cd51e6404ae4656f8ad9a0"
+  integrity sha512-rQgpZra72iFjiheNreXn77q1haS2GEy69zCMbu4cpXCFPMQF+D4Ik5V7ktMzUF/sA7xCIgcqHwGPnCD+0a1vHg==
   dependencies:
-    cssnano-preset-default "^6.0.1"
-    lilconfig "^2.1.0"
+    cssnano-preset-default "^7.0.4"
+    lilconfig "^3.1.2"
 
 csso@5.0.5, csso@^5.0.5:
   version "5.0.5"
@@ -14078,10 +13916,10 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-cssstyle@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
-  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
+cssstyle@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.0.1.tgz#ef29c598a1e90125c870525490ea4f354db0660a"
+  integrity sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==
   dependencies:
     rrweb-cssom "^0.6.0"
 
@@ -14090,6 +13928,11 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
   integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
 
+csv-writer@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/csv-writer/-/csv-writer-1.6.0.tgz#d0cea44b6b4d7d3baa2ecc6f3f7209233514bcf9"
+  integrity sha512-NOx7YDFWEsM/fTRAJjRpPp8t+MKRVvniAg9wQlUKx20MFrPs73WLJhFf5iteqrxNYnsy924K3Iroh3yNHeYd2g==
+
 custom-error-instance@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/custom-error-instance/-/custom-error-instance-2.1.1.tgz#3cf6391487a6629a6247eb0ca0ce00081b7e361a"
@@ -14105,11 +13948,6 @@ dag-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
   integrity sha512-xnsprIzYuDeiyu5zSKwilV/ajRHxnoMlAhEREfyfTgTSViMVY2fGP1ZcHJbtwup26oCkofySU/m6oKJ3HrkW7w==
 
-dash-get@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/dash-get/-/dash-get-1.0.2.tgz#4c9e9ad5ef04c4bf9d3c9a451f6f7997298dcc7c"
-  integrity sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ==
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -14117,6 +13955,18 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@~5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz#db89a9e279c2ffe74f50637a59a32fb23b3e4d7c"
+  integrity sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==
+
+data-uri-utils@~1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/data-uri-utils/-/data-uri-utils-1.0.8.tgz#4651354c3293b02d7de69996a39f20e12fade011"
+  integrity sha512-LHm6O/aHmTdSsIKGI6d/BJ8gQyBiai/5g57s1XKDHFecVWbq0HYlEXheohwiLbpsEHjpdHNf+D50Q/onMnNIYQ==
+  dependencies:
+    data-uri-to-buffer "~5.0.0"
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -14126,14 +13976,13 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-data-urls@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
-  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
   dependencies:
-    abab "^2.0.6"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.0"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
 
 date-fns@2.30.0, date-fns@^2.28.0, date-fns@^2.30.0:
   version "2.30.0"
@@ -14142,11 +13991,6 @@ date-fns@2.30.0, date-fns@^2.28.0, date-fns@^2.30.0:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-date-format@^4.0.14:
-  version "4.0.14"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400"
-  integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
-
 date-time@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2"
@@ -14185,10 +14029,10 @@ debug@3.2.7, debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
   dependencies:
     ms "2.1.2"
 
@@ -14199,6 +14043,13 @@ debug@4.1.1:
   dependencies:
     ms "^2.1.1"
 
+debug@4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -14246,6 +14097,11 @@ decompress-response@^6.0.0:
   dependencies:
     mimic-response "^3.1.0"
 
+dedent@^1.0.0:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.3.tgz#99aee19eb9bae55a67327717b6e848d0bf777e5a"
+  integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==
+
 deep-eql@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.2.tgz#270ceb902f87724077e6f6449aed81463f42fc1c"
@@ -14286,16 +14142,11 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@4.3.1, deepmerge@^4.0.0, deepmerge@^4.2.2, deepmerge@^4.3.1:
+deepmerge@4.3.1, deepmerge@^4.0.0, deepmerge@^4.2.2:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
-deepmerge@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
-  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
-
 default-browser-id@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c"
@@ -14328,6 +14179,15 @@ deferred-leveldown@~0.2.0:
   dependencies:
     abstract-leveldown "~0.12.1"
 
+define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -14457,12 +14317,12 @@ 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:
+detect-newline@3.1.0, detect-newline@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
@@ -14647,13 +14507,6 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
-domexception@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
-  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
-  dependencies:
-    webidl-conversions "^7.0.0"
-
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -14775,11 +14628,6 @@ duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -14795,6 +14643,14 @@ ecdsa-sig-formatter@1.0.11:
   dependencies:
     safe-buffer "^5.0.1"
 
+echarts@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.5.1.tgz#8dc9c68d0c548934bedcb5f633db07ed1dd2101c"
+  integrity sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==
+  dependencies:
+    tslib "2.3.0"
+    zrender "5.6.0"
+
 editions@^1.1.1:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
@@ -14863,10 +14719,10 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.477:
-  version "1.4.490"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz#d99286f6e915667fa18ea4554def1aa60eb4d5f1"
-  integrity sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.796:
+  version "1.4.806"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.806.tgz#2cb046631cbabceb26fc72be68d273fa183e36bc"
+  integrity sha512-nkoEX2QIB8kwCOtvtgwhXWy2IHVcOLQZu9Qo36uaGB835mdX/h8uLRlosL6QIhLVUnAiicXRW00PwaPZC74Nrg==
 
 element-closest@^3.0.2:
   version "3.0.2"
@@ -14925,14 +14781,16 @@ ember-assign-polyfill@^2.6.0:
     ember-cli-babel "^7.20.5"
     ember-cli-version-checker "^2.0.0"
 
-ember-auto-import@2.6.3, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-import@^2.2.3, ember-auto-import@^2.4.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
-  integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
+ember-auto-import@2.7.4, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-import@^2.2.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.7.4.tgz#ca99570eb3d6165968df797a4750aa58073852b5"
+  integrity sha512-6CdXSegJJc8nwwK7+1lIcBUnMVrJRNd4ZdMgcKbCAwPvcGxMgRVBddSzrX/+q/UuflvTEO26Dk1g7Z6KHMXUhw==
   dependencies:
     "@babel/core" "^7.16.7"
     "@babel/plugin-proposal-class-properties" "^7.16.7"
     "@babel/plugin-proposal-decorators" "^7.16.7"
+    "@babel/plugin-proposal-private-methods" "^7.16.7"
+    "@babel/plugin-transform-class-static-block" "^7.16.7"
     "@babel/preset-env" "^7.16.7"
     "@embroider/macros" "^1.0.0"
     "@embroider/shared-internals" "^2.0.0"
@@ -14954,6 +14812,7 @@ ember-auto-import@2.6.3, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-impor
     js-string-escape "^1.0.1"
     lodash "^4.17.19"
     mini-css-extract-plugin "^2.5.2"
+    minimatch "^3.0.0"
     parse5 "^6.0.1"
     resolve "^1.20.0"
     resolve-package-path "^4.0.3"
@@ -15183,15 +15042,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"
@@ -15270,7 +15129,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==
@@ -15399,10 +15258,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"
 
@@ -15646,9 +15505,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"
@@ -16196,10 +16055,10 @@ ember-style-modifier@^0.7.0:
     ember-cli-babel "^7.26.11"
     ember-modifier "^3.2.7"
 
-ember-svg-jar@2.4.7:
-  version "2.4.7"
-  resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.4.7.tgz#930bada6e6e1a84de121c5874f772465baa9c88b"
-  integrity sha512-W1PWqiQOAcNvUIomkZP5oi4JdV2eQPEuGLa1ic0LPhpx/OHKwtW35M1TTDQ+YWwCnKJf0uh/Bl8ZumVw38YXBQ==
+ember-svg-jar@2.4.9:
+  version "2.4.9"
+  resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-2.4.9.tgz#6be24801005a433cbca0c930674659e6fdabdd36"
+  integrity sha512-d/8rdE2nDUt6xVMpTqbohE4kHAaoY+P/7jWCWow3UQGtaGhvURXfKgo8TG/UVK+TfTgJInN6JcU76XLg+MWEtw==
   dependencies:
     "@embroider/macros" "^1.12.2"
     broccoli-caching-writer "^3.0.3"
@@ -16329,34 +16188,26 @@ ember-truth-helpers@3.1.1, "ember-truth-helpers@^2.1.0 || ^3.0.0", ember-truth-h
   dependencies:
     ember-cli-babel "^7.22.1"
 
-ember-websockets@10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/ember-websockets/-/ember-websockets-10.2.1.tgz#172637ee572edf74557a813ca6c35eb7ecb0215a"
-  integrity sha512-Iy99U60Y+DWcrELjxdaQ5SP5YyI2MtAtSaESyrhfyXT/bDJDll5vYtCD3d8LZi4vhmcSRqGL4Ej18UOBxYiUOw==
-  dependencies:
-    ember-auto-import "^2.4.1"
-    ember-cli-babel "^7.26.11"
-    ember-cli-htmlbars "^6.0.1"
-    glob "^8.0.3"
-    morgan "^1.9.0"
-    socket.io-client "^3.1.3"
-    urijs "^1.19.11"
-
 emits@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emits/-/emits-3.0.0.tgz#32752bba95e1707b219562384ab9bb8b1fd62f70"
   integrity sha512-WJSCMaN/qjIkzWy5Ayu0MDENFltcu4zTPPnWqdFPOVBtsENVTN+A3d76G61yuiVALsMK+76MejdPrwmccv/wag==
 
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
+
+emoji-regex@^10.3.0:
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23"
+  integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -16381,29 +16232,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~4.1.0:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-4.1.4.tgz#0bda5ba4bd87bced2ad00b93c67e133d0fb981ba"
-  integrity sha512-843fqAdKeUMFqKi1sSjnR11tJ4wi8sIefu6+JC1OzkkJBmjtc/gM/rZ53tJfu5Iae/3gApm5veoS+v+gtT0+Fg==
-  dependencies:
-    base64-arraybuffer "0.1.4"
-    component-emitter "~1.3.0"
-    debug "~4.3.1"
-    engine.io-parser "~4.0.1"
-    has-cors "1.1.0"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~7.4.2"
-    xmlhttprequest-ssl "~1.6.2"
-    yeast "0.1.2"
-
-engine.io-parser@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6"
-  integrity sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==
-  dependencies:
-    base64-arraybuffer "0.1.4"
-
 engine.io-parser@~5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz#9f213c77512ff1a6cc0c7a86108a7ffceb16fcfb"
@@ -16434,10 +16262,10 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.5.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-enhanced-resolve@^5.15.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
-  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
+enhanced-resolve@^5.17.0:
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5"
+  integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -16474,11 +16302,6 @@ entities@~2.1.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
   integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
 
-entities@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
-  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
-
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -16489,6 +16312,11 @@ envinfo@^7.7.3:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
+environment@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1"
+  integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
+
 eol@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/eol/-/eol-0.9.1.tgz#f701912f504074be35c6117a5c4ade49cd547acd"
@@ -16525,7 +16353,7 @@ error@^7.0.0:
   dependencies:
     string-template "~0.2.1"
 
-es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.20.1, es-abstract@^1.20.4:
+es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.2, es-abstract@^1.20.1, es-abstract@^1.20.4:
   version "1.21.2"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
   integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
@@ -16570,7 +16398,7 @@ es-array-method-boxes-properly@^1.0.0:
   resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
   integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
 
-es-get-iterator@^1.0.2, es-get-iterator@^1.1.2:
+es-get-iterator@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
   integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
@@ -16620,11 +16448,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-object-assign@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
-  integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==
-
 es6-promise@^4.2.8:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -16635,10 +16458,10 @@ esbuild-plugin-alias@^0.2.1:
   resolved "https://registry.yarnpkg.com/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz#45a86cb941e20e7c2bc68a2bea53562172494fcb"
   integrity sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==
 
-esbuild-register@^3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-3.4.2.tgz#1e39ee0a77e8f320a9790e68c64c3559620b9175"
-  integrity sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==
+esbuild-register@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-3.5.0.tgz#449613fb29ab94325c722f560f800dd946dc8ea8"
+  integrity sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==
   dependencies:
     debug "^4.3.4"
 
@@ -16670,38 +16493,39 @@ esbuild@^0.18.0, esbuild@^0.18.10:
     "@esbuild/win32-ia32" "0.18.14"
     "@esbuild/win32-x64" "0.18.14"
 
-esbuild@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.0.tgz#f187e4ce3bcc7396d13f408a991655efeba65282"
-  integrity sha512-i7i8TP4vuG55bKeLyqqk5sTPu1ZjPH3wkcLvAj/0X/222iWFo3AJUYRKjbOoY6BWFMH3teizxHEdV9Su5ESl0w==
+esbuild@^0.20.1:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
   optionalDependencies:
-    "@esbuild/android-arm" "0.19.0"
-    "@esbuild/android-arm64" "0.19.0"
-    "@esbuild/android-x64" "0.19.0"
-    "@esbuild/darwin-arm64" "0.19.0"
-    "@esbuild/darwin-x64" "0.19.0"
-    "@esbuild/freebsd-arm64" "0.19.0"
-    "@esbuild/freebsd-x64" "0.19.0"
-    "@esbuild/linux-arm" "0.19.0"
-    "@esbuild/linux-arm64" "0.19.0"
-    "@esbuild/linux-ia32" "0.19.0"
-    "@esbuild/linux-loong64" "0.19.0"
-    "@esbuild/linux-mips64el" "0.19.0"
-    "@esbuild/linux-ppc64" "0.19.0"
-    "@esbuild/linux-riscv64" "0.19.0"
-    "@esbuild/linux-s390x" "0.19.0"
-    "@esbuild/linux-x64" "0.19.0"
-    "@esbuild/netbsd-x64" "0.19.0"
-    "@esbuild/openbsd-x64" "0.19.0"
-    "@esbuild/sunos-x64" "0.19.0"
-    "@esbuild/win32-arm64" "0.19.0"
-    "@esbuild/win32-ia32" "0.19.0"
-    "@esbuild/win32-x64" "0.19.0"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
+
+escalade@^3.1.1, escalade@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
 escape-goat@^3.0.0:
   version "3.0.0"
@@ -16804,18 +16628,18 @@ eslint-plugin-filenames@allouis/eslint-plugin-filenames#15dc354f4e3d155fc2d6ae08
     lodash.snakecase "4.1.1"
     lodash.upperfirst "4.3.1"
 
-eslint-plugin-ghost@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ghost/-/eslint-plugin-ghost-3.3.2.tgz#b789c20e645d285743bc8c852f92b9898474eb98"
-  integrity sha512-Ae3u4lTo2ApB8wBdaEShJVEuqNSYG1IiarAFvee8bSx8Ykwj0vRxpyy9MRgwaFc6Lre7dcaIJ60iWVBoO4MwwA==
+eslint-plugin-ghost@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ghost/-/eslint-plugin-ghost-3.4.0.tgz#2a84e53e1bdc3ca722e2886e49d5de0dd2344d6f"
+  integrity sha512-uj/ClW5yyfm0tHikI7jyWJbMqLVnn3PTr5GwVc0NTciM9tgkfS7TxEi8jAEa1idLRGPou+gF+Tvt0QBI/29S4g==
   dependencies:
     "@kapouer/eslint-plugin-no-return-in-loop" "1.0.0"
-    "@typescript-eslint/eslint-plugin" "6.6.0"
-    "@typescript-eslint/parser" "6.6.0"
+    "@typescript-eslint/eslint-plugin" "6.9.1"
+    "@typescript-eslint/parser" "6.9.1"
     eslint-plugin-ember "11.11.1"
     eslint-plugin-filenames allouis/eslint-plugin-filenames#15dc354f4e3d155fc2d6ae082dbfc26377539a18
     eslint-plugin-mocha "7.0.1"
-    eslint-plugin-n "16.0.2"
+    eslint-plugin-n "16.2.0"
     eslint-plugin-sort-imports-es6-autofix "0.6.0"
     eslint-plugin-unicorn "42.0.0"
     typescript "5.2.2"
@@ -16836,14 +16660,15 @@ eslint-plugin-mocha@7.0.1:
     eslint-utils "^2.0.0"
     ramda "^0.27.0"
 
-eslint-plugin-n@16.0.2:
-  version "16.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-16.0.2.tgz#5b2c0ad8dd9b724244d30fad2cc49ff4308a2152"
-  integrity sha512-Y66uDfUNbBzypsr0kELWrIz+5skicECrLUqlWuXawNSLUq3ltGlCwu6phboYYOTSnoTdHgTLrc+5Ydo6KjzZog==
+eslint-plugin-n@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-16.2.0.tgz#3f98ca9fadd9f7bdaaf60068533118ecb685bfb5"
+  integrity sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     builtins "^5.0.1"
     eslint-plugin-es-x "^7.1.0"
+    get-tsconfig "^4.7.0"
     ignore "^5.2.4"
     is-core-module "^2.12.1"
     minimatch "^3.1.2"
@@ -17125,15 +16950,6 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-estree-to-babel@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/estree-to-babel/-/estree-to-babel-3.2.1.tgz#82e78315275c3ca74475fdc8ac1a5103c8a75bf5"
-  integrity sha512-YNF+mZ/Wu2FU/gvmzuWtYc8rloubL7wfXCTgouFrnjGVXPA/EeYYA7pupXWrb3Iv1cTBeSSxxJIbK23l4MRNqg==
-  dependencies:
-    "@babel/traverse" "^7.1.6"
-    "@babel/types" "^7.2.0"
-    c8 "^7.6.0"
-
 estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
@@ -17187,21 +17003,6 @@ exec-sh@^0.3.2:
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
   integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
-execa@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
-  integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.1"
-    human-signals "^4.3.0"
-    is-stream "^3.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^5.1.0"
-    onetime "^6.0.0"
-    signal-exit "^3.0.7"
-    strip-final-newline "^3.0.0"
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -17276,6 +17077,21 @@ execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+execa@~8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
+  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^8.0.1"
+    human-signals "^5.0.0"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^4.1.0"
+    strip-final-newline "^3.0.0"
+
 exists-sync@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
@@ -17333,16 +17149,16 @@ expect@^28.1.3:
     jest-message-util "^28.1.3"
     jest-util "^28.1.3"
 
-expect@^29.0.0, expect@^29.3.1:
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7"
-  integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==
+expect@^29.0.0, expect@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
   dependencies:
-    "@jest/expect-utils" "^29.5.0"
-    jest-get-type "^29.4.3"
-    jest-matcher-utils "^29.5.0"
-    jest-message-util "^29.5.0"
-    jest-util "^29.5.0"
+    "@jest/expect-utils" "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
 
 exponential-backoff@^3.1.1:
   version "3.1.1"
@@ -17357,10 +17173,17 @@ express-brute@1.0.1, express-brute@^1.0.1:
     long-timeout "~0.1.1"
     underscore "~1.8.3"
 
-express-hbs@2.4.2, express-hbs@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/express-hbs/-/express-hbs-2.4.2.tgz#9bc18a08d89eea2aaea94b2e5c38859e86a99019"
-  integrity sha512-lFtWrsAGprvzPrVlfNE6WGJnyE+o/UxsTpl2CWcJt1CRYaUwht9+BkfKOWqs+xG0zhhRAm/bsYEyQ4EwA+ovSw==
+express-end@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.npmjs.org/express-end/-/express-end-0.0.8.tgz#0c8fd95428932158f2b4cf91f4045346bf2c5323"
+  integrity sha512-PPntzICAq006LBpXKBVJtmRUiCRqTMZ+OB8L2RFXgx+OmkMWU66IL4DTEPF/DOcxmsuC7Y0NdbT2R71lb+pBpg==
+  dependencies:
+    debug "^2.2.0"
+
+express-hbs@2.5.0, express-hbs@^2.4.2:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/express-hbs/-/express-hbs-2.5.0.tgz#28ed0b8507bb7bcceb102b63fe863585f13a4d89"
+  integrity sha512-i2O1ZBwKO32KF0MePnkgYHsAAILr9H9Sp5GoGp9JWz/qhsBfTMSq9VF1pN109DHysPX6YO88y7B+f6xnEEF/mg==
   dependencies:
     handlebars "^4.7.7"
     lodash "^4.17.21"
@@ -17387,13 +17210,22 @@ express-query-boolean@2.0.0:
   resolved "https://registry.yarnpkg.com/express-query-boolean/-/express-query-boolean-2.0.0.tgz#ea56ac8138e2b95b171b8eee2af88738302941c3"
   integrity sha512-4dU/1HPm8lkTPR12+HFUXqCarcsC19OKOkb4otLOuADfPYrQMaugPJkSmxNsqwmWYjozvT6vdTiqkgeBHkzOow==
 
-express-session@1.17.3:
-  version "1.17.3"
-  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.3.tgz#14b997a15ed43e5949cb1d073725675dd2777f36"
-  integrity sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==
+express-queue@0.0.13:
+  version "0.0.13"
+  resolved "https://registry.npmjs.org/express-queue/-/express-queue-0.0.13.tgz#e9800d67749d4dfab7c34223f00595af933ce5df"
+  integrity sha512-C4OEDasGDqpXLrZICSUxbY47p5c0bKqf/3/3hwauSCmI+jVVxKBWU2w39BuKLP6nF65z87uDFBbJMPAn2ZrG3g==
   dependencies:
-    cookie "0.4.2"
-    cookie-signature "1.0.6"
+    debug "^4.3.4"
+    express-end "0.0.8"
+    mini-queue "0.0.14"
+
+express-session@1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.18.0.tgz#a6ae39d9091f2efba5f20fc5c65a3ce7c9ce16a3"
+  integrity sha512-m93QLWr0ju+rOwApSsyso838LQwgfs44QtOP/WBiwtAgPIo/SAh1a5c6nn2BR6mFNZehTpqKDESzP+fRHVbxwQ==
+  dependencies:
+    cookie "0.6.0"
+    cookie-signature "1.0.7"
     debug "2.6.9"
     depd "~2.0.0"
     on-headers "~1.0.2"
@@ -17406,17 +17238,17 @@ express-unless@^2.1.3:
   resolved "https://registry.yarnpkg.com/express-unless/-/express-unless-2.1.3.tgz#f951c6cca52a24da3de32d42cfd4db57bc0f9a2e"
   integrity sha512-wj4tLMyCVYuIIKHGt0FhCtIViBcwzWejX0EjNxveAa6dG+0XBCQhMbx+PnkLkFCxLC69qoFrxds4pIyL88inaQ==
 
-express@4.18.2, express@^4.10.7, express@^4.17.1, express@^4.17.2, express@^4.17.3, express@^4.18.2:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+express@4.19.2, express@^4.10.7, express@^4.17.1, express@^4.17.2, express@^4.17.3, express@^4.18.2:
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -17527,11 +17359,6 @@ fake-xml-http-request@^2.1.2:
   resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.2.tgz#f1786720cae50bbb46273035a0173414f3e85e74"
   integrity sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==
 
-faker@5.5.3:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e"
-  integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==
-
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -17542,10 +17369,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"
@@ -17558,10 +17385,10 @@ fast-glob@3.2.7:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1, fast-glob@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -17569,7 +17396,7 @@ fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-gl
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -17586,7 +17413,7 @@ fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
   dependencies:
     blank-object "^1.0.1"
 
-fast-safe-stringify@^2.1.1:
+fast-safe-stringify@2.1.1, fast-safe-stringify@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
@@ -17626,13 +17453,6 @@ fast-xml-parser@4.0.11:
   dependencies:
     strnum "^1.0.5"
 
-fast-xml-parser@4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz#a6747a09296a6cb34f2ae634019bf1738f3b421f"
-  integrity sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==
-  dependencies:
-    strnum "^1.0.5"
-
 fastboot-transform@^0.1.2, fastboot-transform@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd"
@@ -17646,10 +17466,10 @@ fastest-levenshtein@^1.0.16:
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
-fastq@1.15.0, fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+fastq@1.17.1, fastq@^1.13.0, fastq@^1.6.0:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
   dependencies:
     reusify "^1.0.4"
 
@@ -17674,11 +17494,6 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fecha@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
-  integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
-
 fetch-retry@^5.0.2:
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.5.tgz#61079b816b6651d88a022ebd45d51d83aa72b521"
@@ -17769,10 +17584,10 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -17841,11 +17656,6 @@ find-index@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.1.tgz#4b221f8d46b7f8bea33d8faed953f3ca7a081cbc"
   integrity sha512-XYKutXMrIK99YMUPf91KX5QVJoG31/OsgftD6YoTPAObfQIxM4ziA9f0J1AsqKhJmo+IeaIPP0CFopTD4bdUBw==
 
-find-package-json@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/find-package-json/-/find-package-json-1.2.0.tgz#4057d1b943f82d8445fe52dc9cf456f6b8b58083"
-  integrity sha512-+SOGcLGYDJHtyqHd87ysBhmaeQ95oWspDKnMXBrnQ9Eq4OkLNqejgoaD8xVWu6GPa0B6roa6KinCMEMcVeqONw==
-
 find-root@1.1.0, find-root@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
@@ -17935,7 +17745,7 @@ fined@^1.0.1:
     object.pick "^1.2.0"
     parse-filepath "^1.0.1"
 
-fireworm@^0.7.0:
+fireworm@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.2.tgz#bc5736515b48bd30bf3293a2062e0b0e0361537a"
   integrity sha512-GjebTzq+NKKhfmDxjKq3RXwQcN9xRmZWhnnuC9L+/x5wBQtR0aaQM50HsjrzJ2wc28v1vSdfOpELok0TKR4ddg==
@@ -18019,12 +17829,17 @@ flexsearch@0.7.21:
   resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.7.21.tgz#0f5ede3f2aae67ddc351efbe3b24b69d29e9d48b"
   integrity sha512-W7cHV7Hrwjid6lWmy0IhsWDFQboWSng25U3VVywpHOTJnnAZNPScog67G+cVpeX9f7yDD21ih0WDrMMT+JoaYg==
 
+flexsearch@0.7.43:
+  version "0.7.43"
+  resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.7.43.tgz#34f89b36278a466ce379c5bf6fb341965ed3f16c"
+  integrity sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg==
+
 flow-parser@0.*:
   version "0.205.1"
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.205.1.tgz#337464aaf027b00b2514610386cf21a5f7c94137"
   integrity sha512-+RF/e1Et6ZX2I/UG7SGAz3Z8+ulj9xKYLu5AD7Wi8H2llzncU8ZpdKfLR50pPvj4g2a/FbZWkXYL7qHc+zXJNA==
 
-flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
+flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
   integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
@@ -18039,10 +17854,10 @@ 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:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+follow-redirects@^1.0.0, follow-redirects@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -18103,15 +17918,6 @@ form-data@4.0.0, form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@^2.2.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -18140,15 +17946,24 @@ formidable@^2.1.1:
     once "^1.4.0"
     qs "^6.11.0"
 
+formidable@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-3.5.1.tgz#9360a23a656f261207868b1484624c4c8d06ee1a"
+  integrity sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==
+  dependencies:
+    dezalgo "^1.0.4"
+    hexoid "^1.0.0"
+    once "^1.4.0"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fraction.js@^4.3.6:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.6.tgz#e9e3acec6c9a28cf7bc36cbe35eea4ceb2c5c92d"
-  integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==
+fraction.js@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
+  integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
@@ -18175,7 +17990,7 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-extra@11.1.1, fs-extra@^11.0.0, fs-extra@^11.1.0, fs-extra@^11.1.1:
+fs-extra@11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
   integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
@@ -18184,6 +17999,15 @@ fs-extra@11.1.1, fs-extra@^11.0.0, fs-extra@^11.1.0, fs-extra@^11.1.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@11.2.0, fs-extra@^11.0.0, fs-extra@^11.1.0, fs-extra@^11.1.1:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
@@ -18283,13 +18107,13 @@ fs-minipass@^3.0.0:
   dependencies:
     minipass "^4.0.0"
 
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
-  integrity sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==
+fs-mkdirp-stream@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz#1e82575c4023929ad35cf69269f84f1a8c973aa7"
+  integrity sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==
   dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
+    graceful-fs "^4.2.8"
+    streamx "^2.12.0"
 
 fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.9:
   version "0.5.9"
@@ -18351,10 +18175,10 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 function.prototype.name@^1.1.5:
   version "1.1.5"
@@ -18388,21 +18212,6 @@ fwd-stream@^1.0.4:
   dependencies:
     readable-stream "~1.0.26-4"
 
-gauge@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
-  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.2"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.1"
-    object-assign "^4.1.1"
-    signal-exit "^3.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.2"
-
 gauge@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
@@ -18460,19 +18269,25 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-east-asian-width@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz#5e6ebd9baee6fb8b7b6bd505221065f0cd91f64e"
+  integrity sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==
+
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
-  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-nonce@^1.0.0:
   version "1.0.1"
@@ -18489,11 +18304,6 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-port@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
-  integrity sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==
-
 get-port@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
@@ -18528,6 +18338,11 @@ get-stream@^6.0.0, get-stream@^6.0.1:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-stream@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
+  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -18536,6 +18351,13 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-tsconfig@^4.7.0:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce"
+  integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -18627,21 +18449,19 @@ glob-promise@^4.2.0:
   dependencies:
     "@types/glob" "^7.1.3"
 
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
-  integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==
+glob-stream@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-8.0.2.tgz#09e5818e41c16dd85274d72c7a7158d307426313"
+  integrity sha512-R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==
   dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
+    "@gulpjs/to-absolute-glob" "^4.0.0"
+    anymatch "^3.1.3"
+    fastq "^1.13.0"
+    glob-parent "^6.0.2"
+    is-glob "^4.0.3"
     is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
+    normalize-path "^3.0.0"
+    streamx "^2.12.5"
 
 glob-to-regexp@^0.4.1:
   version "0.4.1"
@@ -18692,17 +18512,6 @@ glob@7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 glob@8.1.0, glob@^8.0.3, glob@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
@@ -18714,7 +18523,7 @@ glob@8.1.0, glob@^8.0.3, glob@^8.1.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^10.0.0, glob@^10.3.7:
+glob@^10.0.0, glob@^10.2.2, glob@^10.3.10, glob@^10.3.7:
   version "10.3.10"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
   integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
@@ -18747,7 +18556,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -18759,16 +18568,6 @@ glob@^7.0.4, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^9.3.1:
-  version "9.3.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.4.tgz#e75dee24891a80c25cc7ee1dd327e126b98679af"
-  integrity sha512-qaSc49hojMOv1EPM4EuyITjDSgSKI0rthoHnvE81tcOi1SCVndHko7auqxdQ14eiQG2NDBJBE86+2xIrbIvrbA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    minimatch "^8.0.2"
-    minipass "^4.2.4"
-    path-scurry "^1.6.1"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -18860,7 +18659,7 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^13.0.0, globby@^13.2.0:
+globby@^13.2.0:
   version "13.2.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
   integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
@@ -18871,6 +18670,18 @@ globby@^13.0.0, globby@^13.2.0:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
+globby@^14.0.0:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-14.0.1.tgz#a1b44841aa7f4c6d8af2bc39951109d77301959b"
+  integrity sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==
+  dependencies:
+    "@sindresorhus/merge-streams" "^2.1.0"
+    fast-glob "^3.3.2"
+    ignore "^5.2.4"
+    path-type "^5.0.0"
+    slash "^5.1.0"
+    unicorn-magic "^0.1.0"
+
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
@@ -18948,7 +18759,7 @@ got@9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.8, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -18973,20 +18784,20 @@ 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.43.3:
+  version "4.43.3"
+  resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.43.3.tgz#2d04863569ff3eec72d941eb84afd0cfd94ee56c"
+  integrity sha512-ReFWSD4RCRtfu8zchUXiYrIvXq6oFwCsBRrbMUFLB4QAnHtIwyYAypGXFWrNAhVbs2F1gSZ6a7kyCVF0di/wlA==
   dependencies:
     "@sentry/node" "^7.73.0"
     "@tryghost/config" "^0.2.18"
     "@tryghost/debug" "^0.1.26"
     "@tryghost/errors" "^1.2.26"
     "@tryghost/logging" "^2.4.7"
-    "@tryghost/nql" "^0.11.0"
+    "@tryghost/nql" "^0.12.0"
     "@tryghost/pretty-cli" "^1.2.38"
     "@tryghost/server" "^0.1.37"
-    "@tryghost/zip" "^1.1.38"
+    "@tryghost/zip" "^1.1.42"
     chalk "^4.1.2"
     common-tags "^1.8.2"
     express "^4.18.2"
@@ -19069,11 +18880,6 @@ has-bigints@^1.0.1, has-bigints@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -19152,11 +18958,9 @@ has-values@~2.0.1:
     kind-of "^6.0.2"
 
 has@^1.0.0, has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
 
 hash-base@^3.0.0:
   version "3.1.0"
@@ -19179,7 +18983,7 @@ hash-for-dep@^1.0.2, hash-for-dep@^1.2.3, hash-for-dep@^1.4.7, hash-for-dep@^1.5
     resolve "^1.10.0"
     resolve-package-path "^1.0.11"
 
-hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
+hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
   integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
@@ -19187,6 +18991,13 @@ hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 he@1.2.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -19305,17 +19116,12 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
-html-encoding-sniffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
-  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
   dependencies:
-    whatwg-encoding "^2.0.0"
-
-html-entities@^2.3.6:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
-  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
+    whatwg-encoding "^3.1.1"
 
 html-escaper@^2.0.0:
   version "2.0.2"
@@ -19362,23 +19168,30 @@ 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.21.0:
+  version "8.21.0"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-8.21.0.tgz#fcb8aa4d05d95c9b806bebf3d1be6836a1d8a196"
+  integrity sha512-f6uyHdNeul4f/E6TDaUrH8agrVmnG5VbWwmIhbkg+Vrz+To/2xxbc+soBKXqani1QSaA+5I12Qr7dQt/HVFJtw==
   dependencies:
     "@babel/code-frame" "^7.10.0"
     "@html-validate/stylish" "^4.1.0"
-    "@sidvind/better-ajv-errors" "^2.0.0"
+    "@sidvind/better-ajv-errors" "2.1.3"
     ajv "^8.0.0"
     deepmerge "4.3.1"
     glob "^10.0.0"
-    ignore "5.2.4"
+    ignore "5.3.1"
     kleur "^4.1.0"
     minimist "^1.2.0"
     prompts "^2.0.0"
     semver "^7.0.0"
 
+html5parser@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html5parser/-/html5parser-2.0.2.tgz#dd504884761e024e682e1535ee9b5b997cc47293"
+  integrity sha512-L0y+IdTVxHsovmye8MBtFgBvWZnq1C9WnI/SmJszxoQjmUH1psX2uzDk21O5k5et6udxdGjwxkbmT9eVRoG05w==
+  dependencies:
+    tslib "^2.2.0"
+
 htmlparser2@^3.10.1, htmlparser2@^3.9.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
@@ -19431,16 +19244,6 @@ htmlparser2@^8.0.0, htmlparser2@^8.0.1:
     domutils "^3.0.1"
     entities "^4.3.0"
 
-http-basic@^8.1.1:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/http-basic/-/http-basic-8.1.3.tgz#a7cabee7526869b9b710136970805b1004261bbf"
-  integrity sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==
-  dependencies:
-    caseless "^0.12.0"
-    concat-stream "^1.6.2"
-    http-response-object "^3.0.1"
-    parse-cache-control "^1.0.1"
-
 http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
@@ -19489,14 +19292,13 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    agent-base "^7.1.0"
+    debug "^4.3.4"
 
 http-proxy@^1.13.1, http-proxy@^1.18.1:
   version "1.18.1"
@@ -19507,13 +19309,6 @@ http-proxy@^1.13.1, http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-response-object@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-3.0.2.tgz#7f435bb210454e4360d074ef1f989d5ea8aa9810"
-  integrity sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==
-  dependencies:
-    "@types/node" "^10.0.3"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -19573,10 +19368,10 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz#0277e28f13a07d45c663633841e20a40aaafe0ab"
-  integrity sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==
+https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
   dependencies:
     agent-base "^7.0.2"
     debug "4"
@@ -19610,10 +19405,10 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-human-signals@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"
-  integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==
+human-signals@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
+  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
 humanize-ms@^1.2.1:
   version "1.2.1"
@@ -19627,42 +19422,36 @@ husky@8.0.3:
   resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
   integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
 
-i18next-parser@8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/i18next-parser/-/i18next-parser-8.8.0.tgz#4aa63729c183927bd09662936d5aa660b651fdb0"
-  integrity sha512-4Eh213/7+cVg/HNR3q/rIeso/IwbUdKSuxz2iJNc3iIL7FFyRJBtgGF7s2UcJyPp+/EtIujo4wAnuSFkR6oO6Q==
+i18next-parser@8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/i18next-parser/-/i18next-parser-8.13.0.tgz#3d0774f1659d691b451c105cc1eaf8c444e11740"
+  integrity sha512-XU7resoeNcpJazh29OncQQUH6HsgCxk06RqBBDAmLHldafxopfCHY1vElyG/o3EY0Sn7XjelAmPTV0SgddJEww==
   dependencies:
+    "@babel/runtime" "^7.23.2"
     broccoli-plugin "^4.0.7"
     cheerio "^1.0.0-rc.2"
     colors "1.4.0"
-    commander "~11.0.0"
+    commander "~11.1.0"
     eol "^0.9.1"
-    esbuild "^0.19.0"
+    esbuild "^0.20.1"
     fs-extra "^11.1.0"
     gulp-sort "^2.0.0"
-    i18next "^22.0.4"
+    i18next "^23.5.1"
     js-yaml "4.1.0"
-    lilconfig "^2.0.6"
+    lilconfig "^3.0.0"
     rsvp "^4.8.2"
     sort-keys "^5.0.0"
     typescript "^5.0.4"
     vinyl "~3.0.0"
-    vinyl-fs "^3.0.2"
+    vinyl-fs "^4.0.0"
     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==
-  dependencies:
-    "@babel/runtime" "^7.22.5"
-
-i18next@^22.0.4:
-  version "22.5.1"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-22.5.1.tgz#99df0b318741a506000c243429a7352e5f44d424"
-  integrity sha512-8TGPgM3pAD+VRsMtUMNknRz3kzqwp/gPALrWMsDnmC1mKqJwpWyooQRLMcbTwq8z8YwSmuj+ZYvc+xCuEpkssA==
+i18next@23.14.0, i18next@^23.5.1:
+  version "23.14.0"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.14.0.tgz#d415a858390cc849f3db0df539cb2bbfe24a3cdb"
+  integrity sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==
   dependencies:
-    "@babel/runtime" "^7.20.6"
+    "@babel/runtime" "^7.23.2"
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
@@ -19698,10 +19487,10 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore@5.2.4, ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0, ignore@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+ignore@5.3.1, ignore@^5.0.4, ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
 ignore@^4.0.6:
   version "4.0.6"
@@ -19713,10 +19502,10 @@ image-extensions@~1.1.0:
   resolved "https://registry.yarnpkg.com/image-extensions/-/image-extensions-1.1.0.tgz#b8e6bf6039df0056e333502a00b6637a3105d894"
   integrity sha512-P0t7ByhK8Jk9TU05ct/7+f7h8dNuXq5OY4m0IO/T+1aga/qHkpC0Wf472x3FLdq/zFDG17pgapCM3JDTxwZzow==
 
-image-size@1.0.2, image-size@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.2.tgz#d778b6d0ab75b2737c1556dd631652eb963bc486"
-  integrity sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg==
+image-size@1.1.1, image-size@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac"
+  integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==
   dependencies:
     queue "6.0.2"
 
@@ -19727,6 +19516,11 @@ image-size@^0.8.1:
   dependencies:
     queue "6.0.1"
 
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
+
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@@ -19743,13 +19537,13 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-in-the-middle@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz#2a266676e3495e72c04bbaa5ec14756ba168391b"
-  integrity sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==
+import-in-the-middle@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.8.1.tgz#8b51c2cc631b64e53e958d7048d2d9463ce628f8"
+  integrity sha512-yhRwoHtiLGvmSozNOALgjRPFI6uYsds60EoMqqnXyyv+JOIW/BrrLejuTGBt+bq0T5tLzOHrN0T7xYTm4Qt/ng==
   dependencies:
     acorn "^8.8.2"
-    acorn-import-assertions "^1.9.0"
+    acorn-import-attributes "^1.9.5"
     cjs-module-lexer "^1.2.2"
     module-details-from-path "^1.0.3"
 
@@ -19758,6 +19552,14 @@ import-lazy@^4.0.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
+import-local@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -19911,10 +19713,10 @@ inquirer@^7.3.3:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-install-artifact-from-github@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.3.tgz#57d89bacfa0f47d7307fe41b6247cda9f9a8079c"
-  integrity sha512-x79SL0d8WOi1ZjXSTUqqs0GPQZ92YArJAN9O46wgU9wdH2U9ecyyhB9YGDbPe2OLV4ptmt6AZYRQZ2GydQZosQ==
+install-artifact-from-github@^1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.5.tgz#88c96fe40e5eb21d45586d564208c648a1dbf38d"
+  integrity sha512-gZHC7f/cJgXz7MXlHFBxPVMsvIbev1OQN1uKQYKVJDydGNm9oYf9JstbU4Atnh/eSvk41WtEovoRm+8IF686xg==
 
 internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
   version "1.0.5"
@@ -19988,9 +19790,9 @@ ip-regex@4.3.0:
   integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -20103,7 +19905,7 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@^1.1.5, is-buffer@~1.1.6:
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -20137,12 +19939,12 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.12.0, is-core-module@^2.12.1, is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+is-core-module@^2.12.1, is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -20208,7 +20010,7 @@ is-extendable@^0.1.0, is-extendable@^0.1.1:
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
   integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
-is-extendable@^1.0.0, is-extendable@^1.0.1:
+is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
@@ -20252,6 +20054,18 @@ is-fullwidth-code-point@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
   integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
 
+is-fullwidth-code-point@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz#9609efced7c2f97da7b60145ef481c787c7ba704"
+  integrity sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==
+  dependencies:
+    get-east-asian-width "^1.0.0"
+
+is-generator-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+
 is-generator-function@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
@@ -20307,11 +20121,6 @@ is-invalid-path@^0.1.0:
   dependencies:
     is-glob "^2.0.0"
 
-is-invalid-path@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-invalid-path/-/is-invalid-path-1.0.2.tgz#2f84731559f4936abcf1b227632719cf45c5dc0e"
-  integrity sha512-6KLcFrPCEP3AFXMfnWrIFkZpYNBVzZAoBJJDEZKtI3LXkaDjM3uFMJQjxiizUuZTZ9Oh9FNv/soXbx5TcpaDmA==
-
 is-lambda@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
@@ -20327,7 +20136,7 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-nan@^1.2.1:
+is-nan@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
   integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
@@ -20455,11 +20264,6 @@ is-resolvable@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
-is-retry-allowed@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
-  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
 is-set@^2.0.1, is-set@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
@@ -20548,10 +20352,10 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-uri@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-uri/-/is-uri-1.2.4.tgz#d098837e45701eaedce1b53de68b8102465fbd46"
-  integrity sha512-8sHi5gEARwpMYwJD9uSAkU9Bb7YkSagcM10EYqSe+osqOErXln4VL+EgLSG40e9lVTpcpygpvb9Z6ohZpECDGA==
+is-uri@~1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/is-uri/-/is-uri-1.2.6.tgz#f8f5f55d9b997493f470bf10ca214a3838b1e818"
+  integrity sha512-kNciklu//Ki8BUmRseLTfG/WW55qDHavf3MKUic8wvXR3d7etbSMoQPTpjvDeLVekESSgJM4AG+BESIKU02u3A==
   dependencies:
     parse-uri "~1.0.3"
     punycode2 "~1.0.0"
@@ -20561,11 +20365,6 @@ is-url-superb@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-url-superb/-/is-url-superb-4.0.0.tgz#b54d1d2499bb16792748ac967aa3ecb41a33a8c2"
   integrity sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==
 
-is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==
-
 is-valid-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
@@ -20660,6 +20459,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isexe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
+  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
+
 iso-639-3@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/iso-639-3/-/iso-639-3-2.2.0.tgz#eb01d7734d61396efec934979e8b0806550837f1"
@@ -20708,6 +20512,17 @@ istanbul-lib-instrument@^5.0.4:
     istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^6.0.0:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
+  integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
+  dependencies:
+    "@babel/core" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@istanbuljs/schema" "^0.1.3"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^7.5.4"
+
 istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
@@ -20717,7 +20532,7 @@ istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1:
     make-dir "^4.0.0"
     supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^4.0.1:
+istanbul-lib-source-maps@^4.0.0, istanbul-lib-source-maps@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
   integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
@@ -20726,10 +20541,10 @@ istanbul-lib-source-maps@^4.0.1:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.2, istanbul-reports@^3.1.4, istanbul-reports@^3.1.5, istanbul-reports@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
-  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
+istanbul-reports@^3.0.2, istanbul-reports@^3.1.3, istanbul-reports@^3.1.4, istanbul-reports@^3.1.5, istanbul-reports@^3.1.6:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -20752,25 +20567,17 @@ istextorbinary@^2.5.1:
     editions "^2.2.0"
     textextensions "^2.5.0"
 
-iterate-iterator@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.2.tgz#551b804c9eaa15b847ea6a7cdc2f5bf1ec150f91"
-  integrity sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw==
-
-iterate-value@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.2.tgz#935115bd37d006a52046535ebc8d07e9c9337f57"
-  integrity sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==
-  dependencies:
-    es-get-iterator "^1.0.2"
-    iterate-iterator "^1.0.1"
+iterare@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.2.1.tgz#139c400ff7363690e33abffa33cbba8920f00042"
+  integrity sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==
 
-jackspeak@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+jackspeak@2.1.1, jackspeak@^2.3.5:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.1.tgz#2a42db4cfbb7e55433c28b6f75d8b796af9669cd"
+  integrity sha512-juf9stUEwUaILepraGOWIJTLwg48bUnBmRqd2ln2Os1sW987zeoj/hzhbvRB95oMuS2ZTpjULmdwHNX4rzZIZw==
   dependencies:
-    "@isaacs/cliui" "^8.0.2"
+    cliui "^8.0.1"
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
@@ -20792,6 +20599,86 @@ jake@^10.8.5:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
+jest-changed-files@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
+  integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
+  dependencies:
+    execa "^5.0.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+
+jest-circus@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
+  integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^1.0.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^29.7.0"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+    pretty-format "^29.7.0"
+    pure-rand "^6.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
+jest-cli@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
+  integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
+  dependencies:
+    "@jest/core" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    create-jest "^29.7.0"
+    exit "^0.1.2"
+    import-local "^3.0.2"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    yargs "^17.3.1"
+
+jest-config@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
+  integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-jest "^29.7.0"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
 jest-diff@^28.1.3:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
@@ -20802,7 +20689,7 @@ jest-diff@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
-jest-diff@^29.3.1, jest-diff@^29.5.0:
+jest-diff@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
   integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
@@ -20812,12 +20699,42 @@ jest-diff@^29.3.1, jest-diff@^29.5.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
+jest-docblock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
+  integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
+  dependencies:
+    detect-newline "^3.0.0"
+
+jest-each@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
+  integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    jest-get-type "^29.6.3"
+    jest-util "^29.7.0"
+    pretty-format "^29.7.0"
+
+jest-environment-node@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
+  integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+
 jest-get-type@^28.0.2:
   version "28.0.2"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
   integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
 
-jest-get-type@^29.2.0, jest-get-type@^29.4.3, jest-get-type@^29.6.3:
+jest-get-type@^29.2.0, jest-get-type@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
   integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
@@ -20841,25 +20758,33 @@ jest-haste-map@^28.1.3:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-haste-map@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843"
-  integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==
+jest-haste-map@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
+  integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.6.3"
     "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.9"
-    jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
-    jest-worker "^29.3.1"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
     micromatch "^4.0.4"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
+jest-leak-detector@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
+  integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
+  dependencies:
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
 jest-matcher-utils@^28.1.3:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
@@ -20870,15 +20795,15 @@ jest-matcher-utils@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
-jest-matcher-utils@^29.3.1, jest-matcher-utils@^29.5.0:
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5"
-  integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==
+jest-matcher-utils@^29.3.1, jest-matcher-utils@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^29.5.0"
-    jest-get-type "^29.4.3"
-    pretty-format "^29.5.0"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
 jest-message-util@^28.1.3:
   version "28.1.3"
@@ -20895,18 +20820,18 @@ jest-message-util@^28.1.3:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-message-util@^29.3.1, jest-message-util@^29.5.0:
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e"
-  integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==
+jest-message-util@^29.3.1, jest-message-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.5.0"
+    "@jest/types" "^29.6.3"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^29.5.0"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
@@ -20918,15 +20843,107 @@ jest-mock@^27.0.6:
     "@jest/types" "^27.5.1"
     "@types/node" "*"
 
+jest-mock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
+  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-util "^29.7.0"
+
+jest-pnp-resolver@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
+
 jest-regex-util@^28.0.2:
   version "28.0.2"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
   integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
 
-jest-regex-util@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
-  integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
+jest-regex-util@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
+  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
+
+jest-resolve-dependencies@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
+  integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
+  dependencies:
+    jest-regex-util "^29.6.3"
+    jest-snapshot "^29.7.0"
+
+jest-resolve@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
+  integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
+  dependencies:
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    resolve "^1.20.0"
+    resolve.exports "^2.0.0"
+    slash "^3.0.0"
+
+jest-runner@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
+  integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/environment" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-leak-detector "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-resolve "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-util "^29.7.0"
+    jest-watcher "^29.7.0"
+    jest-worker "^29.7.0"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
+jest-runtime@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
+  integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/globals" "^29.7.0"
+    "@jest/source-map" "^29.6.3"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    cjs-module-lexer "^1.0.0"
+    collect-v8-coverage "^1.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
 
 jest-snapshot@^28.1.3:
   version "28.1.3"
@@ -20957,35 +20974,31 @@ jest-snapshot@^28.1.3:
     pretty-format "^28.1.3"
     semver "^7.3.5"
 
-jest-snapshot@^29.0.0:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e"
-  integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==
+jest-snapshot@^29.0.0, jest-snapshot@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
+  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
   dependencies:
     "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
     "@babel/plugin-syntax-jsx" "^7.7.2"
     "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/traverse" "^7.7.2"
     "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^29.3.1"
-    "@jest/transform" "^29.3.1"
-    "@jest/types" "^29.3.1"
-    "@types/babel__traverse" "^7.0.6"
-    "@types/prettier" "^2.1.5"
+    "@jest/expect-utils" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^29.3.1"
+    expect "^29.7.0"
     graceful-fs "^4.2.9"
-    jest-diff "^29.3.1"
-    jest-get-type "^29.2.0"
-    jest-haste-map "^29.3.1"
-    jest-matcher-utils "^29.3.1"
-    jest-message-util "^29.3.1"
-    jest-util "^29.3.1"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
     natural-compare "^1.4.0"
-    pretty-format "^29.3.1"
-    semver "^7.3.5"
+    pretty-format "^29.7.0"
+    semver "^7.5.3"
 
 jest-util@^28.1.3:
   version "28.1.3"
@@ -20999,18 +21012,44 @@ jest-util@^28.1.3:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-util@^29.3.1, jest-util@^29.5.0:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.6.1.tgz#c9e29a87a6edbf1e39e6dee2b4689b8a146679cb"
-  integrity sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==
+jest-util@^29.0.0, jest-util@^29.3.1, jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
   dependencies:
-    "@jest/types" "^29.6.1"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-validate@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
+  integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^29.6.3"
+    leven "^3.1.0"
+    pretty-format "^29.7.0"
+
+jest-watcher@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
+  integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
+  dependencies:
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    jest-util "^29.7.0"
+    string-length "^4.0.1"
+
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -21029,30 +21068,35 @@ jest-worker@^28.1.3:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b"
-  integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==
+jest-worker@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
+  integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
   dependencies:
     "@types/node" "*"
-    jest-util "^29.3.1"
+    jest-util "^29.7.0"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jiti@^1.18.2, jiti@^1.19.1:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.20.0.tgz#2d823b5852ee8963585c8dd8b7992ffc1ae83b42"
-  integrity sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==
+jest@29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
+  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
+  dependencies:
+    "@jest/core" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    import-local "^3.0.2"
+    jest-cli "^29.7.0"
 
-join-component@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/join-component/-/join-component-1.1.0.tgz#b8417b750661a392bee2c2537c68b2a9d4977cd5"
-  integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==
+jiti@^1.18.2, jiti@^1.21.0:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
+  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
 
-jose@4.15.4, jose@^4.14.6:
-  version "4.15.4"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.4.tgz#02a9a763803e3872cf55f29ecef0dfdcc218cc03"
-  integrity sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==
+jose@4.15.9, jose@^4.14.6:
+  version "4.15.9"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100"
+  integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==
 
 jquery-deferred@^0.3.0:
   version "0.3.1"
@@ -21109,20 +21153,21 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jscodeshift@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881"
-  integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==
-  dependencies:
-    "@babel/core" "^7.13.16"
-    "@babel/parser" "^7.13.16"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
-    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
-    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
-    "@babel/preset-flow" "^7.13.13"
-    "@babel/preset-typescript" "^7.13.0"
-    "@babel/register" "^7.13.16"
+jscodeshift@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.15.1.tgz#6c7a9572acdfa4f54098e958f71a05716a4e546b"
+  integrity sha512-hIJfxUy8Rt4HkJn/zZPU9ChKfKZM1342waJ1QC2e2YsPcWhM+3BJ4dcfQCzArTrk1jJeNLB341H+qOcEHRxJZg==
+  dependencies:
+    "@babel/core" "^7.23.0"
+    "@babel/parser" "^7.23.0"
+    "@babel/plugin-transform-class-properties" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
+    "@babel/plugin-transform-optional-chaining" "^7.23.0"
+    "@babel/plugin-transform-private-methods" "^7.22.5"
+    "@babel/preset-flow" "^7.22.15"
+    "@babel/preset-typescript" "^7.23.0"
+    "@babel/register" "^7.22.15"
     babel-core "^7.0.0-bridge.0"
     chalk "^4.1.2"
     flow-parser "0.*"
@@ -21130,38 +21175,36 @@ jscodeshift@^0.14.0:
     micromatch "^4.0.4"
     neo-async "^2.5.0"
     node-dir "^0.1.17"
-    recast "^0.21.0"
+    recast "^0.23.3"
     temp "^0.8.4"
     write-file-atomic "^2.3.0"
 
-jsdom@22.1.0, jsdom@^22.0.0, jsdom@^22.1.0, jsdom@~22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
-  integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
+jsdom@24.1.3, jsdom@^24.0.0, jsdom@^24.1.0, jsdom@~24.1.0:
+  version "24.1.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-24.1.3.tgz#88e4a07cb9dd21067514a619e9f17b090a394a9f"
+  integrity sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==
   dependencies:
-    abab "^2.0.6"
-    cssstyle "^3.0.0"
-    data-urls "^4.0.0"
+    cssstyle "^4.0.1"
+    data-urls "^5.0.0"
     decimal.js "^10.4.3"
-    domexception "^4.0.0"
     form-data "^4.0.0"
-    html-encoding-sniffer "^3.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.1"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.2"
+    https-proxy-agent "^7.0.5"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.4"
+    nwsapi "^2.2.12"
     parse5 "^7.1.2"
-    rrweb-cssom "^0.6.0"
+    rrweb-cssom "^0.7.1"
     saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.1.2"
-    w3c-xmlserializer "^4.0.0"
+    tough-cookie "^4.1.4"
+    w3c-xmlserializer "^5.0.0"
     webidl-conversions "^7.0.0"
-    whatwg-encoding "^2.0.0"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.1"
-    ws "^8.13.0"
-    xml-name-validator "^4.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+    ws "^8.18.0"
+    xml-name-validator "^5.0.0"
 
 jsdom@^16.4.0:
   version "16.7.0"
@@ -21216,13 +21259,6 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
-json-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
-  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
-  dependencies:
-    bignumber.js "^9.0.0"
-
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
@@ -21263,14 +21299,17 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stable-stringify@1.0.2, json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0"
-  integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==
+json-stable-stringify@1.1.1, json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz#52d4361b47d49168bcc4e564189a42e5a7439454"
+  integrity sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==
   dependencies:
+    call-bind "^1.0.5"
+    isarray "^2.0.5"
     jsonify "^0.0.1"
+    object-keys "^1.1.1"
 
-json-stringify-safe@5.0.x, json-stringify-safe@^5.0.0, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
@@ -21287,7 +21326,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.1, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3:
+json5@^2.1.1, json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -21332,12 +21371,7 @@ jsonpath@1.1.1:
   dependencies:
     esprima "1.2.2"
     static-eval "2.0.2"
-    underscore "1.12.1"
-
-jsonschema@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
-  integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
+    underscore "1.12.1"
 
 jsonwebtoken@8.5.1:
   version "8.5.1"
@@ -21383,7 +21417,7 @@ jsprim@^1.2.2:
     array-includes "^3.1.5"
     object.assign "^4.1.3"
 
-juice@9.1.0, juice@^9.0.0:
+juice@9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/juice/-/juice-9.1.0.tgz#3ef8a12392d44c1cd996022aa977581049a65050"
   integrity sha512-odblShmPrUoHUwRuC8EmLji5bPP2MLO1GL+gt4XU3tT2ECmbSrrMjtMQaqg3wgMFP2zvUzdPZGfxc5Trk3Z+fQ==
@@ -21394,6 +21428,17 @@ juice@9.1.0, juice@^9.0.0:
     slick "^1.12.2"
     web-resource-inliner "^6.0.1"
 
+juice@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/juice/-/juice-10.0.0.tgz#c6b717ded8be4b969f12503ac9cfbd2604d35937"
+  integrity sha512-9f68xmhGrnIi6DBkiiP3rUrQN33SEuaKu1+njX6VgMP+jwZAsnT33WIzlrWICL9matkhYu3OyrqSUP55YTIdGg==
+  dependencies:
+    cheerio "^1.0.0-rc.12"
+    commander "^6.1.0"
+    mensch "^0.3.4"
+    slick "^1.12.2"
+    web-resource-inliner "^6.0.1"
+
 just-extend@^4.0.2:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
@@ -21506,26 +21551,26 @@ klona@^2.0.4, klona@^2.0.6:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
   integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
 
-knex-migrator@5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-5.1.5.tgz#8130fcc627bfcf5bc693719708d0213c497929ee"
-  integrity sha512-swHy7sOqdzcSldP6FxVTjz2vmz/I46HPbBDUZny+9eVcVmsREFzGPg1DL8q0yBJkbSfc+7aOTyqm4LJ+UwMo9g==
+knex-migrator@5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-5.2.1.tgz#891e34eead500ddbee1fe90dc8a3be6e3151dbe1"
+  integrity sha512-GzuWFkrrVTrfF6v9VKnmx3gfUBh1iIa9Yl0kQTRqV5HNGjDA+tVyjwQEISiltVWuiRP7YTzsn1GKaB/Vl85HzA==
   dependencies:
-    "@tryghost/database-info" "0.3.17"
-    "@tryghost/errors" "1.2.25"
-    "@tryghost/logging" "2.4.5"
-    bluebird "3.7.2"
+    "@tryghost/database-info" "0.3.22"
+    "@tryghost/errors" "1.3.1"
+    "@tryghost/logging" "2.4.10"
+    "@tryghost/promise" "0.3.8"
     commander "5.1.0"
     compare-ver "2.0.2"
     debug "4.3.4"
     knex "2.4.2"
     lodash "4.17.21"
     moment "2.24.0"
-    mysql2 "3.2.0"
-    nconf "0.12.0"
-    resolve "1.22.3"
+    mysql2 "3.9.7"
+    nconf "0.12.1"
+    resolve "1.22.8"
   optionalDependencies:
-    sqlite3 "5.1.6"
+    sqlite3 "5.1.7"
 
 knex@2.4.2:
   version "2.4.2"
@@ -21601,12 +21646,10 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
-  integrity sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==
-  dependencies:
-    flush-write-stream "^1.0.2"
+lead@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lead/-/lead-4.0.0.tgz#5317a49effb0e7ec3a0c8fb9c1b24fb716aab939"
+  integrity sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==
 
 leaky-bucket@2.2.0:
   version "2.2.0"
@@ -21740,18 +21783,25 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lexical@^0.12.2:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/lexical/-/lexical-0.12.2.tgz#68535e145715d5788374495c9ee0420e417d792b"
-  integrity sha512-Kxavd+ETjxtVwG/hvPd6WZfXD44sLOKe9Vlkwxy7lBQ1qZArS+rZfs+u5iXwXe6tX9f2PIM0u3RHsrCEDDE0fw==
+lexical@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/lexical/-/lexical-0.13.1.tgz#0abffe9bc05a7a9da8a6128ea478bf08c11654db"
+  integrity sha512-jaqRYzVEfBKbX4FwYpd/g+MyOjRaraAel0iQsTrwvx3hyN0bswUZuzb6H6nGlFSjcdrc77wKpyKwoWj4aUd+Bw==
 
-lib0@0.2.87, lib0@^0.2.74, lib0@^0.2.85:
-  version "0.2.87"
-  resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.87.tgz#7075d3a8083c756314e31f83eb662d2ad4426a46"
-  integrity sha512-TbB63XJixvNToW2IHWAFsCJj9tVnajmwjE14p69i51Rx8byOQd2IP4ourE8v4d7vhyO++nVm1sQk3ePslfbucg==
+lib0@0.2.94, lib0@^0.2.85, lib0@^0.2.86:
+  version "0.2.94"
+  resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.94.tgz#fc28b4b65f816599f1e2f59d3401e231709535b3"
+  integrity sha512-hZ3p54jL4Wpu7IOg26uC7dnEWiMyNlUrb9KoG7+xYs45WkQwpVvKFndVq2+pqLYKe1u8Fp3+zAfZHVvTK34PvQ==
   dependencies:
     isomorphic.js "^0.2.4"
 
+lie@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==
+  dependencies:
+    immediate "~3.0.5"
+
 liftoff@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
@@ -21766,11 +21816,16 @@ liftoff@3.1.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-lilconfig@2.1.0, lilconfig@^2.0.5, lilconfig@^2.0.6, lilconfig@^2.1.0:
+lilconfig@^2.0.5, lilconfig@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
 
+lilconfig@^3.0.0, lilconfig@^3.1.1, lilconfig@^3.1.2, lilconfig@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.2.tgz#e4a7c3cb549e3a606c8dcc32e5ae1005e62c05cb"
+  integrity sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==
+
 limiter@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
@@ -21808,33 +21863,33 @@ linkify-it@^3.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
-linkify-it@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
-  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
+linkify-it@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421"
+  integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==
   dependencies:
-    uc.micro "^1.0.1"
+    uc.micro "^2.0.0"
 
 linkifyjs@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.1.tgz#73d427e3bbaaf4ca8e71c589ad4ffda11a9a5fde"
   integrity sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA==
 
-lint-staged@14.0.1:
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-14.0.1.tgz#57dfa3013a3d60762d9af5d9c83bdb51291a6232"
-  integrity sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==
-  dependencies:
-    chalk "5.3.0"
-    commander "11.0.0"
-    debug "4.3.4"
-    execa "7.2.0"
-    lilconfig "2.1.0"
-    listr2 "6.6.1"
-    micromatch "4.0.5"
-    pidtree "0.6.0"
-    string-argv "0.3.2"
-    yaml "2.3.1"
+lint-staged@15.2.10:
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.2.10.tgz#92ac222f802ba911897dcf23671da5bb80643cd2"
+  integrity sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==
+  dependencies:
+    chalk "~5.3.0"
+    commander "~12.1.0"
+    debug "~4.3.6"
+    execa "~8.0.1"
+    lilconfig "~3.1.2"
+    listr2 "~8.2.4"
+    micromatch "~4.0.8"
+    pidtree "~0.6.0"
+    string-argv "~0.3.2"
+    yaml "~2.5.0"
 
 liquid-fire@0.34.0:
   version "0.34.0"
@@ -21867,17 +21922,17 @@ liquid-wormhole@3.0.1:
     ember-decorators "^6.1.1"
     perf-primitives RobbieTheWagner/perf-primitives#a6a26f11497ca27be3763a88a5f20744e424756b
 
-listr2@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d"
-  integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==
+listr2@~8.2.4:
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.2.4.tgz#486b51cbdb41889108cb7e2c90eeb44519f5a77f"
+  integrity sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==
   dependencies:
-    cli-truncate "^3.1.0"
+    cli-truncate "^4.0.0"
     colorette "^2.0.20"
     eventemitter3 "^5.0.1"
-    log-update "^5.0.1"
-    rfdc "^1.3.0"
-    wrap-ansi "^8.1.0"
+    log-update "^6.1.0"
+    rfdc "^1.4.1"
+    wrap-ansi "^9.0.0"
 
 livereload-js@^3.3.1:
   version "3.4.1"
@@ -21922,6 +21977,13 @@ local-pkg@^0.4.3:
   resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963"
   integrity sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==
 
+localforage@^1.8.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
+  integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
+  dependencies:
+    lie "3.1.1"
+
 locate-character@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"
@@ -21964,7 +22026,7 @@ locate-path@^7.1.0:
   dependencies:
     p-locate "^6.0.0"
 
-lodash-es@^4.17.11, lodash-es@^4.17.15:
+lodash-es@4.17.21, lodash-es@^4.17.11, lodash-es@^4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
@@ -22065,12 +22127,7 @@ lodash.assign@^3.2.0:
     lodash._createassigner "^3.0.0"
     lodash.keys "^3.0.0"
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==
-
-lodash.assignin@^4.0.9, lodash.assignin@^4.1.0:
+lodash.assignin@^4.0.9:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
   integrity sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==
@@ -22085,21 +22142,11 @@ lodash.camelcase@4.3.0, lodash.camelcase@^4.1.1, lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
-lodash.castarray@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
-  integrity sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==
-
-lodash.clonedeep@^4.4.1, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
 
-lodash.compact@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz#540ce3837745975807471e16b4a2ba21e7256ca5"
-  integrity sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==
-
 lodash.debounce@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
@@ -22132,11 +22179,6 @@ lodash.filter@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
   integrity sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==
 
-lodash.find@^4.5.1, lodash.find@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
-  integrity sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==
-
 lodash.flatten@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
@@ -22150,41 +22192,21 @@ lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
   integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
 
-lodash.flattendeep@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
-
 lodash.foreach@^4.3.0, lodash.foreach@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
   integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==
 
-lodash.forin@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.forin/-/lodash.forin-4.4.0.tgz#5d3f20ae564011fbe88381f7d98949c9c9519731"
-  integrity sha512-APldePP4yvGhMcplVxv9L+exdLHMRHRhH1Q9O70zRJMm9HbTm6zxaihXtNl+ICOBApeFWoH7jNmFr/L4XfWeiQ==
-
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
-lodash.has@^4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
-  integrity sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g==
-
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
   integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
 
-lodash.invokemap@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz#1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62"
-  integrity sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==
-
 lodash.isarguments@^3.0.0, lodash.isarguments@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -22200,21 +22222,6 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
 
-lodash.isempty@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
-  integrity sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==
-
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
-
-lodash.isfunction@^3.0.9:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
-  integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==
-
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
@@ -22249,22 +22256,12 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash.lowerfirst@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/lodash.lowerfirst/-/lodash.lowerfirst-4.3.1.tgz#de3c7b12e02c6524a0059c2f6cb7c5c52655a13d"
-  integrity sha512-UUKX7VhP1/JL54NXg2aq/E1Sfnjjes8fNYTNkPU8ZmsaVeBvPHKdbNaN79Re5XRL01u6wbq3j0cbYZj71Fcu5w==
-
-lodash.map@^4.4.0, lodash.map@^4.6.0:
+lodash.map@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
   integrity sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==
 
-lodash.mapvalues@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-  integrity sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==
-
-lodash.memoize@^4.1.2:
+lodash.memoize@4.x, lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
@@ -22284,7 +22281,7 @@ lodash.once@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
-lodash.pick@^4.2.1, lodash.pick@^4.4.0:
+lodash.pick@^4.2.1:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
   integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==
@@ -22304,7 +22301,7 @@ lodash.restparam@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
   integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
 
-lodash.snakecase@4.1.1, lodash.snakecase@^4.1.1:
+lodash.snakecase@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
   integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==
@@ -22352,22 +22349,12 @@ lodash.uniqby@4.5.0:
     lodash._baseiteratee "~4.7.0"
     lodash._baseuniq "~4.6.0"
 
-lodash.uniqby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
-  integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==
-
 lodash.upperfirst@4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
   integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
 
-lodash.values@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
-  integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q==
-
-lodash@4.17.21, lodash@^4.14.2, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.5.1, lodash@^4.7.0, lodash@~4.17.21:
+lodash@4.17.21, lodash@^4.0.0, lodash@^4.14.2, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.5.1, lodash@^4.7.0, lodash@~4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -22387,27 +22374,16 @@ log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
-log-update@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09"
-  integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==
-  dependencies:
-    ansi-escapes "^5.0.0"
-    cli-cursor "^4.0.0"
-    slice-ansi "^5.0.0"
-    strip-ansi "^7.0.1"
-    wrap-ansi "^8.0.1"
-
-log4js@^6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6"
-  integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==
+log-update@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-6.1.0.tgz#1a04ff38166f94647ae1af562f4bd6a15b1b7cd4"
+  integrity sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==
   dependencies:
-    date-format "^4.0.14"
-    debug "^4.3.4"
-    flatted "^3.2.7"
-    rfdc "^1.3.0"
-    streamroller "^3.1.5"
+    ansi-escapes "^7.0.0"
+    cli-cursor "^5.0.0"
+    slice-ansi "^7.1.0"
+    strip-ansi "^7.1.0"
+    wrap-ansi "^9.0.0"
 
 logd-console-output@^1.2.1:
   version "1.3.0"
@@ -22419,18 +22395,6 @@ logd-console-output@^1.2.1:
     ee-types "^2.2.0"
     glob "^7.1.2"
 
-logform@^2.3.2:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/logform/-/logform-2.5.1.tgz#44c77c34becd71b3a42a3970c77929e52c6ed48b"
-  integrity sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==
-  dependencies:
-    "@colors/colors" "1.5.0"
-    "@types/triple-beam" "^1.3.2"
-    fecha "^4.2.0"
-    ms "^2.1.1"
-    safe-stable-stringify "^2.3.1"
-    triple-beam "^1.3.0"
-
 long-timeout@^0.1.1, long-timeout@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/long-timeout/-/long-timeout-0.1.1.tgz#9721d788b47e0bcb5a24c2e2bee1a0da55dab514"
@@ -22492,6 +22456,11 @@ lru-cache@2:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
   integrity sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==
 
+lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
+  integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
+
 lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -22514,7 +22483,7 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.10.1, lru-cache@^7.14.1, lru-cache@^7.7.1:
+lru-cache@^7.10.1, lru-cache@^7.14.1:
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
@@ -22524,11 +22493,6 @@ lru-cache@^8.0.0:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-8.0.5.tgz#983fe337f3e176667f8e567cfcce7cb064ea214e"
   integrity sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA==
 
-"lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
-  integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
-
 lru-cache@~4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -22545,20 +22509,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.5.0, luxon@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.5.0.tgz#6b6f65c5cd1d61d1fd19dbf07ee87a50bf4b8e20"
+  integrity sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==
 
 luxon@^1.26.0:
   version "1.28.0"
@@ -22598,12 +22557,12 @@ magic-string@^0.30.0, magic-string@^0.30.1:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
-mailgun.js@9.3.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/mailgun.js/-/mailgun.js-9.3.0.tgz#2fc86acfa2e8ade457b65e03aac1cfb802062a5e"
-  integrity sha512-iRqCglCdi+Q5anFpeRKHiytT/i34E14p/WtTE57VSeq5bATK+zQ8UnpFgPRaqGGTJqyGjqcO9m5YDRRB4/qirw==
+mailgun.js@10.2.3:
+  version "10.2.3"
+  resolved "https://registry.yarnpkg.com/mailgun.js/-/mailgun.js-10.2.3.tgz#77a0602340383e5340aa6ab1a6c704ab3839e7e3"
+  integrity sha512-7Mcw5IFtzN21i+qFQoWI+aQFDpLYSMUIWvDUXKLlpGFVVGfYVL8GIiveS+LIXpEJTQcF1hoNhOhDwenFqNSKmw==
   dependencies:
-    axios "^1.3.3"
+    axios "^1.7.2"
     base-64 "^1.0.0"
     url-join "^4.0.1"
 
@@ -22638,30 +22597,26 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-error@^1.1.1, make-error@^1.3.6:
+make-error@1.x, make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^11.0.3:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
-  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+make-fetch-happen@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0"
+  integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^17.0.0"
+    "@npmcli/agent" "^2.0.0"
+    cacache "^18.0.0"
     http-cache-semantics "^4.1.1"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^5.0.0"
+    minipass "^7.0.2"
     minipass-fetch "^3.0.0"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
     negotiator "^0.6.3"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
 make-fetch-happen@^9.1.0:
@@ -22732,15 +22687,15 @@ markdown-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
   integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
-markdown-it-footnote@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz#e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8"
-  integrity sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w==
+markdown-it-footnote@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-4.0.0.tgz#02ede0cb68a42d7e7774c3abdc72d77aaa24c531"
+  integrity sha512-WYJ7urf+khJYl3DqofQpYfEYkZKbmXmwxQV8c8mO/hGIhgZ1wOe7R4HLFNwqx7TjILbnC98fuyeSsin19JdFcQ==
 
-markdown-it-image-lazy-loading@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-image-lazy-loading/-/markdown-it-image-lazy-loading-1.2.0.tgz#dc86c7a1c72d18ecd7fe1c285a34611c84c3e11a"
-  integrity sha512-/aeNoa7DxCe3Ey01sF68shdj5JML+ixzr0adWAliwJZp0lpezl84iLCWybhcmCmSZgX0RcO7wGKzXMOI57RbKQ==
+markdown-it-image-lazy-loading@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it-image-lazy-loading/-/markdown-it-image-lazy-loading-2.0.1.tgz#bfc233281864c43bfa2ea6535c457c88b4b7cafb"
+  integrity sha512-IN1DNE2ubw8yn0I7G2conoxSz0R5GgMuOczbxtV+k20MtXeHrDvMQPkQYYGQSd+ejy4eSKQOhqu3gk676Ca//A==
   dependencies:
     image-size "^1.0.0"
 
@@ -22749,20 +22704,20 @@ markdown-it-lazy-headers@^0.1.3:
   resolved "https://registry.yarnpkg.com/markdown-it-lazy-headers/-/markdown-it-lazy-headers-0.1.3.tgz#e70dd4da79c87a9ce82ca4701b8b7c0e2d72297b"
   integrity sha512-65BxqvmYLpVifv6MvTElthY8zvZ/TpZBCdshr/mTpsFkqwcwWtfD3YoSE7RYSn7ugnEAAaj2gywszq+hI/Pxgg==
 
-markdown-it-mark@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-it-mark/-/markdown-it-mark-3.0.1.tgz#51257db58787d78aaf46dc13418d99a9f3f0ebd3"
-  integrity sha512-HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A==
+markdown-it-mark@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-mark/-/markdown-it-mark-4.0.0.tgz#c19cbc87d9cb9fd1a495e8fe31b740b6d9ebf8c8"
+  integrity sha512-YLhzaOsU9THO/cal0lUjfMjrqSMPjjyjChYM7oyj4DnyaXEzA8gnW6cVJeyCrCVeyesrY2PlEdUYJSPFYL4Nkg==
 
-markdown-it-sub@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz#375fd6026eae7ddcb012497f6411195ea1e3afe8"
-  integrity sha512-z2Rm/LzEE1wzwTSDrI+FlPEveAAbgdAdPhdWarq/ZGJrGW/uCQbKAnhoCsE4hAbc3SEym26+W2z/VQB0cQiA9Q==
+markdown-it-sub@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-sub/-/markdown-it-sub-2.0.0.tgz#10f6c7bbf2faacf71ae1a64c75009c40ef9b2c94"
+  integrity sha512-iCBKgwCkfQBRg2vApy9vx1C1Tu6D8XYo8NvevI3OlwzBRmiMtsJ2sXupBgEA7PPxiDwNni3qIUkhZ6j5wofDUA==
 
-markdown-it-sup@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz#cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3"
-  integrity sha512-E32m0nV9iyhRR7CrhnzL5msqic7rL1juWre6TQNxsnApg7Uf+F97JOKxUijg5YwXz86lZ0mqfOnutoryyNdntQ==
+markdown-it-sup@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-2.0.0.tgz#683b9390929f3024fcd5291799c466ce3d367f44"
+  integrity sha512-5VgmdKlkBd8sgXuoDoxMpiU+BiEt3I49GItBzzw7Mxq9CxvnhE/k09HFli09zgfFDRixDQDfDxi0mgBCXtaTvA==
 
 markdown-it-terminal@0.2.1:
   version "0.2.1"
@@ -22786,16 +22741,17 @@ markdown-it@^12.0.2:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-markdown-it@^13.0.0, markdown-it@^13.0.1:
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
-  integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
+markdown-it@^14.0.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45"
+  integrity sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==
   dependencies:
     argparse "^2.0.1"
-    entities "~3.0.1"
-    linkify-it "^4.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
+    entities "^4.4.0"
+    linkify-it "^5.0.0"
+    mdurl "^2.0.0"
+    punycode.js "^2.3.1"
+    uc.micro "^2.1.0"
 
 markdown-it@^8.3.1:
   version "8.4.2"
@@ -22852,15 +22808,6 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-md5@^2.2.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
-  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
-  dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
-
 mdast-util-compact@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz#d531bb7667b5123abf20859be086c4d06c894593"
@@ -22910,6 +22857,11 @@ mdurl@^1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
 
+mdurl@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0"
+  integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -23013,94 +22965,81 @@ 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.45.10:
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.45.10.tgz#c0ae6952513d7ba2fe4eff9dce8dbd073b565901"
+  integrity sha512-S00rvCOqoHrM3WzTRzeIg/TP5Pi35IqtFjsmYIhiqIzTlHHHWvsV2ZBnHjPQkwyu90kADWQh3Cem2BYYk1fvDw==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
 
-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.45.10:
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.45.10.tgz#61588e6b1206fc60f54f2becccbdd1b0502263c0"
+  integrity sha512-SfIq7mvcU6QvX6RfdIdzvY37UBf1T59wflbEiSlMVMutuAFsx+2JhvlImK5eMDdH1SEL4bmgkmvAiE/oQYXD0g==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
 
-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.45.10:
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.45.10.tgz#20fc0433604fbf559204e88e47d7faf3f82240bb"
+  integrity sha512-s7Kt3tGjVHmE2bYT+lGGFMZe4QeIYVwAdHvFT4JIRCDTDQaxCHfry4+HnGc6nnGiJHSyzgNX+4eZtzELP+pS4w==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
 
-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.42.0:
+  version "5.42.0"
+  resolved "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.42.0.tgz#6fc0f750ed77e5839111b37b210f32bc92ce6d89"
+  integrity sha512-Fk9OQn9WBpKOeIYHs+73z7jd8RoHxU+HtBHM4tY88lvHozEXA7qIUl07NM3rURLJo8vQNT7zXcJ1l7VCHDfqfQ==
   dependencies:
     "@keyvhq/memoize" "~2.0.3"
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.40.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.45.10:
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.45.10.tgz#c0789e8f506c0138dbff7017f5ea602267e3e91f"
+  integrity sha512-HpIUuczIgefUgmlpDRLRzgYE4P0gD7Z2VsgSI5Qa8sgXqhEGC45UPn6J+LaQuhTaBirVNCHhgqX5uHG4EPDhAw==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
     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.45.10:
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.45.10.tgz#31ecaa735da8a05314af90cefa7161051522f945"
+  integrity sha512-LW5TrmeA3TNPqTCaSmDrs+WuID56OJaqZZffIeG/VtataeoLBPr5rr1c5pN+YNsB8RqW7Y8HpNBDlxs4GdkNuA==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
 
-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.45.10:
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.45.10.tgz#8d3c1b374647508b445fc122c980911de12696bb"
+  integrity sha512-GGlA7zqkHOe1mAIeRm+V3cHdvveqNO1vX6US8+COorRj9q0tyOMfBFnvmpZp6wE/bX8yGk/r1PVKOdDvAMzBTA==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
 
-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.45.10:
+  version "5.45.10"
+  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.45.10.tgz#b7498db4ce2d592fad4bc68a4a3831f11f6ae0c0"
+  integrity sha512-rlT5I1W06U/WPzM6CR5i+IIm9WYi6eyLGanLDD1C+pMBZqptSqWO9lWBDJQmqZGEuWKMqD7sMij9vZ+IZPBdFQ==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
 
-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.45.15:
+  version "5.45.15"
+  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.45.15.tgz#08ecde5a3ebb3ca3c783fac295940fe92dd85cb4"
+  integrity sha512-TzJIMHkhfhEEuA18CBE+vyov1ESYbpuMzIc/LILHWwpdWWEwmABh/pEX1AD3dsSLCMbcDLQUd4imlhAS6yqxdw==
   dependencies:
-    "@metascraper/helpers" "^5.37.1"
+    "@metascraper/helpers" "^5.45.10"
     cheerio "~1.0.0-rc.12"
     lodash "~4.17.21"
-    whoops "~4.1.4"
+    whoops "~4.1.7"
 
 methods@^1.1.2, methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micro-memoize@^4.0.9:
-  version "4.0.14"
-  resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.0.14.tgz#d1239ce2e5831125ac518509f5a23b54e7ca3e17"
-  integrity sha512-2tzWP1w2Hh+r7kCYa4f//jpBEA6dAueiuLco38NxfjF9Py3KCCI7wVOTdCvOhmTC043t+ulclVBdl3v+s+UJIQ==
-
-micromatch@4.0.5, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -23120,6 +23059,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@~4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 microsoft-capitalize@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/microsoft-capitalize/-/microsoft-capitalize-1.0.5.tgz#bcaf915039f14224c8cfd74c31cea42fecacbb31"
@@ -23197,6 +23144,11 @@ mimic-fn@~3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
   integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
 
+mimic-function@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
+  integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==
+
 mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -23229,6 +23181,13 @@ mini-css-extract-plugin@^2.5.2:
   dependencies:
     schema-utils "^4.0.0"
 
+mini-queue@0.0.14:
+  version "0.0.14"
+  resolved "https://registry.npmjs.org/mini-queue/-/mini-queue-0.0.14.tgz#83d2f3f908e3cac5390bd986d1e6fbbfa0d95b93"
+  integrity sha512-DNh9Wn8U1jrmn1yVfpviwClyER/Y4ltgGbG+LF/KIdKJ8BEo2Q9jDDPG7tEhz6F/DTZ/ohv5D7AAXFVSFyP05Q==
+  dependencies:
+    debug "^3.1.0"
+
 mini-svg-data-uri@^1.2.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
@@ -23280,13 +23239,6 @@ minimatch@^5.0.1, minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^8.0.2:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.3.tgz#0415cb9bb0c1d8ac758c8a673eb1d288e13f5e75"
-  integrity sha512-tEEvU9TkZgnFDCtpnrEYnPsjT7iUx42aXfs4bzmQ5sMA09/6hZY0jeZcGkXyDagiBOvkUjNo8Viom+Me6+2x7g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimatch@^9.0.1:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
@@ -23325,6 +23277,13 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
+minipass-collect@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
+  integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==
+  dependencies:
+    minipass "^7.0.3"
+
 minipass-fetch@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
@@ -23383,7 +23342,7 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   dependencies:
     yallist "^4.0.0"
 
-minipass@^4.0.0, minipass@^4.2.4:
+minipass@^4.0.0:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb"
   integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==
@@ -23393,10 +23352,10 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.1.tgz#dff63464407cd8b83d7f008c0f116fa8c9b77ebf"
-  integrity sha512-NQ8MCKimInjVlaIqx51RKJJB7mINVkLTJbsZKmto4UAAOC/CWXES8PGaOgoBZyqoUsUA/U3DToGK7GJkkHbjJw==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
 minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -23406,36 +23365,14 @@ minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-miragejs@0.1.47, miragejs@^0.1.43:
-  version "0.1.47"
-  resolved "https://registry.yarnpkg.com/miragejs/-/miragejs-0.1.47.tgz#c4a8dff21adfc0ce3181d78987f11848d74c6869"
-  integrity sha512-99tuCbIAlMhNhyF3s5d3+5/FdJ7O4jSq/5e3e+sDv7L8dZdwJuwutXe0pobJ7hm6yRChTDjK+Nn8dZZd175wbg==
+miragejs@0.1.48, miragejs@^0.1.43:
+  version "0.1.48"
+  resolved "https://registry.yarnpkg.com/miragejs/-/miragejs-0.1.48.tgz#f30babc00186ac556f0058e5b050fa1137807c5c"
+  integrity sha512-MGZAq0Q3OuRYgZKvlB69z4gLN4G3PvgC4A2zhkCXCXrLD5wm2cCnwNB59xOBVA+srZ0zEes6u+VylcPIkB4SqA==
   dependencies:
     "@miragejs/pretender-node-polyfill" "^0.1.0"
     inflected "^2.0.4"
-    lodash.assign "^4.2.0"
-    lodash.camelcase "^4.3.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.compact "^3.0.1"
-    lodash.find "^4.6.0"
-    lodash.flatten "^4.4.0"
-    lodash.forin "^4.4.0"
-    lodash.get "^4.4.2"
-    lodash.has "^4.5.2"
-    lodash.invokemap "^4.6.0"
-    lodash.isempty "^4.4.0"
-    lodash.isequal "^4.5.0"
-    lodash.isfunction "^3.0.9"
-    lodash.isinteger "^4.0.4"
-    lodash.isplainobject "^4.0.6"
-    lodash.lowerfirst "^4.3.1"
-    lodash.map "^4.6.0"
-    lodash.mapvalues "^4.6.0"
-    lodash.pick "^4.4.0"
-    lodash.snakecase "^4.1.1"
-    lodash.uniq "^4.5.0"
-    lodash.uniqby "^4.7.0"
-    lodash.values "^4.3.0"
+    lodash "^4.0.0"
     pretender "^3.4.7"
 
 mississippi@^3.0.0:
@@ -23491,6 +23428,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+mkdirp@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
+
 mktemp@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
@@ -23587,35 +23529,24 @@ module-details-from-path@^1.0.3:
   resolved "https://registry.yarnpkg.com/module-details-from-path/-/module-details-from-path-1.0.3.tgz#114c949673e2a8a35e9d35788527aa37b679da2b"
   integrity sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==
 
-moment-timezone@0.5.23, moment-timezone@0.5.34, moment-timezone@^0.5.23, moment-timezone@^0.5.31, moment-timezone@^0.5.33:
-  version "0.5.23"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463"
-  integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==
+moment-timezone@0.5.34, moment-timezone@0.5.45, moment-timezone@^0.5.23, moment-timezone@^0.5.31, moment-timezone@^0.5.33:
+  version "0.5.45"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
+  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
   dependencies:
-    moment ">= 2.9.0"
+    moment "^2.29.4"
 
-moment@2.24.0, moment@2.27.0, moment@2.29.1, moment@2.29.3, moment@2.29.4, "moment@>= 2.9.0", moment@^2.10.2, moment@^2.18.1, moment@^2.19.3, moment@^2.27.0, moment@^2.29.1:
+moment@2.24.0, moment@2.27.0, moment@2.29.1, moment@2.29.3, moment@2.29.4, moment@2.30.1, moment@^2.10.2, moment@^2.18.1, moment@^2.19.3, moment@^2.27.0, moment@^2.29.1, moment@^2.29.4:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-monobundle@TryGhost/monobundle#44fdf2c8e304e797a04858bfd7339b2a1fa47441:
-  version "0.1.0"
-  resolved "https://codeload.github.com/TryGhost/monobundle/tar.gz/44fdf2c8e304e797a04858bfd7339b2a1fa47441"
-  dependencies:
-    detect-indent "6.1.0"
-    detect-newline "3.1.0"
-    find-root "1.1.0"
-    glob "8.0.3"
-    lodash.flattendeep "4.4.0"
-    ultra-runner "3.10.5"
-
 moo@^0.5.0, moo@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
   integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
 
-morgan@^1.10.0, morgan@^1.9.0:
+morgan@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
   integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
@@ -23663,11 +23594,6 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -23692,6 +23618,19 @@ multer@1.4.4, multer@^1.4.4:
     type-is "^1.6.4"
     xtend "^4.0.0"
 
+multer@1.4.4-lts.1:
+  version "1.4.4-lts.1"
+  resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.4-lts.1.tgz#24100f701a4611211cfae94ae16ea39bb314e04d"
+  integrity sha512-WeSGziVj6+Z2/MwQo3GvqzgR+9Uc+qt8SwHKh3gvNPiISKfsMfG4SvCOFYlxxgkXt7yIV2i1yczehm0EOKIxIg==
+  dependencies:
+    append-field "^1.0.0"
+    busboy "^1.0.0"
+    concat-stream "^1.5.2"
+    mkdirp "^0.5.4"
+    object-assign "^4.1.1"
+    type-is "^1.6.4"
+    xtend "^4.0.0"
+
 mustache@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64"
@@ -23716,24 +23655,25 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-mysql2@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.2.0.tgz#3613a8903bcb7ade0ae35b29945a0378eb67da89"
-  integrity sha512-0Vn6a9WSrq6fWwvPgrvIwnOCldiEcgbzapVRDAtDZ4cMTxN7pnGqCTx8EG32S/NYXl6AXkdO+9hV1tSIi/LigA==
+mysql2@3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.11.0.tgz#2a7bd7c615ab43f8167ed9922063b968f3e48f33"
+  integrity sha512-J9phbsXGvTOcRVPR95YedzVSxJecpW5A5+cQ57rhHIFXteTP10HCs+VBjS7DHIKfEaI1zQ5tlVrquCd64A6YvA==
   dependencies:
+    aws-ssl-profiles "^1.1.1"
     denque "^2.1.0"
     generate-function "^2.3.1"
     iconv-lite "^0.6.3"
     long "^5.2.1"
-    lru-cache "^7.14.1"
+    lru-cache "^8.0.0"
     named-placeholders "^1.1.3"
     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.9.7:
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.9.7.tgz#843755daf65b5ef08afe545fe14b8fb62824741a"
+  integrity sha512-KnJT8vYRcNAZv73uf9zpXqNbvBG7DJrs+1nACsjZP1HMJ1TgXEy8wnNilXAn/5i57JizXKtrUtwDB7HxT9DDpw==
   dependencies:
     denque "^2.1.0"
     generate-function "^2.3.1"
@@ -23769,10 +23709,10 @@ named-placeholders@^1.1.3:
   dependencies:
     lru-cache "^7.14.1"
 
-nan@^2.12.1, nan@^2.14.0, nan@^2.16.0, nan@^2.17.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
-  integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
+nan@^2.12.1, nan@^2.14.0, nan@^2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3"
+  integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==
 
 nanoclone@^0.2.1:
   version "0.2.1"
@@ -23784,10 +23724,10 @@ nanoid@3.3.3:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
   integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
 
-nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -23816,16 +23756,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-nconf@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.12.0.tgz#9cf70757aae4d440d43ed53c42f87da18471b8bf"
-  integrity sha512-T3fZPw3c7Dfrz8JBQEbEcZJ2s8f7cUMpKuyBtsGQe0b71pcXx6gNh4oti2xh5dxB+gO9ufNfISBlGvvWtfyMcA==
-  dependencies:
-    async "^3.0.0"
-    ini "^2.0.0"
-    secure-keys "^1.0.0"
-    yargs "^16.1.1"
-
 nconf@0.12.1, nconf@^0.12.0:
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.12.1.tgz#b0b91d2e32dc588fad19ac8bc5245e7472ebb4b9"
@@ -23870,33 +23800,6 @@ 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.3.0:
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-11.3.0.tgz#e1074af4cab72dc97ac111b2f3a6764e01dfa830"
-  integrity sha512-7DG+iqo1LqQyGxleikHO0a2TaNZzxCje2NlQyRVo474p0WT6w8CGyeEnlxLsFiV1+OqnGGF3tFfUUkWfHzAyNg==
-  dependencies:
-    "@grpc/grpc-js" "^1.8.10"
-    "@grpc/proto-loader" "^0.7.5"
-    "@newrelic/aws-sdk" "^7.0.0"
-    "@newrelic/koa" "^8.0.0"
-    "@newrelic/security-agent" "0.3.0"
-    "@newrelic/superagent" "^7.0.0"
-    "@tyriar/fibonacci-heap" "^2.0.7"
-    concat-stream "^2.0.0"
-    https-proxy-agent "^7.0.1"
-    import-in-the-middle "^1.4.2"
-    json-bigint "^1.0.0"
-    json-stringify-safe "^5.0.0"
-    module-details-from-path "^1.0.3"
-    readable-stream "^3.6.1"
-    require-in-the-middle "^7.2.0"
-    semver "^7.5.2"
-    winston-transport "^4.5.0"
-  optionalDependencies:
-    "@contrast/fn-inspect" "^3.3.0"
-    "@newrelic/native-metrics" "^10.0.0"
-    "@prisma/prisma-fmt-wasm" "^4.17.0-16.27eb2449f178cd9fe1a4b892d732cc4795f75085"
-
 next-tick@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
@@ -23918,10 +23821,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"
@@ -23954,10 +23857,18 @@ nock@13.3.3:
     lodash "^4.17.21"
     propagate "^2.0.0"
 
-node-abi@^3.3.0:
-  version "3.28.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz#b0df8b317e1c4f2f323756c5fc8ffccc5bca4718"
-  integrity sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==
+nock@^14.0.0-beta.6:
+  version "14.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-14.0.0-beta.6.tgz#beefba44893b89596bc9a526db50f8f0567403a9"
+  integrity sha512-b7lc7qvj1dQzxtbU7TqyTMnKbNKwGQd585xsRtcCZOv3I/yOK9Vwv4nOgnLFxFtX9m1yjhQDRbgqFCqNh9HuEw==
+  dependencies:
+    json-stringify-safe "^5.0.1"
+    propagate "^2.0.0"
+
+node-abi@^3.3.0, node-abi@^3.61.0:
+  version "3.62.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.62.0.tgz#017958ed120f89a3a14a7253da810f5d724e3f36"
+  integrity sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==
   dependencies:
     semver "^7.3.5"
 
@@ -23966,17 +23877,17 @@ node-addon-api@^3.2.1:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
-node-addon-api@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
-  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
+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-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@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.0.0.tgz#8136add2f510997b3b94814f4af1cce0b0e3962e"
+  integrity sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==
 
-node-dir@^0.1.10, node-dir@^0.1.17:
+node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
   integrity sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==
@@ -23988,10 +23899,10 @@ node-fetch-native@^1.0.2:
   resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.1.1.tgz#b8977dd7fe6c5599e417301ed3987bca787d3d6f"
   integrity sha512-9VvspTSUp2Sxbl+9vbZTlFGq9lHwE8GDVVekxx6YsNd1YH59sb3Ba8v3Y3cD8PkLNcileGGcA21PFjVl0jzDaw==
 
-node-fetch@^2.0.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
-  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
+node-fetch@^2.0.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -24000,7 +23911,7 @@ node-forge@^1.2.1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-gyp-build@^4.3.0, node-gyp-build@^4.4.0:
+node-gyp-build@^4.3.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
   integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
@@ -24021,22 +23932,21 @@ node-gyp@8.x:
     tar "^6.1.2"
     which "^2.0.2"
 
-node-gyp@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369"
-  integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==
+node-gyp@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.1.0.tgz#75e6f223f2acb4026866c26a2ead6aab75a8ca7e"
+  integrity sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"
-    glob "^7.1.4"
+    glob "^10.3.10"
     graceful-fs "^4.2.6"
-    make-fetch-happen "^11.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
+    make-fetch-happen "^13.0.0"
+    nopt "^7.0.0"
+    proc-log "^3.0.0"
     semver "^7.3.5"
     tar "^6.1.2"
-    which "^2.0.2"
+    which "^4.0.0"
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -24118,10 +24028,10 @@ node-notifier@^10.0.0:
     uuid "^8.3.2"
     which "^2.0.2"
 
-node-releases@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
-  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 nodemailer-direct-transport@^3.3.2:
   version "3.3.2"
@@ -24157,10 +24067,10 @@ nodemailer-stub-transport@^1.1.0:
   resolved "https://registry.yarnpkg.com/nodemailer-stub-transport/-/nodemailer-stub-transport-1.1.0.tgz#11421d2d66b4ee6f405354f914c1f4641eb24b0d"
   integrity sha512-4fwl2f+647IIyuNuf6wuEMqK4oEU9FMJSYme8kPckVSr1rXIXcmI6BNcIWO+1cAK8XeexYKxYoFztam0jAwjkA==
 
-nodemailer@^6.6.3:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.8.0.tgz#804bcc5256ee5523bc914506ee59f8de8f0b1cd5"
-  integrity sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==
+nodemailer@6.9.15, nodemailer@^6.6.3:
+  version "6.9.15"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.15.tgz#57b79dc522be27e0e47ac16cc860aa0673e62e04"
+  integrity sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ==
 
 nopt@^3.0.6:
   version "3.0.6"
@@ -24183,6 +24093,13 @@ nopt@^6.0.0:
   dependencies:
     abbrev "^1.0.0"
 
+nopt@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
+  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
+  dependencies:
+    abbrev "^2.0.0"
+
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -24203,6 +24120,11 @@ normalize-package-data@^3.0.2:
     semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
+normalize-path@3.0.0, normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -24210,11 +24132,6 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
@@ -24245,12 +24162,12 @@ normalize.css@3.0.3:
   resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-3.0.3.tgz#acc00262e235a2caa91363a2e5e3bfa4f8ad05c6"
   integrity sha512-7OavvKXqPta8bgGhWzcUOnZ9KCkANYzbq4ytNKgNeFRTaz3KAm1eGUQ/vyAeVjlDXjolsbYREctuzyQytCDiBA==
 
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
+now-and-later@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-3.0.0.tgz#cdc045dc5b894b35793cf276cc3206077bb7302d"
+  integrity sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==
   dependencies:
-    once "^1.3.2"
+    once "^1.4.0"
 
 npm-git-info@^1.0.3:
   version "1.0.3"
@@ -24266,13 +24183,6 @@ npm-package-arg@^8.1.0:
     semver "^7.3.4"
     validate-npm-package-name "^3.0.0"
 
-npm-run-path@4.0.1, npm-run-path@^4.0.0, npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -24287,6 +24197,13 @@ npm-run-path@^3.0.0:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
 npm-run-path@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00"
@@ -24304,16 +24221,6 @@ npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-npmlog@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
-  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
-  dependencies:
-    are-we-there-yet "^2.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^3.0.0"
-    set-blocking "^2.0.0"
-
 npmlog@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
@@ -24353,10 +24260,10 @@ numbered@^1.1.0:
   resolved "https://registry.yarnpkg.com/numbered/-/numbered-1.1.0.tgz#9fcd79564c73a84b9574e8370c3d8e58fe3c133c"
   integrity sha512-pv/ue2Odr7IfYOO0byC1KgBI10wo5YDauLhxY6/saNzAdAs0r1SotGCPzzCLNPL0xtrAwWRialLu23AAu9xO1g==
 
-nwsapi@^2.2.0, nwsapi@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5"
-  integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==
+nwsapi@^2.2.0, nwsapi@^2.2.12:
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.12.tgz#fb6af5c0ec35b27b4581eb3bbad34ec9e5c696f8"
+  integrity sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==
 
 nx@16.8.1:
   version "16.8.1"
@@ -24445,7 +24352,7 @@ object-inspect@^1.12.3, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
-object-is@^1.0.1, object-is@^1.1.5:
+object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
   integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
@@ -24479,7 +24386,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.0.4, object.assign@^4.1.3, object.assign@^4.1.4:
+object.assign@^4.1.3, object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -24543,13 +24450,6 @@ object.map@^1.0.0:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
 
-object.omit@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af"
-  integrity sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==
-  dependencies:
-    is-extendable "^1.0.0"
-
 object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -24590,7 +24490,7 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -24618,6 +24518,13 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
+onetime@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60"
+  integrity sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==
+  dependencies:
+    mimic-function "^5.0.0"
+
 open@^8.0.4, open@^8.4.0:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
@@ -24678,13 +24585,6 @@ ora@^5.4.0, ora@^5.4.1:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
-  integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==
-  dependencies:
-    readable-stream "^2.0.1"
-
 orderedmap@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-2.1.1.tgz#61481269c44031c449915497bf5a4ad273c512d2"
@@ -24757,7 +24657,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -24908,11 +24808,6 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-cache-control@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-cache-control/-/parse-cache-control-1.0.1.tgz#8eeab3e54fa56920fe16ba38f77fa21aacc2d74e"
-  integrity sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==
-
 parse-entities@^1.0.2, parse-entities@^1.1.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
@@ -25005,17 +24900,7 @@ parseley@^0.7.0:
     moo "^0.5.1"
     nearley "^2.20.1"
 
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
-
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -25105,7 +24990,7 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
-path-scurry@^1.10.1, path-scurry@^1.6.1:
+path-scurry@^1.10.1:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
   integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
@@ -25118,6 +25003,11 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
+path-to-regexp@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.2.0.tgz#fa7877ecbc495c601907562222453c43cc204a5f"
+  integrity sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==
+
 path-to-regexp@^1.0.0, path-to-regexp@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
@@ -25130,6 +25020,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+path-type@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
+  integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==
+
 pathe@^1.1.0, pathe@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a"
@@ -25196,22 +25091,17 @@ picocolors@^0.2.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pid-cwd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pid-cwd/-/pid-cwd-1.2.0.tgz#c14c03d812b1d23f97aee27767957fc16272c979"
-  integrity sha512-8QQzIdBmy4bd2l1NKWON1X8flO5TQQRzU2uRDua/XaxSC0iJ+rgbDrlX76t0W3DaJ7OevTYpftyvQ6oMe3hclQ==
-
-pidtree@0.6.0:
+pidtree@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
   integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
@@ -25250,7 +25140,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-dir@^4.1.0:
+pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -25339,6 +25229,14 @@ postcss-attribute-case-insensitive@^5.0.2:
   dependencies:
     postcss-selector-parser "^6.0.10"
 
+postcss-calc@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-10.0.0.tgz#aca29a1c66dd481ca30d08f6932b1274a1003716"
+  integrity sha512-OmjhudoNTP0QleZCwl1i6NeBwN+5MZbY5ersLZz69mjJiDVv/p57RjRuKDkHeDWr4T+S97wQfsqRTNoDHB2e3g==
+  dependencies:
+    postcss-selector-parser "^6.0.16"
+    postcss-value-parser "^4.2.0"
+
 postcss-calc@^7.0.1:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e"
@@ -25348,14 +25246,6 @@ postcss-calc@^7.0.1:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.0.2"
 
-postcss-calc@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.0.tgz#cd9b2b155e57c823687eb67c9afcbe97c98ecaa4"
-  integrity sha512-B9BNW/SVh4SMJfoCQ6D9h1Wo7Yjqks7UdbiARJ16J5TIsQn5NEqwMF5joSgOYb26oJPUR5Uv3fCQ/4PvmZWeJQ==
-  dependencies:
-    postcss-selector-parser "^6.0.11"
-    postcss-value-parser "^4.2.0"
-
 postcss-clamp@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363"
@@ -25363,18 +25253,18 @@ postcss-clamp@^4.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-cli@10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-cli/-/postcss-cli-10.1.0.tgz#f6658c4998a1c35bd66cd71009132b2d12e04f80"
-  integrity sha512-Zu7PLORkE9YwNdvOeOVKPmWghprOtjFQU3srMUGbdz3pHJiFh7yZ4geiZFMkjMfB0mtTFR3h8RemR62rPkbOPA==
+postcss-cli@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-cli/-/postcss-cli-11.0.0.tgz#649f4b9af447501feb6cbca7f7505a132f90442b"
+  integrity sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==
   dependencies:
     chokidar "^3.3.0"
     dependency-graph "^0.11.0"
     fs-extra "^11.0.0"
     get-stdin "^9.0.0"
-    globby "^13.0.0"
+    globby "^14.0.0"
     picocolors "^1.0.0"
-    postcss-load-config "^4.0.0"
+    postcss-load-config "^5.0.0"
     postcss-reporter "^7.0.0"
     pretty-hrtime "^1.0.3"
     read-cache "^1.0.0"
@@ -25422,14 +25312,14 @@ postcss-colormin@^4.0.3:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-colormin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.0.tgz#d4250652e952e1c0aca70c66942da93d3cdeaafe"
-  integrity sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==
+postcss-colormin@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-7.0.1.tgz#6534c7d1175e30f788d4ced891436ad2fa3bd173"
+  integrity sha512-uszdT0dULt3FQs47G5UHCduYK+FnkLYlpu1HpWu061eGsKZ7setoG7kA+WC9NQLsOJf69D5TxGHgnAdRgylnFQ==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.23.1"
     caniuse-api "^3.0.0"
-    colord "^2.9.1"
+    colord "^2.9.3"
     postcss-value-parser "^4.2.0"
 
 postcss-convert-values@^4.0.1:
@@ -25440,12 +25330,12 @@ postcss-convert-values@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-convert-values@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz#ec94a954957e5c3f78f0e8f65dfcda95280b8996"
-  integrity sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==
+postcss-convert-values@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-7.0.2.tgz#8a33265f5f1decfc93328e2a23e03e8491a3d9ae"
+  integrity sha512-MuZIF6HJ4izko07Q0TgW6pClalI4al6wHRNPkFzqQdwAwG7hPn0lA58VZdxyb2Vl5AYjJ1piO+jgF9EnTjQwQQ==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.23.1"
     postcss-value-parser "^4.2.0"
 
 postcss-custom-media@7.0.8:
@@ -25498,10 +25388,12 @@ postcss-discard-comments@^4.0.2:
   dependencies:
     postcss "^7.0.0"
 
-postcss-discard-comments@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz#9ca335e8b68919f301b24ba47dde226a42e535fe"
-  integrity sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==
+postcss-discard-comments@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.1.tgz#00b01c5a99e95f97927b0ba12a1c422ab90bf55f"
+  integrity sha512-GVrQxUOhmle1W6jX2SvNLt4kmN+JYhV7mzI6BMnkAWR9DtVvg8e67rrV0NfdWhn7x1zxvzdWkMBPdBDCls+uwQ==
+  dependencies:
+    postcss-selector-parser "^6.1.0"
 
 postcss-discard-duplicates@^4.0.2:
   version "4.0.2"
@@ -25510,10 +25402,10 @@ postcss-discard-duplicates@^4.0.2:
   dependencies:
     postcss "^7.0.0"
 
-postcss-discard-duplicates@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz#c26177a6c33070922e67e9a92c0fd23d443d1355"
-  integrity sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==
+postcss-discard-duplicates@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.0.tgz#47ae1154cc89ad0a50099fbac1f74c942214c961"
+  integrity sha512-bAnSuBop5LpAIUmmOSsuvtKAAKREB6BBIYStWUTGq8oG5q9fClDMMuY8i4UPI/cEcDx2TN+7PMnXYIId20UVDw==
 
 postcss-discard-empty@^4.0.1:
   version "4.0.1"
@@ -25522,10 +25414,10 @@ postcss-discard-empty@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
-postcss-discard-empty@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz#06c1c4fce09e22d2a99e667c8550eb8a3a1b9aee"
-  integrity sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==
+postcss-discard-empty@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-7.0.0.tgz#218829d1ef0a5d5142dd62f0aa60e00e599d2033"
+  integrity sha512-e+QzoReTZ8IAwhnSdp/++7gBZ/F+nBq9y6PomfwORfP7q9nBpK5AMP64kOt0bA+lShBFbBDcgpJ3X4etHg4lzA==
 
 postcss-discard-overridden@^4.0.1:
   version "4.0.1"
@@ -25534,10 +25426,10 @@ postcss-discard-overridden@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
-postcss-discard-overridden@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz#49c5262db14e975e349692d9024442de7cd8e234"
-  integrity sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==
+postcss-discard-overridden@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-7.0.0.tgz#b123ea51e3d4e1d0a254cf71eaff1201926d319c"
+  integrity sha512-GmNAzx88u3k2+sBTZrJSDauR0ccpE24omTQCVmaTTZFz1du6AasspjaUPMJ2ud4RslZpoFKyf+6MSPETLojc6w==
 
 postcss-double-position-gradients@^3.1.2:
   version "3.1.2"
@@ -25595,7 +25487,16 @@ postcss-import@12.0.1:
     read-cache "^1.0.0"
     resolve "^1.1.7"
 
-postcss-import@15.1.0, postcss-import@^15.1.0:
+postcss-import@16.1.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-16.1.0.tgz#258732175518129667fe1e2e2a05b19b5654b96a"
+  integrity sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg==
+  dependencies:
+    postcss-value-parser "^4.0.0"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-import@^15.1.0:
   version "15.1.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70"
   integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==
@@ -25624,7 +25525,7 @@ postcss-lab-function@^4.2.1:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-load-config@^4.0.0, postcss-load-config@^4.0.1:
+postcss-load-config@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd"
   integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==
@@ -25632,6 +25533,14 @@ postcss-load-config@^4.0.0, postcss-load-config@^4.0.1:
     lilconfig "^2.0.5"
     yaml "^2.1.1"
 
+postcss-load-config@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-5.1.0.tgz#4ded23410da973e05edae9d41fa99bb5c1d5477f"
+  integrity sha512-G5AJ+IX0aD0dygOE0yFZQ/huFFMSNneyfp0e3/bT05a8OfPC5FUoZRPfGijUdGOJNMewJiwzcHJXFafFzeKFVA==
+  dependencies:
+    lilconfig "^3.1.1"
+    yaml "^2.4.2"
+
 postcss-loader@^7.2.4:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.0.tgz#05991c1e490d8ff86ef18358d87db3b5b2dcb5f5"
@@ -25662,13 +25571,13 @@ postcss-merge-longhand@^4.0.11:
     postcss-value-parser "^3.0.0"
     stylehacks "^4.0.0"
 
-postcss-merge-longhand@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz#6f627b27db939bce316eaa97e22400267e798d69"
-  integrity sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==
+postcss-merge-longhand@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-7.0.2.tgz#b9fddce88498ca7e45ff130163b69864b25c05dc"
+  integrity sha512-06vrW6ZWi9qeP7KMS9fsa9QW56+tIMW55KYqF7X3Ccn+NI2pIgPV6gFfvXTMQ05H90Y5DvnCDPZ2IuHa30PMUg==
   dependencies:
     postcss-value-parser "^4.2.0"
-    stylehacks "^6.0.0"
+    stylehacks "^7.0.2"
 
 postcss-merge-rules@^4.0.3:
   version "4.0.3"
@@ -25682,15 +25591,15 @@ postcss-merge-rules@^4.0.3:
     postcss-selector-parser "^3.0.0"
     vendors "^1.0.0"
 
-postcss-merge-rules@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz#39f165746404e646c0f5c510222ccde4824a86aa"
-  integrity sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==
+postcss-merge-rules@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-7.0.2.tgz#f7c991576cff4c7d0a8f16101c20bbfa9426695c"
+  integrity sha512-VAR47UNvRsdrTHLe7TV1CeEtF9SJYR5ukIB9U4GZyZOptgtsS20xSxy+k5wMrI3udST6O1XuIn7cjQkg7sDAAw==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.23.1"
     caniuse-api "^3.0.0"
-    cssnano-utils "^4.0.0"
-    postcss-selector-parser "^6.0.5"
+    cssnano-utils "^5.0.0"
+    postcss-selector-parser "^6.1.0"
 
 postcss-minify-font-values@^4.0.2:
   version "4.0.2"
@@ -25700,10 +25609,10 @@ postcss-minify-font-values@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-minify-font-values@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz#68d4a028f9fa5f61701974724b2cc9445d8e6070"
-  integrity sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==
+postcss-minify-font-values@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-7.0.0.tgz#d16a75a2548e000779566b3568fc874ee5d0aa17"
+  integrity sha512-2ckkZtgT0zG8SMc5aoNwtm5234eUx1GGFJKf2b1bSp8UflqaeFzR50lid4PfqVI9NtGqJ2J4Y7fwvnP/u1cQog==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25717,13 +25626,13 @@ postcss-minify-gradients@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-minify-gradients@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz#22b5c88cc63091dadbad34e31ff958404d51d679"
-  integrity sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==
+postcss-minify-gradients@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-7.0.0.tgz#f6d84456e6d49164a55d0e45bb1b1809c6cf0959"
+  integrity sha512-pdUIIdj/C93ryCHew0UgBnL2DtUS3hfFa5XtERrs4x+hmpMYGhbzo6l/Ir5de41O0GaKVpK1ZbDNXSY6GkXvtg==
   dependencies:
-    colord "^2.9.1"
-    cssnano-utils "^4.0.0"
+    colord "^2.9.3"
+    cssnano-utils "^5.0.0"
     postcss-value-parser "^4.2.0"
 
 postcss-minify-params@^4.0.2:
@@ -25738,13 +25647,13 @@ postcss-minify-params@^4.0.2:
     postcss-value-parser "^3.0.0"
     uniqs "^2.0.0"
 
-postcss-minify-params@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz#2b3a85a9e3b990d7a16866f430f5fd1d5961b539"
-  integrity sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==
+postcss-minify-params@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-7.0.1.tgz#08d753bb09d3ebf1a6d6fb0968d60bb3b981e513"
+  integrity sha512-e+Xt8xErSRPgSRFxHeBCSxMiO8B8xng7lh8E0A5ep1VfwYhY8FXhu4Q3APMjgx9YDDbSp53IBGENrzygbUvgUQ==
   dependencies:
-    browserslist "^4.21.4"
-    cssnano-utils "^4.0.0"
+    browserslist "^4.23.1"
+    cssnano-utils "^5.0.0"
     postcss-value-parser "^4.2.0"
 
 postcss-minify-selectors@^4.0.2:
@@ -25757,12 +25666,13 @@ postcss-minify-selectors@^4.0.2:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-postcss-minify-selectors@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz#5046c5e8680a586e5a0cad52cc9aa36d6be5bda2"
-  integrity sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==
+postcss-minify-selectors@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-7.0.2.tgz#869c8ef885a4f9c2550d0d5ec1a2876027d3965c"
+  integrity sha512-dCzm04wqW1uqLmDZ41XYNBJfjgps3ZugDpogAmJXoCb5oCiTzIX4oPXXKxDpTvWOnKxQKR4EbV4ZawJBLcdXXA==
   dependencies:
-    postcss-selector-parser "^6.0.5"
+    cssesc "^3.0.0"
+    postcss-selector-parser "^6.1.0"
 
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
@@ -25814,10 +25724,10 @@ postcss-normalize-charset@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
-postcss-normalize-charset@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz#36cc12457259064969fb96f84df491652a4b0975"
-  integrity sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==
+postcss-normalize-charset@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-7.0.0.tgz#92244ae73c31bf8f8885d5f16ff69e857ac6c001"
+  integrity sha512-ABisNUXMeZeDNzCQxPxBCkXexvBrUHV+p7/BXOY+ulxkcjUZO0cp8ekGBwvIh2LbCwnWbyMPNJVtBSdyhM2zYQ==
 
 postcss-normalize-display-values@^4.0.2:
   version "4.0.2"
@@ -25828,10 +25738,10 @@ postcss-normalize-display-values@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-display-values@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz#8d2961415078644d8c6bbbdaf9a2fdd60f546cd4"
-  integrity sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==
+postcss-normalize-display-values@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.0.tgz#01fb50e5e97ef8935363629bea5a6d3b3aac1342"
+  integrity sha512-lnFZzNPeDf5uGMPYgGOw7v0BfB45+irSRz9gHQStdkkhiM0gTfvWkWB5BMxpn0OqgOQuZG/mRlZyJxp0EImr2Q==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25845,10 +25755,10 @@ postcss-normalize-positions@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-positions@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz#25b96df99a69f8925f730eaee0be74416865e301"
-  integrity sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==
+postcss-normalize-positions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-7.0.0.tgz#4eebd7c9d3dde40c97b8047cad38124fc844c463"
+  integrity sha512-I0yt8wX529UKIGs2y/9Ybs2CelSvItfmvg/DBIjTnoUSrPxSV7Z0yZ8ShSVtKNaV/wAY+m7bgtyVQLhB00A1NQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25862,10 +25772,10 @@ postcss-normalize-repeat-style@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-repeat-style@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz#ddf30ad8762feb5b1eb97f39f251acd7b8353299"
-  integrity sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==
+postcss-normalize-repeat-style@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.0.tgz#0cb784655d5714d29bd3bda6dee2fb628aa7227b"
+  integrity sha512-o3uSGYH+2q30ieM3ppu9GTjSXIzOrRdCUn8UOMGNw7Af61bmurHTWI87hRybrP6xDHvOe5WlAj3XzN6vEO8jLw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25878,10 +25788,10 @@ postcss-normalize-string@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-string@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz#948282647a51e409d69dde7910f0ac2ff97cb5d8"
-  integrity sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==
+postcss-normalize-string@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-7.0.0.tgz#a119d3e63a9614570d8413d572fb9fc8c6a64e8c"
+  integrity sha512-w/qzL212DFVOpMy3UGyxrND+Kb0fvCiBBujiaONIihq7VvtC7bswjWgKQU/w4VcRyDD8gpfqUiBQ4DUOwEJ6Qg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25894,10 +25804,10 @@ postcss-normalize-timing-functions@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-timing-functions@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz#5f13e650b8c43351989fc5de694525cc2539841c"
-  integrity sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==
+postcss-normalize-timing-functions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.0.tgz#99d0ee8c4b23b7f4355fafb91385833b9b07108b"
+  integrity sha512-tNgw3YV0LYoRwg43N3lTe3AEWZ66W7Dh7lVEpJbHoKOuHc1sLrzMLMFjP8SNULHaykzsonUEDbKedv8C+7ej6g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25910,12 +25820,12 @@ postcss-normalize-unicode@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-unicode@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz#741b3310f874616bdcf07764f5503695d3604730"
-  integrity sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==
+postcss-normalize-unicode@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.1.tgz#6545debfff2b4b154583cb24bb388b9681ffa119"
+  integrity sha512-PTPGdY9xAkTw+8ZZ71DUePb7M/Vtgkbbq+EoI33EuyQEzbKemEQMhe5QSr0VP5UfZlreANDPxSfcdSprENcbsg==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.23.1"
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-url@^4.0.1:
@@ -25928,10 +25838,10 @@ postcss-normalize-url@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-url@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz#d0a31e962a16401fb7deb7754b397a323fb650b4"
-  integrity sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==
+postcss-normalize-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-7.0.0.tgz#c88cb7cf8952d3ff631e4eba924e7b060ca802f6"
+  integrity sha512-+d7+PpE+jyPX1hDQZYG+NaFD+Nd2ris6r8fPTBAjE8z/U41n/bib3vze8x7rKs5H1uEw5ppe9IojewouHk0klQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25943,10 +25853,10 @@ postcss-normalize-whitespace@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-normalize-whitespace@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz#accb961caa42e25ca4179b60855b79b1f7129d4d"
-  integrity sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==
+postcss-normalize-whitespace@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.0.tgz#46b025f0bea72139ddee63015619b0c21cebd845"
+  integrity sha512-37/toN4wwZErqohedXYqWgvcHUGlT8O/m2jVkAfAe9Bd4MzRqlBmXrJRePH0e9Wgnz2X7KymTgTOaaFizQe3AQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -25964,12 +25874,12 @@ postcss-ordered-values@^4.1.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-ordered-values@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz#374704cdff25560d44061d17ba3c6308837a3218"
-  integrity sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==
+postcss-ordered-values@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-7.0.1.tgz#8b4b5b8070ca7756bd49f07d5edf274b8f6782e0"
+  integrity sha512-irWScWRL6nRzYmBOXReIKch75RRhNS86UPUAxXdmW/l0FcAsg0lvAXQCby/1lymxn/o0gVa6Rv/0f03eJOwHxw==
   dependencies:
-    cssnano-utils "^4.0.0"
+    cssnano-utils "^5.0.0"
     postcss-value-parser "^4.2.0"
 
 postcss-overflow-shorthand@^3.0.4:
@@ -26063,12 +25973,12 @@ postcss-reduce-initial@^4.0.3:
     has "^1.0.0"
     postcss "^7.0.0"
 
-postcss-reduce-initial@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz#7d16e83e60e27e2fa42f56ec0b426f1da332eca7"
-  integrity sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==
+postcss-reduce-initial@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-7.0.1.tgz#d5308153f757ff9dd5b041cd4954a7592ef0d43b"
+  integrity sha512-0JDUSV4bGB5FGM5g8MkS+rvqKukJZ7OTHw/lcKn7xPNqeaqJyQbUO8/dJpvyTpaVwPsd3Uc33+CfNzdVowp2WA==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.23.1"
     caniuse-api "^3.0.0"
 
 postcss-reduce-transforms@^4.0.2:
@@ -26081,10 +25991,10 @@ postcss-reduce-transforms@^4.0.2:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-reduce-transforms@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz#28ff2601a6d9b96a2f039b3501526e1f4d584a46"
-  integrity sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==
+postcss-reduce-transforms@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.0.tgz#0386080a14e5faad9f8eda33375b79fe7c4f9677"
+  integrity sha512-pnt1HKKZ07/idH8cpATX/ujMbtOGhUfE+m8gbqwJE05aTaNw8gbo34a2e3if0xc0dlu75sUOiqvwCGY3fzOHew==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -26127,10 +26037,10 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
-  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.16, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9, postcss-selector-parser@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53"
+  integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -26144,13 +26054,13 @@ postcss-svgo@^4.0.3:
     postcss-value-parser "^3.0.0"
     svgo "^1.0.0"
 
-postcss-svgo@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.0.tgz#7b18742d38d4505a0455bbe70d52b49f00eaf69d"
-  integrity sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==
+postcss-svgo@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-7.0.1.tgz#2b63571d8e9568384df334bac9917baff4d23f58"
+  integrity sha512-0WBUlSL4lhD9rA5k1e5D8EN5wCEyZD6HJk0jIvRxl+FDVOMlJ7DePHYWGGVc5QRqrJ3/06FTXM0bxjmJpmTPSA==
   dependencies:
     postcss-value-parser "^4.2.0"
-    svgo "^3.0.2"
+    svgo "^3.3.2"
 
 postcss-unique-selectors@^4.0.1:
   version "4.0.1"
@@ -26161,12 +26071,12 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-unique-selectors@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz#c94e9b0f7bffb1203894e42294b5a1b3fb34fbe1"
-  integrity sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==
+postcss-unique-selectors@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-7.0.1.tgz#3e4e7c408ca5cd57e834d197e9c96111fc163237"
+  integrity sha512-MH7QE/eKUftTB5ta40xcHLl7hkZjgDFydpfTK+QWXeHxghVt3VoPqYL5/G+zYZPPIs+8GuqFXSTgxBSoB1RZtQ==
   dependencies:
-    postcss-selector-parser "^6.0.5"
+    postcss-selector-parser "^6.1.0"
 
 postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3:
   version "3.3.1"
@@ -26196,14 +26106,14 @@ postcss-values-parser@^4.0.0:
     is-url-superb "^4.0.0"
     postcss "^7.0.5"
 
-postcss@8.4.31, postcss@^8.1.4, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.4.19, postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.4:
-  version "8.4.31"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
-  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
+postcss@8.4.39, postcss@^8.1.4, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.4.19, postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.4:
+  version "8.4.39"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3"
+  integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==
   dependencies:
-    nanoid "^3.3.6"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    nanoid "^3.3.7"
+    picocolors "^1.0.1"
+    source-map-js "^1.2.0"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5:
   version "7.0.39"
@@ -26259,16 +26169,6 @@ prettier@^2.8.0:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-prettier@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b"
-  integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==
-
-pretty-bytes@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
-  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
-
 pretty-format@^27.0.2:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
@@ -26288,7 +26188,7 @@ pretty-format@^28.1.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-pretty-format@^29.0.0, pretty-format@^29.3.1, pretty-format@^29.5.0, pretty-format@^29.7.0:
+pretty-format@^29.0.0, pretty-format@^29.5.0, pretty-format@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
   integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
@@ -26359,12 +26259,17 @@ probe-image-size@^5.0.0:
     request "^2.83.0"
     stream-parser "~0.3.1"
 
+proc-log@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
+  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
+
 process-es6@^0.11.2:
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/process-es6/-/process-es6-0.11.6.tgz#c6bb389f9a951f82bd4eb169600105bd2ff9c778"
   integrity sha512-GYBRQtL4v3wgigq10Pv58jmTbFXlIiTbSfgnNqZLY0ldUPqy1rRxDI5fCjoCpnM6TqmHQI8ydzTBXW86OYc0gA==
 
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
+process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
@@ -26411,31 +26316,12 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-promise.allsettled@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.5.tgz#2443f3d4b2aa8dfa560f6ac2aa6c4ea999d75f53"
-  integrity sha512-tVDqeZPoBC0SlzJHzWGZ2NKAguVq2oiYj7gbggbiTvH2itHohijTp7njOUA0aQ/nl+0lr/r6egmhoYu63UZ/pQ==
-  dependencies:
-    array.prototype.map "^1.0.4"
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
-    iterate-value "^1.0.2"
-
 promise.hash.helper@^1.0.7:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7"
   integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg==
 
-promise@^8.0.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a"
-  integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==
-  dependencies:
-    asap "~2.0.6"
-
-prompts@^2.0.0, prompts@^2.4.0:
+prompts@^2.0.0, prompts@^2.0.1, prompts@^2.4.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
@@ -26471,21 +26357,21 @@ property-expr@^2.0.4:
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
   integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
 
-prosemirror-changeset@^2.2.0:
+prosemirror-changeset@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.2.1.tgz#dae94b63aec618fac7bb9061648e6e2a79988383"
   integrity sha512-J7msc6wbxB4ekDFj+n9gTW/jav/p53kdlivvuppHsrZXCaQdVgRghoZbSS3kwrRyAstRVQ4/+u5k7YfLgkkQvQ==
   dependencies:
     prosemirror-transform "^1.0.0"
 
-prosemirror-collab@^1.3.0:
+prosemirror-collab@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.3.1.tgz#0e8c91e76e009b53457eb3b3051fb68dad029a33"
   integrity sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==
   dependencies:
     prosemirror-state "^1.0.0"
 
-prosemirror-commands@^1.0.0, prosemirror-commands@^1.3.1:
+prosemirror-commands@^1.0.0, prosemirror-commands@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.5.2.tgz#e94aeea52286f658cd984270de9b4c3fff580852"
   integrity sha512-hgLcPaakxH8tu6YvVAaILV2tXYsW3rAdDR8WNkeKGcgeMVQg3/TMhPdVoh7iAmfgVjZGtcOSjKiQaoeKjzd2mQ==
@@ -26494,7 +26380,7 @@ prosemirror-commands@^1.0.0, prosemirror-commands@^1.3.1:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-dropcursor@^1.5.0:
+prosemirror-dropcursor@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.1.tgz#49b9fb2f583e0d0f4021ff87db825faa2be2832d"
   integrity sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==
@@ -26503,7 +26389,7 @@ prosemirror-dropcursor@^1.5.0:
     prosemirror-transform "^1.1.0"
     prosemirror-view "^1.1.0"
 
-prosemirror-gapcursor@^1.3.1:
+prosemirror-gapcursor@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.2.tgz#5fa336b83789c6199a7341c9493587e249215cb4"
   integrity sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==
@@ -26513,25 +26399,25 @@ prosemirror-gapcursor@^1.3.1:
     prosemirror-state "^1.0.0"
     prosemirror-view "^1.0.0"
 
-prosemirror-history@^1.0.0, prosemirror-history@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.3.2.tgz#ce6ad7ab9db83e761aee716f3040d74738311b15"
-  integrity sha512-/zm0XoU/N/+u7i5zepjmZAEnpvjDtzoPWW6VmKptcAnPadN/SStsBjMImdCEbb3seiNTpveziPTIrXQbHLtU1g==
+prosemirror-history@^1.0.0, prosemirror-history@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.4.1.tgz#cc370a46fb629e83a33946a0e12612e934ab8b98"
+  integrity sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==
   dependencies:
     prosemirror-state "^1.2.2"
     prosemirror-transform "^1.0.0"
     prosemirror-view "^1.31.0"
     rope-sequence "^1.3.0"
 
-prosemirror-inputrules@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.2.1.tgz#8faf3d78c16150aedac71d326a3e3947417ce557"
-  integrity sha512-3LrWJX1+ULRh5SZvbIQlwZafOXqp1XuV21MGBu/i5xsztd+9VD15x6OtN6mdqSFI7/8Y77gYUbQ6vwwJ4mr6QQ==
+prosemirror-inputrules@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.4.0.tgz#ef1519bb2cb0d1e0cec74bad1a97f1c1555068bb"
+  integrity sha512-6ygpPRuTJ2lcOXs9JkefieMst63wVJBgHZGl5QOytN7oSZs3Co/BYbc3Yx9zm9H37Bxw8kVzCnDsihsVsL4yEg==
   dependencies:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.0:
+prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz#14a54763a29c7b2704f561088ccf3384d14eb77e"
   integrity sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==
@@ -26539,48 +26425,48 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.0:
     prosemirror-state "^1.0.0"
     w3c-keyname "^2.2.0"
 
-prosemirror-markdown@^1.10.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.11.1.tgz#441ad0ac4ab7c30f50623517e65c6bb8e966e9e3"
-  integrity sha512-CLOieKoaSSEusKyYcXIj8v2qHGLW+tnuffci+8678Sen48NEFQE7M3o0Nx0gj9v63iVDj+yLibj2gCe8eb3jIw==
+prosemirror-markdown@^1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.13.0.tgz#67ebfa40af48a22d1e4ed6cad2e29851eb61e649"
+  integrity sha512-UziddX3ZYSYibgx8042hfGKmukq5Aljp2qoBiJRejD/8MH70siQNz5RB1TrdTPheqLMy4aCe4GYNF10/3lQS5g==
   dependencies:
-    markdown-it "^13.0.1"
-    prosemirror-model "^1.0.0"
+    markdown-it "^14.0.0"
+    prosemirror-model "^1.20.0"
 
-prosemirror-menu@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.2.2.tgz#c545a2de0b8cb79babc07682b1d93de0f273aa33"
-  integrity sha512-437HIWTq4F9cTX+kPfqZWWm+luJm95Aut/mLUy+9OMrOml0bmWDS26ceC6SNfb2/S94et1sZ186vLO7pDHzxSw==
+prosemirror-menu@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.2.4.tgz#3cfdc7c06d10f9fbd1bce29082c498bd11a0a79a"
+  integrity sha512-S/bXlc0ODQup6aiBbWVsX/eM+xJgCTAfMq/nLqaO5ID/am4wS0tTCIkzwytmao7ypEtjj39i7YbJjAgO20mIqA==
   dependencies:
     crelt "^1.0.0"
     prosemirror-commands "^1.0.0"
     prosemirror-history "^1.0.0"
     prosemirror-state "^1.0.0"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.19.0, prosemirror-model@^1.8.1:
-  version "1.19.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.19.3.tgz#f0d55285487fefd962d0ac695f716f4ec6705006"
-  integrity sha512-tgSnwN7BS7/UM0sSARcW+IQryx2vODKX4MI7xpqY2X+iaepJdKBPc7I4aACIsDV/LTaTjt12Z56MhDr9LsyuZQ==
+prosemirror-model@^1.0.0, prosemirror-model@^1.19.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.22.2, prosemirror-model@^1.8.1:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.22.2.tgz#9bae923c4c4149eee59ff61a5b390c26011a26b4"
+  integrity sha512-I4lS7HHIW47D0Xv/gWmi4iUWcQIDYaJKd8Hk4+lcSps+553FlQrhmxtItpEvTr75iAruhzVShVp6WUwsT6Boww==
   dependencies:
     orderedmap "^2.0.0"
 
-prosemirror-schema-basic@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.2.tgz#6695f5175e4628aab179bf62e5568628b9cfe6c7"
-  integrity sha512-/dT4JFEGyO7QnNTe9UaKUhjDXbTNkiWTq/N4VpKaF79bBjSExVV2NXmJpcM7z/gD7mbqNjxbmWW5nf1iNSSGnw==
+prosemirror-schema-basic@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.3.tgz#649c349bb21c61a56febf9deb71ac68fca4cedf2"
+  integrity sha512-h+H0OQwZVqMon1PNn0AG9cTfx513zgIG2DY00eJ00Yvgb3UD+GQ/VlWW5rcaxacpCGT1Yx8nuhwXk4+QbXUfJA==
   dependencies:
     prosemirror-model "^1.19.0"
 
-prosemirror-schema-list@^1.2.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.3.0.tgz#05374702cf35a3ba5e7ec31079e355a488d52519"
-  integrity sha512-Hz/7gM4skaaYfRPNgr421CU4GSwotmEwBVvJh5ltGiffUJwm7C8GfN/Bc6DR1EKEp5pDKhODmdXXyi9uIsZl5A==
+prosemirror-schema-list@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.4.1.tgz#78b8d25531db48ca9688836dbde50e13ac19a4a1"
+  integrity sha512-jbDyaP/6AFfDfu70VzySsD75Om2t3sXTOdl5+31Wlxlg62td1haUpty/ybajSfJ1pkGadlOfwQq9kgW5IMo1Rg==
   dependencies:
     prosemirror-model "^1.0.0"
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.7.3"
 
-prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.4.1:
+prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.3.tgz#94aecf3ffd54ec37e87aa7179d13508da181a080"
   integrity sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==
@@ -26589,10 +26475,10 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, pr
     prosemirror-transform "^1.0.0"
     prosemirror-view "^1.27.0"
 
-prosemirror-tables@^1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.3.4.tgz#0b7cc16d49f90c5b834c9f29291c545478ce9ab0"
-  integrity sha512-z6uLSQ1BLC3rgbGwZmpfb+xkdvD7W/UOsURDfognZFYaTtc0gsk7u/t71Yijp2eLflVpffMk6X0u0+u+MMDvIw==
+prosemirror-tables@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.4.0.tgz#59c3dc241e03fc4ba8c093995b130d2980f0ffdc"
+  integrity sha512-fxryZZkQG12fSCNuZDrYx6Xvo2rLYZTbKLRd8rglOPgNJGMKIS8uvTt6gGC38m7UCu/ENnXIP9pEz5uDaPc+cA==
   dependencies:
     prosemirror-keymap "^1.1.2"
     prosemirror-model "^1.8.1"
@@ -26600,29 +26486,27 @@ prosemirror-tables@^1.3.0:
     prosemirror-transform "^1.2.1"
     prosemirror-view "^1.13.3"
 
-prosemirror-trailing-node@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.4.tgz#60febdeb947550ee93a224f2e56dbd5cb2cdd607"
-  integrity sha512-0Yl9w7IdHkaCdqR+NE3FOucePME4OmiGcybnF1iasarEILP5U8+4xTnl53yafULjmwcg1SrSG65Hg7Zk2H2v3g==
+prosemirror-trailing-node@^2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.9.tgz#a087e6d1372e888cd3e57c977507b6b85dc658e4"
+  integrity sha512-YvyIn3/UaLFlFKrlJB6cObvUhmwFNZVhy1Q8OpW/avoTbD/Y7H5EcjK4AZFKhmuS6/N6WkGgt7gWtBWDnmFvHg==
   dependencies:
-    "@babel/runtime" "^7.21.0"
-    "@remirror/core-constants" "^2.0.1"
-    "@remirror/core-helpers" "^2.0.2"
+    "@remirror/core-constants" "^2.0.2"
     escape-string-regexp "^4.0.0"
 
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.7.0, prosemirror-transform@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.7.3.tgz#cc2225cd1bf88a3c62404b9eb051ff73e9c716a6"
-  integrity sha512-qDapyx5lqYfxVeUWEw0xTGgeP2S8346QtE7DxkalsXlX89lpzkY6GZfulgfHyk1n4tf74sZ7CcXgcaCcGjsUtA==
+prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.7.3, prosemirror-transform@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.9.0.tgz#81fd1fbd887929a95369e6dd3d240c23c19313f8"
+  integrity sha512-5UXkr1LIRx3jmpXXNKDhv8OyAOeLTGuXNwdVfg8x27uASna/wQkr9p6fD3eupGOi4PLJfbezxTyi/7fSJypXHg==
   dependencies:
-    prosemirror-model "^1.0.0"
+    prosemirror-model "^1.21.0"
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.27.0, prosemirror-view@^1.28.2, prosemirror-view@^1.31.0:
-  version "1.31.6"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.31.6.tgz#fb297606724fc4c827a31bf65376c05290177690"
-  integrity sha512-wwgErp+EWnuW4kGAYKrt90hhOetaoWpYNdOpnuQMXo1m4x/+uhauFeQoCCm8J30ZqAa4LgIER4yzKSO545gRfA==
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0, prosemirror-view@^1.33.9:
+  version "1.33.9"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.33.9.tgz#0ed61ae42405cfc9799bde4db86badbb1ad99b08"
+  integrity sha512-xV1A0Vz9cIcEnwmMhKKFAOkfIp8XmJRnaZoPqNXrPS7EK5n11Ov8V76KhR0RsfQd/SIzmWY+bg+M44A2Lx/Nnw==
   dependencies:
-    prosemirror-model "^1.16.0"
+    prosemirror-model "^1.20.0"
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.1.0"
 
@@ -26631,10 +26515,10 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-protobufjs@^7.2.4:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.5.tgz#45d5c57387a6d29a17aab6846dcc283f9b8e7f2d"
-  integrity sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==
+protobufjs@^7.2.5, protobufjs@^7.3.0:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.3.2.tgz#60f3b7624968868f6f739430cfbc8c9370e26df4"
+  integrity sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -26672,11 +26556,6 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-ps-list@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-7.2.0.tgz#3d110e1de8249a4b178c9b1cf2a215d1e4e42fc0"
-  integrity sha512-v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ==
-
 pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -26715,7 +26594,7 @@ pump@^2.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3, pumpify@^1.3.5:
+pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
@@ -26724,6 +26603,11 @@ pumpify@^1.3.3, pumpify@^1.3.5:
     inherits "^2.0.3"
     pump "^2.0.0"
 
+punycode.js@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
+  integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==
+
 punycode2@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/punycode2/-/punycode2-1.0.1.tgz#7190290a2f672a97c18bda38ad9f402787b4eded"
@@ -26739,10 +26623,10 @@ punycode@^1.2.4:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
 
-punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 puppeteer-core@^2.1.1:
   version "2.1.1"
@@ -26760,6 +26644,11 @@ puppeteer-core@^2.1.1:
     rimraf "^2.6.1"
     ws "^6.1.0"
 
+pure-rand@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
+  integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
+
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -26890,16 +26779,6 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-body@2.5.2:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
@@ -26928,24 +26807,24 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-re2@~1.20.1:
-  version "1.20.3"
-  resolved "https://registry.yarnpkg.com/re2/-/re2-1.20.3.tgz#7370b05f0a534873a9054fe7704be2f10bfc4c90"
-  integrity sha512-g5j4YjygwGEccP9SCuDI90uPlgALLEYLotfL0K+kqL3XKB4ht7Nm1JuXfOTG96c7JozpvCUxTz1T7oTNwwMI6w==
+re2@~1.21.0:
+  version "1.21.3"
+  resolved "https://registry.yarnpkg.com/re2/-/re2-1.21.3.tgz#4bced725a837cbe73d7d42b702a0d46671e6d00a"
+  integrity sha512-GI+KoGkHT4kxTaX+9p0FgNB1XUnCndO9slG5qqeEoZ7kbf6Dk6ohQVpmwKVeSp7LPLn+g6Q3BaCopz4oHuBDuQ==
   dependencies:
-    install-artifact-from-github "^1.3.3"
-    nan "^2.17.0"
-    node-gyp "^9.4.0"
+    install-artifact-from-github "^1.3.5"
+    nan "^2.20.0"
+    node-gyp "^10.1.0"
 
 reachable-url@~1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/reachable-url/-/reachable-url-1.7.1.tgz#4d56f534d088c084e7d9884dafadf2c43d074c66"
-  integrity sha512-SCk7V5cwUw246mPhJ7uaqMcxa5iJNlzfztCvcDK1EgqexW2ghLWWrAGZCBNg/lT0ZqjJnLcsKPfGWxmmoABvOw==
+  version "1.7.2"
+  resolved "https://registry.npmjs.org/reachable-url/-/reachable-url-1.7.2.tgz#15b9eee6dd4ec390bc9ad7c4e8acf9079f61f27d"
+  integrity sha512-aJHwaTbbLjYcbMmzD/6xQ785vbEs8TTwoUg/Y/+faSk0TxPcsUxFk9bwsYRyDJID/krm1ZATBn3U+JSP1Vv2Bg==
   dependencies:
     got "~11.8.0"
     p-reflect "~2.1.0"
 
-react-colorful@^5.1.2:
+react-colorful@5.6.1, react-colorful@^5.1.2:
   version "5.6.1"
   resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.6.1.tgz#7dc2aed2d7c72fac89694e834d179e32f3da563b"
   integrity sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==
@@ -26955,21 +26834,21 @@ react-docgen-typescript@^2.2.2:
   resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz#4611055e569edc071204aadb20e1c93e1ab1659c"
   integrity sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==
 
-react-docgen@6.0.0-alpha.3:
-  version "6.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-6.0.0-alpha.3.tgz#4d8a4916b45de4aadb90eb5f3a6f923edf447928"
-  integrity sha512-DDLvB5EV9As1/zoUsct6Iz2Cupw9FObEGD3DMcIs3EDFIoSKyz8FZtoWj3Wj+oodrU4/NfidN0BL5yrapIcTSA==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@babel/generator" "^7.12.11"
-    ast-types "^0.14.2"
-    commander "^2.19.0"
+react-docgen@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-7.0.1.tgz#b6528fe45385908645ffbee1ec0d65709e1e047c"
+  integrity sha512-rCz0HBIT0LWbIM+///LfRrJoTKftIzzwsYDf0ns5KwaEjejMHQRtphcns+IXFHDNY9pnz6G8l/JbbI6pD4EAIA==
+  dependencies:
+    "@babel/core" "^7.18.9"
+    "@babel/traverse" "^7.18.9"
+    "@babel/types" "^7.18.9"
+    "@types/babel__core" "^7.18.0"
+    "@types/babel__traverse" "^7.18.0"
+    "@types/doctrine" "^0.0.9"
+    "@types/resolve" "^1.20.2"
     doctrine "^3.0.0"
-    estree-to-babel "^3.1.0"
-    neo-async "^2.6.1"
-    node-dir "^0.1.10"
-    resolve "^1.17.0"
-    strip-indent "^3.0.0"
+    resolve "^1.22.1"
+    strip-indent "^4.0.0"
 
 react-dom@17.0.2:
   version "17.0.2"
@@ -26980,13 +26859,13 @@ react-dom@17.0.2:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
-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==
+react-dom@18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
+  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
     loose-envify "^1.1.0"
-    scheduler "^0.23.0"
+    scheduler "^0.23.2"
 
 react-element-to-jsx-string@^15.0.0:
   version "15.0.0"
@@ -26997,6 +26876,13 @@ react-element-to-jsx-string@^15.0.0:
     is-plain-object "5.0.0"
     react-is "18.1.0"
 
+react-error-boundary@^3.1.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.4.tgz#255db92b23197108757a888b01e5b729919abde0"
+  integrity sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
 react-hot-toast@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/react-hot-toast/-/react-hot-toast-2.4.1.tgz#df04295eda8a7b12c4f968e54a61c8d36f4c0994"
@@ -27004,11 +26890,6 @@ react-hot-toast@2.4.1:
   dependencies:
     goober "^2.1.10"
 
-react-inspector@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.1.tgz#1a37f0165d9df81ee804d63259eaaeabe841287d"
-  integrity sha512-cxKSeFTf7jpSSVddm66sKdolG90qURAX3g1roTeaN6x0YEbtWc8JpmFN9+yIqLNH2uEkYerWLtJZIXRIFuBKrg==
-
 react-is@18.1.0:
   version "18.1.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
@@ -27034,10 +26915,10 @@ react-refresh@^0.14.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-remove-scroll-bar@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"
-  integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==
+react-remove-scroll-bar@^2.3.3, react-remove-scroll-bar@^2.3.4:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz#3e585e9d163be84a010180b18721e851ac81a29c"
+  integrity sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==
   dependencies:
     react-style-singleton "^2.2.1"
     tslib "^2.0.0"
@@ -27053,10 +26934,21 @@ 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-remove-scroll@2.5.7:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.7.tgz#15a1fd038e8497f65a695bf26a4a57970cac1ccb"
+  integrity sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==
+  dependencies:
+    react-remove-scroll-bar "^2.3.4"
+    react-style-singleton "^2.2.1"
+    tslib "^2.1.0"
+    use-callback-ref "^1.3.0"
+    use-sidecar "^1.1.2"
+
+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"
@@ -27100,10 +26992,10 @@ react@17.0.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-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==
+react@18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
+  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
   dependencies:
     loose-envify "^1.1.0"
 
@@ -27152,7 +27044,7 @@ read-pkg@^6.0.0:
     parse-json "^5.2.0"
     type-fest "^1.0.1"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -27175,7 +27067,7 @@ readable-stream@1.1.x, readable-stream@^1.0.26-4:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.1:
+"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -27234,20 +27126,10 @@ recast@^0.18.1:
     private "^0.1.8"
     source-map "~0.6.1"
 
-recast@^0.21.0:
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495"
-  integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==
-  dependencies:
-    ast-types "0.15.2"
-    esprima "~4.0.0"
-    source-map "~0.6.1"
-    tslib "^2.0.1"
-
-recast@^0.23.1:
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.2.tgz#d3dda3e8f0a3366860d7508c00e34a338ac52b41"
-  integrity sha512-Qv6cPfVZyMOtPszK6PgW70pUgm7gPlFitAPf0Q69rlOA0zLw2XdDcNmPbVGYicFGT9O8I7TZ/0ryJD+6COvIPw==
+recast@^0.23.1, recast@^0.23.3:
+  version "0.23.4"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.4.tgz#ca1bac7bfd3011ea5a28dfecb5df678559fb1ddf"
+  integrity sha512-qtEDqIZGVcSZCHniWwZWbRy79Dc6Wp3kT/UmDA2RJKBPg7+7k51aQBZirHmUGn5uvHf2rg8DkjizrN26k61ATw==
   dependencies:
     assert "^2.0.0"
     ast-types "^0.16.1"
@@ -27309,6 +27191,11 @@ redis-parser@^3.0.0:
   dependencies:
     redis-errors "^1.0.0"
 
+reflect-metadata@0.1.14:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859"
+  integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==
+
 reframe.js@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/reframe.js/-/reframe.js-4.0.2.tgz#07f5f8fb40e0eb6f2d783ce952030d3e14dca7b7"
@@ -27519,33 +27406,11 @@ remark@^11.0.2:
     remark-stringify "^7.0.0"
     unified "^8.2.0"
 
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
-  integrity sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
-
 remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
-remove-trailing-slash@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d"
-  integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==
-
 repeat-element@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
@@ -27563,11 +27428,6 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
 replace-ext@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
@@ -27582,11 +27442,6 @@ reqresnext@^1.7.0:
     lodash "^4.17.21"
     setprototypeof "^1.2.0"
 
-request-ip@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-3.3.0.tgz#863451e8fec03847d44f223e30a5d63e369fa611"
-  integrity sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA==
-
 request-promise-core@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
@@ -27645,10 +27500,10 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-in-the-middle@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz#b539de8f00955444dc8aed95e17c69b0a4f10fcf"
-  integrity sha512-3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw==
+require-in-the-middle@^7.1.1:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-7.3.0.tgz#ce64a1083647dc07b3273b348357efac8a9945c9"
+  integrity sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==
   dependencies:
     debug "^4.1.1"
     module-details-from-path "^1.0.3"
@@ -27689,6 +27544,13 @@ resolve-alpn@^1.0.0, resolve-alpn@^1.2.0:
   resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
   integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
 
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -27712,12 +27574,12 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
-  integrity sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==
+resolve-options@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-2.0.0.tgz#a1a57a9949db549dd075de3f5550675f02f1e4c5"
+  integrity sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==
   dependencies:
-    value-or-function "^3.0.0"
+    value-or-function "^4.0.0"
 
 resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6:
   version "1.2.7"
@@ -27758,6 +27620,11 @@ resolve-path@^1.4.0:
     http-errors "~1.6.2"
     path-is-absolute "1.0.1"
 
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
 resolve-url-loader@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz#ee3142fb1f1e0d9db9524d539cfa166e9314f795"
@@ -27774,19 +27641,15 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@1.22.3:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
-  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
-  dependencies:
-    is-core-module "^2.12.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
+resolve.exports@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.22.2, resolve@^1.22.3, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.22.4"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
-  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
+resolve@1.22.8, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.22.2, resolve@^1.22.3, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
     is-core-module "^2.13.0"
     path-parse "^1.0.7"
@@ -27838,13 +27701,13 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
-restore-cursor@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9"
-  integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==
+restore-cursor@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz#0766d95699efacb14150993f55baf0953ea1ebe7"
+  integrity sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==
   dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    onetime "^7.0.0"
+    signal-exit "^4.1.0"
 
 ret@~0.1.10:
   version "0.1.15"
@@ -27868,10 +27731,10 @@ rewire@6.0.0:
   dependencies:
     eslint "^7.32.0"
 
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+rfdc@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
+  integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
 rgb-regex@^1.0.1:
   version "1.0.1"
@@ -27883,10 +27746,10 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-rimraf@5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
-  integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
+rimraf@5.0.10:
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.10.tgz#23b9843d3dc92db71f96e1a2ce92e39fd2a8221c"
+  integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==
   dependencies:
     glob "^10.3.7"
 
@@ -27918,11 +27781,6 @@ rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
-ringbufferjs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ringbufferjs/-/ringbufferjs-2.0.0.tgz#09f40e2675a99cfef430b7ec5815ac1bc2e24120"
-  integrity sha512-GCOqTzUsTHF7nrqcgtNGAFotXztLgiePpIDpyWZ7R5I02tmfJWV+/yuJc//Hlsd8G+WzI1t/dc2y/w2imDZdog==
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -28001,6 +27859,11 @@ rrweb-cssom@^0.6.0:
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
   integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
 
+rrweb-cssom@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz#c73451a484b86dd7cfb1e0b2898df4b703183e4b"
+  integrity sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==
+
 rss@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/rss/-/rss-1.2.2.tgz#50a1698876138133a74f9a05d2bdc8db8d27a921"
@@ -28043,24 +27906,19 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.4.0, rxjs@^6.6.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^7.5.5, rxjs@^7.8.1:
+rxjs@7.8.1, rxjs@^7.5.5, rxjs@^7.8.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
+rxjs@^6.4.0, rxjs@^6.6.0:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
 
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -28105,7 +27963,7 @@ safe-regex@^2.1.1:
   dependencies:
     regexp-tree "~0.1.1"
 
-safe-stable-stringify@^2.2.0, safe-stable-stringify@^2.3.1:
+safe-stable-stringify@^2.2.0:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
   integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
@@ -28135,10 +27993,10 @@ sane@^4.0.0, sane@^4.1.0:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.11.0.tgz#9a6434ee8fcaeddc740d8ae7cd5dd71d3981f8f6"
-  integrity sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA==
+sanitize-html@2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.0.tgz#71aedcdb777897985a4ea1877bf4f895a1170dae"
+  integrity sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -28182,10 +28040,10 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-scheduler@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
-  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
+scheduler@^0.23.2:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
+  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
   dependencies:
     loose-envify "^1.1.0"
 
@@ -28266,12 +28124,10 @@ semver@7.5.3:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.5.4, semver@^7.0.0, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
+semver@7.6.3, semver@^7.0.0, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.2:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
@@ -28328,17 +28184,6 @@ serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-serve-favicon@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
-  integrity sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==
-  dependencies:
-    etag "~1.8.1"
-    fresh "0.5.2"
-    ms "2.1.1"
-    parseurl "~1.3.2"
-    safe-buffer "5.1.1"
-
 serve-static@1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
@@ -28354,6 +28199,16 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -28394,18 +28249,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:
@@ -28437,16 +28292,16 @@ shell-quote@^1.8.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
-shellwords-ts@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shellwords-ts/-/shellwords-ts-3.0.1.tgz#7c2ed81ea6d0804705a95a5625682363972600e2"
-  integrity sha512-GabK4ApLMqHFRGlpgNqg8dmtHTnYHt0WUUJkIeMd3QaDrUUBEDXHSSNi3I0PzMimg8W+I0EN4TshQxsnHv1cwg==
-
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+shimmer@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
 should-equal@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3"
@@ -28515,10 +28370,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-signal-exit@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
-  integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==
+signal-exit@^4.0.1, signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
   version "1.1.1"
@@ -28564,13 +28419,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-simple-update-notifier@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"
-  integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==
-  dependencies:
-    semver "^7.5.3"
-
 sinon@15.2.0:
   version "15.2.0"
   resolved "https://registry.yarnpkg.com/sinon/-/sinon-15.2.0.tgz#5e44d4bc5a9b5d993871137fd3560bebfac27565"
@@ -28583,6 +28431,30 @@ 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@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-17.0.1.tgz#26b8ef719261bf8df43f925924cccc96748e407a"
+  integrity sha512-wmwE19Lie0MLT+ZYNpDymasPHUKTaZHUH/pKEubRXIzySv9Atnlw+BUMGCzWgV7b7wO+Hw6f1TEOr0IUnmU8/g==
+  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"
@@ -28624,10 +28496,10 @@ slash@^4.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
-slash@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-5.0.0.tgz#8c18a871096b71ee0e002976a4fe3374991c3074"
-  integrity sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==
+slash@^5.0.0, slash@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce"
+  integrity sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==
 
 slice-ansi@^4.0.0:
   version "4.0.0"
@@ -28646,6 +28518,14 @@ slice-ansi@^5.0.0:
     ansi-styles "^6.0.0"
     is-fullwidth-code-point "^4.0.0"
 
+slice-ansi@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.0.tgz#cd6b4655e298a8d1bdeb04250a433094b347b9a9"
+  integrity sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==
+  dependencies:
+    ansi-styles "^6.2.1"
+    is-fullwidth-code-point "^5.0.0"
+
 slick@^1.12.2:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7"
@@ -28714,28 +28594,6 @@ socket.io-adapter@~2.5.2:
   dependencies:
     ws "~8.11.0"
 
-socket.io-client@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-3.1.3.tgz#57ddcefea58cfab71f0e94c21124de8e3c5aa3e2"
-  integrity sha512-4sIGOGOmCg3AOgGi7EEr6ZkTZRkrXwub70bBB/F0JSkMOUFpA77WsL87o34DffQQ31PkbMUIadGOk+3tx1KGbw==
-  dependencies:
-    "@types/component-emitter" "^1.2.10"
-    backo2 "~1.0.2"
-    component-emitter "~1.3.0"
-    debug "~4.3.1"
-    engine.io-client "~4.1.0"
-    parseuri "0.0.6"
-    socket.io-parser "~4.0.4"
-
-socket.io-parser@~4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df"
-  integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==
-  dependencies:
-    "@types/component-emitter" "^1.2.10"
-    component-emitter "~1.3.0"
-    debug "~4.3.1"
-
 socket.io-parser@~4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
@@ -28744,10 +28602,10 @@ socket.io-parser@~4.2.4:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socket.io@4.7.2, socket.io@^4.1.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.2.tgz#22557d76c3f3ca48f82e73d68b7add36a22df002"
-  integrity sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==
+socket.io@^4.5.4:
+  version "4.7.5"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.5.tgz#56eb2d976aef9d1445f373a62d781a41c7add8f8"
+  integrity sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
@@ -28766,16 +28624,16 @@ socks-proxy-agent@^6.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+socks-proxy-agent@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
+  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
   dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
+    agent-base "^7.0.2"
+    debug "^4.3.4"
+    socks "^2.7.1"
 
-socks@^2.6.2:
+socks@^2.6.2, socks@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
   integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
@@ -28812,10 +28670,10 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-js@^1.0.1, source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+source-map-js@^1.0.1, source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
 source-map-resolve@^0.5.0:
   version "0.5.3"
@@ -28828,6 +28686,14 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
@@ -28955,13 +28821,14 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sqlite3@5.1.6:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.6.tgz#1d4fbc90fe4fbd51e952e0a90fd8f6c2b9098e97"
-  integrity sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==
+sqlite3@5.1.7:
+  version "5.1.7"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.7.tgz#59ca1053c1ab38647396586edad019b1551041b7"
+  integrity sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==
   dependencies:
-    "@mapbox/node-pre-gyp" "^1.0.0"
-    node-addon-api "^4.2.0"
+    bindings "^1.5.0"
+    node-addon-api "^7.0.0"
+    prebuild-install "^7.1.1"
     tar "^6.1.11"
   optionalDependencies:
     node-gyp "8.x"
@@ -29093,12 +28960,12 @@ store2@^2.14.2:
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068"
   integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==
 
-storybook@7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.4.0.tgz#f1b64222e3d474bc6e258eb7e48c675685829873"
-  integrity sha512-jSwbyxHlr2dTY51Pv0mzenjrMDJNZH7DQhHu4ZezpjV+QK/rLCnD+Gt/7iDSaNlsmZJejQcmURDoEybWggMOqw==
+storybook@7.6.20:
+  version "7.6.20"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.6.20.tgz#6204ff0c28471536a1a64cb16d1c97872dd33f95"
+  integrity sha512-Wt04pPTO71pwmRmsgkyZhNo4Bvdb/1pBAMsIFb9nQLykEdzzpXjvingxFFvdOG4nIowzwgxD+CLlyRqVJqnATw==
   dependencies:
-    "@storybook/cli" "7.4.0"
+    "@storybook/cli" "7.6.20"
 
 stream-browserify@^2.0.1:
   version "2.0.2"
@@ -29108,6 +28975,13 @@ stream-browserify@^2.0.1:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
+stream-composer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/stream-composer/-/stream-composer-1.0.2.tgz#7ee61ca1587bf5f31b2e29aa2093cbf11442d152"
+  integrity sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==
+  dependencies:
+    streamx "^2.13.2"
+
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
@@ -29139,15 +29013,6 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-streamroller@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff"
-  integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==
-  dependencies:
-    date-format "^4.0.14"
-    debug "^4.3.4"
-    fs-extra "^8.1.0"
-
 streamsearch@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
@@ -29158,15 +29023,17 @@ 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.0, streamx@^2.12.5, streamx@^2.13.2, streamx@^2.14.0, streamx@^2.15.0:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614"
+  integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==
   dependencies:
     fast-fifo "^1.1.0"
     queue-tick "^1.0.1"
+  optionalDependencies:
+    bare-events "^2.2.0"
 
-string-argv@0.3.2:
+string-argv@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
   integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
@@ -29178,6 +29045,14 @@ string-length@^1.0.1:
   dependencies:
     strip-ansi "^3.0.0"
 
+string-length@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
+  dependencies:
+    char-regex "^1.0.2"
+    strip-ansi "^6.0.0"
+
 string-range@~1.2, string-range@~1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd"
@@ -29188,15 +29063,6 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -29206,6 +29072,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -29214,19 +29089,14 @@ string-width@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+string-width@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.1.0.tgz#d994252935224729ea3719c49f7206dc9c46550a"
+  integrity sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==
   dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
-string.fromcodepoint@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653"
-  integrity sha512-n69H31OnxSGSZyZbgBlvYIXlrMhJQ0dQAX1js1QDhpaUH6zmU3QYlj07bCwCNlPOu3oRXIubGPl2gDGnHsiCqg==
+    emoji-regex "^10.3.0"
+    get-east-asian-width "^1.0.0"
+    strip-ansi "^7.1.0"
 
 string.prototype.matchall@^4.0.5, string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.8:
   version "4.0.8"
@@ -29299,13 +29169,6 @@ stringify-entities@^2.0.0:
     is-decimal "^1.0.2"
     is-hexadecimal "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -29327,10 +29190,17 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
-  integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
     ansi-regex "^6.0.1"
 
@@ -29457,13 +29327,13 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-stylehacks@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.0.tgz#9fdd7c217660dae0f62e14d51c89f6c01b3cb738"
-  integrity sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==
+stylehacks@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-7.0.2.tgz#cc0ec317e9d5b30fdbdfe7ed6b8d3b1a8c57fa06"
+  integrity sha512-HdkWZS9b4gbgYTdMg4gJLmm7biAUug1qTqXjS+u8X+/pUd+9Px1E+520GnOW3rST9MNsVOVpsJG+mPHNosxjOQ==
   dependencies:
-    browserslist "^4.21.4"
-    postcss-selector-parser "^6.0.4"
+    browserslist "^4.23.1"
+    postcss-selector-parser "^6.1.0"
 
 stylelint@15.10.3:
   version "15.10.3"
@@ -29552,6 +29422,21 @@ superagent@^8.0.5:
     qs "^6.11.0"
     semver "^7.3.8"
 
+superagent@^9.0.1:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-9.0.2.tgz#a18799473fc57557289d6b63960610e358bdebc1"
+  integrity sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==
+  dependencies:
+    component-emitter "^1.3.0"
+    cookiejar "^2.1.4"
+    debug "^4.3.4"
+    fast-safe-stringify "^2.1.1"
+    form-data "^4.0.0"
+    formidable "^3.5.1"
+    methods "^1.1.2"
+    mime "2.6.0"
+    qs "^6.11.0"
+
 supertest@6.3.3:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.3.3.tgz#42f4da199fee656106fd422c094cf6c9578141db"
@@ -29560,6 +29445,14 @@ supertest@6.3.3:
     methods "^1.1.2"
     superagent "^8.0.5"
 
+supertest@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/supertest/-/supertest-7.0.0.tgz#cac53b3d6872a0b317980b2b0cfa820f09cd7634"
+  integrity sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==
+  dependencies:
+    methods "^1.1.2"
+    superagent "^9.0.1"
+
 supports-color@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
@@ -29652,18 +29545,27 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-svgo@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a"
-  integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==
+svgo@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8"
+  integrity sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==
   dependencies:
     "@trysound/sax" "0.2.0"
     commander "^7.2.0"
     css-select "^5.1.0"
-    css-tree "^2.2.1"
+    css-tree "^2.3.1"
+    css-what "^6.1.0"
     csso "^5.0.5"
     picocolors "^1.0.0"
 
+swr@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-2.2.5.tgz#063eea0e9939f947227d5ca760cc53696f46446b"
+  integrity sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==
+  dependencies:
+    client-only "^0.0.1"
+    use-sync-external-store "^1.2.0"
+
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -29696,22 +29598,6 @@ sync-disk-cache@^2.0.0:
     rimraf "^3.0.0"
     username-sync "^1.0.2"
 
-sync-request@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.1.0.tgz#e96217565b5e50bbffe179868ba75532fb597e68"
-  integrity sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==
-  dependencies:
-    http-response-object "^3.0.1"
-    sync-rpc "^1.2.1"
-    then-request "^6.0.0"
-
-sync-rpc@^1.2.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/sync-rpc/-/sync-rpc-1.3.6.tgz#b2e8b2550a12ccbc71df8644810529deb68665a7"
-  integrity sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==
-  dependencies:
-    get-port "^3.1.0"
-
 synchronous-promise@^2.0.15:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz#38901319632f946c982152586f2caf8ddc25c032"
@@ -29738,10 +29624,10 @@ table@^6.0.9, table@^6.8.1:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-tailwindcss@3.3.5:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.5.tgz#22a59e2fbe0ecb6660809d9cc5f3976b077be3b8"
-  integrity sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==
+tailwindcss@3.4.10:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.10.tgz#70442d9aeb78758d1f911af29af8255ecdb8ffef"
+  integrity sha512-KWZkVPm7yJRhdu4SRSl9d4AK2wM3a50UsvgHZO7xY77NQr2V+fIrEuoDGQcbvswWvFGbS2f6e+jC/6WJm1Dl0w==
   dependencies:
     "@alloc/quick-lru" "^5.2.0"
     arg "^5.0.2"
@@ -29751,7 +29637,7 @@ tailwindcss@3.3.5:
     fast-glob "^3.3.0"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
-    jiti "^1.19.1"
+    jiti "^1.21.0"
     lilconfig "^2.1.0"
     micromatch "^4.0.5"
     normalize-path "^3.0.0"
@@ -29795,6 +29681,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"
@@ -29806,6 +29701,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"
@@ -29888,21 +29792,21 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^5.3.7:
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
-  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.1"
-    terser "^5.16.8"
+    terser "^5.26.0"
 
-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.31.6, terser@^5.26.0, terser@^5.7.0:
+  version "5.31.6"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1"
+  integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -29927,10 +29831,10 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-testem@3.10.1, testem@^3.2.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.1.tgz#bab8a83bec11e975f7d1e47e924eed6135957e5b"
-  integrity sha512-42c4e7qlAelwMd8O3ogtVGRbgbr6fJnX6H51ACOIG1V1IjsKPlcQtxPyOwaL4iikH22Dfh+EyIuJnMG4yxieBQ==
+testem@3.15.1, testem@^3.2.0:
+  version "3.15.1"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.15.1.tgz#bb39b41b6928bf347fbb9ea1bfe1e085b15ecb7e"
+  integrity sha512-532OJy6VVsnDFEGZBdWVywvceNWdjdxJruC6qCDzLH586+eh1duWk5ju6QSRqQdP6gZB7zNiUJU9dSQdHPzFuA==
   dependencies:
     "@xmldom/xmldom" "^0.8.0"
     backbone "^1.1.2"
@@ -29941,22 +29845,18 @@ testem@3.10.1, testem@^3.2.0:
     consolidate "^0.16.0"
     execa "^1.0.0"
     express "^4.10.7"
-    fireworm "^0.7.0"
+    fireworm "^0.7.2"
     glob "^7.0.4"
     http-proxy "^1.13.1"
     js-yaml "^3.2.5"
-    lodash.assignin "^4.1.0"
-    lodash.castarray "^4.4.0"
-    lodash.clonedeep "^4.4.1"
-    lodash.find "^4.5.1"
-    lodash.uniqby "^4.7.0"
-    mkdirp "^1.0.4"
+    lodash "^4.17.21"
+    mkdirp "^3.0.1"
     mustache "^4.2.0"
     node-notifier "^10.0.0"
     npmlog "^6.0.0"
     printf "^0.6.1"
     rimraf "^3.0.2"
-    socket.io "^4.1.2"
+    socket.io "^4.5.4"
     spawn-args "^0.2.0"
     styled_string "0.0.1"
     tap-parser "^7.0.0"
@@ -29972,23 +29872,6 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
   integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
 
-then-request@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/then-request/-/then-request-6.0.2.tgz#ec18dd8b5ca43aaee5cb92f7e4c1630e950d4f0c"
-  integrity sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==
-  dependencies:
-    "@types/concat-stream" "^1.6.0"
-    "@types/form-data" "0.0.33"
-    "@types/node" "^8.0.0"
-    "@types/qs" "^6.2.31"
-    caseless "~0.12.0"
-    concat-stream "^1.6.0"
-    form-data "^2.2.0"
-    http-basic "^8.1.1"
-    http-response-object "^3.0.1"
-    promise "^8.0.0"
-    qs "^6.4.0"
-
 thenby@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.4.tgz#81581f6e1bb324c6dedeae9bfc28e59b1a2201cc"
@@ -30008,20 +29891,7 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-throttle-debounce@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
-  integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
-
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
+through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -30116,17 +29986,17 @@ tlds@^1.242.0:
   resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.242.0.tgz#da136a9c95b0efa1a4cd57dca8ef240c08ada4b7"
   integrity sha512-aP3dXawgmbfU94mA32CJGHmJUE1E58HCB1KmlKRhBNtqBL27mSQcAEmcaMaQ1Za9kIVvOdbxJD3U5ycDy7nJ3w==
 
-tldts-core@^6.0.14:
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.0.14.tgz#66a325500fc46826b85719b588715f23e167b0e7"
-  integrity sha512-ESYhU/bgs6jiHlnl5h029f+0dB7EKRiTaxM/jHLZ6powScbmsgsrFcFjmyrjDgCvI/BRY79TEBBClmqLNEPyjQ==
+tldts-core@^6.1.30:
+  version "6.1.30"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.30.tgz#96ea6ae4064bee4611795bf28bdcfba347a95baa"
+  integrity sha512-CPlL58/oIvnovk5KTHIho/B0bMuvPkZrcC7f4pfQH+BBPY/mMz6CekiIdhjFxk9XZZJNirbwh1rRTSo4e5KXQA==
 
-tldts@~6.0.12:
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.0.14.tgz#bd126027d456b61e833aa4a49b85f4e7074c3f97"
-  integrity sha512-mYU7xwVGfiiC4lkWr4h3Q6U4kfAq3aWP1KsJZyRlVVeDQ3ZSBLmE20543dWSqI0U799PNzhpHObex5n60TeBGw==
+tldts@~6.1.24:
+  version "6.1.30"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.30.tgz#75d6481e9729dd779f67ce7e7e68f8eddfd26d74"
+  integrity sha512-NErlfxa+LPJynXZ07f86N6ylkXhYaOL4rB2k+qwF69cdvol1IJHmlouXE8c7Hrqr1BiYNWL4qbdTxaX+szfOpQ==
   dependencies:
-    tldts-core "^6.0.14"
+    tldts-core "^6.1.30"
 
 tmp@0.0.28:
   version "0.0.28"
@@ -30161,14 +30031,6 @@ tmpl@1.0.5:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
-to-absolute-glob@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
-  integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==
-  dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -30226,12 +30088,12 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
-  integrity sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==
+to-through@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/to-through/-/to-through-3.0.0.tgz#bf4956eaca5a0476474850a53672bed6906ace54"
+  integrity sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==
   dependencies:
-    through2 "^2.0.3"
+    streamx "^2.12.5"
 
 tocbot@^4.20.1:
   version "4.21.0"
@@ -30273,10 +30135,10 @@ totalist@^3.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.0.tgz#4ef9c58c5f095255cdc3ff2a0a55091c57a3a1bd"
   integrity sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==
 
-tough-cookie@4.1.3, tough-cookie@^4.0.0, tough-cookie@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+tough-cookie@4.1.4, tough-cookie@^4.0.0, tough-cookie@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
@@ -30298,12 +30160,12 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
-tr46@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
-  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
+tr46@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec"
+  integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==
   dependencies:
-    punycode "^2.3.0"
+    punycode "^2.3.1"
 
 tr46@~0.0.3:
   version "0.0.3"
@@ -30365,11 +30227,6 @@ trim@0.0.1:
   resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
   integrity sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==
 
-triple-beam@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984"
-  integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==
-
 trough@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
@@ -30390,10 +30247,24 @@ ts-interface-checker@^0.1.9:
   resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
   integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
 
-ts-node@10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ts-jest@29.1.5:
+  version "29.1.5"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.5.tgz#d6c0471cc78bffa2cb4664a0a6741ef36cfe8f69"
+  integrity sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==
+  dependencies:
+    bs-logger "0.x"
+    fast-json-stable-stringify "2.x"
+    jest-util "^29.0.0"
+    json5 "^2.2.3"
+    lodash.memoize "4.x"
+    make-error "1.x"
+    semver "^7.5.3"
+    yargs-parser "^21.0.1"
+
+ts-node@10.9.2:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
   dependencies:
     "@cspotcode/source-map-support" "^0.8.0"
     "@tsconfig/node10" "^1.0.7"
@@ -30418,21 +30289,21 @@ tsconfig-paths@^4.1.2:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
-  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
+tslib@2.6.3, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
 tslib@^1.11.1, tslib@^1.13.0, tslib@^1.9.0:
   version "1.14.1"
   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:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
 tsscmp@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
@@ -30494,7 +30365,7 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.21.2, type-fest@^0.21.3:
+type-fest@^0.21.3:
   version "0.21.3"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
@@ -30509,7 +30380,7 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-fest@^1.0.1, type-fest@^1.0.2, type-fest@^1.2.1, type-fest@^1.2.2:
+type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
@@ -30558,25 +30429,35 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.1.tgz#02737495d5df6ebf72c07ba0d002e8f4cf5ccfa0"
   integrity sha512-GQ90TcKpIH4XxYTI2F98yEQYZgjNMOGPpOgdjIBhaLaWji5HPWlRnZ4AeA1hfBxtY7bCGDJsqDDHk/KaHOl5bA==
 
-typescript@5.2.2, typescript@^5.0.4:
+typescript@5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
+typescript@5.4.5, typescript@^5.0.4:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
+uc.micro@^2.0.0, uc.micro@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
+  integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
+
 ufo@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"
   integrity sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==
 
 uglify-js@^3.1.4, uglify-js@^3.5.1:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.0.tgz#6d45f1cad2c54117fa2fabd87fc2713a83e3bf7b"
+  integrity sha512-wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q==
 
 uid-safe@~2.1.5:
   version "2.1.5"
@@ -30585,29 +30466,12 @@ uid-safe@~2.1.5:
   dependencies:
     random-bytes "~1.0.0"
 
-ultra-runner@3.10.5:
-  version "3.10.5"
-  resolved "https://registry.yarnpkg.com/ultra-runner/-/ultra-runner-3.10.5.tgz#7a723b64326642a6d4649ca4cd51a9900c7eccd2"
-  integrity sha512-0U2OPII7sbvtbu9rhDlUUkP4Au/DPz2Tzbnawd/XwDuUruDqd+t/Bmel3cLJxl3yMLHf0OY0TMcIx9zzxdlAZw==
+uid@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/uid/-/uid-2.0.2.tgz#4b5782abf0f2feeefc00fa88006b2b3b7af3e3b9"
+  integrity sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==
   dependencies:
-    ansi-split "^1.0.1"
-    chalk "^4.1.0"
-    cross-spawn "^7.0.3"
-    fast-glob "^3.2.5"
-    globrex "^0.1.2"
-    ignore "^5.1.8"
-    json5 "^2.2.0"
-    micro-memoize "^4.0.9"
-    npm-run-path "4.0.1"
-    pid-cwd "^1.2.0"
-    ps-list "^7.2.0"
-    shellwords-ts "^3.0.0"
-    string-width "^4.2.0"
-    tslib "2.1.0"
-    type-fest "^0.21.2"
-    wrap-ansi "^7.0.0"
-    yamljs "^0.3.0"
-    yargs "^16.2.0"
+    "@lukeed/csprng" "^1.0.0"
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -30652,10 +30516,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"
@@ -30664,20 +30528,6 @@ undici@^5.22.1:
   dependencies:
     busboy "^1.6.0"
 
-unescape-js@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/unescape-js/-/unescape-js-1.1.4.tgz#4bc6389c499cb055a98364a0b3094e1c3d5da395"
-  integrity sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g==
-  dependencies:
-    string.fromcodepoint "^0.2.1"
-
-unescape@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unescape/-/unescape-1.0.1.tgz#956e430f61cad8a4d57d82c518f5e6cc5d0dda96"
-  integrity sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==
-  dependencies:
-    extend-shallow "^2.0.1"
-
 unherit@^1.0.4:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
@@ -30709,6 +30559,11 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
+unicorn-magic@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4"
+  integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==
+
 unidecode@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/unidecode/-/unidecode-0.1.8.tgz#efbb301538bc45246a9ac8c559d72f015305053e"
@@ -30773,14 +30628,6 @@ unique-slug@^4.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -30908,13 +30755,13 @@ upath@^2.0.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356"
+  integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
 
 upper-case@^1.1.1:
   version "1.1.3"
@@ -30928,11 +30775,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.11:
-  version "1.19.11"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
-  integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
-
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -31001,10 +30843,10 @@ use-sidecar@^1.1.2:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
-use-sync-external-store@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
-  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
+use-sync-external-store@^1.2.0, use-sync-external-store@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9"
+  integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==
 
 use@^3.1.0:
   version "3.1.1"
@@ -31038,7 +30880,7 @@ util@0.10.3:
   dependencies:
     inherits "2.0.1"
 
-util@0.12.5, util@^0.12.0, util@^0.12.4:
+util@0.12.5, util@^0.12.4, util@^0.12.5:
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
   integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
@@ -31091,14 +30933,14 @@ v8-compile-cache@2.3.0, v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-to-istanbul@^9.0.0, v8-to-istanbul@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
-  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
+v8-to-istanbul@^9.0.0, v8-to-istanbul@^9.0.1, v8-to-istanbul@^9.1.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
+  integrity sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
+    convert-source-map "^2.0.0"
 
 v8flags@^3.1.3:
   version "3.2.0"
@@ -31135,6 +30977,11 @@ validate-peer-dependencies@^1.1.0:
     resolve-package-path "^3.1.0"
     semver "^7.3.2"
 
+validator@13.12.0, validator@^13.0.0:
+  version "13.12.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.12.0.tgz#7d78e76ba85504da3fee4fd1922b385914d4b35f"
+  integrity sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==
+
 validator@7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/validator/-/validator-7.2.0.tgz#a63dcbaba51d4350bf8df20988e0d5a54d711791"
@@ -31145,15 +30992,10 @@ validator@^12.0.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
   integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
 
-validator@^13.0.0:
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.11.0.tgz#23ab3fd59290c61248364eabf4067f04955fbb1b"
-  integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==
-
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
-  integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==
+value-or-function@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-4.0.0.tgz#70836b6a876a010dc3a2b884e7902e9db064378d"
+  integrity sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"
@@ -31207,55 +31049,47 @@ video-extensions@~1.2.0:
   resolved "https://registry.yarnpkg.com/video-extensions/-/video-extensions-1.2.0.tgz#62f449f403b853f02da40964cbf34143f7d96731"
   integrity sha512-TriMl18BHEsh2KuuSA065tbu4SNAC9fge7k8uKoTTofTq89+Xsg4K1BGbmSVETwUZhqSjd9KwRCNwXAW/buXMg==
 
-vinyl-fs@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
+vinyl-contents@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-contents/-/vinyl-contents-2.0.0.tgz#cc2ba4db3a36658d069249e9e36d9e2b41935d89"
+  integrity sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==
   dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
-    is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
+    bl "^5.0.0"
+    vinyl "^3.0.0"
 
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
-  integrity sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==
+vinyl-fs@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-4.0.0.tgz#06cb36efc911c6e128452f230b96584a9133c3a1"
+  integrity sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==
   dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
-
-vinyl@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
-  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
+    fs-mkdirp-stream "^2.0.1"
+    glob-stream "^8.0.0"
+    graceful-fs "^4.2.11"
+    iconv-lite "^0.6.3"
+    is-valid-glob "^1.0.0"
+    lead "^4.0.0"
+    normalize-path "3.0.0"
+    resolve-options "^2.0.0"
+    stream-composer "^1.0.2"
+    streamx "^2.14.0"
+    to-through "^3.0.0"
+    value-or-function "^4.0.0"
+    vinyl "^3.0.0"
+    vinyl-sourcemap "^2.0.0"
+
+vinyl-sourcemap@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz#422f410a0ea97cb54cebd698d56a06d7a22e0277"
+  integrity sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==
   dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
+    convert-source-map "^2.0.0"
+    graceful-fs "^4.2.10"
+    now-and-later "^3.0.0"
+    streamx "^2.12.5"
+    vinyl "^3.0.0"
+    vinyl-contents "^2.0.0"
 
-vinyl@~3.0.0:
+vinyl@^3.0.0, vinyl@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.0.tgz#11e14732bf56e2faa98ffde5157fe6c13259ff30"
   integrity sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==
@@ -31278,10 +31112,10 @@ vite-node@0.34.3:
     picocolors "^1.0.0"
     vite "^3.0.0 || ^4.0.0"
 
-vite-plugin-commonjs@0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.0.tgz#b748361e761b2d4d9ef8c76be36508cc54ca0a98"
-  integrity sha512-tl0/fy4VJ9yMjL4QocviiDan1iyKvUIY7Pn+pn6rpWyyqdprzgP4s2UFXoMiJIVYMV6oJ5goyAHZMKJkS/CxPA==
+vite-plugin-commonjs@0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.1.tgz#18585abc6020adaee733150847972f55a1f88c55"
+  integrity sha512-taP8R9kYGlCW5OzkVR0UIWRCnG6rSxeWWuA7tnU5b9t5MniibOnDY219NhisTeDhJAeGT8cEnrhVWZ9A5yD+vg==
   dependencies:
     acorn "^8.8.2"
     fast-glob "^3.2.12"
@@ -31312,10 +31146,10 @@ vite-plugin-svgr@3.3.0:
     "@svgr/core" "^8.1.0"
     "@svgr/plugin-jsx" "^8.1.0"
 
-vite@4.5.0, "vite@^3.0.0 || ^4.0.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.0.tgz#ec406295b4167ac3bc23e26f9c8ff559287cff26"
-  integrity sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==
+vite@4.5.3, "vite@^3.0.0 || ^4.0.0":
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.3.tgz#d88a4529ea58bae97294c7e2e6f0eab39a50fb1a"
+  integrity sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.27"
@@ -31385,12 +31219,12 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-w3c-xmlserializer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
-  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
   dependencies:
-    xml-name-validator "^4.0.0"
+    xml-name-validator "^5.0.0"
 
 walk-sync@3.0.0, walk-sync@^3.0.0:
   version "3.0.0"
@@ -31463,10 +31297,10 @@ watchpack@^1.7.4:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"
 
-watchpack@^2.2.0, watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+watchpack@^2.2.0, watchpack@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff"
+  integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -31528,34 +31362,34 @@ webpack-virtual-modules@^0.5.0:
   resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c"
   integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==
 
-webpack@5.89.0:
-  version "5.89.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
-  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
+webpack@5.93.0:
+  version "5.93.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
+  integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.0"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.14.5"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
+    enhanced-resolve "^5.17.0"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
     schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.7"
-    watchpack "^2.4.0"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
 webpack@^4.43.0:
@@ -31608,10 +31442,10 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-encoding@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
-  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
   dependencies:
     iconv-lite "0.6.3"
 
@@ -31625,17 +31459,17 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-mimetype@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
-  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
 
-whatwg-url@^12.0.0, whatwg-url@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
-  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
+whatwg-url@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6"
+  integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==
   dependencies:
-    tr46 "^4.1.1"
+    tr46 "^5.0.0"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
@@ -31702,10 +31536,17 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-whoops@~4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/whoops/-/whoops-4.1.4.tgz#f7981b697f76e229dd9c01dbf379a3cbc7b12f7e"
-  integrity sha512-SXjaHhIbfLTLshNIXZ7/Gb76NUKsSvO0r0UpHGZiecWCi7zkKk9Og7Fy2s01xp5Co3R39nUhzYWdAu5FNGvMbg==
+which@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
+  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
+  dependencies:
+    isexe "^3.1.1"
+
+whoops@~4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/whoops/-/whoops-4.1.7.tgz#7579470180f1d0ec16fd67e952f4f602966b694d"
+  integrity sha512-weRPO7XE2Oko2/KQkddqvj6uAjLDOoiJdrXiE2ymgiV5Ugefi0/GJZPkeNr6OUUMfcqGAwUUPIZrG6UdSuBk2g==
   dependencies:
     clean-stack "~3.0.0"
     mimic-fn "~3.1.0"
@@ -31718,22 +31559,13 @@ why-is-node-running@^2.2.2:
     siginfo "^2.0.0"
     stackback "0.0.2"
 
-wide-align@^1.1.0, wide-align@^1.1.2, wide-align@^1.1.5:
+wide-align@^1.1.0, wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-winston-transport@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa"
-  integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==
-  dependencies:
-    logform "^2.3.2"
-    readable-stream "^3.6.0"
-    triple-beam "^1.3.0"
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -31777,37 +31609,37 @@ 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"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+wrap-ansi@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^6.0.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+wrap-ansi@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.0.tgz#1a3dc8b70d85eeb8398ddfb1e4a02cd186e58b3e"
+  integrity sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==
   dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
+    ansi-styles "^6.2.1"
+    string-width "^7.0.0"
+    strip-ansi "^7.1.0"
 
 wrap-legacy-hbs-plugin-if-needed@^1.0.1:
   version "1.0.1"
@@ -31843,7 +31675,7 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write-file-atomic@^4.0.1:
+write-file-atomic@^4.0.1, write-file-atomic@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
@@ -31859,10 +31691,10 @@ write-file-atomic@^5.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^4.0.1"
 
-ws@8.14.2, ws@^8.13.0, ws@^8.2.3:
-  version "8.14.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f"
-  integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==
+ws@8.18.0, ws@^8.18.0, ws@^8.2.3:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
 
 ws@^6.1.0:
   version "6.2.2"
@@ -31871,16 +31703,11 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.4.6, ws@^7.5.9:
+ws@^7.4.6:
   version "7.5.9"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-ws@~7.4.2:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
-
 ws@~8.11.0:
   version "8.11.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
@@ -31896,10 +31723,10 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xml-name-validator@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
-  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
 
 xml@1.0.1:
   version "1.0.1"
@@ -31911,11 +31738,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmlhttprequest-ssl@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
-  integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==
-
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
@@ -31926,7 +31748,7 @@ xtend@^2.2.0:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.2.0.tgz#eef6b1f198c1c8deafad8b1765a04dad4a01c5a9"
   integrity sha512-SLt5uylT+4aoXxXuwtQp5ZnMMzhDb1Xkg4pEqc00WUJCQifPfV9Ub1VrNhp9kXkrjZD2I2Hl8WnjP37jzZLPZw==
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
@@ -31991,30 +31813,22 @@ yam@^1.0.0:
     fs-extra "^4.0.2"
     lodash.merge "^4.6.0"
 
-yaml@2.3.1, yaml@^2.1.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
-  integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
-
 yaml@^1.10.0:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yamljs@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b"
-  integrity sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==
-  dependencies:
-    argparse "^1.0.7"
-    glob "^7.0.5"
+yaml@^2.1.1, yaml@^2.4.2, yaml@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.0.tgz#c6165a721cf8000e91c36490a41d7be25176cf5d"
+  integrity sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==
 
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@21.1.1, yargs-parser@^21.1.1:
+yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -32047,7 +31861,7 @@ yargs@16.2.0, yargs@^16.1.1, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2:
+yargs@^17.0.0, yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -32068,17 +31882,12 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==
-
-yjs@13.6.8:
-  version "13.6.8"
-  resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.6.8.tgz#0d6cebf4d7e69b08ede5ecf6368ddbd9c7603c2e"
-  integrity sha512-ZPq0hpJQb6f59B++Ngg4cKexDJTvfOgeiv0sBc4sUm8CaBWH7OQC4kcCgrqbjJ/B2+6vO49exvTmYfdlPtcjbg==
+yjs@13.6.18:
+  version "13.6.18"
+  resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.6.18.tgz#d1575203478bc99ad1b89c098e7d4bacb7f91c3b"
+  integrity sha512-GBTjO4QCmv2HFKFkYIJl7U77hIB1o22vSCSQD1Ge8ZxWbIbn8AltI4gyXbtL+g5/GJep67HCMq3Y5AmNwDSyEg==
   dependencies:
-    lib0 "^0.2.74"
+    lib0 "^0.2.86"
 
 yn@3.1.1:
   version "3.1.1"
@@ -32116,3 +31925,10 @@ zip-stream@^4.1.0:
     archiver-utils "^2.1.0"
     compress-commons "^4.1.0"
     readable-stream "^3.6.0"
+
+zrender@5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.6.0.tgz#01325b0bb38332dd5e87a8dbee7336cafc0f4a5b"
+  integrity sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==
+  dependencies:
+    tslib "2.3.0"